diff --git a/.gitignore b/.gitignore index c78df3afc..cd299f2d8 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ nbproject #ignore things from transifex-client venv/ + +#ignore git projects in vendor +vendor/**/.git diff --git a/INSTALL.txt b/INSTALL.txt index 4c57064f6..81dfdfd27 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -37,7 +37,7 @@ local .htaccess file - PHP *command line* access with register_argc_argv set to true in the php.ini file [or see 'poormancron' in section 8] - - curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions + - curl, gd (with at least jpeg support), mysql, mbstring and openssl extensions - some form of email server or email gateway such that PHP mail() works diff --git a/boot.php b/boot.php index 6f036d846..c93b4f517 100644 --- a/boot.php +++ b/boot.php @@ -17,7 +17,7 @@ * easily as email does today. */ -require_once('include/autoloader.php'); +require_once(__DIR__ . DIRECTORY_SEPARATOR. 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'); use \Friendica\Core\Config; @@ -29,7 +29,6 @@ require_once('include/datetime.php'); require_once('include/pgettext.php'); require_once('include/nav.php'); require_once('include/cache.php'); -require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); require_once('include/identity.php'); require_once('update.php'); @@ -648,7 +647,6 @@ class App { set_include_path( 'include' . PATH_SEPARATOR . 'library' . PATH_SEPARATOR - . 'library/phpsec' . PATH_SEPARATOR . 'library/langdet' . PATH_SEPARATOR . '.' ); diff --git a/composer.json b/composer.json new file mode 100644 index 000000000..a7800ffff --- /dev/null +++ b/composer.json @@ -0,0 +1,34 @@ +{ + "name": "friendica/friendica", + "description": "A decentralized social network part of The Federation", + "type": "project", + "keywords": [ + "social network", + "dfrn", + "ostatus", + "diaspora" + ], + "licence": "GNU-Affero", + "support": { + "issues": "https://github.com/friendica/friendica/issues" + }, + "require": { + "ezyang/htmlpurifier": "~4.7.0", + "mobiledetect/mobiledetectlib": "2.8.*" + }, + "autoload": { + "psr-4": { + "Friendica\\": "src/" + } + }, + "config": { + "autoloader-suffix": "Friendica", + "optimize-autoloader": true, + "preferred-install": "dist" + }, + "archive": { + "exclude": [ + "log", "cache", "/photo", "/proxy" + ] + } +} diff --git a/composer.lock b/composer.lock new file mode 100644 index 000000000..2ca9991bf --- /dev/null +++ b/composer.lock @@ -0,0 +1,114 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "content-hash": "49b00f1ed3192e5173bd5577a3b91ba2", + "packages": [ + { + "name": "ezyang/htmlpurifier", + "version": "v4.7.0", + "source": { + "type": "git", + "url": "https://github.com/ezyang/htmlpurifier.git", + "reference": "ae1828d955112356f7677c465f94f7deb7d27a40" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40", + "reference": "ae1828d955112356f7677c465f94f7deb7d27a40", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "HTMLPurifier": "library/" + }, + "files": [ + "library/HTMLPurifier.composer.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Edward Z. Yang", + "email": "admin@htmlpurifier.org", + "homepage": "http://ezyang.com" + } + ], + "description": "Standards compliant HTML filter written in PHP", + "homepage": "http://htmlpurifier.org/", + "keywords": [ + "html" + ], + "time": "2015-08-05T01:03:42+00:00" + }, + { + "name": "mobiledetect/mobiledetectlib", + "version": "2.8.25", + "source": { + "type": "git", + "url": "https://github.com/serbanghita/Mobile-Detect.git", + "reference": "f0896b5c7274d1450023b0b376240be902c3251c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/f0896b5c7274d1450023b0b376240be902c3251c", + "reference": "f0896b5c7274d1450023b0b376240be902c3251c", + "shasum": "" + }, + "require": { + "php": ">=5.0.0" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "type": "library", + "autoload": { + "classmap": [ + "Mobile_Detect.php" + ], + "psr-0": { + "Detection": "namespaced/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Serban Ghita", + "email": "serbanghita@gmail.com", + "homepage": "http://mobiledetect.net", + "role": "Developer" + } + ], + "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.", + "homepage": "https://github.com/serbanghita/Mobile-Detect", + "keywords": [ + "detect mobile devices", + "mobile", + "mobile detect", + "mobile detector", + "php mobile detect" + ], + "time": "2017-03-29T13:59:30+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff --git a/doc/Composer.md b/doc/Composer.md new file mode 100644 index 000000000..d0e930e34 --- /dev/null +++ b/doc/Composer.md @@ -0,0 +1,98 @@ +Using Composer +============== + +* [Home](help) + * [Developer Intro](help/Developers-Intro) + +Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes. + +It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application through `boot.php`. + +* [Class autoloading](help/autoloader) + +## How to use Composer + +If you don't have Composer installed on your system, Friendica ships with a copy of it at `util/composer.phar`. +For the purpose of this help, all examples will use this path to run Composer commands, however feel free to replace them with your own way of calling Composer. +Composer requires PHP CLI and the following examples assume it's available system-wide. + +### Installing/Updating Friendica + +#### From Archive + +If you just unpacked a Friendica release archive, you don't have to use Commposer at all, all the required libraries are already bundled in the archive. + +#### Installing with Git + +If you prefer to use `git`, you will have to run Composer to fetch the required libraries and build the autoloader before you can run Friendica. +Here are the typical commands you will have to run to do so: + +```` +~> git clone https://github.com/friendica/friendica.git friendica +~/friendica> cd friendica +~/friendica> util/composer.phar install +```` + +That's it! Composer will take care of fetching all the required libraries in the `vendor` folder and build the autoloader to make those libraries available to Friendica. + +#### Updating with Git + +Updating Friendica to the current stable or the latest develop version is easy with Git, just remember to run Composer after every branch pull. + +```` +~> cd friendica +~/friendica> git pull +~/friendica> util/composer.phar install +```` + +And that's it. If any library used by Friendica has been upgraded, Composer will fetch the version currently used by Friendica and refresh the autoloader to ensure the best performances. + +### Developing Friendica + +First of all, thanks for contributing to Friendica! +Composer is meant to be used by developers to maintain third-party libraries required by Friendica. +If you don't need to use any third-party library, then you don't need to use Composer beyond what is above to install/update Friendica. + +#### Adding a third-party library to Friendica + +Does your shiny new [Plugin](help/Plugins) need to rely on a third-party library not required by Friendica yet? +First of all, this library should be available on [Packagist](https://packagist.org) so that Composer knows how to fetch it directly just by mentioning its name in `composer.json`. + +This file is the configuration of Friendica for Composer. It lists details about the Friendica project, but also a list of required dependencies and their target version. +Here's a simplified version of the one we currently use on Friendica: + +````json +{ + "name": "friendica/friendica", + "description": "A decentralized social network part of The Federation", + "type": "project", + ... + "require": { + "ezyang/htmlpurifier": "~4.7.0", + "mobiledetect/mobiledetectlib": "2.8.*" + }, + ... +} +```` + +The important part is under the `require` key, this is a list of all the libraries Friendica may need to run. +As you can see, at the moment we only require two, HTMLPurifier and MobileDetect. +Each library has a different target version, and [per Composer documentation about version constraints](https://getcomposer.org/doc/articles/versions.md#writing-basic-version-constraints), this means that: + +* We will update HTMLPurifier up to version 4.8.0 excluded +* We will update MobileDetect up to version 2.9.0 excluded + +There are other operators you can use to allow Composer to update the package up to the next major version excluded. +Or you can specify the exact version of the library if you code requires it, and Composer will never update it although it isn't recommended. + +To add a library, just add its Packagist identifier to the `require` list and set a target version string. + +Then you should run `util/composer.phar update` to add it to your local `vendor` folder and update the `composer.lock` file that specifies the current versions of the dependencies. + +#### Updating an existing dependency + +If a package needs to be updated, whether to the next minor version or to the next major version provided you changed the adequate code in Friendica, simply edit `composer.json` to update the target version string of the relevant library. + +Then you should run `util/composer.phar update` to update it in your local `vendor` folder and update the `composer.lock` file that specifies the current versions of the dependencies. + +Please note that you should commit both `composer.json` and `composer.lock` with your work every time you make a change to the former. \ No newline at end of file diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index 61b300b0c..5568afeb5 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -6,8 +6,7 @@ Where to get started to help improve Friendica? Do you want to help us improve Friendica? Here we have compiled some hints on how to get started and some tasks to help you choose. A project like Friendica is the sum of many different contributions. -**Very different skills are required to make good software. -Some of them involve coding, others do not.** +**Very different skills are required to make good software, not all of them involve coding!** We are looking for helpers in all areas, whether you write text or code, whether you spread the word to convince people or design new icons. Whether you feel like an expert or like a newbie - join us with your ideas! @@ -47,6 +46,14 @@ We can't promise we have the right skills in the group but we'll try. Programming --- +### Composer + +Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes. + +It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application through `boot.php`. + +* [Using Composer](help/Composer) + ###Coding standards For the sake of consistency between contribution and general code readability, Friendica follows the widespread [PSR-2 coding standards](http://www.php-fig.org/psr/psr-2/) to the exception of a few rules. @@ -120,6 +127,7 @@ Ask us to find out whom to talk to about their experiences. Do not worry about cross-posting. ###Client software + As Friendica is using a [Twitter/GNU Social compatible API](help/api) any of the clients for those platforms should work with Friendica as well. Furthermore there are several client projects, especially for use with Friendica. If you are interested in improving those clients, please contact the developers of the clients directly. diff --git a/doc/Home.md b/doc/Home.md index b4b389921..5490d171f 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -47,6 +47,7 @@ Friendica Documentation and Resources * [Protocol Documentation](help/Protocol) * [Database schema documantation](help/database) * [Class Autoloading](help/autoloader) +* [Using Composer](help/Composer) * [Code - Reference(Doxygen generated - sets cookies)](doc/html/) * [Twitter/GNU Social API Functions](help/api) diff --git a/doc/Install.md b/doc/Install.md index 9a194254a..b817339bb 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -30,7 +30,6 @@ Requirements * PHP *command line* access with register_argc_argv set to true in the php.ini file * curl, gd, mysql, hash and openssl extensions * some form of email server or email gateway such that PHP mail() works -* mcrypt (optional; used for server-to-server message encryption) * Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.) * the ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) (Note: other options are presented in Section 7 of this document.) * Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will not be as convenient to use and have not been thoroughly tested. diff --git a/doc/Settings.md b/doc/Settings.md index 9590ad42d..5055ed7d2 100644 --- a/doc/Settings.md +++ b/doc/Settings.md @@ -152,13 +152,6 @@ Value is in seconds. Default is 60 seconds. Set to 0 for unlimited (not recommended). -#### UTF-8 Regular Expressions - -During registrations, full names are checked using UTF-8 regular expressions. -This requires PHP to have been compiled with a special setting to allow UTF-8 expressions. -If you are completely unable to register accounts, set no_utf to true. -The default is set to false (meaning UTF8 regular expressions are supported and working). - #### Verify SSL Certitificates By default Friendica allows SSL communication between websites that have "self-signed" SSL certificates. diff --git a/doc/autoloader.md b/doc/autoloader.md index 69c62451c..83f101044 100644 --- a/doc/autoloader.md +++ b/doc/autoloader.md @@ -1,209 +1,192 @@ -Autoloader +Autoloader with Composer ========== * [Home](help) + * [Developer Intro](help/Developers-Intro) -There is some initial support to class autoloading in Friendica core. +Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes. -The autoloader code is in `include/autoloader.php`. -It's derived from composer autoloader code. +It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application through `boot.php`. -Namespaces and Classes are mapped to folders and files in `library/`, -and the map must be updated by hand, because we don't use composer yet. -The mapping is defined by files in `include/autoloader/` folder. +* [Using Composer](help/Composer) -Currently, only HTMLPurifier library is loaded using autoloader. +## A quick introduction to class autoloading +The autoloader dynamically includes the file defining a class when it is first referenced, either by instantiating an object or simply making sure that it is available, without the need to explicitly use "require_once". -## A quick introdution to class autoloading +Once it is set up you don't have to directly use it, you can directly use any class that is covered by the autoloader (currently `vendor` and `src`) -The autoloader it's a way for php to automagically include the file that define a class when the class is first used, without the need to use "require_once" every time. +Under the hood, Composer registers a callback with [`spl_autoload_register()`](http://php.net/manual/en/function.spl-autoload-register.php) that receives a class name as an argument and includes the corresponding class definition file. +For more info about PHP autoloading, please refer to the [official PHP documentation](http://php.net/manual/en/language.oop5.autoload.php). -Once is setup you don't have to use it in any way. You need a class? you use the class. +### Example -At his basic is a function passed to the "spl_autoload_register()" function, which receive as argument the class name the script want and is it job to include the correct php file where that class is defined. -The best source for documentation is [php site](http://php.net/manual/en/language.oop5.autoload.php). +Let's say you have a PHP file in `src/` that define a very useful class: -One example, based on fictional friendica code. +```php + // src/ItemsManager.php + array($baseDir."/include"); - ); -``` - - -That tells the autoloader code to look for files that defines classes in "Friendica" namespace under "include/" folder. (And btw, that's why the file has the same name as the class it defines.) - -*note*: The structure of files in "include/autoloader/" has been copied from the code generated by composer, to ease the work of enable autoloader for external libraries under "library/" - -Let's say now that you need to load some items in a view, maybe in a fictional "mod/network.php". -Somewere at the start of the scripts, the autoloader was initialized. In Friendica is done at the top of "boot.php", with "require_once('include/autoloader.php');". +Let's say now that you need to load some items in a view, maybe in a fictional `mod/network.php`. +In order for the Composer autoloader to work, it must first be included. In Friendica this is already done at the top of `boot.php`, with `require_once('vendor/autoload.php');`. The code will be something like: -``` - file: mod/network.php - getAll(); + function network_content(App $a) { + $itemsmanager = new \Friendica\ItemsManager(); + $items = $itemsmanager->getAll(); - // pass $items to template - // return result - } + // pass $items to template + // return result + } ``` -That's a quite simple example, but look: no "require()"! -You need to use a class, you use the class and you don't need to do anything more. +That's a quite simple example, but look: no `require()`! +If you need to use a class, you can simply use it and you don't need to do anything else. -Going further: now we have a bunch of "*Manager" classes that cause some code duplication, let's define a BaseManager class, where to move all code in common between all managers: +Going further: now we have a bunch of `*Manager` classes that cause some code duplication, let's define a `BaseManager` class, where we move all common code between all managers: -``` - file: include/BaseManager.php - config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is set to a non zero -// value and the PHP mcrypt extension is installed on both systems -// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt +// Encryption will only be provided if this setting is set to a non zero value +// set to 0 to disable, 2 to enable, 1 is deprecated $a->config['system']['rino_encrypt'] = 2; diff --git a/include/Probe.php b/include/Probe.php index 1b6feb107..c2136eec8 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -18,6 +18,8 @@ require_once('include/network.php'); */ class Probe { + private static $baseurl; + /** * @brief Rearrange the array so that it always has the same order * @@ -54,6 +56,9 @@ class Probe { */ private function xrd($host) { + // Reset the static variable + self::$baseurl = ''; + $ssl_url = "https://".$host."/.well-known/host-meta"; $url = "http://".$host."/.well-known/host-meta"; @@ -102,6 +107,9 @@ class Probe { elseif ($attributes["rel"] == "lrdd") $xrd_data["lrdd"] = $attributes["template"]; } + + self::$baseurl = "http://".$host; + return $xrd_data; } @@ -169,6 +177,8 @@ class Probe { $path_parts = explode("/", trim($parts["path"], "/")); + $nick = array_pop($path_parts); + do { $lrdd = self::xrd($host); $host .= "/".array_shift($path_parts); @@ -192,6 +202,19 @@ class Probe { $path = str_replace('{uri}', urlencode("acct:".$uri), $link); $webfinger = self::webfinger($path); } + + // Special treatment for Mastodon + // Problem is that Mastodon uses an URL format like http://domain.tld/@nick + // But the webfinger for this format fails. + if (!$webfinger AND isset($nick)) { + // Mastodon uses a "@" as prefix for usernames in their url format + $nick = ltrim($nick, '@'); + + $addr = $nick."@".$host; + + $path = str_replace('{uri}', urlencode("acct:".$addr), $link); + $webfinger = self::webfinger($path); + } } if (!is_array($webfinger["links"])) @@ -258,8 +281,13 @@ class Probe { $data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' '))); } - if (!isset($data["network"])) + if (self::$baseurl != "") { + $data["baseurl"] = self::$baseurl; + } + + if (!isset($data["network"])) { $data["network"] = NETWORK_PHANTOM; + } $data = self::rearrange_data($data); @@ -286,6 +314,7 @@ class Probe { dbesc(normalise_link($data['url'])) ); } + return $data; } @@ -301,7 +330,34 @@ class Probe { * @return array uri data */ private function detect($uri, $network, $uid) { - if (strstr($uri, '@')) { + $parts = parse_url($uri); + + if (isset($parts["scheme"]) AND isset($parts["host"]) AND isset($parts["path"])) { + + /// @todo: Ports? + $host = $parts["host"]; + + if ($host == 'twitter.com') { + return array("network" => NETWORK_TWITTER); + } + $lrdd = self::xrd($host); + + $path_parts = explode("/", trim($parts["path"], "/")); + + while (!$lrdd AND (sizeof($path_parts) > 1)) { + $host .= "/".array_shift($path_parts); + $lrdd = self::xrd($host); + } + if (!$lrdd) { + return self::feed($uri); + } + $nick = array_pop($path_parts); + + // Mastodon uses a "@" as prefix for usernames in their url format + $nick = ltrim($nick, '@'); + + $addr = $nick."@".$host; + } elseif (strstr($uri, '@')) { // If the URI starts with "mailto:" then jump directly to the mail detection if (strpos($url,'mailto:') !== false) { $uri = str_replace('mailto:', '', $url); @@ -317,42 +373,19 @@ class Probe { $host = substr($uri,strpos($uri, '@') + 1); $nick = substr($uri,0, strpos($uri, '@')); - if (strpos($uri, '@twitter.com')) + if (strpos($uri, '@twitter.com')) { return array("network" => NETWORK_TWITTER); - + } $lrdd = self::xrd($host); - if (!$lrdd) + if (!$lrdd) { return self::mail($uri, $uid); - + } $addr = $uri; } else { - $parts = parse_url($uri); - if (!isset($parts["scheme"]) OR - !isset($parts["host"]) OR - !isset($parts["path"])) - return false; - - /// @todo: Ports? - $host = $parts["host"]; - - if ($host == 'twitter.com') - return array("network" => NETWORK_TWITTER); - - $lrdd = self::xrd($host); - - $path_parts = explode("/", trim($parts["path"], "/")); - - while (!$lrdd AND (sizeof($path_parts) > 1)) { - $host .= "/".array_shift($path_parts); - $lrdd = self::xrd($host); - } - if (!$lrdd) - return self::feed($uri); - - $nick = array_pop($path_parts); - $addr = $nick."@".$host; + return false; } + $webfinger = false; /// @todo Do we need the prefix "acct:" or "acct://"? @@ -855,33 +888,36 @@ class Probe { * @return array OStatus data */ private function ostatus($webfinger) { - $data = array(); - if (is_array($webfinger["aliases"])) - foreach($webfinger["aliases"] AS $alias) - if (strstr($alias, "@")) + if (is_array($webfinger["aliases"])) { + foreach ($webfinger["aliases"] AS $alias) { + if (strstr($alias, "@")) { $data["addr"] = str_replace('acct:', '', $alias); + } + } + } - if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@")) + if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@")) { $data["addr"] = str_replace('acct:', '', $webfinger["subject"]); - + } $pubkey = ""; foreach ($webfinger["links"] AS $link) { if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND - ($link["type"] == "text/html") AND ($link["href"] != "")) + ($link["type"] == "text/html") AND ($link["href"] != "")) { $data["url"] = $link["href"]; - elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) + } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) { $data["notify"] = $link["href"]; - elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) + } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) { $data["poll"] = $link["href"]; - elseif (($link["rel"] == "magic-public-key") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "magic-public-key") AND ($link["href"] != "")) { $pubkey = $link["href"]; if (substr($pubkey, 0, 5) === 'data:') { - if (strstr($pubkey, ',')) + if (strstr($pubkey, ',')) { $pubkey = substr($pubkey, strpos($pubkey, ',') + 1); - else + } else { $pubkey = substr($pubkey, 5); + } } elseif (normalise_link($pubkey) == 'http://') { $ret = z_fetch_url($pubkey); if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { @@ -897,16 +933,15 @@ class Probe { $e = base64url_decode($key[2]); $data["pubkey"] = metopem($m,$e); } - } } if (isset($data["notify"]) AND isset($data["pubkey"]) AND isset($data["poll"]) AND isset($data["url"])) { $data["network"] = NETWORK_OSTATUS; - } else + } else { return false; - + } // Fetch all additional data from the feed $ret = z_fetch_url($data["poll"]); if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { @@ -914,32 +949,32 @@ class Probe { } $feed = $ret['body']; $feed_data = feed_import($feed,$dummy1,$dummy2, $dummy3, true); - if (!$feed_data) + if (!$feed_data) { return false; - - if ($feed_data["header"]["author-name"] != "") + } + if ($feed_data["header"]["author-name"] != "") { $data["name"] = $feed_data["header"]["author-name"]; - - if ($feed_data["header"]["author-nick"] != "") + } + if ($feed_data["header"]["author-nick"] != "") { $data["nick"] = $feed_data["header"]["author-nick"]; - - if ($feed_data["header"]["author-avatar"] != "") - $data["photo"] = $feed_data["header"]["author-avatar"]; - - if ($feed_data["header"]["author-id"] != "") + } + if ($feed_data["header"]["author-avatar"] != "") { + $data["photo"] = ostatus::fix_avatar($feed_data["header"]["author-avatar"], $data["url"]); + } + if ($feed_data["header"]["author-id"] != "") { $data["alias"] = $feed_data["header"]["author-id"]; - - if ($feed_data["header"]["author-location"] != "") + } + if ($feed_data["header"]["author-location"] != "") { $data["location"] = $feed_data["header"]["author-location"]; - - if ($feed_data["header"]["author-about"] != "") + } + if ($feed_data["header"]["author-about"] != "") { $data["about"] = $feed_data["header"]["author-about"]; - + } // OStatus has serious issues when the the url doesn't fit (ssl vs. non ssl) // So we take the value that we just fetched, although the other one worked as well - if ($feed_data["header"]["author-link"] != "") + if ($feed_data["header"]["author-link"] != "") { $data["url"] = $feed_data["header"]["author-link"]; - + } /// @todo Fetch location and "about" from the feed as well return $data; } diff --git a/include/api.php b/include/api.php index 701e527cc..9fc853340 100644 --- a/include/api.php +++ b/include/api.php @@ -352,6 +352,7 @@ use \Friendica\Core\Config; } } } + logger('API call not implemented: '.$a->query_string); throw new NotImplementedException(); } catch (HTTPException $e) { header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}"); @@ -2720,6 +2721,7 @@ use \Friendica\Core\Config; return api_format_data('config', $type, array('config' => $config)); } + api_register_func('api/gnusocial/config','api_statusnet_config',false); api_register_func('api/statusnet/config','api_statusnet_config',false); function api_statusnet_version($type) { @@ -2728,6 +2730,7 @@ use \Friendica\Core\Config; return api_format_data('version', $type, array('version' => $fake_statusnet_version)); } + api_register_func('api/gnusocial/version','api_statusnet_version',false); api_register_func('api/statusnet/version','api_statusnet_version',false); /** @@ -3963,7 +3966,7 @@ use \Friendica\Core\Config; $multi_profiles = feature_enabled(api_user(),'multi_profiles'); $directory = get_config('system', 'directory'); -// get data of the specified profile id or all profiles of the user if not specified + // get data of the specified profile id or all profiles of the user if not specified if ($profileid != 0) { $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d", intval(api_user()), @@ -3971,11 +3974,10 @@ use \Friendica\Core\Config; // error message if specified gid is not in database if (!dbm::is_result($r)) throw new BadRequestException("profile_id not available"); - } - else + } else { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", intval(api_user())); - + } // loop through all returned profiles and retrieve data and users $k = 0; foreach ($r as $rr) { @@ -4002,9 +4004,11 @@ use \Friendica\Core\Config; } // return settings, authenticated user and profiles data + $self = q("SELECT `nurl` FROM `contact` WHERE `uid`= %d AND `self` LIMIT 1", intval(api_user())); + $result = array('multi_profiles' => $multi_profiles ? true : false, 'global_dir' => $directory, - 'friendica_owner' => api_get_user($a, intval(api_user())), + 'friendica_owner' => api_get_user($a, $self[0]['nurl']), 'profiles' => $profiles); return api_format_data("friendica_profiles", $type, array('$result' => $result)); } diff --git a/include/autoloader.php b/include/autoloader.php deleted file mode 100644 index 6caa08291..000000000 --- a/include/autoloader.php +++ /dev/null @@ -1,69 +0,0 @@ - $path) { - $loader->set($namespace, $path); - } - - $map = require __DIR__ . '/autoloader/autoload_psr4.php'; - foreach ($map as $namespace => $path) { - $loader->setPsr4($namespace, $path); - } - - $classMap = require __DIR__ . '/autoloader/autoload_classmap.php'; - if ($classMap) { - $loader->addClassMap($classMap); - } - - $loader->register(true); - - $includeFiles = require __DIR__ . '/autoloader/autoload_files.php'; - foreach ($includeFiles as $fileIdentifier => $file) { - friendicaRequire($fileIdentifier, $file); - } - - - return $loader; - } -} - -function friendicaRequire($fileIdentifier, $file) -{ - if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { - require $file; - - $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; - } -} - - - -return FriendicaAutoloaderInit::getLoader(); diff --git a/include/autoloader/autoload_classmap.php b/include/autoloader/autoload_classmap.php deleted file mode 100644 index 3efd09fc6..000000000 --- a/include/autoloader/autoload_classmap.php +++ /dev/null @@ -1,9 +0,0 @@ - array($baseDir . '/include'), -); diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index e50999923..03eff5a6b 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -59,15 +59,6 @@ function diaspora2bb($s) { $s = str_replace('#', '#', $s); - $search = array(" \n", "\n "); - $replace = array("\n", "\n"); - do { - $oldtext = $s; - $s = str_replace($search, $replace, $s); - } while ($oldtext != $s); - - $s = str_replace("\n\n", '
', $s); - $s = html2bbcode($s); // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 62d79d877..56c032847 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -88,7 +88,7 @@ function network_to_name($s, $profile = "") { NETWORK_PUMPIO => t('pump.io'), NETWORK_TWITTER => t('Twitter'), NETWORK_DIASPORA2 => t('Diaspora Connector'), - NETWORK_STATUSNET => t('GNU Social'), + NETWORK_STATUSNET => t('GNU Social Connector'), NETWORK_PNUT => t('pnut'), NETWORK_APPNET => t('App.net') ); @@ -98,17 +98,16 @@ function network_to_name($s, $profile = "") { $search = array_keys($nets); $replace = array_values($nets); - $networkname = str_replace($search,$replace,$s); - - if (($s == NETWORK_DIASPORA) AND ($profile != "") AND Diaspora::is_redmatrix($profile)) { - $networkname = t("Hubzilla/Redmatrix"); + $networkname = str_replace($search, $replace, $s); + if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) AND ($profile != "")) { $r = q("SELECT `gserver`.`platform` FROM `gcontact` INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url` WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''", dbesc(normalise_link($profile))); - if ($r) + if (dbm::is_result($r)) { $networkname = $r[0]["platform"]; + } } return $networkname; diff --git a/include/cron.php b/include/cron.php index ca9b5dff2..58a3fcf9c 100644 --- a/include/cron.php +++ b/include/cron.php @@ -1,28 +1,24 @@ 1) { + cron_poll_contacts($argc, $argv); + return; + } $last = get_config('system','last_cron'); $poll_interval = intval(get_config('system','cron_interval')); - if(! $poll_interval) + if (! $poll_interval) { $poll_interval = 10; - - if($last) { + } + if ($last) { $next = $last + ($poll_interval * 60); if($next > time()) { logger('cron intervall not reached'); @@ -33,19 +29,16 @@ function cron_run(&$argv, &$argc){ logger('cron: start'); // run queue delivery process in the background - proc_run(PRIORITY_NEGLIGIBLE, "include/queue.php"); // run the process to discover global contacts in the background - proc_run(PRIORITY_LOW, "include/discover_poco.php"); // run the process to update locally stored global contacts in the background - proc_run(PRIORITY_LOW, "include/discover_poco.php", "checkcontact"); // Expire and remove user entries - cron_expire_and_remove_users(); + proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "expire_and_remove_users"); // Check OStatus conversations proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_mentions"); @@ -59,14 +52,22 @@ function cron_run(&$argv, &$argc){ // update nodeinfo data proc_run(PRIORITY_LOW, "include/cronjobs.php", "nodeinfo"); - // once daily run birthday_updates and then expire in background + // Clear cache entries + proc_run(PRIORITY_LOW, "include/cronjobs.php", "clear_cache"); + // Repair missing Diaspora values in contacts + proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_diaspora"); + + // Repair entries in the database + proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database"); + + // once daily run birthday_updates and then expire in background $d1 = get_config('system','last_expire_day'); $d2 = intval(datetime_convert('UTC','UTC','now','d')); if($d2 != intval($d1)) { - update_contact_birthdays(); + proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays"); proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server"); @@ -78,18 +79,9 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_MEDIUM, 'include/dbclean.php'); - cron_update_photo_albums(); + proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_photo_albums"); } - // Clear cache entries - cron_clear_cache($a); - - // Repair missing Diaspora values in contacts - cron_repair_diaspora($a); - - // Repair entries in the database - cron_repair_database(); - // Poll contacts cron_poll_contacts($argc, $argv); @@ -100,39 +92,6 @@ function cron_run(&$argv, &$argc){ return; } -/** - * @brief Update the cached values for the number of photo albums per user - */ -function cron_update_photo_albums() { - $r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`"); - if (!dbm::is_result($r)) { - return; - } - - foreach ($r AS $user) { - photo_albums($user['uid'], true); - } -} - -/** - * @brief Expire and remove user entries - */ -function cron_expire_and_remove_users() { - // expire any expired accounts - q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 - AND `account_expires_on` > '%s' - AND `account_expires_on` < UTC_TIMESTAMP()", dbesc(NULL_DATE)); - - // delete user and contact records for recently removed accounts - $r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); - if ($r) { - foreach($r as $user) { - q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid'])); - q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid'])); - } - } -} - /** * @brief Poll contacts for unreceived messages * @@ -145,14 +104,15 @@ function cron_poll_contacts($argc, $argv) { $force = false; $restart = false; - if (($argc > 1) && ($argv[1] == 'force')) + if (($argc > 1) && ($argv[1] == 'force')) { $force = true; - + } if (($argc > 1) && ($argv[1] == 'restart')) { $restart = true; $generation = intval($argv[2]); - if (!$generation) + if (!$generation) { killme(); + } } if (($argc > 1) && intval($argv[1])) { @@ -171,9 +131,9 @@ function cron_poll_contacts($argc, $argv) { // we are unable to match those posts with a Diaspora GUID and prevent duplicates. $abandon_days = intval(get_config('system','account_abandon_days')); - if($abandon_days < 1) + if ($abandon_days < 1) { $abandon_days = 0; - + } $abandon_sql = (($abandon_days) ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) : '' @@ -244,185 +204,44 @@ function cron_poll_contacts($argc, $argv) { switch ($contact['priority']) { case 5: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) { $update = true; + } break; case 4: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) { $update = true; + } break; case 3: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) { $update = true; + } break; case 2: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) { $update = true; + } break; case 1: default: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) { $update = true; + } break; } - if (!$update) + if (!$update) { continue; + } } logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]); if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) { - proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', $contact['id']); + proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id'])); } else { - proc_run(PRIORITY_LOW, 'include/onepoll.php', $contact['id']); + proc_run(PRIORITY_LOW, 'include/onepoll.php', intval($contact['id'])); } } } } - -/** - * @brief Clear cache entries - * - * @param App $a - */ -function cron_clear_cache(App $a) { - - $last = get_config('system','cache_last_cleared'); - - if($last) { - $next = $last + (3600); // Once per hour - $clear_cache = ($next <= time()); - } else - $clear_cache = true; - - if (!$clear_cache) - return; - - // clear old cache - Cache::clear(); - - // clear old item cache files - clear_cache(); - - // clear cache for photos - clear_cache($a->get_basepath(), $a->get_basepath()."/photo"); - - // clear smarty cache - clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled"); - - // clear cache for image proxy - if (!get_config("system", "proxy_disabled")) { - clear_cache($a->get_basepath(), $a->get_basepath()."/proxy"); - - $cachetime = get_config('system','proxy_cache_time'); - if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME; - - q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime); - } - - // Delete the cached OEmbed entries that are older than one year - q("DELETE FROM `oembed` WHERE `created` < NOW() - INTERVAL 3 MONTH"); - - // Delete the cached "parse_url" entries that are older than one year - q("DELETE FROM `parsed_url` WHERE `created` < NOW() - INTERVAL 3 MONTH"); - - // Maximum table size in megabyte - $max_tablesize = intval(get_config('system','optimize_max_tablesize')) * 1000000; - if ($max_tablesize == 0) - $max_tablesize = 100 * 1000000; // Default are 100 MB - - if ($max_tablesize > 0) { - // Minimum fragmentation level in percent - $fragmentation_level = intval(get_config('system','optimize_fragmentation')) / 100; - if ($fragmentation_level == 0) - $fragmentation_level = 0.3; // Default value is 30% - - // Optimize some tables that need to be optimized - $r = q("SHOW TABLE STATUS"); - foreach($r as $table) { - - // Don't optimize tables that are too large - if ($table["Data_length"] > $max_tablesize) - continue; - - // Don't optimize empty tables - if ($table["Data_length"] == 0) - continue; - - // Calculate fragmentation - $fragmentation = $table["Data_free"] / ($table["Data_length"] + $table["Index_length"]); - - logger("Table ".$table["Name"]." - Fragmentation level: ".round($fragmentation * 100, 2), LOGGER_DEBUG); - - // Don't optimize tables that needn't to be optimized - if ($fragmentation < $fragmentation_level) - continue; - - // So optimize it - logger("Optimize Table ".$table["Name"], LOGGER_DEBUG); - q("OPTIMIZE TABLE `%s`", dbesc($table["Name"])); - } - } - - set_config('system','cache_last_cleared', time()); -} - -/** - * @brief Repair missing values in Diaspora contacts - * - * @param App $a - */ -function cron_repair_diaspora(App $a) { - $r = q("SELECT `id`, `url` FROM `contact` - WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '') - ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA)); - if (dbm::is_result($r)) { - foreach ($r AS $contact) { - if (poco_reachable($contact["url"])) { - $data = probe_url($contact["url"]); - if ($data["network"] == NETWORK_DIASPORA) { - logger("Repair contact ".$contact["id"]." ".$contact["url"], LOGGER_DEBUG); - q("UPDATE `contact` SET `batch` = '%s', `notify` = '%s', `poll` = '%s', pubkey = '%s' WHERE `id` = %d", - dbesc($data["batch"]), dbesc($data["notify"]), dbesc($data["poll"]), dbesc($data["pubkey"]), - intval($contact["id"])); - } - } - } - } -} - -/** - * @brief Do some repairs in database entries - * - */ -function cron_repair_database() { - - // Sometimes there seem to be issues where the "self" contact vanishes. - // We haven't found the origin of the problem by now. - $r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)"); - if (dbm::is_result($r)) { - foreach ($r AS $user) { - logger('Create missing self contact for user '.$user['uid']); - user_create_self_contact($user['uid']); - } - } - - // Set the parent if it wasn't set. (Shouldn't happen - but does sometimes) - // This call is very "cheap" so we can do it at any time without a problem - q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0"); - - // There was an issue where the nick vanishes from the contact table - q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''"); - - // Update the global contacts for local users - $r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`"); - if (dbm::is_result($r)) - foreach ($r AS $user) - update_gcontact_for_user($user["uid"]); - - /// @todo - /// - remove thread entries without item - /// - remove sign entries without item - /// - remove children when parent got lost - /// - set contact-id in item when not present -} diff --git a/include/cronjobs.php b/include/cronjobs.php index 5cc2bf132..79ee32bb3 100644 --- a/include/cronjobs.php +++ b/include/cronjobs.php @@ -8,10 +8,17 @@ function cronjobs_run(&$argv, &$argc){ require_once('include/ostatus.php'); require_once('include/post_update.php'); require_once('mod/nodeinfo.php'); + require_once('include/photos.php'); + require_once('include/user.php'); + require_once('include/socgraph.php'); + require_once('include/Probe.php'); // No parameter set? So return - if ($argc <= 1) + if ($argc <= 1) { return; + } + + logger("Starting cronjob ".$argv[1], LOGGER_DEBUG); // Check OStatus conversations // Check only conversations with mentions (for a longer time) @@ -39,5 +46,244 @@ function cronjobs_run(&$argv, &$argc){ return; } + // Expire and remove user entries + if ($argv[1] == 'expire_and_remove_users') { + cron_expire_and_remove_users(); + return; + } + + if ($argv[1] == 'update_contact_birthdays') { + update_contact_birthdays(); + return; + } + + if ($argv[1] == 'update_photo_albums') { + cron_update_photo_albums(); + return; + } + + // Clear cache entries + if ($argv[1] == 'clear_cache') { + cron_clear_cache($a); + return; + } + + // Repair missing Diaspora values in contacts + if ($argv[1] == 'repair_diaspora') { + cron_repair_diaspora($a); + return; + } + + // Repair entries in the database + if ($argv[1] == 'repair_database') { + cron_repair_database(); + return; + } + + logger("Xronjob ".$argv[1]." is unknown.", LOGGER_DEBUG); + return; } + +/** + * @brief Update the cached values for the number of photo albums per user + */ +function cron_update_photo_albums() { + $r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`"); + if (!dbm::is_result($r)) { + return; + } + + foreach ($r AS $user) { + photo_albums($user['uid'], true); + } +} + +/** + * @brief Expire and remove user entries + */ +function cron_expire_and_remove_users() { + // expire any expired accounts + q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 + AND `account_expires_on` > '%s' + AND `account_expires_on` < UTC_TIMESTAMP()", dbesc(NULL_DATE)); + + // delete user and contact records for recently removed accounts + $r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); + if (dbm::is_result($r)) { + foreach ($r as $user) { + q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid'])); + q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid'])); + } + } +} + +/** + * @brief Clear cache entries + * + * @param App $a + */ +function cron_clear_cache(App $a) { + + $last = get_config('system','cache_last_cleared'); + + if ($last) { + $next = $last + (3600); // Once per hour + $clear_cache = ($next <= time()); + } else { + $clear_cache = true; + } + + if (!$clear_cache) { + return; + } + + // clear old cache + Cache::clear(); + + // clear old item cache files + clear_cache(); + + // clear cache for photos + clear_cache($a->get_basepath(), $a->get_basepath()."/photo"); + + // clear smarty cache + clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled"); + + // clear cache for image proxy + if (!get_config("system", "proxy_disabled")) { + clear_cache($a->get_basepath(), $a->get_basepath()."/proxy"); + + $cachetime = get_config('system','proxy_cache_time'); + if (!$cachetime) { + $cachetime = PROXY_DEFAULT_TIME; + } + q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime); + } + + // Delete the cached OEmbed entries that are older than one year + q("DELETE FROM `oembed` WHERE `created` < NOW() - INTERVAL 3 MONTH"); + + // Delete the cached "parse_url" entries that are older than one year + q("DELETE FROM `parsed_url` WHERE `created` < NOW() - INTERVAL 3 MONTH"); + + // Maximum table size in megabyte + $max_tablesize = intval(get_config('system','optimize_max_tablesize')) * 1000000; + if ($max_tablesize == 0) { + $max_tablesize = 100 * 1000000; // Default are 100 MB + } + if ($max_tablesize > 0) { + // Minimum fragmentation level in percent + $fragmentation_level = intval(get_config('system','optimize_fragmentation')) / 100; + if ($fragmentation_level == 0) { + $fragmentation_level = 0.3; // Default value is 30% + } + + // Optimize some tables that need to be optimized + $r = q("SHOW TABLE STATUS"); + foreach ($r as $table) { + + // Don't optimize tables that are too large + if ($table["Data_length"] > $max_tablesize) { + continue; + } + + // Don't optimize empty tables + if ($table["Data_length"] == 0) { + continue; + } + + // Calculate fragmentation + $fragmentation = $table["Data_free"] / ($table["Data_length"] + $table["Index_length"]); + + logger("Table ".$table["Name"]." - Fragmentation level: ".round($fragmentation * 100, 2), LOGGER_DEBUG); + + // Don't optimize tables that needn't to be optimized + if ($fragmentation < $fragmentation_level) { + continue; + } + + // So optimize it + logger("Optimize Table ".$table["Name"], LOGGER_DEBUG); + q("OPTIMIZE TABLE `%s`", dbesc($table["Name"])); + } + } + + set_config('system','cache_last_cleared', time()); +} + +/** + * @brief Repair missing values in Diaspora contacts + * + * @param App $a + */ +function cron_repair_diaspora(App $a) { + + $starttime = time(); + + $r = q("SELECT `id`, `url` FROM `contact` + WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '') + ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA)); + if (!dbm::is_result($r)) { + return; + } + + foreach ($r AS $contact) { + // Quit the loop after 3 minutes + if (time() > ($starttime + 180)) { + return; + } + + if (!poco_reachable($contact["url"])) { + continue; + } + + $data = Probe::uri($contact["url"]); + if ($data["network"] != NETWORK_DIASPORA) { + continue; + } + + logger("Repair contact ".$contact["id"]." ".$contact["url"], LOGGER_DEBUG); + q("UPDATE `contact` SET `batch` = '%s', `notify` = '%s', `poll` = '%s', pubkey = '%s' WHERE `id` = %d", + dbesc($data["batch"]), dbesc($data["notify"]), dbesc($data["poll"]), dbesc($data["pubkey"]), + intval($contact["id"])); + } +} + +/** + * @brief Do some repairs in database entries + * + */ +function cron_repair_database() { + + // Sometimes there seem to be issues where the "self" contact vanishes. + // We haven't found the origin of the problem by now. + $r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)"); + if (dbm::is_result($r)) { + foreach ($r AS $user) { + logger('Create missing self contact for user '.$user['uid']); + user_create_self_contact($user['uid']); + } + } + + // Set the parent if it wasn't set. (Shouldn't happen - but does sometimes) + // This call is very "cheap" so we can do it at any time without a problem + q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0"); + + // There was an issue where the nick vanishes from the contact table + q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''"); + + // Update the global contacts for local users + $r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`"); + if (dbm::is_result($r)) { + foreach ($r AS $user) { + update_gcontact_for_user($user["uid"]); + } + } + + /// @todo + /// - remove thread entries without item + /// - remove sign entries without item + /// - remove children when parent got lost + /// - set contact-id in item when not present +} diff --git a/include/crypto.php b/include/crypto.php index f5163a9da..4600e7291 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -1,94 +1,52 @@ =') || $alg === 'sha1') { - openssl_sign($data,$sig,$key,(($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg)); - } - else { - if(strlen($key) < 1024 || extension_loaded('gmp')) { - require_once('library/phpsec/Crypt/RSA.php'); - $rsa = new CRYPT_RSA(); - $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; - $rsa->setHash($alg); - $rsa->loadKey($key); - $sig = $rsa->sign($data); - } - else { - logger('rsa_sign: insecure algorithm used. Please upgrade PHP to 5.3'); - openssl_private_encrypt(hex2bin('3031300d060960864801650304020105000420') . hash('sha256',$data,true), $sig, $key); - } - } +function rsa_sign($data, $key, $alg = 'sha256') { + openssl_sign($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg)); return $sig; } -function rsa_verify($data,$sig,$key,$alg = 'sha256') { - - if (version_compare(PHP_VERSION, '5.3.0', '>=') || $alg === 'sha1') { - $verify = openssl_verify($data,$sig,$key,(($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg)); - } - else { - if(strlen($key) <= 300 || extension_loaded('gmp')) { - require_once('library/phpsec/Crypt/RSA.php'); - $rsa = new CRYPT_RSA(); - $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; - $rsa->setHash($alg); - $rsa->loadKey($key); - $verify = $rsa->verify($data,$sig); - } - else { - // fallback sha256 verify for PHP < 5.3 and large key lengths - $rawsig = ''; - openssl_public_decrypt($sig,$rawsig,$key); - $verify = (($rawsig && substr($rawsig,-32) === hash('sha256',$data,true)) ? true : false); - } - } - return $verify; +function rsa_verify($data, $sig, $key, $alg = 'sha256') { + return openssl_verify($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg)); } +function DerToPem($Der, $Private = false) { + //Encode: + $Der = base64_encode($Der); + //Split lines: + $lines = str_split($Der, 65); + $body = implode("\n", $lines); + //Get title: + $title = $Private ? 'RSA PRIVATE KEY' : 'PUBLIC KEY'; + //Add wrapping: + $result = "-----BEGIN {$title}-----\n"; + $result .= $body . "\n"; + $result .= "-----END {$title}-----\n"; -function DerToPem($Der, $Private=false) -{ - //Encode: - $Der = base64_encode($Der); - //Split lines: - $lines = str_split($Der, 65); - $body = implode("\n", $lines); - //Get title: - $title = $Private? 'RSA PRIVATE KEY' : 'PUBLIC KEY'; - //Add wrapping: - $result = "-----BEGIN {$title}-----\n"; - $result .= $body . "\n"; - $result .= "-----END {$title}-----\n"; - - return $result; + return $result; } -function DerToRsa($Der) -{ - //Encode: - $Der = base64_encode($Der); - //Split lines: - $lines = str_split($Der, 64); - $body = implode("\n", $lines); - //Get title: - $title = 'RSA PUBLIC KEY'; - //Add wrapping: - $result = "-----BEGIN {$title}-----\n"; - $result .= $body . "\n"; - $result .= "-----END {$title}-----\n"; - - return $result; +function DerToRsa($Der) { + //Encode: + $Der = base64_encode($Der); + //Split lines: + $lines = str_split($Der, 64); + $body = implode("\n", $lines); + //Get title: + $title = 'RSA PUBLIC KEY'; + //Add wrapping: + $result = "-----BEGIN {$title}-----\n"; + $result .= $body . "\n"; + $result .= "-----END {$title}-----\n"; + + return $result; } - -function pkcs8_encode($Modulus,$PublicExponent) { +function pkcs8_encode($Modulus, $PublicExponent) { //Encode key sequence $modulus = new ASNValue(ASNValue::TAG_INTEGER); $modulus->SetIntBuffer($Modulus); @@ -111,8 +69,7 @@ function pkcs8_encode($Modulus,$PublicExponent) { return $PublicDER; } - -function pkcs1_encode($Modulus,$PublicExponent) { +function pkcs1_encode($Modulus, $PublicExponent) { //Encode key sequence $modulus = new ASNValue(ASNValue::TAG_INTEGER); $modulus->SetIntBuffer($Modulus); @@ -126,22 +83,20 @@ function pkcs1_encode($Modulus,$PublicExponent) { return $bitStringValue; } - -function metopem($m,$e) { - $der = pkcs8_encode($m,$e); - $key = DerToPem($der,false); +function metopem($m, $e) { + $der = pkcs8_encode($m, $e); + $key = DerToPem($der, false); return $key; -} - +} function pubrsatome($key,&$m,&$e) { require_once('library/asn1.php'); require_once('include/salmon.php'); - $lines = explode("\n",$key); + $lines = explode("\n", $key); unset($lines[0]); unset($lines[count($lines)]); - $x = base64_decode(implode('',$lines)); + $x = base64_decode(implode('', $lines)); $r = ASN_BASE::parseASNString($x); @@ -151,21 +106,21 @@ function pubrsatome($key,&$m,&$e) { function rsatopem($key) { - pubrsatome($key,$m,$e); - return(metopem($m,$e)); + pubrsatome($key, $m, $e); + return metopem($m, $e); } function pemtorsa($key) { - pemtome($key,$m,$e); - return(metorsa($m,$e)); + pemtome($key, $m, $e); + return metorsa($m, $e); } -function pemtome($key,&$m,&$e) { +function pemtome($key, &$m, &$e) { require_once('include/salmon.php'); - $lines = explode("\n",$key); + $lines = explode("\n", $key); unset($lines[0]); unset($lines[count($lines)]); - $x = base64_decode(implode('',$lines)); + $x = base64_decode(implode('', $lines)); $r = ASN_BASE::parseASNString($x); @@ -173,82 +128,36 @@ function pemtome($key,&$m,&$e) { $e = base64url_decode($r[0]->asnData[1]->asnData[0]->asnData[1]->asnData); } -function metorsa($m,$e) { - $der = pkcs1_encode($m,$e); +function metorsa($m, $e) { + $der = pkcs1_encode($m, $e); $key = DerToRsa($der); return $key; -} +} function salmon_key($pubkey) { - pemtome($pubkey,$m,$e); - return 'RSA' . '.' . base64url_encode($m,true) . '.' . base64url_encode($e,true) ; + pemtome($pubkey, $m, $e); + return 'RSA' . '.' . base64url_encode($m, true) . '.' . base64url_encode($e, true) ; } - - -if(! function_exists('aes_decrypt')) { -// DEPRECATED IN 3.4.1 -function aes_decrypt($val,$ky) -{ - $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; - for($a=0;$a=0 and ord(substr($dec, strlen($dec)-1,1))<=16)? chr(ord( substr($dec,strlen($dec)-1,1))):null)); -}} - - -if(! function_exists('aes_encrypt')) { -// DEPRECATED IN 3.4.1 -function aes_encrypt($val,$ky) -{ - $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; - for($a=0;$a strlen($text)) return false; - if (strspn($text, chr($pad), strlen($text) - $pad) != $pad) return false; - return substr($text, 0, -1 * $pad); -} - - function new_keypair($bits) { - $openssl_options = array( 'digest_alg' => 'sha1', 'private_key_bits' => $bits, - 'encrypt_key' => false + 'encrypt_key' => false ); - $conf = get_config('system','openssl_conf_file'); - if($conf) + $conf = get_config('system', 'openssl_conf_file'); + if ($conf) { $openssl_options['config'] = $conf; - + } $result = openssl_pkey_new($openssl_options); - if(empty($result)) { + if (empty($result)) { logger('new_keypair: failed'); return false; } // Get private key - $response = array('prvkey' => '', 'pubkey' => ''); openssl_pkey_export($result, $response['prvkey']); @@ -258,6 +167,4 @@ function new_keypair($bits) { $response['pubkey'] = $pkey["key"]; return $response; - } - diff --git a/include/dfrn.php b/include/dfrn.php index 25f8c9358..4002bb426 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -864,6 +864,30 @@ class dfrn { return $entry; } + /** + * @brief encrypts data via AES + * + * @param string $data The data that is to be encrypted + * @param string $key The AES key + * + * @return string encrypted data + */ + private static function aes_encrypt($data, $key) { + return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA); + } + + /** + * @brief decrypts data via AES + * + * @param string $encrypted The encrypted data + * @param string $key The AES key + * + * @return string decrypted data + */ + public static function aes_decrypt($encrypted, $key) { + return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA); + } + /** * @brief Delivers the atom content to the contacts * @@ -888,8 +912,6 @@ class dfrn { $rino = get_config('system','rino_encrypt'); $rino = intval($rino); - // use RINO1 if mcrypt isn't installed and RINO2 was selected - if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1; logger("Local rino version: ". $rino, LOGGER_DEBUG); @@ -1015,8 +1037,8 @@ class dfrn { switch($rino_remote_version) { case 1: // Deprecated rino version! - $key = substr(random_string(),0,16); - $data = aes_encrypt($postvars['data'],$key); + $key = openssl_random_pseudo_bytes(16); + $data = self::aes_encrypt($postvars['data'], $key); break; case 2: // RINO 2 based on php-encryption @@ -1352,7 +1374,9 @@ class dfrn { $poco["photo"] = $author["avatar"]; $poco["hide"] = $hide; $poco["contact-type"] = $contact["contact-type"]; - update_gcontact($poco); + $gcid = update_gcontact($poco); + + link_gcontact($gcid, $importer["uid"], $contact["id"]); } return($author); diff --git a/include/diaspora.php b/include/diaspora.php index eca22092d..bdedb9e0b 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -10,17 +10,17 @@ use \Friendica\Core\Config; -require_once("include/items.php"); -require_once("include/bb2diaspora.php"); -require_once("include/Scrape.php"); -require_once("include/Contact.php"); -require_once("include/Photo.php"); -require_once("include/socgraph.php"); -require_once("include/group.php"); -require_once("include/xml.php"); -require_once("include/datetime.php"); -require_once("include/queue_fn.php"); -require_once("include/cache.php"); +require_once 'include/items.php'; +require_once 'include/bb2diaspora.php'; +require_once 'include/Scrape.php'; +require_once 'include/Contact.php'; +require_once 'include/Photo.php'; +require_once 'include/socgraph.php'; +require_once 'include/group.php'; +require_once 'include/xml.php'; +require_once 'include/datetime.php'; +require_once 'include/queue_fn.php'; +require_once 'include/cache.php'; /** * @brief This class contain functions to create and send Diaspora XML files @@ -160,6 +160,32 @@ class Diaspora { return $data; } + /** + * @brief encrypts data via AES + * + * @param string $key The AES key + * @param string $iv The IV (is used for CBC encoding) + * @param string $data The data that is to be encrypted + * + * @return string encrypted data + */ + private static function aes_encrypt($key, $iv, $data) { + return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0")); + } + + /** + * @brief decrypts data via AES + * + * @param string $key The AES key + * @param string $iv The IV (is used for CBC encoding) + * @param string $encrypted The encrypted data + * + * @return string decrypted data + */ + private static function aes_decrypt($key, $iv, $encrypted) { + return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0")); + } + /** * @brief: Decodes incoming Diaspora message * @@ -199,10 +225,7 @@ class Diaspora { $outer_iv = base64_decode($j_outer_key_bundle->iv); $outer_key = base64_decode($j_outer_key_bundle->key); - $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $outer_key, $ciphertext, MCRYPT_MODE_CBC, $outer_iv); - - - $decrypted = pkcs5_unpad($decrypted); + $decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext); logger('decrypted: '.$decrypted, LOGGER_DEBUG); $idom = parse_xml_string($decrypted,false); @@ -261,8 +284,7 @@ class Diaspora { // Decode the encrypted blob $inner_encrypted = base64_decode($data); - $inner_decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $inner_encrypted, MCRYPT_MODE_CBC, $inner_iv); - $inner_decrypted = pkcs5_unpad($inner_decrypted); + $inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted); } if (!$author_link) { @@ -1848,18 +1870,15 @@ class Diaspora { intval($importer["uid"]) ); - if ($searchable) { - poco_check($contact["url"], $name, NETWORK_DIASPORA, $image_url, $about, $location, $gender, $keywords, "", - datetime_convert(), 2, $contact["id"], $importer["uid"]); - } - $gcontact = array("url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2, "photo" => $image_url, "name" => $name, "location" => $location, "about" => $about, "birthday" => $birthday, "gender" => $gender, "addr" => $author, "nick" => $nick, "keywords" => $keywords, "hide" => !$searchable, "nsfw" => $nsfw); - update_gcontact($gcontact); + $gcid = update_gcontact($gcontact); + + link_gcontact($gcid, $importer["uid"], $contact["id"]); logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG); @@ -2621,20 +2640,19 @@ class Diaspora { return false; } - $inner_aes_key = random_string(32); + $inner_aes_key = openssl_random_pseudo_bytes(32); $b_inner_aes_key = base64_encode($inner_aes_key); - $inner_iv = random_string(16); + $inner_iv = openssl_random_pseudo_bytes(16); $b_inner_iv = base64_encode($inner_iv); - $outer_aes_key = random_string(32); + $outer_aes_key = openssl_random_pseudo_bytes(32); $b_outer_aes_key = base64_encode($outer_aes_key); - $outer_iv = random_string(16); + $outer_iv = openssl_random_pseudo_bytes(16); $b_outer_iv = base64_encode($outer_iv); $handle = self::my_handle($user); - $padded_data = pkcs5_pad($msg,16); - $inner_encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv); + $inner_encrypted = self::aes_encrypt($inner_aes_key, $inner_iv, $msg); $b64_data = base64_encode($inner_encrypted); @@ -2656,9 +2674,8 @@ class Diaspora { "author_id" => $handle)); $decrypted_header = xml::from_array($xmldata, $xml, true); - $decrypted_header = pkcs5_pad($decrypted_header,16); - $ciphertext = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $outer_aes_key, $decrypted_header, MCRYPT_MODE_CBC, $outer_iv); + $ciphertext = self::aes_encrypt($outer_aes_key, $outer_iv, $decrypted_header); $outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key)); diff --git a/include/discover_poco.php b/include/discover_poco.php index f0bfb646b..bb53efb5c 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -14,6 +14,9 @@ function discover_poco_run(&$argv, &$argc) { - suggestions: Discover other servers for their contacts. - server : Searches for the poco server list. "poco url" is base64 encoded. - update_server: Frequently check the first 250 servers for vitality. + - update_server_directory: Discover the given server id for their contacts + - poco_load: Load POCO data from a given POCO address + - check_profile: Update remote profile data */ if (($argc > 2) && ($argv[1] == "dirsearch")) { @@ -27,6 +30,12 @@ function discover_poco_run(&$argv, &$argc) { $mode = 4; } elseif (($argc == 2) && ($argv[1] == "update_server")) { $mode = 5; + } elseif (($argc == 3) && ($argv[1] == "update_server_directory")) { + $mode = 6; + } elseif (($argc > 5) && ($argv[1] == "poco_load")) { + $mode = 7; + } elseif (($argc == 3) && ($argv[1] == "check_profile")) { + $mode = 8; } elseif ($argc == 1) { $search = ""; $mode = 0; @@ -36,7 +45,21 @@ function discover_poco_run(&$argv, &$argc) { logger('start '.$search); - if ($mode == 5) { + if ($mode == 8) { + $profile_url = base64_decode($argv[2]); + if ($profile_url != "") { + poco_last_updated($profile_url, true); + } + } elseif ($mode == 7) { + if ($argc == 6) { + $url = base64_decode($argv[5]); + } else { + $url = ''; + } + poco_load_worker(intval($argv[2]), intval($argv[3]), intval($argv[4]), $url); + } elseif ($mode == 6) { + poco_discover_single_server(intval($argv[2])); + } elseif ($mode == 5) { update_server(); } elseif ($mode == 4) { $server_url = base64_decode($argv[2]); @@ -106,7 +129,9 @@ function update_server() { function discover_users() { logger("Discover users", LOGGER_DEBUG); - $users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url` FROM `gcontact` + $starttime = time(); + + $users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url`, `network` FROM `gcontact` WHERE `last_contact` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND `last_failure` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND `network` IN ('%s', '%s', '%s', '%s', '') ORDER BY rand()", @@ -140,14 +165,19 @@ function discover_users() { continue; } + $server_url = poco_detect_server($user["url"]); + $force_update = false; + if ($user["server_url"] != "") { + + $force_update = (normalise_link($user["server_url"]) != normalise_link($server_url)); + $server_url = $user["server_url"]; - } else { - $server_url = poco_detect_server($user["url"]); } - if (($server_url == "") OR poco_check_server($server_url, $gcontacts[0]["network"])) { - logger('Check user '.$user["url"]); - poco_last_updated($user["url"], true); + + if ((($server_url == "") AND ($user["network"] == NETWORK_FEED)) OR $force_update OR poco_check_server($server_url, $user["network"])) { + logger('Check profile '.$user["url"]); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"])); if (++$checked > 100) { return; @@ -156,6 +186,11 @@ function discover_users() { q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc(normalise_link($user["url"]))); } + + // Quit the loop after 3 minutes + if (time() > ($starttime + 180)) { + return; + } } } @@ -202,7 +237,14 @@ function discover_directory($search) { if ($data["network"] == NETWORK_DFRN) { logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG); logger("Add profile ".$jj->url." to local directory (".$search.")", LOGGER_DEBUG); - poco_check($data["url"], $data["name"], $data["network"], $data["photo"], "", "", "", $jj->tags, $data["addr"], "", 0); + + if ($jj->tags != "") { + $data["keywords"] = $jj->tags; + } + + $data["server_url"] = $data["baseurl"]; + + update_gcontact($data); } else { logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG); } diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 189ba91f1..c14629b89 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -2,7 +2,7 @@ /** * @file include/html2bbcode.php * @brief Converter for HTML to BBCode - * + * * Made by: ike@piratenpartei.de * Originally made for the syncom project: http://wiki.piratenpartei.de/Syncom * https://github.com/annando/Syncom @@ -79,16 +79,25 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb) return($replace); } -function _replace_code_cb($m){ - return "".str_replace("\n","
\n",$m[1]). ""; -} - function html2bbcode($message) { $message = str_replace("\r", "", $message); - $message = preg_replace_callback("|
([^<]*)
|ism", "_replace_code_cb", $message); + // Removing code blocks before the whitespace removal processing below + $codeblocks = []; + $message = preg_replace_callback('#
(.*)
#iUs', + function ($matches) use (&$codeblocks) { + $return = '[codeblock-' . count($codeblocks) . ']'; + + $prefix = '[code]'; + if ($matches[1] != '') { + $prefix = '[code=' . $matches[1] . ']'; + } + $codeblocks[] = $prefix . $matches[2] . '[/code]'; + return $return; + } + , $message); $message = str_replace(array( "

  • ", @@ -232,7 +241,6 @@ function html2bbcode($message) node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]'); node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); - node2bbcode($doc, 'code', array(), '[code]', '[/code]'); node2bbcode($doc, 'key', array(), '[code]', '[/code]'); $message = $doc->saveHTML(); @@ -302,6 +310,19 @@ function html2bbcode($message) // Handling Yahoo style of mails $message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message); - return(trim($message)); + // Restore code blocks + $message = preg_replace_callback('#\[codeblock-([0-9]+)\]#iU', + function ($matches) use ($codeblocks) { + $return = ''; + if (isset($codeblocks[intval($matches[1])])) { + $return = $codeblocks[$matches[1]]; + } + return $return; + } + , $message); + + $message = trim($message); + + return $message; } ?> diff --git a/include/oembed.php b/include/oembed.php index a1945894f..0b8b71366 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -17,10 +17,10 @@ function oembed_replacecb($matches){ /** * @brief Get data from an URL to embed its content. - * + * * @param string $embedurl The URL from which the data should be fetched. * @param bool $no_rich_type If set to true rich type content won't be fetched. - * + * * @return bool|object Returns object with embed content or false if no embedable * content exists */ @@ -41,8 +41,8 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ // These media files should now be caught in bbcode.php // left here as a fallback in case this is called from another source - $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm"); - $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION); + $noexts = array("mp3", "mp4", "ogg", "ogv", "oga", "ogm", "webm"); + $ext = pathinfo(strtolower($embedurl), PATHINFO_EXTENSION); if (is_null($txt)) { @@ -74,21 +74,10 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ } } - if ($txt==false || $txt=="") { - $embedly = Config::get("system", "embedly"); - if ($embedly != "") { - // try embedly service - $ourl = "https://api.embed.ly/1/oembed?key=".$embedly."&url=".urlencode($embedurl); - $txt = fetch_url($ourl); + $txt = trim($txt); - logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG); - } - } - - $txt=trim($txt); - - if ($txt[0]!="{") { - $txt='{"type":"error"}'; + if ($txt[0] != "{") { + $txt = '{"type":"error"}'; } else { //save in cache $j = json_decode($txt); if ($j->type != "error") { diff --git a/include/ostatus.php b/include/ostatus.php index 2c4b677a5..aad4c1041 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -27,6 +27,42 @@ class ostatus { const OSTATUS_DEFAULT_POLL_TIMEFRAME = 1440; // given in minutes const OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS = 14400; // given in minutes + /** + * @brief Mix two paths together to possibly fix missing parts + * + * @param string $avatar Path to the avatar + * @param string $base Another path that is hopefully complete + * + * @return string fixed avatar path + */ + public static function fix_avatar($avatar, $base) { + $base_parts = parse_url($base); + + // Remove all parts that could create a problem + unset($base_parts['path']); + unset($base_parts['query']); + unset($base_parts['fragment']); + + $avatar_parts = parse_url($avatar); + + // Now we mix them + $parts = array_merge($base_parts, $avatar_parts); + + // And put them together again + $scheme = isset($parts['scheme']) ? $parts['scheme'] . '://' : ''; + $host = isset($parts['host']) ? $parts['host'] : ''; + $port = isset($parts['port']) ? ':' . $parts['port'] : ''; + $path = isset($parts['path']) ? $parts['path'] : ''; + $query = isset($parts['query']) ? '?' . $parts['query'] : ''; + $fragment = isset($parts['fragment']) ? '#' . $parts['fragment'] : ''; + + $fixed = $scheme.$host.$port.$path.$query.$fragment; + + logger('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, LOGGER_DATA); + + return $fixed; + } + /** * @brief Fetches author data * @@ -77,7 +113,7 @@ class ostatus { } if (count($avatarlist) > 0) { krsort($avatarlist); - $author["author-avatar"] = current($avatarlist); + $author["author-avatar"] = self::fix_avatar(current($avatarlist), $author["author-link"]); } $displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue; @@ -132,9 +168,6 @@ class ostatus { dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["alias"]), dbesc($contact["about"]), dbesc($contact["location"]), dbesc(datetime_convert()), intval($contact["id"])); - - poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"], - "", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]); } if (isset($author["author-avatar"]) AND ($author["author-avatar"] != $r[0]['avatar'])) { @@ -163,7 +196,9 @@ class ostatus { $contact["generation"] = 2; $contact["hide"] = false; // OStatus contacts are never hidden $contact["photo"] = $author["author-avatar"]; - update_gcontact($contact); + $gcid = update_gcontact($contact); + + link_gcontact($gcid, $contact["uid"], $contact["id"]); } return($author); @@ -501,12 +536,16 @@ class ostatus { $item["author-name"] = $orig_author["author-name"]; $item["author-link"] = $orig_author["author-link"]; $item["author-avatar"] = $orig_author["author-avatar"]; + $item["body"] = add_page_info_to_body(html2bbcode($orig_body)); $item["created"] = $orig_created; $item["edited"] = $orig_edited; $item["uri"] = $orig_uri; - $item["plink"] = $orig_link; + + if (!isset($item["plink"])) { + $item["plink"] = $orig_link; + } $item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue; @@ -800,6 +839,9 @@ class ostatus { /// @todo This function is totally ugly and has to be rewritten totally + // Import all threads or only threads that were started by our followers? + $all_threads = !get_config('system','ostatus_full_threads'); + $item_stored = -1; $conversation_url = self::fetch_conversation($self, $conversation_url); @@ -808,8 +850,8 @@ class ostatus { // Don't do a completion on liked content if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR ($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) { - $item_stored = item_store($item, true); - return($item_stored); + $item_stored = item_store($item, $all_threads); + return $item_stored; } // Get the parent @@ -889,7 +931,7 @@ class ostatus { if (!sizeof($items)) { if (count($item) > 0) { - $item_stored = item_store($item, true); + $item_stored = item_store($item, $all_threads); if ($item_stored) { logger("Conversation ".$conversation_url." couldn't be fetched. Item uri ".$item["uri"]." stored: ".$item_stored, LOGGER_DEBUG); @@ -1066,10 +1108,11 @@ class ostatus { $arr["owner-name"] = $single_conv->actor->portablecontacts_net->displayName; $arr["owner-link"] = $actor; - $arr["owner-avatar"] = $single_conv->actor->image->url; + $arr["owner-avatar"] = self::fix_avatar($single_conv->actor->image->url, $arr["owner-link"]); + $arr["author-name"] = $arr["owner-name"]; - $arr["author-link"] = $actor; - $arr["author-avatar"] = $single_conv->actor->image->url; + $arr["author-link"] = $arr["owner-link"]; + $arr["author-avatar"] = $arr["owner-avatar"]; $arr["body"] = add_page_info_to_body(html2bbcode($single_conv->content)); if (isset($single_conv->status_net->notice_info->source)) @@ -1120,11 +1163,11 @@ class ostatus { $arr["edited"] = $single_conv->object->published; $arr["author-name"] = $single_conv->object->actor->displayName; - if ($arr["owner-name"] == '') + if ($arr["owner-name"] == '') { $arr["author-name"] = $single_conv->object->actor->contact->displayName; - + } $arr["author-link"] = $single_conv->object->actor->url; - $arr["author-avatar"] = $single_conv->object->actor->image->url; + $arr["author-avatar"] = self::fix_avatar($single_conv->object->actor->image->url, $arr["author-link"]); $arr["app"] = $single_conv->object->provider->displayName."#"; //$arr["verb"] = $single_conv->object->verb; @@ -1187,7 +1230,7 @@ class ostatus { } } - $item_stored = item_store($item, true); + $item_stored = item_store($item, $all_threads); if ($item_stored) { logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG); self::store_conversation($item_stored, $conversation_url); diff --git a/include/socgraph.php b/include/socgraph.php index d9fd6f8be..642d03d89 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -14,8 +14,13 @@ require_once("include/html2bbcode.php"); require_once("include/Contact.php"); require_once("include/Photo.php"); -/* - * poco_load +/** + * @brief Fetch POCO data + * + * @param integer $cid Contact ID + * @param integer $uid User ID + * @param integer $zcid Global Contact ID + * @param integer $url POCO address that should be polled * * Given a contact-id (minimum), load the PortableContacts friend list for that contact, * and add the entries to the gcontact (Global Contact) table, or update existing entries @@ -27,12 +32,21 @@ require_once("include/Photo.php"); * pointing to the same global contact id. * */ +function poco_load($cid, $uid = 0, $zcid = 0, $url = null) { + // Call the function "poco_load_worker" via the worker + proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", intval($cid), intval($uid), intval($zcid), base64_encode($url)); +} - - - -function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { - +/** + * @brief Fetch POCO data from the worker + * + * @param integer $cid Contact ID + * @param integer $uid User ID + * @param integer $zcid Global Contact ID + * @param integer $url POCO address that should be polled + * + */ +function poco_load_worker($cid, $uid, $zcid, $url) { $a = get_app(); if($cid) { @@ -145,27 +159,27 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { if (isset($entry->contactType) AND ($entry->contactType >= 0)) $contact_type = $entry->contactType; - // If you query a Friendica server for its profiles, the network has to be Friendica - /// TODO It could also be a Redmatrix server - //if ($uid == 0) - // $network = NETWORK_DFRN; + $gcontact = array("url" => $profile_url, + "name" => $name, + "network" => $network, + "photo" => $profile_photo, + "about" => $about, + "location" => $location, + "gender" => $gender, + "keywords" => $keywords, + "connect" => $connect_url, + "updated" => $updated, + "contact-type" => $contact_type, + "generation" => $generation); - poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid); + try { + $gcontact = sanitize_gcontact($gcontact); + $gcid = update_gcontact($gcontact); - $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation); - update_gcontact($gcontact); - - // Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php) - // Deactivated because we now update Friendica contacts in dfrn.php - //if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != "")) - // q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' - // WHERE `nurl` = '%s' AND NOT `self` AND `network` = '%s'", - // dbesc($location), - // dbesc($about), - // dbesc($keywords), - // dbesc($gender), - // dbesc(normalise_link($profile_url)), - // dbesc(NETWORK_DFRN)); + link_gcontact($gcid, $uid, $cid, $zcid); + } catch (Exception $e) { + logger($e->getMessage(), LOGGER_DEBUG); + } } logger("poco_load: loaded $total entries",LOGGER_DEBUG); @@ -176,172 +190,158 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { ); } +/** + * @brief Sanitize the given gcontact data + * + * @param array $gcontact array with gcontact data + * @throw Exception + * + * Generation: + * 0: No definition + * 1: Profiles on this server + * 2: Contacts of profiles on this server + * 3: Contacts of contacts of profiles on this server + * 4: ... + * + */ +function sanitize_gcontact($gcontact) { -function poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid = 0, $uid = 0, $zcid = 0) { + if ($gcontact['url'] == "") { + throw new Exception('URL is empty'); + } - // Generation: - // 0: No definition - // 1: Profiles on this server - // 2: Contacts of profiles on this server - // 3: Contacts of contacts of profiles on this server - // 4: ... - - $gcid = ""; - - if ($profile_url == "") - return $gcid; - - $urlparts = parse_url($profile_url); - if (!isset($urlparts["scheme"])) - return $gcid; + $urlparts = parse_url($gcontact['url']); + if (!isset($urlparts["scheme"])) { + throw new Exception("This (".$gcontact['url'].") doesn't seem to be an url."); + } if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com", - "identi.ca", "alpha.app.net"))) - return $gcid; + "identi.ca", "alpha.app.net"))) { + throw new Exception('Contact from a non federated network ignored. ('.$gcontact['url'].')'); + } // Don't store the statusnet connector as network // We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well - if ($network == NETWORK_STATUSNET) - $network = ""; + if ($gcontact['network'] == NETWORK_STATUSNET) { + $gcontact['network'] = ""; + } // Assure that there are no parameter fragments in the profile url - if (in_array($network, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) - $profile_url = clean_contact_url($profile_url); + if (in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) { + $gcontact['url'] = clean_contact_url($gcontact['url']); + } - $alternate = poco_alternate_ostatus_url($profile_url); - - $orig_updated = $updated; + $alternate = poco_alternate_ostatus_url($gcontact['url']); // The global contacts should contain the original picture, not the cached one - if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link(App::get_baseurl()."/photo/"))) { - $profile_photo = ""; + if (($gcontact['generation'] != 1) AND stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) { + $gcontact['photo'] = ""; } - $r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1", - dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET) - ); - if (dbm::is_result($r)) { - $network = $r[0]["network"]; - } - - if (($network == "") OR ($network == NETWORK_OSTATUS)) { - $r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1", - dbesc($profile_url), dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET) + if (!isset($gcontact['network'])) { + $r = q("SELECT `network` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1", + dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET) ); if (dbm::is_result($r)) { - $network = $r[0]["network"]; - //$profile_url = $r[0]["url"]; + $gcontact['network'] = $r[0]["network"]; + } + + if (($gcontact['network'] == "") OR ($gcontact['network'] == NETWORK_OSTATUS)) { + $r = q("SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1", + dbesc($gcontact['url']), dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET) + ); + if (dbm::is_result($r)) { + $gcontact['network'] = $r[0]["network"]; + } } } + $gcontact['server_url'] = ''; + $gcontact['network'] = ''; + $x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", - dbesc(normalise_link($profile_url)) + dbesc(normalise_link($gcontact['url'])) ); if (count($x)) { - if (($network == "") AND ($x[0]["network"] != NETWORK_STATUSNET)) { - $network = $x[0]["network"]; + if (!isset($gcontact['network']) AND ($x[0]["network"] != NETWORK_STATUSNET)) { + $gcontact['network'] = $x[0]["network"]; } - if ($updated <= NULL_DATE) { - $updated = $x[0]["updated"]; + if ($gcontact['updated'] <= NULL_DATE) { + $gcontact['updated'] = $x[0]["updated"]; + } + if (!isset($gcontact['server_url']) AND (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) { + $gcontact['server_url'] = $x[0]["server_url"]; + } + if (!isset($gcontact['addr'])) { + $gcontact['addr'] = $x[0]["addr"]; } - $created = $x[0]["created"]; - $server_url = $x[0]["server_url"]; - $nick = $x[0]["nick"]; - $addr = $x[0]["addr"]; - $alias = $x[0]["alias"]; - $notify = $x[0]["notify"]; - } else { - $created = NULL_DATE; - $server_url = ""; - - $urlparts = parse_url($profile_url); - $nick = end(explode("/", $urlparts["path"])); - $addr = ""; - $alias = ""; - $notify = ""; } - if ((($network == "") OR ($name == "") OR ($addr == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate) - AND poco_reachable($profile_url, $server_url, $network, false)) { - $data = probe_url($profile_url); + if ((!isset($gcontact['network']) OR !isset($gcontact['name']) OR !isset($gcontact['addr']) OR !isset($gcontact['photo']) OR !isset($gcontact['server_url']) OR $alternate) + AND poco_reachable($gcontact['url'], $gcontact['server_url'], $gcontact['network'], false)) { + $data = Probe::uri($gcontact['url']); - $orig_profile = $profile_url; + if ($data["network"] == NETWORK_PHANTOM) { + throw new Exception('Probing for URL '.$gcontact['url'].' failed'); + } - $network = $data["network"]; - $name = $data["name"]; - $nick = $data["nick"]; - $addr = $data["addr"]; - $alias = $data["alias"]; - $notify = $data["notify"]; - $profile_url = $data["url"]; - $profile_photo = $data["photo"]; - $server_url = $data["baseurl"]; + $orig_profile = $gcontact['url']; - if ($alternate AND ($network == NETWORK_OSTATUS)) { + $gcontact["server_url"] = $data["baseurl"]; + + $gcontact = array_merge($gcontact, $data); + + if ($alternate AND ($gcontact['network'] == NETWORK_OSTATUS)) { // Delete the old entry - if it exists $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile))); if ($r) { q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile))); q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"])); } - - // possibly create a new entry - poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid); } } - if ($alternate AND ($network == NETWORK_OSTATUS)) - return $gcid; - - if (count($x) AND ($x[0]["network"] == "") AND ($network != "")) { - q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'", - dbesc($network), - dbesc(normalise_link($profile_url)) - ); + if (!isset($gcontact['name']) OR !isset($gcontact['photo'])) { + throw new Exception('No name and photo for URL '.$gcontact['url']); } - if (($name == "") OR ($profile_photo == "")) - return $gcid; + if (!in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { + throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']); + } - if (!in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) - return $gcid; + if (!isset($gcontact['server_url'])) { + // We check the server url to be sure that it is a real one + $server_url = poco_detect_server($gcontact['url']); - logger("profile-check generation: ".$generation." Network: ".$network." URL: ".$profile_url." name: ".$name." avatar: ".$profile_photo, LOGGER_DEBUG); - - // We check the server url to be sure that it is a real one - $server_url2 = poco_detect_server($profile_url); - - // We are no sure that it is a correct URL. So we use it in the future - if ($server_url2 != "") { - $server_url = $server_url2; + // We are now sure that it is a correct URL. So we use it in the future + if ($server_url != "") { + $gcontact['server_url'] = $server_url; + } } // The server URL doesn't seem to be valid, so we don't store it. - if (!poco_check_server($server_url, $network)) { - $server_url = ""; + if (!poco_check_server($gcontact['server_url'], $gcontact['network'])) { + $gcontact['server_url'] = ""; } - $gcontact = array("url" => $profile_url, - "addr" => $addr, - "alias" => $alias, - "name" => $name, - "network" => $network, - "photo" => $profile_photo, - "about" => $about, - "location" => $location, - "gender" => $gender, - "keywords" => $keywords, - "server_url" => $server_url, - "connect" => $connect_url, - "notify" => $notify, - "updated" => $updated, - "generation" => $generation); + return $gcontact; +} - $gcid = update_gcontact($gcontact); +/** + * @brief Link the gcontact entry with user, contact and global contact + * + * @param integer $gcid Global contact ID + * @param integer $cid Contact ID + * @param integer $uid User ID + * @param integer $zcid Global Contact ID + * * + */ +function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) { - if(!$gcid) - return $gcid; + if ($gcid <= 0) { + return; + } $r = q("SELECT * FROM `glink` WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d LIMIT 1", intval($cid), @@ -349,8 +349,8 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca intval($gcid), intval($zcid) ); - if (! dbm::is_result($r)) { - q("INSERT INTO `glink` (`cid`,`uid`,`gcid`,`zcid`, `updated`) VALUES (%d,%d,%d,%d, '%s') ", + if (!dbm::is_result($r)) { + q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ", intval($cid), intval($uid), intval($gcid), @@ -366,8 +366,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca intval($zcid) ); } - - return $gcid; } function poco_reachable($profile, $server = "", $network = "", $force = false) { @@ -465,15 +463,26 @@ function poco_last_updated($profile, $force = false) { $gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profile))); - if ($gcontacts[0]["created"] <= NULL_DATE) { - q("UPDATE `gcontact` SET `created` = '%s' WHERE `nurl` = '%s'", - dbesc(datetime_convert()), dbesc(normalise_link($profile))); + if (!dbm::is_result($gcontacts)) { + return false; } - if ($gcontacts[0]["server_url"] != "") { + + $contact = array("url" => $profile); + + if ($gcontacts[0]["created"] <= NULL_DATE) { + $contact['created'] = datetime_convert(); + } + + if ($force) { + $server_url = normalise_link(poco_detect_server($profile)); + } + + if (($server_url == '') AND ($gcontacts[0]["server_url"] != "")) { $server_url = $gcontacts[0]["server_url"]; } - if (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"])) { - $server_url = poco_detect_server($profile); + + if (!$force AND (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) { + $server_url = normalise_link(poco_detect_server($profile)); } if (!in_array($gcontacts[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS, ""))) { @@ -483,67 +492,64 @@ function poco_last_updated($profile, $force = false) { if ($server_url != "") { if (!poco_check_server($server_url, $gcontacts[0]["network"], $force)) { - - if ($force) + if ($force) { q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc(normalise_link($profile))); + } logger("Profile ".$profile.": Server ".$server_url." wasn't reachable.", LOGGER_DEBUG); return false; } - - q("UPDATE `gcontact` SET `server_url` = '%s' WHERE `nurl` = '%s'", - dbesc($server_url), dbesc(normalise_link($profile))); + $contact['server_url'] = $server_url; } if (in_array($gcontacts[0]["network"], array("", NETWORK_FEED))) { $server = q("SELECT `network` FROM `gserver` WHERE `nurl` = '%s' AND `network` != ''", dbesc(normalise_link($server_url))); - if ($server) - q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'", - dbesc($server[0]["network"]), dbesc(normalise_link($profile))); - else + if ($server) { + $contact['network'] = $server[0]["network"]; + } else { return false; + } } // noscrape is really fast so we don't cache the call. - if (($gcontacts[0]["server_url"] != "") AND ($gcontacts[0]["nick"] != "")) { + if (($server_url != "") AND ($gcontacts[0]["nick"] != "")) { // Use noscrape if possible - $server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($gcontacts[0]["server_url"]))); + $server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url))); if ($server) { $noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]); - if ($noscraperet["success"] AND ($noscraperet["body"] != "")) { + if ($noscraperet["success"] AND ($noscraperet["body"] != "")) { $noscrape = json_decode($noscraperet["body"], true); if (is_array($noscrape)) { - $contact = array("url" => $profile, - "network" => $server[0]["network"], - "generation" => $gcontacts[0]["generation"]); + $contact["network"] = $server[0]["network"]; - if (isset($noscrape["fn"])) + if (isset($noscrape["fn"])) { $contact["name"] = $noscrape["fn"]; - - if (isset($noscrape["comm"])) + } + if (isset($noscrape["comm"])) { $contact["community"] = $noscrape["comm"]; - + } if (isset($noscrape["tags"])) { $keywords = implode(" ", $noscrape["tags"]); - if ($keywords != "") + if ($keywords != "") { $contact["keywords"] = $keywords; + } } $location = formatted_location($noscrape); - if ($location) + if ($location) { $contact["location"] = $location; - - if (isset($noscrape["dfrn-notify"])) + } + if (isset($noscrape["dfrn-notify"])) { $contact["notify"] = $noscrape["dfrn-notify"]; - + } // Remove all fields that are not present in the gcontact table unset($noscrape["fn"]); unset($noscrape["key"]); @@ -581,12 +587,14 @@ function poco_last_updated($profile, $force = false) { } // If we only can poll the feed, then we only do this once a while - if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) { + if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) { logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG); + + update_gcontact($contact); return $gcontacts[0]["updated"]; } - $data = probe_url($profile); + $data = Probe::uri($profile); // Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711) // Then check the other link and delete this one @@ -598,10 +606,18 @@ function poco_last_updated($profile, $force = false) { q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profile))); q("DELETE FROM `glink` WHERE `gcid` = %d", intval($gcontacts[0]["id"])); - poco_check($data["url"], $data["name"], $data["network"], $data["photo"], $gcontacts[0]["about"], $gcontacts[0]["location"], - $gcontacts[0]["gender"], $gcontacts[0]["keywords"], $data["addr"], $gcontacts[0]["updated"], $gcontacts[0]["generation"]); + $gcontact = array_merge($gcontacts[0], $data); - poco_last_updated($data["url"], $force); + $gcontact["server_url"] = $data["baseurl"]; + + try { + $gcontact = sanitize_gcontact($gcontact); + update_gcontact($gcontact); + + poco_last_updated($data["url"], $force); + } catch (Exception $e) { + logger($e->getMessage(), LOGGER_DEBUG); + } logger("Profile ".$profile." was deleted", LOGGER_DEBUG); return false; @@ -615,21 +631,10 @@ function poco_last_updated($profile, $force = false) { return false; } - $contact = array("generation" => $gcontacts[0]["generation"]); - $contact = array_merge($contact, $data); $contact["server_url"] = $data["baseurl"]; - unset($contact["batch"]); - unset($contact["poll"]); - unset($contact["request"]); - unset($contact["confirm"]); - unset($contact["poco"]); - unset($contact["priority"]); - unset($contact["pubkey"]); - unset($contact["baseurl"]); - update_gcontact($contact); $feedret = z_fetch_url($data["poll"]); @@ -672,9 +677,10 @@ function poco_last_updated($profile, $force = false) { q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'", dbesc(dbm::date($last_updated)), dbesc(dbm::date()), dbesc(normalise_link($profile))); - if (($gcontacts[0]["generation"] == 0)) + if (($gcontacts[0]["generation"] == 0)) { q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'", dbesc(normalise_link($profile))); + } logger("Profile ".$profile." was last updated at ".$last_updated, LOGGER_DEBUG); @@ -1668,6 +1674,68 @@ function poco_discover_federation() { set_config('poco','last_federation_discovery', time()); } +function poco_discover_single_server($id) { + $r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id)); + if (!dbm::is_result($r)) { + return false; + } + + $server = $r[0]; + + // Discover new servers out there (Works from Friendica version 3.5.2) + poco_fetch_serverlist($server["poco"]); + + // Fetch all users from the other server + $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation"; + + logger("Fetch all users from the server ".$server["url"], LOGGER_DEBUG); + + $retdata = z_fetch_url($url); + if ($retdata["success"]) { + $data = json_decode($retdata["body"]); + + poco_discover_server($data, 2); + + if (get_config('system','poco_discovery') > 1) { + + $timeframe = get_config('system','poco_discovery_since'); + if ($timeframe == 0) { + $timeframe = 30; + } + + $updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400); + + // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3) + $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation"; + + $success = false; + + $retdata = z_fetch_url($url); + if ($retdata["success"]) { + logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG); + $success = poco_discover_server(json_decode($retdata["body"])); + } + + if (!$success AND (get_config('system','poco_discovery') > 2)) { + logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG); + poco_discover_server_users($data, $server); + } + } + + q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"])); + + return true; + } else { + // If the server hadn't replied correctly, then force a sanity check + poco_check_server($server["url"], $server["network"], true); + + // If we couldn't reach the server, we will try it some time later + q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"])); + + return false; + } +} + function poco_discover($complete = false) { // Update the server list @@ -1677,13 +1745,13 @@ function poco_discover($complete = false) { $requery_days = intval(get_config("system", "poco_requery_days")); - if ($requery_days == 0) + if ($requery_days == 0) { $requery_days = 7; - + } $last_update = date("c", time() - (60 * 60 * 24 * $requery_days)); - $r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update)); - if ($r) + $r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update)); + if (dbm::is_result($r)) { foreach ($r AS $server) { if (!poco_check_server($server["url"], $server["network"])) { @@ -1692,56 +1760,14 @@ function poco_discover($complete = false) { continue; } - // Discover new servers out there - poco_fetch_serverlist($server["poco"]); + logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", intval($server['id'])); - // Fetch all users from the other server - $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation"; - - logger("Fetch all users from the server ".$server["nurl"], LOGGER_DEBUG); - - $retdata = z_fetch_url($url); - if ($retdata["success"]) { - $data = json_decode($retdata["body"]); - - poco_discover_server($data, 2); - - if (get_config('system','poco_discovery') > 1) { - - $timeframe = get_config('system','poco_discovery_since'); - if ($timeframe == 0) - $timeframe = 30; - - $updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400); - - // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3) - $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation"; - - $success = false; - - $retdata = z_fetch_url($url); - if ($retdata["success"]) { - logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG); - $success = poco_discover_server(json_decode($retdata["body"])); - } - - if (!$success AND (get_config('system','poco_discovery') > 2)) { - logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG); - poco_discover_server_users($data, $server); - } - } - - q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"])); - if (!$complete AND (--$no_of_queries == 0)) - break; - } else { - // If the server hadn't replied correctly, then force a sanity check - poco_check_server($server["url"], $server["network"], true); - - // If we couldn't reach the server, we will try it some time later - q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"])); + if (!$complete AND (--$no_of_queries == 0)) { + break; } } + } } function poco_discover_server_users($data, $server) { @@ -1855,10 +1881,26 @@ function poco_discover_server($data, $default_generation = 0) { $success = true; logger("Store profile ".$profile_url, LOGGER_DEBUG); - poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, 0, 0, 0); - $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation); - update_gcontact($gcontact); + $gcontact = array("url" => $profile_url, + "name" => $name, + "network" => $network, + "photo" => $profile_photo, + "about" => $about, + "location" => $location, + "gender" => $gender, + "keywords" => $keywords, + "connect" => $connect_url, + "updated" => $updated, + "contact-type" => $contact_type, + "generation" => $generation); + + try { + $gcontact = sanitize_gcontact($gcontact); + update_gcontact($gcontact); + } catch (Exception $e) { + logger($e->getMessage(), LOGGER_DEBUG); + } logger("Done for profile ".$profile_url, LOGGER_DEBUG); } @@ -2153,6 +2195,8 @@ function update_gcontact_from_probe($url) { return; } + $data["server_url"] = $data["baseurl"]; + update_gcontact($data); } diff --git a/include/user.php b/include/user.php index df871c546..973d6b8b1 100644 --- a/include/user.php +++ b/include/user.php @@ -97,13 +97,6 @@ function create_user($arr) { if(mb_strlen($username) < 3) $result['message'] .= t('Name too short.') . EOL; - // I don't really like having this rule, but it cuts down - // on the number of auto-registrations by Russian spammers - - // Using preg_match was completely unreliable, due to mixed UTF-8 regex support - // $no_utf = get_config('system','no_utf'); - // $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); - // So now we are just looking for a space in the full name. $loose_reg = get_config('system','no_regfullname'); @@ -182,17 +175,7 @@ function create_user($arr) { $prvkey = $keys['prvkey']; $pubkey = $keys['pubkey']; - /** - * - * Create another keypair for signing/verifying - * salmon protocol messages. We have to use a slightly - * less robust key because this won't be using openssl - * but the phpseclib. Since it is PHP interpreted code - * it is not nearly as efficient, and the larger keys - * will take several minutes each to process. - * - */ - + // Create another keypair for signing/verifying salmon protocol messages. $sres = new_keypair(512); $sprvkey = $sres['prvkey']; $spubkey = $sres['pubkey']; diff --git a/library/Mobile_Detect/.gitignore b/library/Mobile_Detect/.gitignore deleted file mode 100644 index 48b35e714..000000000 --- a/library/Mobile_Detect/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -vendor/ -nbproject/ -/*.buildpath -/*.project -/.settings -/error.log -/export/nicejson -.idea/ -*.iml -/coverage -/phpunit.phar diff --git a/library/Mobile_Detect/.gitmodules b/library/Mobile_Detect/.gitmodules deleted file mode 100644 index 306e55ae5..000000000 --- a/library/Mobile_Detect/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "export/nicejson"] - path = export/nicejson - url = https://github.com/GerHobbelt/nicejson-php.git diff --git a/library/Mobile_Detect/.php_cs b/library/Mobile_Detect/.php_cs deleted file mode 100644 index 336ef0c87..000000000 --- a/library/Mobile_Detect/.php_cs +++ /dev/null @@ -1,24 +0,0 @@ -notName('LICENSE') - ->notName('README.md') - ->notName('.php_cs') - ->notName('composer.*') - ->notName('phpunit.xml*') - ->notName('*.phar') - ->exclude('vendor') - ->exclude('examples') - ->exclude('Symfony/CS/Tests/Fixer') - ->notName('ElseifFixer.php') - ->exclude('data') - ->in(__DIR__) -; - -return Symfony\CS\Config\Config::create() - ->finder($finder) -; - - diff --git a/library/Mobile_Detect/.travis.yml b/library/Mobile_Detect/.travis.yml deleted file mode 100644 index 29af5249f..000000000 --- a/library/Mobile_Detect/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -language: php -php: - - "5.2" - - "5.3" - - "5.4" - - "5.5" - - "5.6" - -branches: - only: - - devel - -script: - - phpunit -v -c tests/phpunit.xml - -notifications: - email: false diff --git a/library/Mobile_Detect/Mobile_Detect.json b/library/Mobile_Detect/Mobile_Detect.json deleted file mode 100644 index 0ba016319..000000000 --- a/library/Mobile_Detect/Mobile_Detect.json +++ /dev/null @@ -1 +0,0 @@ -{"version":"2.8.11","headerMatch":{"HTTP_ACCEPT":{"matches":["application\/x-obml2d","application\/vnd.rim.html","text\/vnd.wap.wml","application\/vnd.wap.xhtml+xml"]},"HTTP_X_WAP_PROFILE":null,"HTTP_X_WAP_CLIENTID":null,"HTTP_WAP_CONNECTION":null,"HTTP_PROFILE":null,"HTTP_X_OPERAMINI_PHONE_UA":null,"HTTP_X_NOKIA_GATEWAY_ID":null,"HTTP_X_ORANGE_ID":null,"HTTP_X_VODAFONE_3GPDPCONTEXT":null,"HTTP_X_HUAWEI_USERID":null,"HTTP_UA_OS":null,"HTTP_X_MOBILE_GATEWAY":null,"HTTP_X_ATT_DEVICEID":null,"HTTP_UA_CPU":{"matches":["ARM"]}},"uaHttpHeaders":["HTTP_USER_AGENT","HTTP_X_OPERAMINI_PHONE_UA","HTTP_X_DEVICE_USER_AGENT","HTTP_X_ORIGINAL_USER_AGENT","HTTP_X_SKYFIRE_PHONE","HTTP_X_BOLT_PHONE_UA","HTTP_DEVICE_STOCK_UA","HTTP_X_UCBROWSER_DEVICE_UA"],"uaMatch":{"phones":{"iPhone":"\\biPhone\\b|\\biPod\\b","BlackBerry":"BlackBerry|\\bBB10\\b|rim[0-9]+","HTC":"HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m","Nexus":"Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6","Dell":"Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b","Motorola":"Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925","Samsung":"Samsung|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750","LG":"\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802)","Sony":"SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533","Asus":"Asus.*Galaxy|PadFone.*Mobile","Micromax":"Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b","Palm":"PalmSource|Palm","Vertu":"Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature","Pantech":"PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790","Fly":"IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250","iMobile":"i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)","SimValley":"\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b","Wolfgang":"AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q","Alcatel":"Alcatel","Nintendo":"Nintendo 3DS","Amoi":"Amoi","INQ":"INQ","GenericPhone":"Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"},"tablets":{"iPad":"iPad|iPad.*Mobile","NexusTablet":"Android.*Nexus[\\s]+(7|9|10)|^.*Android.*Nexus(?:(?!Mobile).)*$","SamsungTablet":"SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-I9205|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T707A|SM-T807A|SM-T237P|SM-T807P|SM-P607T|SM-T217T|SM-T337T","Kindle":"Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI)\\b","SurfaceTablet":"Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)","HPTablet":"HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10","AsusTablet":"^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG","BlackBerryTablet":"PlayBook|RIM Tablet","HTCtablet":"HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410","MotorolaTablet":"xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617","NookTablet":"Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2","AcerTablet":"Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b","ToshibaTablet":"Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO","LGTablet":"\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b","FujitsuTablet":"Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b","PrestigioTablet":"PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD","LenovoTablet":"Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)","DellTablet":"Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7","YarvikTablet":"Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b","MedionTablet":"Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB","ArnovaTablet":"AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2","IntensoTablet":"INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004","IRUTablet":"M702pro","MegafonTablet":"MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b","EbodaTablet":"E-Boda (Supreme|Impresspeed|Izzycomm|Essential)","AllViewTablet":"Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)","ArchosTablet":"\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b","AinolTablet":"NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark","SonyTablet":"Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551","PhilipsTablet":"\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b","CubeTablet":"Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT","CobyTablet":"MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010","MIDTablet":"M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733","MSITablet":"MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b","SMiTTablet":"Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)","RockChipTablet":"Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A","FlyTablet":"IQ310|Fly Vision","bqTablet":"bq.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant)|Maxwell.*Lite|Maxwell.*Plus","HuaweiTablet":"MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim","NecTablet":"\\bN-06D|\\bN-08D","PantechTablet":"Pantech.*P4100","BronchoTablet":"Broncho.*(N701|N708|N802|a710)","VersusTablet":"TOUCHPAD.*[78910]|\\bTOUCHTAB\\b","ZyncTablet":"z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900","PositivoTablet":"TB07STA|TB10STA|TB07FTA|TB10FTA","NabiTablet":"Android.*\\bNabi","KoboTablet":"Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build","DanewTablet":"DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b","TexetTablet":"NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE","PlaystationTablet":"Playstation.*(Portable|Vita)","TrekstorTablet":"ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab","PyleAudioTablet":"\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b","AdvanTablet":"Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ","DanyTechTablet":"Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1","GalapadTablet":"Android.*\\bG1\\b","MicromaxTablet":"Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b","KarbonnTablet":"Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b","AllFineTablet":"Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide","PROSCANTablet":"\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b","YONESTablet":"BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026","ChangJiaTablet":"TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503","GUTablet":"TX-A1301|TX-M9002|Q702|kf026","PointOfViewTablet":"TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10","OvermaxTablet":"OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)","HCLTablet":"HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync","DPSTablet":"DPS Dream 9|DPS Dual 7","VistureTablet":"V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10","CrestaTablet":"CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989","MediatekTablet":"\\bMT8125|MT8389|MT8135|MT8377\\b","ConcordeTablet":"Concorde([ ]+)?Tab|ConCorde ReadMan","GoCleverTablet":"GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042","ModecomTablet":"FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003","VoninoTablet":"\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b","ECSTablet":"V07OT2|TM105A|S10OT1|TR10CS1","StorexTablet":"eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab","VodafoneTablet":"SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7","EssentielBTablet":"Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2","RossMoorTablet":"RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711","iMobileTablet":"i-mobile i-note","TolinoTablet":"tolino tab [0-9.]+|tolino shine","AudioSonicTablet":"\\bC-22Q|T7-QC|T-17B|T-17P\\b","AMPETablet":"Android.* A78 ","SkkTablet":"Android.* (SKYPAD|PHOENIX|CYCLOPS)","TecnoTablet":"TECNO P9","JXDTablet":"Android.*\\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b","iJoyTablet":"Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)","FX2Tablet":"FX2 PAD7|FX2 PAD10","XoroTablet":"KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151","ViewsonicTablet":"ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a","OdysTablet":"LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10","CaptivaTablet":"CAPTIVA PAD","IconbitTablet":"NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S","TeclastTablet":"T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi","JaytechTablet":"TPC-PA762","BlaupunktTablet":"Endeavour 800NG|Endeavour 1010","DigmaTablet":"\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b","EvolioTablet":"ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b","LavaTablet":"QPAD E704|\\bIvoryS\\b|E-TAB IVORY","CelkonTablet":"CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b","MiTablet":"\\bMI PAD\\b|\\bHM NOTE 1W\\b","NibiruTablet":"Nibiru M1|Nibiru Jupiter One","NexoTablet":"NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI","UbislateTablet":"UbiSlate[\\s]?7C","PocketBookTablet":"Pocketbook","Hudl":"Hudl HT7S3","TelstraTablet":"T-Hub2","GenericTablet":"Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b"},"browsers":{"Chrome":"\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?","Dolfin":"\\bDolfin\\b","Opera":"Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+","Skyfire":"Skyfire","IE":"IEMobile|MSIEMobile","Firefox":"fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile","Bolt":"bolt","TeaShark":"teashark","Blazer":"Blazer","Safari":"Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari","Tizen":"Tizen","UCBrowser":"UC.*Browser|UCWEB","baiduboxapp":"baiduboxapp","baidubrowser":"baidubrowser","DiigoBrowser":"DiigoBrowser","Puffin":"Puffin","Mercury":"\\bMercury\\b","ObigoBrowser":"Obigo","NetFront":"NF-Browser","GenericBrowser":"NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger"},"os":{"AndroidOS":"Android","BlackBerryOS":"blackberry|\\bBB10\\b|rim tablet os","PalmOS":"PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino","SymbianOS":"Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b","WindowsMobileOS":"Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;","WindowsPhoneOS":"Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;","iOS":"\\biPhone.*Mobile|\\biPod|\\biPad","MeeGoOS":"MeeGo","MaemoOS":"Maemo","JavaOS":"J2ME\/|\\bMIDP\\b|\\bCLDC\\b","webOS":"webOS|hpwOS","badaOS":"\\bBada\\b","BREWOS":"BREW"},"utilities":{"DesktopMode":"WPDesktop","TV":"SonyDTV|HbbTV","WebKit":"(webkit)[ \/]([\\w.]+)","Bot":"Googlebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|facebookexternalhit","MobileBot":"Googlebot-Mobile|YahooSeeker\/M1A1-R2D2","Console":"\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b","Watch":"SM-V700"}}} \ No newline at end of file diff --git a/library/Mobile_Detect/README.md b/library/Mobile_Detect/README.md deleted file mode 100644 index db46648e6..000000000 --- a/library/Mobile_Detect/README.md +++ /dev/null @@ -1,219 +0,0 @@ -[![Build Status](https://travis-ci.org/serbanghita/Mobile-Detect.svg?branch=devel)](https://travis-ci.org/serbanghita/Mobile-Detect) [![Latest Stable Version](https://poser.pugx.org/mobiledetect/mobiledetectlib/v/stable.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib) [![Total Downloads](https://poser.pugx.org/mobiledetect/mobiledetectlib/downloads.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib) [![Daily Downloads](https://poser.pugx.org/mobiledetect/mobiledetectlib/d/daily.png)](https://packagist.org/packages/mobiledetect/mobiledetectlib) [![License](https://poser.pugx.org/mobiledetect/mobiledetectlib/license.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib) -[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/serbanghita/Mobile-Detect?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) - -![Mobile Detect](http://demo.mobiledetect.net/logo-github.png) - -> Motto: "Every business should have a mobile detection script to detect mobile readers." - -Mobile_Detect is a lightweight PHP class for detecting mobile devices (including tablets). -It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment. - -> We're commited to make Mobile_Detect the best open-source mobile detection resource and this is why before each release we're running [unit tests](./tests), we also research and update the detection rules on daily and weekly basis. - -Your website's _content strategy_ is important! You need a complete toolkit to deliver an experience that is _optimized_, _fast_ and _relevant_ to your users. Mobile_Detect class is a [server-side detection](http://www.w3.org/TR/mwabp/#bp-devcap-detection) tool that can help you with your RWD strategy, it is not a replacement for CSS3 media queries or other forms of client-side feature detection. - -##### This month updates - -First of all a **BIG THANK YOU** to our growing community for your continuous support and for all the feedback received! I'm still working my way with the current issues and all the emails. - -Nick is almost done with all the code for the upcoming `3.0.0` so that I only have to integrate the new parsing engine. We will release minor `2.8.xx` versions until a feature freeze where we will switch to the new branch. You will all be announced before this and hopefully we can make the transition smooth for everyone. - - Last but not least, special thanks for supporting us to our friends from [TryCatch.us](http://trycatch.us/) who _are set to carefully curate the most talented developers in Europe_! - -Thank you all and we're excited for the new release! - -##### Download and demo - -|Download|Docs|Examples| -|-------------|-------------|-------------| -|[Go to releases](../../tags)|[Become a contributor](../../wiki/Become-a-contributor)|[Code examples](../../wiki/Code-examples) -|[Mobile_Detect.php](./Mobile_Detect.php)|[History](../../wiki/History)|[:iphone: Live demo!](http://is.gd/mobiletest) -|[Composer package](https://packagist.org/packages/mobiledetect/mobiledetectlib)| - -##### Help - -|Pledgie|Paypal| -|-------|------| -|[Donate :+1:](http://pledgie.com/campaigns/21856)|[Donate :beer:](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mobiledetectlib%40gmail%2ecom&lc=US&item_name=Mobile%20Detect¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)| - - -I'm currently paying for hosting and spend a lot of my family time to maintain the project and planning the future releases. -I would highly appreciate any money donations that will keep the research going. - -Special thanks to the community :+1: for donations, [BrowserStack](http://browserstack.com) - for providing access to their great platform, [Zend](http://zend.com) - for donating licenses, [Dragos Gavrila](https://twitter.com/grafician) who contributed with the logo. - -##### 3rd party modules / [Submit new](../../issues/new?title=New%203rd%20party%20module&body=Name, Link and Description of the module.) - -:point_right: Keep `Mobile_Detect.php` class in a separate `module` and do NOT include it in your script core because of the high frequency of updates. -:point_right: When including the class into you `web application` or `module` always use `include_once '../path/to/Mobile_Detect.php` to prevent conflicts. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Varnish Cache -

    Varnish Mobile Detect - Drop-in varnish solution to mobile user detection based on the Mobile-Detect library. Made by willemk

    -

    mobiledetect2vcl - Python script to transform the Mobile Detect JSON database into an UA-based mobile detection VCL subroutine easily integrable in any Varnish Cache configuration. Made by Carlos Abalde

    -
    WordPress -

    WordPress Mobile Detect - Gives you the ability to wrap that infographic in a `[notdevice][/notdevice]` shortcode so at the server level WordPress will decide to show that content only if the user is NOT on a phone or tablet. Made by Jesse Friedman.

    - -

    mobble - provides mobile related conditional functions for your site. e.g. is_iphone(), is_mobile() and is_tablet(). Made by Scott Evans.

    - -

    WordPress Responsage - A small WordPress theme plugin that allows you to make your images responsive. Made by Adrian Ciaschetti.

    - -

    Social PopUP - This plugin will display a popup or splash screen when a new user visit your site showing a Google+, Twitter and Facebook follow links. It uses Mobile_Detect to detect mobile devices.

    -
    Drupal -

    Drupal Mobile Switch - The Mobile Switch Drupal module provides a automatic theme switch functionality for mobile devices, - detected by Browscap or Mobile Detect. Made by Siegfried Neumann.

    - -

    Drupal Context Mobile Detect - This is a Drupal context module which integrates Context and PHP Mobile Detect library. - Created by Artem Shymko.

    - -

    Drupal Mobile Detect - Lightweight mobile detect module for Drupal created by Matthew Donadio

    -
    Joomla

    yagendoo Joomla! Mobile Detection Plugin - Lightweight PHP plugin for Joomla! that detects a mobile browser using the Mobile Detect class. Made by yagendoo media.

    Magento

    Magento - This Magento helper from Optimise Web enables the use of all functions provided by MobileDetect.net. - Made by Kathir Vel.

    PrestaShop

    PrestaShop is a free, secure and open source shopping cart platform. Mobile_Detect is included in the default package since 1.5.x.

    Zend Framework -

    ZF2 Mobile-Detect - Zend Framework 2 module that provides Mobile-Detect features (Mobile_Detect class as a service, helper for views and plugin controllers). Made by neilime

    - -

    ZF2 MobileDetectModule - Facilitates integration of a PHP MobileDetect class with some ZF2-based application. Has similar idea like the existing ZF2 Mobile-Detect module, but differs in initialization and provision routine of the actual Mobile_Detect class. Appropriate view helper and controller plugin also have different conceptions. Made by Nikola Posa

    -
    Symfony

    Symfony2 Mobile Detect Bundle - The bundle for detecting mobile devices, manage mobile view and redirect to the mobile and tablet version. - Made by Nikolay Ivlev.

    -

    Silex Mobile Detect Service Provider - Silex service provider to interact with Mobile detect class methods. Made by Lhassan Baazzi.

    -
    Laravel -

    Laravel-Agent a user agent class for Laravel, based on Mobile Detect with some additional functionality. Made by Jens Segers.

    -

    BrowserDetect is a browser & mobile detection package, collects and wrap together the best user-agent identifiers for Laravel. Created by Varga Zsolt.

    -
    ExpressionEngine

    EE2 Detect Mobile - Lightweight PHP plugin for EE2 that detects a mobile browser using the Mobile Detect class. Made by Gareth Davies.

    Yii Framework

    Yii Extension - Mobile detect plugin for Yii framework. Made by Alexey Salnikov.

    CakePHP

    CakePHP MobileDetect - plugin component for CakePHP 2.x. Made by Gregory Gaskill

    FuelPHPSpecial Agent is a FuelPHP package which uses php-mobile-detect to determine whether a device is mobile or not. -It overrides the Fuelphp Agent class its methods. Made by Robbie Bardjin.
    Typo3px_mobiledetect is an extension that helps to detect visitor's mobile device class (if that’s tablet or mobile device like smartphone). Made by Alexander Tretyak.
    Statamic

    Statamic CMS Mobile Detect - plugin. Made by Sergei Filippov of Haiku Lab.

    Kohana

    Kohana Mobile Detect - an example of implementation of Mobile_Detect class with Kohana framework. Written by Luiz Alberto S. Ribeiro.

    mobile-detect.js

    A JavaScript port of Mobile-Detect class. Made by Heinrich Goebl

    Perl

    MobileDetect.pm - Perl module for Mobile Detect. Made by Sebastian Enger.

    python

    pymobiledetect - Mobile detect python package. Made by Bas van Oostveen.

    Ruby

    mobile_detect.rb - A Ruby gem using the JSON data exposed by the php project and implementing a basic subset of the API (as much as can be done by the exposed data). Made by Karthik T.

    GoMobileDetect

    GoMobileDetect - Go port of Mobile Detect class. Made by Shaked.

    MemHT

    MemHT is a Free PHP CMS and Blog that permit the creation and the management online of websites with few and easy steps. Has the class included in the core.

    concrete5

    concrete5 is a CMS that is free and open source. The library is included in the core.

    engine7

    ExEngine 7 PHP Open Source Framework. The Mobile_Detect class is included in the engine.

    Zikula

    Zikula is a free and open-source Content Management Framework, which allows you to run impressive websites and build powerful online applications. The core uses Mobile-Detect to switch to a special Mobile theme, using jQueryMobile

    UserAgentInfo

    UserAgentInfo is a PHP class for parsing user agent strings (HTTP_USER_AGENT). Includes mobile checks, bot checks, browser types/versions and more. -Based on browscap, Mobile_Detect and ua-parser. Created for high traffic websites and fast batch processing. Made by quentin389

    Craft CMS

    LJ Mobile Detect is a simple implementation of Mobile Detect for Craft CMS. Made by Lewis Jenkins

    diff --git a/library/defuse/php-encryption-1.2.1/Crypto.php b/library/defuse/php-encryption-1.2.1/Crypto.php index 60b5a62cc..5b60f6f12 100644 --- a/library/defuse/php-encryption-1.2.1/Crypto.php +++ b/library/defuse/php-encryption-1.2.1/Crypto.php @@ -342,9 +342,9 @@ final class Crypto */ private static function SecureRandom($octets) { - self::EnsureFunctionExists("mcrypt_create_iv"); - $random = mcrypt_create_iv($octets, MCRYPT_DEV_URANDOM); - if ($random === FALSE) { + self::EnsureFunctionExists("openssl_random_pseudo_bytes"); + $random = openssl_random_pseudo_bytes($octets, $crypto_strong); + if ($crypto_strong === FALSE) { throw new CannotPerformOperationException(); } else { return $random; diff --git a/library/markdown.php b/library/markdown.php index a8152c2ab..769bdb121 100644 --- a/library/markdown.php +++ b/library/markdown.php @@ -1,24 +1,17 @@ hard_wrap = true; + $html = $MarkdownParser->transform($text); $a->save_timestamp($stamp1, "parser"); return $html; } -?> diff --git a/library/oauth.php b/library/oauth.php deleted file mode 100644 index caf1a0839..000000000 --- a/library/oauth.php +++ /dev/null @@ -1,728 +0,0 @@ - , - // "expires" => , - // "scope" => , - // "redirect_uri" => , - // "expires" => , - // "scope" => - // ) - // - // Return null if the code is invalid. - - return null; - } - - // Take the provided authorization code values and store them somewhere (db, etc.) - // Required for AUTH_CODE_GRANT_TYPE - protected function store_auth_code($code, $client_id, $redirect_uri, $expires, $scope) { - // This function should be the storage counterpart to get_stored_auth_code - - // If storage fails for some reason, we're not currently checking - // for any sort of success/failure, so you should bail out of the - // script and provide a descriptive fail message - } - - // Grant access tokens for basic user credentials - // IETF Draft 4.1.2: http://tools.ietf.org/html/draft-ietf-oauth-v2-08#section-4.1.2 - // Required for USER_CREDENTIALS_GRANT_TYPE - protected function check_user_credentials($client_id, $username, $password) { - // Check the supplied username and password for validity - // You can also use the $client_id param to do any checks required - // based on a client, if you need that - // If the username and password are invalid, return false - - // If the username and password are valid, and you want to verify the scope of - // a user's access, return an array with the scope values, like so: - // - // array ( - // "scope" => - // ) - // - // We'll check the scope you provide against the requested scope before - // providing an access token. - // - // Otherwise, just return true. - - return false; - } - - // Grant access tokens for assertions - // IETF Draft 4.1.3: http://tools.ietf.org/html/draft-ietf-oauth-v2-08#section-4.1.3 - // Required for ASSERTION_GRANT_TYPE - protected function check_assertion($client_id, $assertion_type, $assertion) { - // Check the supplied assertion for validity - // You can also use the $client_id param to do any checks required - // based on a client, if you need that - // If the assertion is invalid, return false - - // If the assertion is valid, and you want to verify the scope of - // an access request, return an array with the scope values, like so: - // - // array ( - // "scope" => - // ) - // - // We'll check the scope you provide against the requested scope before - // providing an access token. - // - // Otherwise, just return true. - - return false; - } - - // Grant refresh access tokens - // IETF Draft 4.1.4: http://tools.ietf.org/html/draft-ietf-oauth-v2-08#section-4.1.4 - // Required for REFRESH_TOKEN_GRANT_TYPE - protected function get_refresh_token($refresh_token) { - // Retrieve the stored data for the given refresh token - // Should return: - // - // array ( - // "client_id" => , - // "expires" => , - // "scope" => - // ) - // - // Return null if the token id is invalid. - - return null; - } - - // Store refresh access tokens - // Required for REFRESH_TOKEN_GRANT_TYPE - protected function store_refresh_token($token, $client_id, $expires, $scope = null) { - // If storage fails for some reason, we're not currently checking - // for any sort of success/failure, so you should bail out of the - // script and provide a descriptive fail message - - return; - } - - // Grant access tokens for the "none" grant type - // Not really described in the IETF Draft, so I just left a method stub...do whatever you want! - // Required for NONE_GRANT_TYPE - protected function check_none_access($client_id) { - return false; - } - - protected function get_default_authentication_realm() { - // Change this to whatever authentication realm you want to send in a WWW-Authenticate header - return "Service"; - } - - /* End stuff that should get overridden */ - - private $access_token_lifetime = 3600; - private $auth_code_lifetime = 30; - private $refresh_token_lifetime = 1209600; // Two weeks - - public function __construct($access_token_lifetime = 3600, $auth_code_lifetime = 30, $refresh_token_lifetime = 1209600) { - $this->access_token_lifetime = $access_token_lifetime; - $this->auth_code_lifetime = $auth_code_lifetime; - $this->refresh_token_lifetime = $refresh_token_lifetime; - } - - /* Resource protecting (Section 5) */ - - // Check that a valid access token has been provided - // - // The scope parameter defines any required scope that the token must have - // If a scope param is provided and the token does not have the required scope, - // we bounce the request - // - // Some implementations may choose to return a subset of the protected resource - // (i.e. "public" data) if the user has not provided an access token - // or if the access token is invalid or expired - // - // The IETF spec says that we should send a 401 Unauthorized header and bail immediately - // so that's what the defaults are set to - // - // Here's what each parameter does: - // $scope = A space-separated string of required scope(s), if you want to check for scope - // $exit_not_present = If true and no access token is provided, send a 401 header and exit, otherwise return false - // $exit_invalid = If true and the implementation of get_access_token returns null, exit, otherwise return false - // $exit_expired = If true and the access token has expired, exit, otherwise return false - // $exit_scope = If true the access token does not have the required scope(s), exit, otherwise return false - // $realm = If you want to specify a particular realm for the WWW-Authenticate header, supply it here - public function verify_access_token($scope = null, $exit_not_present = true, $exit_invalid = true, $exit_expired = true, $exit_scope = true, $realm = null) { - $token_param = $this->get_access_token_param(); - if ($token_param === false) // Access token was not provided - return $exit_not_present ? $this->send_401_unauthorized($realm, $scope) : false; - - // Get the stored token data (from the implementing subclass) - $token = $this->get_access_token($token_param); - if ($token === null) - return $exit_invalid ? $this->send_401_unauthorized($realm, $scope, ERROR_INVALID_TOKEN) : false; - - // Check token expiration (I'm leaving this check separated, later we'll fill in better error messages) - if (isset($token["expires"]) && time() > $token["expires"]) - return $exit_expired ? $this->send_401_unauthorized($realm, $scope, ERROR_EXPIRED_TOKEN) : false; - - // Check scope, if provided - // If token doesn't have a scope, it's null/empty, or it's insufficient, then throw an error - if ($scope && - (!isset($token["scope"]) || !$token["scope"] || !$this->check_scope($scope, $token["scope"]))) - return $exit_scope ? $this->send_401_unauthorized($realm, $scope, ERROR_INSUFFICIENT_SCOPE) : false; - - return true; - } - - - // Returns true if everything in required scope is contained in available scope - // False if something in required scope is not in available scope - private function check_scope($required_scope, $available_scope) { - // The required scope should match or be a subset of the available scope - if (!is_array($required_scope)) - $required_scope = explode(" ", $required_scope); - - if (!is_array($available_scope)) - $available_scope = explode(" ", $available_scope); - - return (count(array_diff($required_scope, $available_scope)) == 0); - } - - // Send a 401 unauthorized header with the given realm - // and an error, if provided - private function send_401_unauthorized($realm, $scope, $error = null) { - $realm = $realm === null ? $this->get_default_authentication_realm() : $realm; - - $auth_header = "WWW-Authenticate: Token realm='".$realm."'"; - - if ($scope) - $auth_header .= ", scope='".$scope."'"; - - if ($error !== null) - $auth_header .= ", error='".$error."'"; - - header("HTTP/1.1 401 Unauthorized"); - header($auth_header); - - exit; - } - - // Pulls the access token out of the HTTP request - // Either from the Authorization header or GET/POST/etc. - // Returns false if no token is present - // TODO: Support POST or DELETE - private function get_access_token_param() { - $auth_header = $this->get_authorization_header(); - - if ($auth_header !== false) { - // Make sure only the auth header is set - if (isset($_GET[OAUTH_TOKEN_PARAM_NAME]) || isset($_POST[OAUTH_TOKEN_PARAM_NAME])) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - $auth_header = trim($auth_header); - - // Make sure it's Token authorization - if (strcmp(substr($auth_header, 0, 6),"Token ") !== 0) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - // Parse the rest of the header - if (preg_match('/\s*token\s*="(.+)"/', substr($auth_header, 6), $matches) == 0 || count($matches) < 2) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - return $matches[1]; - } - - if (isset($_GET[OAUTH_TOKEN_PARAM_NAME])) { - if (isset($_POST[OAUTH_TOKEN_PARAM_NAME])) // Both GET and POST are not allowed - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - return $_GET[OAUTH_TOKEN_PARAM_NAME]; - } - - if (isset($_POST[OAUTH_TOKEN_PARAM_NAME])) - return $_POST[OAUTH_TOKEN_PARAM_NAME]; - - return false; - } - - /* Access token granting (Section 4) */ - - // Grant or deny a requested access token - // This would be called from the "/token" endpoint as defined in the spec - // Obviously, you can call your endpoint whatever you want - public function grant_access_token() { - $filters = array( - "grant_type" => array("filter" => FILTER_VALIDATE_REGEXP, "options" => array("regexp" => REGEX_TOKEN_GRANT_TYPE), "flags" => FILTER_REQUIRE_SCALAR), - "scope" => array("flags" => FILTER_REQUIRE_SCALAR), - "code" => array("flags" => FILTER_REQUIRE_SCALAR), - "redirect_uri" => array("filter" => FILTER_VALIDATE_URL, "flags" => array(FILTER_FLAG_SCHEME_REQUIRED, FILTER_REQUIRE_SCALAR)), - "username" => array("flags" => FILTER_REQUIRE_SCALAR), - "password" => array("flags" => FILTER_REQUIRE_SCALAR), - "assertion_type" => array("flags" => FILTER_REQUIRE_SCALAR), - "assertion" => array("flags" => FILTER_REQUIRE_SCALAR), - "refresh_token" => array("flags" => FILTER_REQUIRE_SCALAR), - ); - - $input = filter_input_array(INPUT_POST, $filters); - - // Grant Type must be specified. - if (!$input["grant_type"]) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - // Make sure we've implemented the requested grant type - if (!in_array($input["grant_type"], $this->get_supported_grant_types())) - $this->error(ERROR_BAD_REQUEST, ERROR_UNSUPPORTED_GRANT_TYPE); - - // Authorize the client - $client = $this->get_client_credentials(); - - if ($this->auth_client_credentials($client[0], $client[1]) === false) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_CLIENT_CREDENTIALS); - - if (!$this->authorize_client($client[0], $input["grant_type"])) - $this->error(ERROR_BAD_REQUEST, ERROR_UNAUTHORIZED_CLIENT); - - // Do the granting - switch ($input["grant_type"]) { - case AUTH_CODE_GRANT_TYPE: - if (!$input["code"] || !$input["redirect_uri"]) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - $stored = $this->get_stored_auth_code($input["code"]); - - if ($stored === null || $input["redirect_uri"] != $stored["redirect_uri"] || $client[0] != $stored["client_id"]) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_GRANT); - - if ($stored["expires"] > time()) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_GRANT); - - break; - case USER_CREDENTIALS_GRANT_TYPE: - if (!$input["username"] || !$input["password"]) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - $stored = $this->check_user_credentials($client[0], $input["username"], $input["password"]); - - if ($stored === false) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_GRANT); - - break; - case ASSERTION_GRANT_TYPE: - if (!$input["assertion_type"] || !$input["assertion"]) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - $stored = $this->check_assertion($client[0], $input["assertion_type"], $input["assertion"]); - - if ($stored === false) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_GRANT); - - break; - case REFRESH_TOKEN_GRANT_TYPE: - if (!$input["refresh_token"]) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - $stored = $this->get_refresh_token($input["refresh_token"]); - - if ($stored === null || $client[0] != $stored["client_id"]) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_GRANT); - - if ($stored["expires"] > time()) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_GRANT); - - break; - case NONE_GRANT_TYPE: - $stored = $this->check_none_access($client[0]); - - if ($stored === false) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - } - - // Check scope, if provided - if ($input["scope"] && (!is_array($stored) || !isset($stored["scope"]) || !$this->check_scope($input["scope"], $stored["scope"]))) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_SCOPE); - - if (!$input["scope"]) - $input["scope"] = null; - - $token = $this->create_access_token($client[0], $input["scope"]); - - $this->send_json_headers(); - echo json_encode($token); - } - - // Internal function used to get the client credentials from HTTP basic auth or POST data - // See http://tools.ietf.org/html/draft-ietf-oauth-v2-08#section-2 - private function get_client_credentials() { - if (isset($_SERVER["PHP_AUTH_USER"]) && $_POST && isset($_POST["client_id"])) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_CLIENT_CREDENTIALS); - - // Try basic auth - if (isset($_SERVER["PHP_AUTH_USER"])) - return array($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"]); - - // Try POST - if ($_POST && isset($_POST["client_id"])) { - if (isset($_POST["client_secret"])) - return array($_POST["client_id"], $_POST["client_secret"]); - - return array($_POST["client_id"], NULL); - } - - // No credentials were specified - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_CLIENT_CREDENTIALS); - } - - /* End-user/client Authorization (Section 3 of IETF Draft) */ - - // Pull the authorization request data out of the HTTP request - // and return it so the authorization server can prompt the user - // for approval - public function get_authorize_params() { - $filters = array( - "client_id" => array("filter" => FILTER_VALIDATE_REGEXP, "options" => array("regexp" => REGEX_CLIENT_ID), "flags" => FILTER_REQUIRE_SCALAR), - "response_type" => array("filter" => FILTER_VALIDATE_REGEXP, "options" => array("regexp" => REGEX_AUTH_RESPONSE_TYPE), "flags" => FILTER_REQUIRE_SCALAR), - "redirect_uri" => array("filter" => FILTER_VALIDATE_URL, "flags" => array(FILTER_FLAG_SCHEME_REQUIRED, FILTER_REQUIRE_SCALAR)), - "state" => array("flags" => FILTER_REQUIRE_SCALAR), - "scope" => array("flags" => FILTER_REQUIRE_SCALAR), - ); - - $input = filter_input_array(INPUT_GET, $filters); - - // Make sure a valid client id was supplied - if (!$input["client_id"]) { - if ($input["redirect_uri"]) - $this->callback_error($input["redirect_uri"], ERROR_INVALID_CLIENT_ID, $input["state"]); - - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_CLIENT_ID); // We don't have a good URI to use - } - - // redirect_uri is not required if already established via other channels - // check an existing redirect URI against the one supplied - $redirect_uri = $this->get_redirect_uri($input["client_id"]); - - // At least one of: existing redirect URI or input redirect URI must be specified - if (!$redirect_uri && !$input["redirect_uri"]) - $this->error(ERROR_BAD_REQUEST, ERROR_INVALID_REQUEST); - - // get_redirect_uri should return false if the given client ID is invalid - // this probably saves us from making a separate db call, and simplifies the method set - if ($redirect_uri === false) - $this->callback_error($input["redirect_uri"], ERROR_INVALID_CLIENT_ID, $input["state"]); - - // If there's an existing uri and one from input, verify that they match - if ($redirect_uri && $input["redirect_uri"]) { - // Ensure that the input uri starts with the stored uri - if (strcasecmp(substr($input["redirect_uri"], 0, strlen($redirect_uri)),$redirect_uri) !== 0) - $this->callback_error($input["redirect_uri"], ERROR_REDIRECT_URI_MISMATCH, $input["state"]); - } elseif ($redirect_uri) { // They did not provide a uri from input, so use the stored one - $input["redirect_uri"] = $redirect_uri; - } - - // type and client_id are required - if (!$input["response_type"]) - $this->callback_error($input["redirect_uri"], ERROR_INVALID_REQUEST, $input["state"], ERROR_INVALID_RESPONSE_TYPE); - - // Check requested auth response type against the list of supported types - if (array_search($input["response_type"], $this->get_supported_auth_response_types()) === false) - $this->callback_error($input["redirect_uri"], ERROR_UNSUPPORTED_RESPONSE_TYPE, $input["state"]); - - // Validate that the requested scope is supported - if ($input["scope"] && !$this->check_scope($input["scope"], $this->get_supported_scopes())) - $this->callback_error($input["redirect_uri"], ERROR_INVALID_SCOPE, $input["state"]); - - return $input; - } - - // After the user has approved or denied the access request - // the authorization server should call this function to redirect - // the user appropriately - - // The params all come from the results of get_authorize_params - // except for $is_authorized -- this is true or false depending on whether - // the user authorized the access - public function finish_client_authorization($is_authorized, $type, $client_id, $redirect_uri, $state, $scope = null) { - if ($state !== null) - $result["query"]["state"] = $state; - - if ($is_authorized === false) { - $result["query"]["error"] = ERROR_USER_DENIED; - } else { - if ($type == AUTH_CODE_AUTH_RESPONSE_TYPE || $type == CODE_AND_TOKEN_AUTH_RESPONSE_TYPE) - $result["query"]["code"] = $this->create_auth_code($client_id, $redirect_uri, $scope); - - if ($type == ACCESS_TOKEN_AUTH_RESPONSE_TYPE || $type == CODE_AND_TOKEN_AUTH_RESPONSE_TYPE) - $result["fragment"] = $this->create_access_token($client_id, $scope); - } - - $this->do_redirect_uri_callback($redirect_uri, $result); - } - - /* Other/utility functions */ - - private function do_redirect_uri_callback($redirect_uri, $result) { - header("HTTP/1.1 302 Found"); - header("Location: " . $this->build_uri($redirect_uri, $result)); - exit; - } - - private function build_uri($uri, $data) { - $parse_url = parse_url($uri); - - // Add our data to the parsed uri - foreach ($data as $k => $v) { - if (isset($parse_url[$k])) - $parse_url[$k] .= "&" . http_build_query($v); - else - $parse_url[$k] = http_build_query($v); - } - - // Put humpty dumpty back together - return - ((isset($parse_url["scheme"])) ? $parse_url["scheme"] . "://" : "") - .((isset($parse_url["user"])) ? $parse_url["user"] . ((isset($parse_url["pass"])) ? ":" . $parse_url["pass"] : "") ."@" : "") - .((isset($parse_url["host"])) ? $parse_url["host"] : "") - .((isset($parse_url["port"])) ? ":" . $parse_url["port"] : "") - .((isset($parse_url["path"])) ? $parse_url["path"] : "") - .((isset($parse_url["query"])) ? "?" . $parse_url["query"] : "") - .((isset($parse_url["fragment"])) ? "#" . $parse_url["fragment"] : ""); - } - - // This belongs in a separate factory, but to keep it simple, I'm just keeping it here. - private function create_access_token($client_id, $scope) { - $token = array( - "access_token" => $this->gen_access_token(), - "expires_in" => $this->access_token_lifetime, - "scope" => $scope - ); - - $this->store_access_token($token["access_token"], $client_id, time() + $this->access_token_lifetime, $scope); - - // Issue a refresh token also, if we support them - if (in_array(REFRESH_TOKEN_GRANT_TYPE, $this->get_supported_grant_types())) { - $token["refresh_token"] = $this->gen_access_token(); - $this->store_refresh_token($token["refresh_token"], $client_id, time() + $this->refresh_token_lifetime, $scope); - } - - return $token; - } - - private function create_auth_code($client_id, $redirect_uri, $scope) { - $code = $this->gen_auth_code(); - $this->store_auth_code($code, $client_id, $redirect_uri, time() + $this->auth_code_lifetime, $scope); - return $code; - } - - // Implementing classes may want to override these two functions - // to implement other access token or auth code generation schemes - private function gen_access_token() { - return base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand())); - } - - private function gen_auth_code() { - return base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand())); - } - - // Implementing classes may need to override this function for use on non-Apache web servers - // Just pull out the Authorization HTTP header and return it - // Return false if the Authorization header does not exist - private function get_authorization_header() { - if (array_key_exists("HTTP_AUTHORIZATION", $_SERVER)) - return $_SERVER["HTTP_AUTHORIZATION"]; - - if (function_exists("apache_request_headers")) { - $headers = apache_request_headers(); - - if (array_key_exists("Authorization", $headers)) - return $headers["Authorization"]; - } - - return false; - } - - private function send_json_headers() { - header("Content-Type: application/json"); - header("Cache-Control: no-store"); - } - - public function error($code, $message = null) { - header("HTTP/1.1 " . $code); - - if ($message) { - $this->send_json_headers(); - echo json_encode(array("error" => $message)); - } - - exit; - } - - public function callback_error($redirect_uri, $error, $state, $message = null, $error_uri = null) { - $result["query"]["error"] = $error; - - if ($state) - $result["query"]["state"] = $state; - - if ($message) - $result["query"]["error_description"] = $message; - - if ($error_uri) - $result["query"]["error_uri"] = $error_uri; - - $this->do_redirect_uri_callback($redirect_uri, $result); - } -} \ No newline at end of file diff --git a/library/php-markdown/License.md b/library/php-markdown/License.md index 8a5b85447..c16197b69 100644 --- a/library/php-markdown/License.md +++ b/library/php-markdown/License.md @@ -1,11 +1,11 @@ PHP Markdown Lib -Copyright (c) 2004-2014 Michel Fortin - +Copyright (c) 2004-2016 Michel Fortin + All rights reserved. Based on Markdown Copyright (c) 2003-2006 John Gruber - + All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/library/php-markdown/Michelf/Markdown.inc.php b/library/php-markdown/Michelf/Markdown.inc.php index 8c281094c..e2bd3808e 100644 --- a/library/php-markdown/Michelf/Markdown.inc.php +++ b/library/php-markdown/Michelf/Markdown.inc.php @@ -1,10 +1,10 @@ -# -# Original Markdown -# Copyright (c) 2004-2006 John Gruber -# -# +/** + * Markdown - A text-to-HTML conversion tool for web writers + * + * @package php-markdown + * @author Michel Fortin + * @copyright 2004-2016 Michel Fortin + * @copyright (Original Markdown) 2004-2006 John Gruber + */ + namespace Michelf; - -# -# Markdown Parser Class -# - +/** + * Markdown Parser Class + */ class Markdown implements MarkdownInterface { + /** + * Define the package version + * @var string + */ + const MARKDOWNLIB_VERSION = "1.7.0"; - ### Version ### - - const MARKDOWNLIB_VERSION = "1.4.1"; - - ### Simple Function Interface ### - + /** + * Simple function interface - Initialize the parser and return the result + * of its transform method. This will work fine for derived classes too. + * + * @api + * + * @param string $text + * @return string + */ public static function defaultTransform($text) { - # - # Initialize the parser and return the result of its transform method. - # This will work fine for derived classes too. - # - # Take parser class on which this function was called. + // Take parser class on which this function was called. $parser_class = \get_called_class(); - # try to take parser from the static parser list + // Try to take parser from the static parser list static $parser_list; $parser =& $parser_list[$parser_class]; - # create the parser it not already set - if (!$parser) + // Create the parser it not already set + if (!$parser) { $parser = new $parser_class; + } - # Transform text using parser. + // Transform text using parser. return $parser->transform($text); } - ### Configuration Variables ### + /** + * Configuration variables + */ - # Change to ">" for HTML output. + /** + * Change to ">" for HTML output. + * @var string + */ public $empty_element_suffix = " />"; + + /** + * The width of indentation of the output markup + * @var int + */ public $tab_width = 4; - - # Change to `true` to disallow markup or entities. - public $no_markup = false; + + /** + * Change to `true` to disallow markup or entities. + * @var boolean + */ + public $no_markup = false; public $no_entities = false; - - # Predefined urls and titles for reference links and images. - public $predef_urls = array(); + + + /** + * Change to `true` to enable line breaks on \n without two trailling spaces + * @var boolean + */ + public $hard_wrap = false; + + /** + * Predefined URLs and titles for reference links and images. + * @var array + */ + public $predef_urls = array(); public $predef_titles = array(); - # Optional filter function for URLs + /** + * Optional filter function for URLs + * @var callable + */ public $url_filter_func = null; + /** + * Optional header id="" generation callback function. + * @var callable + */ + public $header_id_func = null; - ### Parser Implementation ### + /** + * Optional function for converting code block content to HTML + * @var callable + */ + public $code_block_content_func = null; - # Regex to match balanced [brackets]. - # Needed to insert a maximum bracked depth while converting to PHP. + /** + * Optional function for converting code span content to HTML. + * @var callable + */ + public $code_span_content_func = null; + + /** + * Class attribute to toggle "enhanced ordered list" behaviour + * setting this to true will allow ordered lists to start from the index + * number that is defined first. + * + * For example: + * 2. List item two + * 3. List item three + * + * Becomes: + *

      + *
    1. List item two
      2. + *
    2. List item three
      3. + *
    + * + * @var bool + */ + public $enhanced_ordered_list = false; + + /** + * Parser implementation + */ + + /** + * Regex to match balanced [brackets]. + * Needed to insert a maximum bracked depth while converting to PHP. + * @var int + */ protected $nested_brackets_depth = 6; protected $nested_brackets_re; - + protected $nested_url_parenthesis_depth = 4; protected $nested_url_parenthesis_re; - # Table of hash values for escaped characters: + /** + * Table of hash values for escaped characters: + * @var string + */ protected $escape_chars = '\`*_{}[]()>#+-.!'; protected $escape_chars_re; - + /** + * Constructor function. Initialize appropriate member variables. + * @return void + */ public function __construct() { - # - # Constructor function. Initialize appropriate member variables. - # $this->_initDetab(); $this->prepareItalicsAndBold(); - - $this->nested_brackets_re = + + $this->nested_brackets_re = str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth). str_repeat('\])*', $this->nested_brackets_depth); - - $this->nested_url_parenthesis_re = + + $this->nested_url_parenthesis_re = str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth). str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth); - + $this->escape_chars_re = '['.preg_quote($this->escape_chars).']'; - - # Sort document, block, and span gamut in ascendent priority order. + + // Sort document, block, and span gamut in ascendent priority order. asort($this->document_gamut); asort($this->block_gamut); asort($this->span_gamut); } - # Internal hashes used during transformation. - protected $urls = array(); - protected $titles = array(); + /** + * Internal hashes used during transformation. + * @var array + */ + protected $urls = array(); + protected $titles = array(); protected $html_hashes = array(); - - # Status flag to avoid invalid nesting. + + /** + * Status flag to avoid invalid nesting. + * @var boolean + */ protected $in_anchor = false; - - + + /** + * Called before the transformation process starts to setup parser states. + * @return void + */ protected function setup() { - # - # Called before the transformation process starts to setup parser - # states. - # - # Clear global hashes. - $this->urls = $this->predef_urls; - $this->titles = $this->predef_titles; + // Clear global hashes. + $this->urls = $this->predef_urls; + $this->titles = $this->predef_titles; $this->html_hashes = array(); - - $this->in_anchor = false; + $this->in_anchor = false; } - + + /** + * Called after the transformation process to clear any variable which may + * be taking up memory unnecessarly. + * @return void + */ protected function teardown() { - # - # Called after the transformation process to clear any variable - # which may be taking up memory unnecessarly. - # - $this->urls = array(); - $this->titles = array(); + $this->urls = array(); + $this->titles = array(); $this->html_hashes = array(); } - + /** + * Main function. Performs some preprocessing on the input text and pass + * it through the document gamut. + * + * @api + * + * @param string $text + * @return string + */ public function transform($text) { - # - # Main function. Performs some preprocessing on the input text - # and pass it through the document gamut. - # $this->setup(); - + # Remove UTF-8 BOM and marker character in input, if present. $text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text); @@ -168,28 +248,33 @@ class Markdown implements MarkdownInterface { foreach ($this->document_gamut as $method => $priority) { $text = $this->$method($text); } - + $this->teardown(); return $text . "\n"; } - + + /** + * Define the document gamut + * @var array + */ protected $document_gamut = array( - # Strip link definitions, store in hashes. + // Strip link definitions, store in hashes. "stripLinkDefinitions" => 20, - "runBasicBlockGamut" => 30, - ); - + ); + /** + * Strips link definitions from text, stores the URLs and titles in + * hash references + * @param string $text + * @return string + */ protected function stripLinkDefinitions($text) { - # - # Strips link definitions from text, stores the URLs and titles in - # hash references. - # + $less_than_tab = $this->tab_width - 1; - # Link defs are in the form: ^[id]: url "optional title" + // Link defs are in the form: ^[id]: url "optional title" $text = preg_replace_callback('{ ^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?: # id = $1 [ ]* @@ -213,43 +298,58 @@ class Markdown implements MarkdownInterface { (?:\n+|\Z) }xm', array($this, '_stripLinkDefinitions_callback'), - $text); + $text + ); return $text; } + + /** + * The callback to strip link definitions + * @param array $matches + * @return string + */ protected function _stripLinkDefinitions_callback($matches) { $link_id = strtolower($matches[1]); $url = $matches[2] == '' ? $matches[3] : $matches[2]; $this->urls[$link_id] = $url; $this->titles[$link_id] =& $matches[4]; - return ''; # String that will replace the block + return ''; // String that will replace the block } - + /** + * Hashify HTML blocks + * @param string $text + * @return string + */ protected function hashHTMLBlocks($text) { - if ($this->no_markup) return $text; + if ($this->no_markup) { + return $text; + } $less_than_tab = $this->tab_width - 1; - # Hashify HTML blocks: - # We only want to do this for block-level HTML tags, such as headers, - # lists, and tables. That's because we still want to wrap

    s around - # "paragraphs" that are wrapped in non-block-level tags, such as anchors, - # phrase emphasis, and spans. The list of tags we're looking for is - # hard-coded: - # - # * List "a" is made of tags which can be both inline or block-level. - # These will be treated block-level when the start tag is alone on - # its line, otherwise they're not matched here and will be taken as - # inline later. - # * List "b" is made of tags which are always block-level; - # + /** + * Hashify HTML blocks: + * + * We only want to do this for block-level HTML tags, such as headers, + * lists, and tables. That's because we still want to wrap

    s around + * "paragraphs" that are wrapped in non-block-level tags, such as + * anchors, phrase emphasis, and spans. The list of tags we're looking + * for is hard-coded: + * + * * List "a" is made of tags which can be both inline or block-level. + * These will be treated block-level when the start tag is alone on + * its line, otherwise they're not matched here and will be taken as + * inline later. + * * List "b" is made of tags which are always block-level; + */ $block_tags_a_re = 'ins|del'; $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'. 'script|noscript|style|form|fieldset|iframe|math|svg|'. 'article|section|nav|aside|hgroup|header|footer|'. 'figure'; - # Regular expression for the content of a block tag. + // Regular expression for the content of a block tag. $nested_tags_level = 4; $attr = ' (?> # optional tag attributes @@ -263,7 +363,7 @@ class Markdown implements MarkdownInterface { | \'[^\']*\' # text inside single quotes (tolerate ">") )* - )? + )? '; $content = str_repeat(' @@ -275,29 +375,32 @@ class Markdown implements MarkdownInterface { (?> /> | - >', $nested_tags_level). # end of opening tag - '.*?'. # last level nested tag content + >', $nested_tags_level). // end of opening tag + '.*?'. // last level nested tag content str_repeat(' # closing nested tag ) - | + | <(?!/\2\s*> # other tags with a different name ) )*', $nested_tags_level); $content2 = str_replace('\2', '\3', $content); - # First, look for nested blocks, e.g.: - #

    - #
    - # tags for inner block must be indented. - #
    - #
    - # - # The outermost tags must start at the left margin for this to match, and - # the inner nested divs must be indented. - # We need to do this before the next, more liberal match, because the next - # match will start at the first `
    ` and stop at the first `
    `. + /** + * First, look for nested blocks, e.g.: + *
    + *
    + * tags for inner block must be indented. + *
    + *
    + * + * The outermost tags must start at the left margin for this to match, + * and the inner nested divs must be indented. + * We need to do this before the next, more liberal match, because the + * next match will start at the first `
    ` and stop at the + * first `
    `. + */ $text = preg_replace_callback('{(?> (?> (?<=\n) # Starting on its own line @@ -306,9 +409,9 @@ class Markdown implements MarkdownInterface { ) ( # save in $1 - # Match from `\n` to `\n`, handling nested tags + # Match from `\n` to `\n`, handling nested tags # in between. - + [ ]{0,'.$less_than_tab.'} <('.$block_tags_b_re.')# start tag = $2 '.$attr.'> # attributes followed by > and \n @@ -326,28 +429,28 @@ class Markdown implements MarkdownInterface { # the matching end tag [ ]* # trailing spaces/tabs (?=\n+|\Z) # followed by a newline or end of document - - | # Special case just for
    . It was easier to make a special + + | # Special case just for
    . It was easier to make a special # case than to make the other regex more complicated. - + [ ]{0,'.$less_than_tab.'} <(hr) # start tag = $2 '.$attr.' # attributes /?> # the matching end tag [ ]* (?=\n{2,}|\Z) # followed by a blank line or end of document - + | # Special case for standalone HTML comments: - + [ ]{0,'.$less_than_tab.'} (?s: ) [ ]* (?=\n{2,}|\Z) # followed by a blank line or end of document - + | # PHP and ASP-style processor instructions (hashBlock($text); return "\n\n$key\n\n"; } - - + + /** + * Called whenever a tag must be hashed when a function insert an atomic + * element in the text stream. Passing $text to through this function gives + * a unique text-token which will be reverted back when calling unhash. + * + * The $boundary argument specify what character should be used to surround + * the token. By convension, "B" is used for block elements that needs not + * to be wrapped into paragraph tags at the end, ":" is used for elements + * that are word separators and "X" is used in the general case. + * + * @param string $text + * @param string $boundary + * @return string + */ protected function hashPart($text, $boundary = 'X') { - # - # Called whenever a tag must be hashed when a function insert an atomic - # element in the text stream. Passing $text to through this function gives - # a unique text-token which will be reverted back when calling unhash. - # - # The $boundary argument specify what character should be used to surround - # the token. By convension, "B" is used for block elements that needs not - # to be wrapped into paragraph tags at the end, ":" is used for elements - # that are word separators and "X" is used in the general case. - # - # Swap back any tag hash found in $text so we do not have to `unhash` - # multiple times at the end. + // Swap back any tag hash found in $text so we do not have to `unhash` + // multiple times at the end. $text = $this->unhash($text); - - # Then hash the block. + + // Then hash the block. static $i = 0; $key = "$boundary\x1A" . ++$i . $boundary; $this->html_hashes[$key] = $text; - return $key; # String that will replace the tag. + return $key; // String that will replace the tag. } - + /** + * Shortcut function for hashPart with block-level boundaries. + * @param string $text + * @return string + */ protected function hashBlock($text) { - # - # Shortcut function for hashPart with block-level boundaries. - # return $this->hashPart($text, 'B'); } - + /** + * Define the block gamut - these are all the transformations that form + * block-level tags like paragraphs, headers, and list items. + * @var array + */ protected $block_gamut = array( - # - # These are all the transformations that form block-level - # tags like paragraphs, headers, and list items. - # "doHeaders" => 10, "doHorizontalRules" => 20, - "doLists" => 40, "doCodeBlocks" => 50, "doBlockQuotes" => 60, - ); + ); + /** + * Run block gamut tranformations. + * + * We need to escape raw HTML in Markdown source before doing anything + * else. This need to be done for each block, and not only at the + * begining in the Markdown function since hashed blocks can be part of + * list items and could have been indented. Indented blocks would have + * been seen as a code block in a previous pass of hashHTMLBlocks. + * + * @param string $text + * @return string + */ protected function runBlockGamut($text) { - # - # Run block gamut tranformations. - # - # We need to escape raw HTML in Markdown source before doing anything - # else. This need to be done for each block, and not only at the - # begining in the Markdown function since hashed blocks can be part of - # list items and could have been indented. Indented blocks would have - # been seen as a code block in a previous pass of hashHTMLBlocks. $text = $this->hashHTMLBlocks($text); - return $this->runBasicBlockGamut($text); } - + + /** + * Run block gamut tranformations, without hashing HTML blocks. This is + * useful when HTML blocks are known to be already hashed, like in the first + * whole-document pass. + * + * @param string $text + * @return string + */ protected function runBasicBlockGamut($text) { - # - # Run block gamut tranformations, without hashing HTML blocks. This is - # useful when HTML blocks are known to be already hashed, like in the first - # whole-document pass. - # + foreach ($this->block_gamut as $method => $priority) { $text = $this->$method($text); } - - # Finally form paragraph and restore hashed blocks. + + // Finally form paragraph and restore hashed blocks. $text = $this->formParagraphs($text); return $text; } - - + + /** + * Convert horizontal rules + * @param string $text + * @return string + */ protected function doHorizontalRules($text) { - # Do Horizontal Rules: return preg_replace( '{ ^[ ]{0,3} # Leading space @@ -459,67 +582,82 @@ class Markdown implements MarkdownInterface { [ ]* # Tailing spaces $ # End of line. }mx', - "\n".$this->hashBlock("empty_element_suffix")."\n", - $text); + "\n".$this->hashBlock("empty_element_suffix")."\n", + $text + ); } - + /** + * These are all the transformations that occur *within* block-level + * tags like paragraphs, headers, and list items. + * @var array + */ protected $span_gamut = array( - # - # These are all the transformations that occur *within* block-level - # tags like paragraphs, headers, and list items. - # - # Process character escapes, code spans, and inline HTML - # in one shot. + // Process character escapes, code spans, and inline HTML + // in one shot. "parseSpan" => -30, - - # Process anchor and image tags. Images must come first, - # because ![foo][f] looks like an anchor. + // Process anchor and image tags. Images must come first, + // because ![foo][f] looks like an anchor. "doImages" => 10, "doAnchors" => 20, - - # Make links out of things like `` - # Must come after doAnchors, because you can use < and > - # delimiters in inline links like [this](). + // Make links out of things like `` + // Must come after doAnchors, because you can use < and > + // delimiters in inline links like [this](). "doAutoLinks" => 30, "encodeAmpsAndAngles" => 40, - "doItalicsAndBold" => 50, "doHardBreaks" => 60, - ); + ); + /** + * Run span gamut transformations + * @param string $text + * @return string + */ protected function runSpanGamut($text) { - # - # Run span gamut tranformations. - # foreach ($this->span_gamut as $method => $priority) { $text = $this->$method($text); } return $text; } - - + + /** + * Do hard breaks + * @param string $text + * @return string + */ protected function doHardBreaks($text) { - # Do hard breaks: - return preg_replace_callback('/ {2,}\n/', - array($this, '_doHardBreaks_callback'), $text); + if ($this->hard_wrap) { + return preg_replace_callback('/ *\n/', + array($this, '_doHardBreaks_callback'), $text); + } else { + return preg_replace_callback('/ {2,}\n/', + array($this, '_doHardBreaks_callback'), $text); + } } + + /** + * Trigger part hashing for the hard break (callback method) + * @param array $matches + * @return string + */ protected function _doHardBreaks_callback($matches) { return $this->hashPart("empty_element_suffix\n"); } - + /** + * Turn Markdown link shortcuts into XHTML tags. + * @param string $text + * @return string + */ protected function doAnchors($text) { - # - # Turn Markdown link shortcuts into XHTML tags. - # - if ($this->in_anchor) return $text; + if ($this->in_anchor) { + return $text; + } $this->in_anchor = true; - - # - # First, handle reference-style links: [link text] [id] - # + + // First, handle reference-style links: [link text] [id] $text = preg_replace_callback('{ ( # wrap whole match in $1 \[ @@ -536,9 +674,7 @@ class Markdown implements MarkdownInterface { }xs', array($this, '_doAnchors_reference_callback'), $text); - # - # Next, inline-style links: [link text](url "optional title") - # + // Next, inline-style links: [link text](url "optional title") $text = preg_replace_callback('{ ( # wrap whole match in $1 \[ @@ -563,11 +699,9 @@ class Markdown implements MarkdownInterface { }xs', array($this, '_doAnchors_inline_callback'), $text); - # - # Last, handle reference-style shortcuts: [link text] - # These must come last in case you've also got [link text][1] - # or [link text](/foo) - # + // Last, handle reference-style shortcuts: [link text] + // These must come last in case you've also got [link text][1] + // or [link text](/foo) $text = preg_replace_callback('{ ( # wrap whole match in $1 \[ @@ -580,48 +714,60 @@ class Markdown implements MarkdownInterface { $this->in_anchor = false; return $text; } + + /** + * Callback method to parse referenced anchors + * @param string $matches + * @return string + */ protected function _doAnchors_reference_callback($matches) { $whole_match = $matches[1]; $link_text = $matches[2]; $link_id =& $matches[3]; if ($link_id == "") { - # for shortcut links like [this][] or [this]. + // for shortcut links like [this][] or [this]. $link_id = $link_text; } - - # lower-case and turn embedded newlines into spaces + + // lower-case and turn embedded newlines into spaces $link_id = strtolower($link_id); $link_id = preg_replace('{[ ]?\n}', ' ', $link_id); if (isset($this->urls[$link_id])) { $url = $this->urls[$link_id]; $url = $this->encodeURLAttribute($url); - + $result = "titles[$link_id] ) ) { $title = $this->titles[$link_id]; $title = $this->encodeAttribute($title); $result .= " title=\"$title\""; } - + $link_text = $this->runSpanGamut($link_text); $result .= ">$link_text"; $result = $this->hashPart($result); - } - else { + } else { $result = $whole_match; } return $result; } + + /** + * Callback method to parse inline anchors + * @param string $matches + * @return string + */ protected function _doAnchors_inline_callback($matches) { $whole_match = $matches[1]; $link_text = $this->runSpanGamut($matches[2]); $url = $matches[3] == '' ? $matches[4] : $matches[3]; $title =& $matches[7]; - // if the URL was of the form it got caught by the HTML - // tag parser and hashed. Need to reverse the process before using the URL. + // If the URL was of the form it got caught by the HTML + // tag parser and hashed. Need to reverse the process before using + // the URL. $unhashed = $this->unhash($url); if ($unhashed != $url) $url = preg_replace('/^<(.*)>$/', '\1', $unhashed); @@ -633,21 +779,20 @@ class Markdown implements MarkdownInterface { $title = $this->encodeAttribute($title); $result .= " title=\"$title\""; } - + $link_text = $this->runSpanGamut($link_text); $result .= ">$link_text"; return $this->hashPart($result); } - + /** + * Turn Markdown image shortcuts into tags. + * @param string $text + * @return string + */ protected function doImages($text) { - # - # Turn Markdown image shortcuts into tags. - # - # - # First, handle reference-style labeled images: ![alt text][id] - # + // First, handle reference-style labeled images: ![alt text][id] $text = preg_replace_callback('{ ( # wrap whole match in $1 !\[ @@ -662,13 +807,11 @@ class Markdown implements MarkdownInterface { \] ) - }xs', + }xs', array($this, '_doImages_reference_callback'), $text); - # - # Next, handle inline images: ![alt text](url "optional title") - # Don't forget: encode * and _ - # + // Next, handle inline images: ![alt text](url "optional title") + // Don't forget: encode * and _ $text = preg_replace_callback('{ ( # wrap whole match in $1 !\[ @@ -696,13 +839,19 @@ class Markdown implements MarkdownInterface { return $text; } + + /** + * Callback to parse references image tags + * @param array $matches + * @return string + */ protected function _doImages_reference_callback($matches) { $whole_match = $matches[1]; $alt_text = $matches[2]; $link_id = strtolower($matches[3]); if ($link_id == "") { - $link_id = strtolower($alt_text); # for shortcut links like ![this][]. + $link_id = strtolower($alt_text); // for shortcut links like ![this][]. } $alt_text = $this->encodeAttribute($alt_text); @@ -716,14 +865,19 @@ class Markdown implements MarkdownInterface { } $result .= $this->empty_element_suffix; $result = $this->hashPart($result); - } - else { - # If there's no such link ID, leave intact: + } else { + // If there's no such link ID, leave intact: $result = $whole_match; } return $result; } + + /** + * Callback to parse inline image tags + * @param array $matches + * @return string + */ protected function _doImages_inline_callback($matches) { $whole_match = $matches[1]; $alt_text = $matches[2]; @@ -735,32 +889,38 @@ class Markdown implements MarkdownInterface { $result = "\"$alt_text\"";encodeAttribute($title); - $result .= " title=\"$title\""; # $title already quoted + $result .= " title=\"$title\""; // $title already quoted } $result .= $this->empty_element_suffix; return $this->hashPart($result); } - + /** + * Parse Markdown heading elements to HTML + * @param string $text + * @return string + */ protected function doHeaders($text) { - # Setext-style headers: - # Header 1 - # ======== - # - # Header 2 - # -------- - # + /** + * Setext-style headers: + * Header 1 + * ======== + * + * Header 2 + * -------- + */ $text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx', array($this, '_doHeaders_callback_setext'), $text); - # atx-style headers: - # # Header 1 - # ## Header 2 - # ## Header 2 with closing hashes ## - # ... - # ###### Header 6 - # + /** + * atx-style headers: + * # Header 1 + * ## Header 2 + * ## Header 2 with closing hashes ## + * ... + * ###### Header 6 + */ $text = preg_replace_callback('{ ^(\#{1,6}) # $1 = string of #\'s [ ]* @@ -773,29 +933,72 @@ class Markdown implements MarkdownInterface { return $text; } + + /** + * Setext header parsing callback + * @param array $matches + * @return string + */ protected function _doHeaders_callback_setext($matches) { - # Terrible hack to check we haven't found an empty list item. - if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) + // Terrible hack to check we haven't found an empty list item. + if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) { return $matches[0]; - + } + $level = $matches[2]{0} == '=' ? 1 : 2; - $block = "".$this->runSpanGamut($matches[1]).""; + + // ID attribute generation + $idAtt = $this->_generateIdFromHeaderValue($matches[1]); + + $block = "".$this->runSpanGamut($matches[1]).""; return "\n" . $this->hashBlock($block) . "\n\n"; } + + /** + * ATX header parsing callback + * @param array $matches + * @return string + */ protected function _doHeaders_callback_atx($matches) { + // ID attribute generation + $idAtt = $this->_generateIdFromHeaderValue($matches[2]); + $level = strlen($matches[1]); - $block = "".$this->runSpanGamut($matches[2]).""; + $block = "".$this->runSpanGamut($matches[2]).""; return "\n" . $this->hashBlock($block) . "\n\n"; } + /** + * If a header_id_func property is set, we can use it to automatically + * generate an id attribute. + * + * This method returns a string in the form id="foo", or an empty string + * otherwise. + * @param string $headerValue + * @return string + */ + protected function _generateIdFromHeaderValue($headerValue) { + if (!is_callable($this->header_id_func)) { + return ""; + } + $idValue = call_user_func($this->header_id_func, $headerValue); + if (!$idValue) { + return ""; + } + + return ' id="' . $this->encodeAttribute($idValue) . '"'; + } + + /** + * Form HTML ordered (numbered) and unordered (bulleted) lists. + * @param string $text + * @return string + */ protected function doLists($text) { - # - # Form HTML ordered (numbered) and unordered (bulleted) lists. - # $less_than_tab = $this->tab_width - 1; - # Re-usable patterns to match list item bullets and number markers: + // Re-usable patterns to match list item bullets and number markers: $marker_ul_re = '[*+-]'; $marker_ol_re = '\d+[\.]'; @@ -805,7 +1008,7 @@ class Markdown implements MarkdownInterface { ); foreach ($markers_relist as $marker_re => $other_marker_re) { - # Re-usable pattern to match any entirel ul or ol list: + // Re-usable pattern to match any entirel ul or ol list: $whole_list_re = ' ( # $1 = whole list ( # $2 @@ -832,18 +1035,17 @@ class Markdown implements MarkdownInterface { ) ) '; // mx - - # We use a different prefix before nested lists than top-level lists. - # See extended comment in _ProcessListItems(). - + + // We use a different prefix before nested lists than top-level lists. + //See extended comment in _ProcessListItems(). + if ($this->list_level) { $text = preg_replace_callback('{ ^ '.$whole_list_re.' }mx', array($this, '_doLists_callback'), $text); - } - else { + } else { $text = preg_replace_callback('{ (?:(?<=\n)\n|\A\n?) # Must eat the newline '.$whole_list_re.' @@ -854,55 +1056,86 @@ class Markdown implements MarkdownInterface { return $text; } + + /** + * List parsing callback + * @param array $matches + * @return string + */ protected function _doLists_callback($matches) { - # Re-usable patterns to match list item bullets and number markers: + // Re-usable patterns to match list item bullets and number markers: $marker_ul_re = '[*+-]'; $marker_ol_re = '\d+[\.]'; $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)"; - + $marker_ol_start_re = '[0-9]+'; + $list = $matches[1]; $list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol"; - + $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re ); - + $list .= "\n"; $result = $this->processListItems($list, $marker_any_re); - - $result = $this->hashBlock("<$list_type>\n" . $result . ""); + + $ol_start = 1; + if ($this->enhanced_ordered_list) { + // Get the start number for ordered list. + if ($list_type == 'ol') { + $ol_start_array = array(); + $ol_start_check = preg_match("/$marker_ol_start_re/", $matches[4], $ol_start_array); + if ($ol_start_check){ + $ol_start = $ol_start_array[0]; + } + } + } + + if ($ol_start > 1 && $list_type == 'ol'){ + $result = $this->hashBlock("<$list_type start=\"$ol_start\">\n" . $result . ""); + } else { + $result = $this->hashBlock("<$list_type>\n" . $result . ""); + } return "\n". $result ."\n\n"; } + /** + * Nesting tracker for list levels + * @var integer + */ protected $list_level = 0; + /** + * Process the contents of a single ordered or unordered list, splitting it + * into individual list items. + * @param string $list_str + * @param string $marker_any_re + * @return string + */ protected function processListItems($list_str, $marker_any_re) { - # - # Process the contents of a single ordered or unordered list, splitting it - # into individual list items. - # - # The $this->list_level global keeps track of when we're inside a list. - # Each time we enter a list, we increment it; when we leave a list, - # we decrement. If it's zero, we're not in a list anymore. - # - # We do this because when we're not inside a list, we want to treat - # something like this: - # - # I recommend upgrading to version - # 8. Oops, now this line is treated - # as a sub-list. - # - # As a single paragraph, despite the fact that the second line starts - # with a digit-period-space sequence. - # - # Whereas when we're inside a list (or sub-list), that line will be - # treated as the start of a sub-list. What a kludge, huh? This is - # an aspect of Markdown's syntax that's hard to parse perfectly - # without resorting to mind-reading. Perhaps the solution is to - # change the syntax rules such that sub-lists must start with a - # starting cardinal number; e.g. "1." or "a.". - + /** + * The $this->list_level global keeps track of when we're inside a list. + * Each time we enter a list, we increment it; when we leave a list, + * we decrement. If it's zero, we're not in a list anymore. + * + * We do this because when we're not inside a list, we want to treat + * something like this: + * + * I recommend upgrading to version + * 8. Oops, now this line is treated + * as a sub-list. + * + * As a single paragraph, despite the fact that the second line starts + * with a digit-period-space sequence. + * + * Whereas when we're inside a list (or sub-list), that line will be + * treated as the start of a sub-list. What a kludge, huh? This is + * an aspect of Markdown's syntax that's hard to parse perfectly + * without resorting to mind-reading. Perhaps the solution is to + * change the syntax rules such that sub-lists must start with a + * starting cardinal number; e.g. "1." or "a.". + */ $this->list_level++; - # trim trailing blank lines: + // Trim trailing blank lines: $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str); $list_str = preg_replace_callback('{ @@ -920,6 +1153,12 @@ class Markdown implements MarkdownInterface { $this->list_level--; return $list_str; } + + /** + * List item parsing callback + * @param array $matches + * @return string + */ protected function _processListItems_callback($matches) { $item = $matches[4]; $leading_line =& $matches[1]; @@ -927,28 +1166,27 @@ class Markdown implements MarkdownInterface { $marker_space = $matches[3]; $tailing_blank_line =& $matches[5]; - if ($leading_line || $tailing_blank_line || + if ($leading_line || $tailing_blank_line || preg_match('/\n{2,}/', $item)) { - # Replace marker with the appropriate whitespace indentation + // Replace marker with the appropriate whitespace indentation $item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item; $item = $this->runBlockGamut($this->outdent($item)."\n"); - } - else { - # Recursion for sub-lists: + } else { + // Recursion for sub-lists: $item = $this->doLists($this->outdent($item)); - $item = preg_replace('/\n+$/', '', $item); - $item = $this->runSpanGamut($item); + $item = $this->formParagraphs($item, false); } return "
  • " . $item . "
    • \n"; } - + /** + * Process Markdown `
    ` blocks.
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function doCodeBlocks($text) {
-	#
-	#	Process Markdown `
    ` blocks.
-	#
 		$text = preg_replace_callback('{
 				(?:\n\n|\A\n?)
 				(	            # $1 = the code block -- one or more lines, starting with a space/tab
@@ -963,106 +1201,141 @@ class Markdown implements MarkdownInterface {
 
 		return $text;
 	}
+
+	/**
+	 * Code block parsing callback
+	 * @param  array $matches
+	 * @return string
+	 */
 	protected function _doCodeBlocks_callback($matches) {
 		$codeblock = $matches[1];
 
 		$codeblock = $this->outdent($codeblock);
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		if ($this->code_block_content_func) {
+			$codeblock = call_user_func($this->code_block_content_func, $codeblock, "");
+		} else {
+			$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		}
 
 		# trim leading newlines and trailing newlines
 		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
 
 		$codeblock = "
    $codeblock\n
    ";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+		return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
 	}
 
-
+	/**
+	 * Create a code span markup for $code. Called from handleSpanToken.
+	 * @param  string $code
+	 * @return string
+	 */
 	protected function makeCodeSpan($code) {
-	#
-	# Create a code span markup for $code. Called from handleSpanToken.
-	#
-		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+		if ($this->code_span_content_func) {
+			$code = call_user_func($this->code_span_content_func, $code);
+		} else {
+			$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+		}
 		return $this->hashPart("$code");
 	}
 
-
+	/**
+	 * Define the emphasis operators with their regex matches
+	 * @var array
+	 */
 	protected $em_relist = array(
 		''  => '(?:(? '(? '(? '(?:(? '(? '(? '(?:(? '(? '(?em_relist as $em => $em_re) {
 			foreach ($this->strong_relist as $strong => $strong_re) {
-				# Construct list of allowed token expressions.
+				// Construct list of allowed token expressions.
 				$token_relist = array();
 				if (isset($this->em_strong_relist["$em$strong"])) {
 					$token_relist[] = $this->em_strong_relist["$em$strong"];
 				}
 				$token_relist[] = $em_re;
 				$token_relist[] = $strong_re;
-				
-				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
+
+				// Construct master expression from list.
+				$token_re = '{(' . implode('|', $token_relist) . ')}';
 				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
 			}
 		}
 	}
-	
+
+	/**
+	 * Convert Markdown italics (emphasis) and bold (strong) to HTML
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function doItalicsAndBold($text) {
 		$token_stack = array('');
 		$text_stack = array('');
 		$em = '';
 		$strong = '';
 		$tree_char_em = false;
-		
+
 		while (1) {
-			#
-			# Get prepared regular expression for seraching emphasis tokens
-			# in current context.
-			#
+			// Get prepared regular expression for seraching emphasis tokens
+			// in current context.
 			$token_re = $this->em_strong_prepared_relist["$em$strong"];
-			
-			#
-			# Each loop iteration search for the next emphasis token. 
-			# Each token is then passed to handleSpanToken.
-			#
+
+			// Each loop iteration search for the next emphasis token.
+			// Each token is then passed to handleSpanToken.
 			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
 			$text_stack[0] .= $parts[0];
 			$token =& $parts[1];
 			$text =& $parts[2];
-			
+
 			if (empty($token)) {
-				# Reached end of text span: empty stack without emitting.
-				# any more emphasis.
+				// Reached end of text span: empty stack without emitting.
+				// any more emphasis.
 				while ($token_stack[0]) {
 					$text_stack[1] .= array_shift($token_stack);
 					$text_stack[0] .= array_shift($text_stack);
 				}
 				break;
 			}
-			
+
 			$token_len = strlen($token);
 			if ($tree_char_em) {
-				# Reached closing marker while inside a three-char emphasis.
+				// Reached closing marker while inside a three-char emphasis.
 				if ($token_len == 3) {
-					# Three-char closing marker, close em and strong.
+					// Three-char closing marker, close em and strong.
 					array_shift($token_stack);
 					$span = array_shift($text_stack);
 					$span = $this->runSpanGamut($span);
@@ -1071,21 +1344,21 @@ class Markdown implements MarkdownInterface {
 					$em = '';
 					$strong = '';
 				} else {
-					# Other closing marker: close one em or strong and
-					# change current token state to match the other
+					// Other closing marker: close one em or strong and
+					// change current token state to match the other
 					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
 					$tag = $token_len == 2 ? "strong" : "em";
 					$span = $text_stack[0];
 					$span = $this->runSpanGamut($span);
 					$span = "<$tag>$span";
 					$text_stack[0] = $this->hashPart($span);
-					$$tag = ''; # $$tag stands for $em or $strong
+					$$tag = ''; // $$tag stands for $em or $strong
 				}
 				$tree_char_em = false;
 			} else if ($token_len == 3) {
 				if ($em) {
-					# Reached closing marker for both em and strong.
-					# Closing strong marker:
+					// Reached closing marker for both em and strong.
+					// Closing strong marker:
 					for ($i = 0; $i < 2; ++$i) {
 						$shifted_token = array_shift($token_stack);
 						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
@@ -1093,11 +1366,11 @@ class Markdown implements MarkdownInterface {
 						$span = $this->runSpanGamut($span);
 						$span = "<$tag>$span";
 						$text_stack[0] .= $this->hashPart($span);
-						$$tag = ''; # $$tag stands for $em or $strong
+						$$tag = ''; // $$tag stands for $em or $strong
 					}
 				} else {
-					# Reached opening three-char emphasis marker. Push on token 
-					# stack; will be handled by the special condition above.
+					// Reached opening three-char emphasis marker. Push on token
+					// stack; will be handled by the special condition above.
 					$em = $token{0};
 					$strong = "$em$em";
 					array_unshift($token_stack, $token);
@@ -1106,12 +1379,12 @@ class Markdown implements MarkdownInterface {
 				}
 			} else if ($token_len == 2) {
 				if ($strong) {
-					# Unwind any dangling emphasis marker:
+					// Unwind any dangling emphasis marker:
 					if (strlen($token_stack[0]) == 1) {
 						$text_stack[1] .= array_shift($token_stack);
 						$text_stack[0] .= array_shift($text_stack);
 					}
-					# Closing strong marker:
+					// Closing strong marker:
 					array_shift($token_stack);
 					$span = array_shift($text_stack);
 					$span = $this->runSpanGamut($span);
@@ -1124,10 +1397,10 @@ class Markdown implements MarkdownInterface {
 					$strong = $token;
 				}
 			} else {
-				# Here $token_len == 1
+				// Here $token_len == 1
 				if ($em) {
 					if (strlen($token_stack[0]) == 1) {
-						# Closing emphasis marker:
+						// Closing emphasis marker:
 						array_shift($token_stack);
 						$span = array_shift($text_stack);
 						$span = $this->runSpanGamut($span);
@@ -1147,7 +1420,11 @@ class Markdown implements MarkdownInterface {
 		return $text_stack[0];
 	}
 
-
+	/**
+	 * Parse Markdown blockquotes to HTML
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function doBlockQuotes($text) {
 		$text = preg_replace_callback('/
 			  (								# Wrap whole match in $1
@@ -1163,51 +1440,64 @@ class Markdown implements MarkdownInterface {
 
 		return $text;
 	}
+
+	/**
+	 * Blockquote parsing callback
+	 * @param  array $matches
+	 * @return string
+	 */
 	protected function _doBlockQuotes_callback($matches) {
 		$bq = $matches[1];
-		# trim one level of quoting - trim whitespace-only lines
+		// trim one level of quoting - trim whitespace-only lines
 		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
+		$bq = $this->runBlockGamut($bq); // recurse
 
 		$bq = preg_replace('/^/m', "  ", $bq);
-		# These leading spaces cause problem with 
     content, 
-		# so we need to fix that:
-		$bq = preg_replace_callback('{(\s*
    .+?
    )}sx', 
+		// These leading spaces cause problem with 
     content,
+		// so we need to fix that:
+		$bq = preg_replace_callback('{(\s*
    .+?
    )}sx',
 			array($this, '_doBlockQuotes_callback2'), $bq);
 
-		return "\n". $this->hashBlock("
    \n$bq\n
    ")."\n\n";
+		return "\n" . $this->hashBlock("
    \n$bq\n
    ") . "\n\n";
 	}
+
+	/**
+	 * Blockquote parsing callback
+	 * @param  array $matches
+	 * @return string
+	 */
 	protected function _doBlockQuotes_callback2($matches) {
 		$pre = $matches[1];
 		$pre = preg_replace('/^  /m', '', $pre);
 		return $pre;
 	}
 
-
-	protected function formParagraphs($text) {
-	#
-	#	Params:
-	#		$text - string to process with html 
     tags
-	#
-		# Strip leading and trailing lines:
+	/**
+	 * Parse paragraphs
+	 *
+	 * @param  string $text String to process in paragraphs
+	 * @param  boolean $wrap_in_p Whether paragraphs should be wrapped in 
     tags
+	 * @return string
+	 */
+	protected function formParagraphs($text, $wrap_in_p = true) {
+		// Strip leading and trailing lines:
 		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
 
 		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
 
-		#
-		# Wrap 
     tags and unhashify HTML blocks
-		#
+		// Wrap 
     tags and unhashify HTML blocks
 		foreach ($grafs as $key => $value) {
 			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
-				# Is a paragraph.
+				// Is a paragraph.
 				$value = $this->runSpanGamut($value);
-				$value = preg_replace('/^([ ]*)/', "
    ", $value);
-				$value .= "
    ";
+				if ($wrap_in_p) {
+					$value = preg_replace('/^([ ]*)/', "
    ", $value);
+					$value .= "
    ";
+				}
 				$grafs[$key] = $this->unhash($value);
-			}
-			else {
-				# Is a block.
-				# Modify elements of @grafs in-place...
+			} else {
+				// Is a block.
+				// Modify elements of @grafs in-place...
 				$graf = $value;
 				$block = $this->html_hashes[$graf];
 				$graf = $block;
@@ -1232,11 +1522,11 @@ class Markdown implements MarkdownInterface {
 //				{
 //					list(, $div_open, , $div_content, $div_close) = $matches;
 //
-//					# We can't call Markdown(), because that resets the hash;
-//					# that initialization code should be pulled into its own sub, though.
+//					// We can't call Markdown(), because that resets the hash;
+//					// that initialization code should be pulled into its own sub, though.
 //					$div_content = $this->hashHTMLBlocks($div_content);
-//					
-//					# Run document gamut methods on the content.
+//
+//					// Run document gamut methods on the content.
 //					foreach ($this->document_gamut as $method => $priority) {
 //						$div_content = $this->$method($div_content);
 //					}
@@ -1253,71 +1543,78 @@ class Markdown implements MarkdownInterface {
 		return implode("\n\n", $grafs);
 	}
 
-
+	/**
+	 * Encode text for a double-quoted HTML attribute. This function
+	 * is *not* suitable for attributes enclosed in single quotes.
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function encodeAttribute($text) {
-	#
-	# Encode text for a double-quoted HTML attribute. This function
-	# is *not* suitable for attributes enclosed in single quotes.
-	#
 		$text = $this->encodeAmpsAndAngles($text);
 		$text = str_replace('"', '"', $text);
 		return $text;
 	}
 
-
+	/**
+	 * Encode text for a double-quoted HTML attribute containing a URL,
+	 * applying the URL filter if set. Also generates the textual
+	 * representation for the URL (removing mailto: or tel:) storing it in $text.
+	 * This function is *not* suitable for attributes enclosed in single quotes.
+	 *
+	 * @param  string $url
+	 * @param  string &$text Passed by reference
+	 * @return string        URL
+	 */
 	protected function encodeURLAttribute($url, &$text = null) {
-	#
-	# Encode text for a double-quoted HTML attribute containing a URL,
-	# applying the URL filter if set. Also generates the textual
-	# representation for the URL (removing mailto: or tel:) storing it in $text.
-	# This function is *not* suitable for attributes enclosed in single quotes.
-	#
-		if ($this->url_filter_func)
+		if ($this->url_filter_func) {
 			$url = call_user_func($this->url_filter_func, $url);
+		}
 
-		if (preg_match('{^mailto:}i', $url))
+		if (preg_match('{^mailto:}i', $url)) {
 			$url = $this->encodeEntityObfuscatedAttribute($url, $text, 7);
-		else if (preg_match('{^tel:}i', $url))
-		{
+		} else if (preg_match('{^tel:}i', $url)) {
 			$url = $this->encodeAttribute($url);
 			$text = substr($url, 4);
-		}
-		else
-		{
+		} else {
 			$url = $this->encodeAttribute($url);
 			$text = $url;
 		}
 
 		return $url;
 	}
-	
-	
+
+	/**
+	 * Smart processing for ampersands and angle brackets that need to
+	 * be encoded. Valid character entities are left alone unless the
+	 * no-entities mode is set.
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function encodeAmpsAndAngles($text) {
-	#
-	# Smart processing for ampersands and angle brackets that need to 
-	# be encoded. Valid character entities are left alone unless the
-	# no-entities mode is set.
-	#
 		if ($this->no_entities) {
 			$text = str_replace('&', '&', $text);
 		} else {
-			# Ampersand-encoding based entirely on Nat Irons's Amputator
-			# MT plugin: 
-			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
+			// Ampersand-encoding based entirely on Nat Irons's Amputator
+			// MT plugin: 
+			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
 								'&', $text);
 		}
-		# Encode remaining <'s
+		// Encode remaining <'s
 		$text = str_replace('<', '<', $text);
 
 		return $text;
 	}
 
-
+	/**
+	 * Parse Markdown automatic links to anchor HTML tags
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function doAutoLinks($text) {
 		$text = preg_replace_callback('{<((https?|ftp|dict|tel):[^\'">\s]+)>}i',
 			array($this, '_doAutoLinks_url_callback'), $text);
 
-		# Email addresses: 
+		// Email addresses: 
 		$text = preg_replace_callback('{
 			<
 			(?:mailto:)?
@@ -1340,11 +1637,23 @@ class Markdown implements MarkdownInterface {
 
 		return $text;
 	}
+
+	/**
+	 * Parse URL callback
+	 * @param  array $matches
+	 * @return string
+	 */
 	protected function _doAutoLinks_url_callback($matches) {
 		$url = $this->encodeURLAttribute($matches[1], $text);
 		$link = "$text";
 		return $this->hashPart($link);
 	}
+
+	/**
+	 * Parse email address callback
+	 * @param  array $matches
+	 * @return string
+	 */
 	protected function _doAutoLinks_email_callback($matches) {
 		$addr = $matches[1];
 		$url = $this->encodeURLAttribute("mailto:$addr", $text);
@@ -1352,42 +1661,52 @@ class Markdown implements MarkdownInterface {
 		return $this->hashPart($link);
 	}
 
-
+	/**
+	 * Input: some text to obfuscate, e.g. "mailto:foo@example.com"
+	 *
+	 * Output: the same text but with most characters encoded as either a
+	 *         decimal or hex entity, in the hopes of foiling most address
+	 *         harvesting spam bots. E.g.:
+	 *
+	 *        mailto:foo
+	 *        @example.co
+	 *        m
+	 *
+	 * Note: the additional output $tail is assigned the same value as the
+	 * ouput, minus the number of characters specified by $head_length.
+	 *
+	 * Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+	 * With some optimizations by Milian Wolff. Forced encoding of HTML
+	 * attribute special characters by Allan Odgaard.
+	 *
+	 * @param  string  $text
+	 * @param  string  &$tail
+	 * @param  integer $head_length
+	 * @return string
+	 */
 	protected function encodeEntityObfuscatedAttribute($text, &$tail = null, $head_length = 0) {
-	#
-	#	Input: some text to obfuscate, e.g. "mailto:foo@example.com"
-	#
-	#	Output: the same text but with most characters encoded as either a
-	#		decimal or hex entity, in the hopes of foiling most address
-	#		harvesting spam bots. E.g.:
-	#
-	#        mailto:foo
-	#        @example.co
-	#        m
-	#
-	#	Note: the additional output $tail is assigned the same value as the
-	#	ouput, minus the number of characters specified by $head_length.
-	#
-	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
-	#   With some optimizations by Milian Wolff. Forced encoding of HTML
-	#	attribute special characters by Allan Odgaard.
-	#
-		if ($text == "") return $tail = "";
+		if ($text == "") {
+			return $tail = "";
+		}
 
 		$chars = preg_split('/(? $char) {
 			$ord = ord($char);
-			# Ignore non-ascii chars.
+			// Ignore non-ascii chars.
 			if ($ord < 128) {
-				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
-				# roughly 10% raw, 45% hex, 45% dec
-				# '@' *must* be encoded. I insist.
-				# '"' and '>' have to be encoded inside the attribute
-				if ($r > 90 && strpos('@"&>', $char) === false) /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
+				$r = ($seed * (1 + $key)) % 100; // Pseudo-random function.
+				// roughly 10% raw, 45% hex, 45% dec
+				// '@' *must* be encoded. I insist.
+				// '"' and '>' have to be encoded inside the attribute
+				if ($r > 90 && strpos('@"&>', $char) === false) {
+					/* do nothing */
+				} else if ($r < 45) {
+					$chars[$key] = '&#x'.dechex($ord).';';
+				} else {
+					$chars[$key] = '&#'.$ord.';';
+				}
 			}
 		}
 
@@ -1397,14 +1716,15 @@ class Markdown implements MarkdownInterface {
 		return $text;
 	}
 
-
+	/**
+	 * Take the string $str and parse it into tokens, hashing embeded HTML,
+	 * escaped characters and handling code spans.
+	 * @param  string $str
+	 * @return string
+	 */
 	protected function parseSpan($str) {
-	#
-	# Take the string $str and parse it into tokens, hashing embeded HTML,
-	# escaped characters and handling code spans.
-	#
 		$output = '';
-		
+
 		$span_re = '{
 				(
 					\\\\'.$this->escape_chars_re.'
@@ -1432,1720 +1752,145 @@ class Markdown implements MarkdownInterface {
 				}xs';
 
 		while (1) {
-			#
-			# Each loop iteration seach for either the next tag, the next 
-			# openning code span marker, or the next escaped character. 
-			# Each token is then passed to handleSpanToken.
-			#
+			// Each loop iteration seach for either the next tag, the next
+			// openning code span marker, or the next escaped character.
+			// Each token is then passed to handleSpanToken.
 			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-			
-			# Create token from text preceding tag.
+
+			// Create token from text preceding tag.
 			if ($parts[0] != "") {
 				$output .= $parts[0];
 			}
-			
-			# Check if we reach the end.
+
+			// Check if we reach the end.
 			if (isset($parts[1])) {
 				$output .= $this->handleSpanToken($parts[1], $parts[2]);
 				$str = $parts[2];
-			}
-			else {
+			} else {
 				break;
 			}
 		}
-		
+
 		return $output;
 	}
-	
-	
+
+	/**
+	 * Handle $token provided by parseSpan by determining its nature and
+	 * returning the corresponding value that should replace it.
+	 * @param  string $token
+	 * @param  string &$str
+	 * @return string
+	 */
 	protected function handleSpanToken($token, &$str) {
-	#
-	# Handle $token provided by parseSpan by determining its nature and 
-	# returning the corresponding value that should replace it.
-	#
 		switch ($token{0}) {
 			case "\\":
 				return $this->hashPart("&#". ord($token{1}). ";");
 			case "`":
-				# Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
+				// Search for end marker in remaining text.
+				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
 					$str, $matches))
 				{
 					$str = $matches[2];
 					$codespan = $this->makeCodeSpan($matches[1]);
 					return $this->hashPart($codespan);
 				}
-				return $token; // return as text since no ending marker found.
+				return $token; // Return as text since no ending marker found.
 			default:
 				return $this->hashPart($token);
 		}
 	}
 
-
+	/**
+	 * Remove one level of line-leading tabs or spaces
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function outdent($text) {
-	#
-	# Remove one level of line-leading tabs or spaces
-	#
-		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+		return preg_replace('/^(\t|[ ]{1,' . $this->tab_width . '})/m', '', $text);
 	}
 
 
-	# String length function for detab. `_initDetab` will create a function to 
-	# hanlde UTF-8 if the default function does not exist.
+	/**
+	 * String length function for detab. `_initDetab` will create a function to
+	 * handle UTF-8 if the default function does not exist.
+	 * @var string
+	 */
 	protected $utf8_strlen = 'mb_strlen';
-	
+
+	/**
+	 * Replace tabs with the appropriate amount of spaces.
+	 *
+	 * For each line we separate the line in blocks delemited by tab characters.
+	 * Then we reconstruct every line by adding the  appropriate number of space
+	 * between each blocks.
+	 *
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function detab($text) {
-	#
-	# Replace tabs with the appropriate amount of space.
-	#
-		# For each line we separate the line in blocks delemited by
-		# tab characters. Then we reconstruct every line by adding the 
-		# appropriate number of space between each blocks.
-		
 		$text = preg_replace_callback('/^.*\t.*$/m',
 			array($this, '_detab_callback'), $text);
 
 		return $text;
 	}
+
+	/**
+	 * Replace tabs callback
+	 * @param  string $matches
+	 * @return string
+	 */
 	protected function _detab_callback($matches) {
 		$line = $matches[0];
-		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
-		
-		# Split in blocks.
+		$strlen = $this->utf8_strlen; // strlen function for UTF-8.
+
+		// Split in blocks.
 		$blocks = explode("\t", $line);
-		# Add each blocks to the line.
+		// Add each blocks to the line.
 		$line = $blocks[0];
-		unset($blocks[0]); # Do not add first block twice.
+		unset($blocks[0]); // Do not add first block twice.
 		foreach ($blocks as $block) {
-			# Calculate amount of space, insert spaces, insert block.
-			$amount = $this->tab_width - 
+			// Calculate amount of space, insert spaces, insert block.
+			$amount = $this->tab_width -
 				$strlen($line, 'UTF-8') % $this->tab_width;
 			$line .= str_repeat(" ", $amount) . $block;
 		}
 		return $line;
 	}
+
+	/**
+	 * Check for the availability of the function in the `utf8_strlen` property
+	 * (initially `mb_strlen`). If the function is not available, create a
+	 * function that will loosely count the number of UTF-8 characters with a
+	 * regular expression.
+	 * @return void
+	 */
 	protected function _initDetab() {
-	#
-	# Check for the availability of the function in the `utf8_strlen` property
-	# (initially `mb_strlen`). If the function is not available, create a 
-	# function that will loosely count the number of UTF-8 characters with a
-	# regular expression.
-	#
-		if (function_exists($this->utf8_strlen)) return;
+
+		if (function_exists($this->utf8_strlen)) {
+			return;
+		}
+
 		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
-			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
+			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
 			$text, $m);');
 	}
 
-
+	/**
+	 * Swap back in all the tags hashed by _HashHTMLBlocks.
+	 * @param  string $text
+	 * @return string
+	 */
 	protected function unhash($text) {
-	#
-	# Swap back in all the tags hashed by _HashHTMLBlocks.
-	#
-		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
+		return preg_replace_callback('/(.)\x1A[0-9]+\1/',
 			array($this, '_unhash_callback'), $text);
 	}
+
+	/**
+	 * Unhashing callback
+	 * @param  array $matches
+	 * @return string
+	 */
 	protected function _unhash_callback($matches) {
 		return $this->html_hashes[$matches[0]];
 	}
-
-}
-
-
-#
-# Temporary Markdown Extra Parser Implementation Class
-#
-# NOTE: DON'T USE THIS CLASS
-# Currently the implementation of of Extra resides here in this temporary class.
-# This makes it easier to propagate the changes between the three different
-# packaging styles of PHP Markdown. When this issue is resolved, this
-# MarkdownExtra_TmpImpl class here will disappear and \Michelf\MarkdownExtra
-# will contain the code. So please use \Michelf\MarkdownExtra and ignore this
-# one.
-#
-
-abstract class _MarkdownExtra_TmpImpl extends \Michelf\Markdown {
-
-	### Configuration Variables ###
-
-	# Prefix for footnote ids.
-	public $fn_id_prefix = "";
-	
-	# Optional title attribute for footnote links and backlinks.
-	public $fn_link_title = "";
-	public $fn_backlink_title = "";
-	
-	# Optional class attribute for footnote links and backlinks.
-	public $fn_link_class = "footnote-ref";
-	public $fn_backlink_class = "footnote-backref";
-
-	# Class name for table cell alignment (%% replaced left/center/right)
-	# For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center'
-	# If empty, the align attribute is used instead of a class name.
-	public $table_align_class_tmpl = '';
-
-	# Optional class prefix for fenced code block.
-	public $code_class_prefix = "";
-	# Class attribute for code blocks goes on the `code` tag;
-	# setting this to true will put attributes on the `pre` tag instead.
-	public $code_attr_on_pre = false;
-	
-	# Predefined abbreviations.
-	public $predef_abbr = array();
-
-
-	### Parser Implementation ###
-
-	public function __construct() {
-	#
-	# Constructor function. Initialize the parser object.
-	#
-		# Add extra escapable characters before parent constructor 
-		# initialize the table.
-		$this->escape_chars .= ':|';
-		
-		# Insert extra document, block, and span transformations. 
-		# Parent constructor will do the sorting.
-		$this->document_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"stripFootnotes"     => 15,
-			"stripAbbreviations" => 25,
-			"appendFootnotes"    => 50,
-			);
-		$this->block_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"doTables"           => 15,
-			"doDefLists"         => 45,
-			);
-		$this->span_gamut += array(
-			"doFootnotes"        => 5,
-			"doAbbreviations"    => 70,
-			);
-		
-		parent::__construct();
-	}
-	
-	
-	# Extra variables used during extra transformations.
-	protected $footnotes = array();
-	protected $footnotes_ordered = array();
-	protected $footnotes_ref_count = array();
-	protected $footnotes_numbers = array();
-	protected $abbr_desciptions = array();
-	protected $abbr_word_re = '';
-	
-	# Give the current footnote number.
-	protected $footnote_counter = 1;
-	
-	
-	protected function setup() {
-	#
-	# Setting up Extra-specific variables.
-	#
-		parent::setup();
-		
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->footnotes_ref_count = array();
-		$this->footnotes_numbers = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-		$this->footnote_counter = 1;
-		
-		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
-			$this->abbr_word_re .= preg_quote($abbr_word);
-			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		}
-	}
-	
-	protected function teardown() {
-	#
-	# Clearing Extra-specific variables.
-	#
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->footnotes_ref_count = array();
-		$this->footnotes_numbers = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-		
-		parent::teardown();
-	}
-	
-	
-	### Extra Attribute Parser ###
-
-	# Expression to use to catch attributes (includes the braces)
-	protected $id_class_attr_catch_re = '\{((?:[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,})[ ]*\}';
-	# Expression to use when parsing in a context when no capture is desired
-	protected $id_class_attr_nocatch_re = '\{(?:[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,}[ ]*\}';
-
-	protected function doExtraAttributes($tag_name, $attr) {
-	#
-	# Parse attributes caught by the $this->id_class_attr_catch_re expression
-	# and return the HTML-formatted list of attributes.
-	#
-	# Currently supported attributes are .class and #id.
-	#
-		if (empty($attr)) return "";
-		
-		# Split on components
-		preg_match_all('/[#.a-z][-_:a-zA-Z0-9=]+/', $attr, $matches);
-		$elements = $matches[0];
-
-		# handle classes and ids (only first id taken into account)
-		$classes = array();
-		$attributes = array();
-		$id = false;
-		foreach ($elements as $element) {
-			if ($element{0} == '.') {
-				$classes[] = substr($element, 1);
-			} else if ($element{0} == '#') {
-				if ($id === false) $id = substr($element, 1);
-			} else if (strpos($element, '=') > 0) {
-				$parts = explode('=', $element, 2);
-				$attributes[] = $parts[0] . '="' . $parts[1] . '"';
-			}
-		}
-
-		# compose attributes as string
-		$attr_str = "";
-		if (!empty($id)) {
-			$attr_str .= ' id="'.$id.'"';
-		}
-		if (!empty($classes)) {
-			$attr_str .= ' class="'.implode(" ", $classes).'"';
-		}
-		if (!$this->no_markup && !empty($attributes)) {
-			$attr_str .= ' '.implode(" ", $attributes);
-		}
-		return $attr_str;
-	}
-
-
-	protected function stripLinkDefinitions($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: ^[id]: url "optional title"
-		$text = preg_replace_callback('{
-							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
-							  [ ]*
-							  \n?				# maybe *one* newline
-							  [ ]*
-							(?:
-							  <(.+?)>			# url = $2
-							|
-							  (\S+?)			# url = $3
-							)
-							  [ ]*
-							  \n?				# maybe one newline
-							  [ ]*
-							(?:
-								(?<=\s)			# lookbehind for whitespace
-								["(]
-								(.*?)			# title = $4
-								[")]
-								[ ]*
-							)?	# title is optional
-					(?:[ ]* '.$this->id_class_attr_catch_re.' )?  # $5 = extra id & class attr
-							(?:\n+|\Z)
-			}xm',
-			array($this, '_stripLinkDefinitions_callback'),
-			$text);
-		return $text;
-	}
-	protected function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$url = $matches[2] == '' ? $matches[3] : $matches[2];
-		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
-		return ''; # String that will replace the block
-	}
-
-
-	### HTML Block Parser ###
-	
-	# Tags that are always treated as block tags:
-	protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|figure';
-						   
-	# Tags treated as block tags only if the opening tag is alone on its line:
-	protected $context_block_tags_re = 'script|noscript|style|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
-	
-	# Tags where markdown="1" default to span mode:
-	protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
-	
-	# Tags which must not have their contents modified, no matter where 
-	# they appear:
-	protected $clean_tags_re = 'script|style|math|svg';
-	
-	# Tags that do not need to be closed.
-	protected $auto_close_tags_re = 'hr|img|param|source|track';
-	
-
-	protected function hashHTMLBlocks($text) {
-	#
-	# Hashify HTML Blocks and "clean tags".
-	#
-	# We only want to do this for block-level HTML tags, such as headers,
-	# lists, and tables. That's because we still want to wrap 
    s around
-	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-	# phrase emphasis, and spans. The list of tags we're looking for is
-	# hard-coded.
-	#
-	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
-	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
-	# attribute is found within a tag, _HashHTMLBlocks_InHTML calls back
-	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
-	# These two functions are calling each other. It's recursive!
-	#
-		if ($this->no_markup)  return $text;
-
-		#
-		# Call the HTML-in-Markdown hasher.
-		#
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
-		
-		return $text;
-	}
-	protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
-										$enclosing_tag_re = '', $span = false)
-	{
-	#
-	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
-	#
-	# *   $indent is the number of space to be ignored when checking for code 
-	#     blocks. This is important because if we don't take the indent into 
-	#     account, something like this (which looks right) won't work as expected:
-	#
-	#     
    
-	#         
    
-	#         Hello World.  <-- Is this a Markdown code block or text?
-	#         
      <-- Is this a Markdown code block or a real tag?
-	#     
    
-	#
-	#     If you don't like this, just don't indent the tag on which
-	#     you apply the markdown="1" attribute.
-	#
-	# *   If $enclosing_tag_re is not empty, stops at the first unmatched closing 
-	#     tag with that name. Nested tags supported.
-	#
-	# *   If $span is true, text inside must treated as span. So any double 
-	#     newline will be replaced by a single newline so that it does not create 
-	#     paragraphs.
-	#
-	# Returns an array of that form: ( processed text , remaining text )
-	#
-		if ($text === '') return array('', '');
-
-		# Regex to check for the presense of newlines around a block tag.
-		$newline_before_re = '/(?:^\n?|\n\n)*$/';
-		$newline_after_re = 
-			'{
-				^						# Start of text following the tag.
-				(?>[ ]*)?		# Optional comment.
-				[ ]*\n					# Must be followed by newline.
-			}xs';
-		
-		# Regex to match any tag.
-		$block_tag_re =
-			'{
-				(					# $2: Capture whole tag.
-									# Tag name.
-							'.$this->block_tags_re.'			|
-							'.$this->context_block_tags_re.'	|
-							'.$this->clean_tags_re.'        	|
-							(?!\s)'.$enclosing_tag_re.'
-						)
-						(?:
-							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
-							(?>
-								".*?"		|	# Double quotes (can contain `>`)
-								\'.*?\'   	|	# Single quotes (can contain `>`)
-								.+?				# Anything but quotes and `>`.
-							)*?
-						)?
-					>					# End of tag.
-				|
-						# HTML Comment
-				|
-					<\?.*?\?> | <%.*?%>	# Processing instruction
-				|
-						# CData Block
-				'. ( !$span ? ' # If not in span.
-				|
-					# Indented code block
-					(?: ^[ ]*\n | ^ | \n[ ]*\n )
-					[ ]{'.($indent+4).'}[^\n]* \n
-					(?>
-						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
-					)*
-				|
-					# Fenced code block marker
-					(?<= ^ | \n )
-					[ ]{0,'.($indent+3).'}(?:~{3,}|`{3,})
-									[ ]*
-					(?:
-					\.?[-_:a-zA-Z0-9]+ # standalone class name
-					|
-						'.$this->id_class_attr_nocatch_re.' # extra attributes
-					)?
-					[ ]*
-					(?= \n )
-				' : '' ). ' # End (if not is span).
-				|
-					# Code span marker
-					# Note, this regex needs to go after backtick fenced
-					# code blocks but it should also be kept outside of the
-					# "if not in span" condition adding backticks to the parser
-					`+
-				)
-			}xs';
-
-		
-		$depth = 0;		# Current depth inside the tag tree.
-		$parsed = "";	# Parsed text that will be returned.
-
-		#
-		# Loop through every tag until we find the closing tag of the parent
-		# or loop until reaching the end of text if no parent tag specified.
-		#
-		do {
-			#
-			# Split the text using the first $tag_match pattern found.
-			# Text before  pattern will be first in the array, text after
-			# pattern will be at the end, and between will be any catches made 
-			# by the pattern.
-			#
-			$parts = preg_split($block_tag_re, $text, 2, 
-								PREG_SPLIT_DELIM_CAPTURE);
-			
-			# If in Markdown span mode, add a empty-string span-level hash 
-			# after each newline to prevent triggering any block element.
-			if ($span) {
-				$void = $this->hashPart("", ':');
-				$newline = "$void\n";
-				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
-			}
-			
-			$parsed .= $parts[0]; # Text before current tag.
-			
-			# If end of $text has been reached. Stop loop.
-			if (count($parts) < 3) {
-				$text = "";
-				break;
-			}
-			
-			$tag  = $parts[1]; # Tag to handle.
-			$text = $parts[2]; # Remaining text after current tag.
-			$tag_re = preg_quote($tag); # For use in a regular expression.
-			
-			#
-			# Check for: Fenced code block marker.
-			# Note: need to recheck the whole tag to disambiguate backtick
-			# fences from code spans
-			#
-			if (preg_match('{^\n?([ ]{0,'.($indent+3).'})(~{3,}|`{3,})[ ]*(?:\.?[-_:a-zA-Z0-9]+|'.$this->id_class_attr_nocatch_re.')?[ ]*\n?$}', $tag, $capture)) {
-				# Fenced code block marker: find matching end marker.
-				$fence_indent = strlen($capture[1]); # use captured indent in re
-				$fence_re = $capture[2]; # use captured fence in re
-				if (preg_match('{^(?>.*\n)*?[ ]{'.($fence_indent).'}'.$fence_re.'[ ]*(?:\n|$)}', $text,
-					$matches)) 
-				{
-					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
-					$text = substr($text, strlen($matches[0]));
-				}
-				else {
-					# No end marker: just skip it.
-					$parsed .= $tag;
-				}
-			}
-			#
-			# Check for: Indented code block.
-			#
-			else if ($tag{0} == "\n" || $tag{0} == " ") {
-				# Indented code block: pass it unchanged, will be handled 
-				# later.
-				$parsed .= $tag;
-			}
-			#
-			# Check for: Code span marker
-			# Note: need to check this after backtick fenced code blocks
-			#
-			else if ($tag{0} == "`") {
-				# Find corresponding end marker.
-				$tag_re = preg_quote($tag);
-				if (preg_match('{^(?>.+?|\n(?!\n))*?(?block_tags_re.')\b}', $tag) ||
-				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
-					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
-				)
-			{
-				# Need to parse tag and following text using the HTML parser.
-				list($block_text, $text) = 
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
-				
-				# Make sure it stays outside of any paragraph by adding newlines.
-				$parsed .= "\n\n$block_text\n\n";
-			}
-			#
-			# Check for: Clean tag (like script, math)
-			#            HTML Comments, processing instructions.
-			#
-			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
-			{
-				# Need to parse tag and following text using the HTML parser.
-				# (don't check for markdown attribute)
-				list($block_text, $text) = 
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
-				
-				$parsed .= $block_text;
-			}
-			#
-			# Check for: Tag with same name as enclosing tag.
-			#
-			else if ($enclosing_tag_re !== '' &&
-				# Same name as enclosing tag.
-				preg_match('{^= 0);
-		
-		return array($parsed, $text);
-	}
-	protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
-	#
-	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
-	#
-	# *   Calls $hash_method to convert any blocks.
-	# *   Stops when the first opening tag closes.
-	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
-	#     (it is not inside clean tags)
-	#
-	# Returns an array of that form: ( processed text , remaining text )
-	#
-		if ($text === '') return array('', '');
-		
-		# Regex to match `markdown` attribute inside of a tag.
-		$markdown_attr_re = '
-			{
-				\s*			# Eat whitespace before the `markdown` attribute
-				markdown
-				\s*=\s*
-				(?>
-					(["\'])		# $1: quote delimiter		
-					(.*?)		# $2: attribute value
-					\1			# matching delimiter	
-				|
-					([^\s>]*)	# $3: unquoted attribute value
-				)
-				()				# $4: make $3 always defined (avoid warnings)
-			}xs';
-		
-		# Regex to match any tag.
-		$tag_re = '{
-				(					# $2: Capture whole tag.
-					
-								".*?"		|	# Double quotes (can contain `>`)
-								\'.*?\'   	|	# Single quotes (can contain `>`)
-								.+?				# Anything but quotes and `>`.
-							)*?
-						)?
-					>					# End of tag.
-				|
-						# HTML Comment
-				|
-					<\?.*?\?> | <%.*?%>	# Processing instruction
-				|
-						# CData Block
-				)
-			}xs';
-		
-		$original_text = $text;		# Save original text in case of faliure.
-		
-		$depth		= 0;	# Current depth inside the tag tree.
-		$block_text	= "";	# Temporary text holder for current text.
-		$parsed		= "";	# Parsed text that will be returned.
-
-		#
-		# Get the name of the starting tag.
-		# (This pattern makes $base_tag_name_re safe without quoting.)
-		#
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
-
-		#
-		# Loop through every tag until we find the corresponding closing tag.
-		#
-		do {
-			#
-			# Split the text using the first $tag_match pattern found.
-			# Text before  pattern will be first in the array, text after
-			# pattern will be at the end, and between will be any catches made 
-			# by the pattern.
-			#
-			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			
-			if (count($parts) < 3) {
-				#
-				# End of $text reached with unbalenced tag(s).
-				# In that case, we return original text unchanged and pass the
-				# first character as filtered to prevent an infinite loop in the 
-				# parent function.
-				#
-				return array($original_text{0}, substr($original_text, 1));
-			}
-			
-			$block_text .= $parts[0]; # Text before current tag.
-			$tag         = $parts[1]; # Tag to handle.
-			$text        = $parts[2]; # Remaining text after current tag.
-			
-			#
-			# Check for: Auto-close tag (like 
    )
-			#			 Comments and Processing Instructions.
-			#
-			if (preg_match('{^auto_close_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
-			{
-				# Just add the tag to the block as if it was text.
-				$block_text .= $tag;
-			}
-			else {
-				#
-				# Increase/decrease nested tag count. Only do so if
-				# the tag's name match base tag's.
-				#
-				if (preg_match('{^mode = $attr_m[2] . $attr_m[3];
-					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
-						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
-					
-					# Calculate indent before tag.
-					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
-						$strlen = $this->utf8_strlen;
-						$indent = $strlen($matches[1], 'UTF-8');
-					} else {
-						$indent = 0;
-					}
-					
-					# End preceding block with this tag.
-					$block_text .= $tag;
-					$parsed .= $this->$hash_method($block_text);
-					
-					# Get enclosing tag name for the ParseMarkdown function.
-					# (This pattern makes $tag_name_re safe without quoting.)
-					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
-					$tag_name_re = $matches[1];
-					
-					# Parse the content using the HTML-in-Markdown parser.
-					list ($block_text, $text)
-						= $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
-							$tag_name_re, $span_mode);
-					
-					# Outdent markdown text.
-					if ($indent > 0) {
-						$block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
-													$block_text);
-					}
-					
-					# Append tag content to parsed text.
-					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
-					else				$parsed .= "$block_text";
-					
-					# Start over with a new block.
-					$block_text = "";
-				}
-				else $block_text .= $tag;
-			}
-			
-		} while ($depth > 0);
-		
-		#
-		# Hash last block text that wasn't processed inside the loop.
-		#
-		$parsed .= $this->$hash_method($block_text);
-		
-		return array($parsed, $text);
-	}
-
-
-	protected function hashClean($text) {
-	#
-	# Called whenever a tag must be hashed when a function inserts a "clean" tag
-	# in $text, it passes through this function and is automaticaly escaped, 
-	# blocking invalid nested overlap.
-	#
-		return $this->hashPart($text, 'C');
-	}
-
-
-	protected function doAnchors($text) {
-	#
-	# Turn Markdown link shortcuts into XHTML  tags.
-	#
-		if ($this->in_anchor) return $text;
-		$this->in_anchor = true;
-		
-		#
-		# First, handle reference-style links: [link text] [id]
-		#
-		$text = preg_replace_callback('{
-			(					# wrap whole match in $1
-			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
-			  \]
-
-			  [ ]?				# one optional space
-			  (?:\n[ ]*)?		# one optional newline followed by spaces
-
-			  \[
-				(.*?)		# id = $3
-			  \]
-			)
-			}xs',
-			array($this, '_doAnchors_reference_callback'), $text);
-
-		#
-		# Next, inline-style links: [link text](url "optional title")
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
-			  \]
-			  \(			# literal paren
-				[ \n]*
-				(?:
-					<(.+?)>	# href = $3
-				|
-					('.$this->nested_url_parenthesis_re.')	# href = $4
-				)
-				[ \n]*
-				(			# $5
-				  ([\'"])	# quote char = $6
-				  (.*?)		# Title = $7
-				  \6		# matching quote
-				  [ \n]*	# ignore any spaces/tabs between closing quote and )
-				)?			# title is optional
-			  \)
-			  (?:[ ]? '.$this->id_class_attr_catch_re.' )?	 # $8 = id/class attributes
-			)
-			}xs',
-			array($this, '_doAnchors_inline_callback'), $text);
-
-		#
-		# Last, handle reference-style shortcuts: [link text]
-		# These must come last in case you've also got [link text][1]
-		# or [link text](/foo)
-		#
-		$text = preg_replace_callback('{
-			(					# wrap whole match in $1
-			  \[
-				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
-			  \]
-			)
-			}xs',
-			array($this, '_doAnchors_reference_callback'), $text);
-
-		$this->in_anchor = false;
-		return $text;
-	}
-	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
-
-		if ($link_id == "") {
-			# for shortcut links like [this][] or [this].
-			$link_id = $link_text;
-		}
-		
-		# lower-case and turn embedded newlines into spaces
-		$link_id = strtolower($link_id);
-		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
-			$url = $this->encodeURLAttribute($url);
-			
-			$result = "titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			if (isset($this->ref_attr[$link_id]))
-				$result .= $this->ref_attr[$link_id];
-		
-			$link_text = $this->runSpanGamut($link_text);
-			$result .= ">$link_text";
-			$result = $this->hashPart($result);
-		}
-		else {
-			$result = $whole_match;
-		}
-		return $result;
-	}
-	protected function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
-
-		// if the URL was of the form  it got caught by the HTML
-		// tag parser and hashed. Need to reverse the process before using the URL.
-		$unhashed = $this->unhash($url);
-		if ($unhashed != $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
-
-		$url = $this->encodeURLAttribute($url);
-
-		$result = "encodeAttribute($title);
-			$result .=  " title=\"$title\"";
-		}
-		$result .= $attr;
-		
-		$link_text = $this->runSpanGamut($link_text);
-		$result .= ">$link_text";
-
-		return $this->hashPart($result);
-	}
-
-
-	protected function doImages($text) {
-	#
-	# Turn Markdown image shortcuts into  tags.
-	#
-		#
-		# First, handle reference-style labeled images: ![alt text][id]
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
-			  \]
-
-			  [ ]?				# one optional space
-			  (?:\n[ ]*)?		# one optional newline followed by spaces
-
-			  \[
-				(.*?)		# id = $3
-			  \]
-
-			)
-			}xs', 
-			array($this, '_doImages_reference_callback'), $text);
-
-		#
-		# Next, handle inline images:  ![alt text](url "optional title")
-		# Don't forget: encode * and _
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
-			  \]
-			  \s?			# One optional whitespace character
-			  \(			# literal paren
-				[ \n]*
-				(?:
-					<(\S*)>	# src url = $3
-				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $4
-				)
-				[ \n]*
-				(			# $5
-				  ([\'"])	# quote char = $6
-				  (.*?)		# title = $7
-				  \6		# matching quote
-				  [ \n]*
-				)?			# title is optional
-			  \)
-			  (?:[ ]? '.$this->id_class_attr_catch_re.' )?	 # $8 = id/class attributes
-			)
-			}xs',
-			array($this, '_doImages_inline_callback'), $text);
-
-		return $text;
-	}
-	protected function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
-
-		if ($link_id == "") {
-			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
-		}
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeURLAttribute($this->urls[$link_id]);
-			$result = "\"$alt_text\"";titles[$link_id])) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			if (isset($this->ref_attr[$link_id]))
-				$result .= $this->ref_attr[$link_id];
-			$result .= $this->empty_element_suffix;
-			$result = $this->hashPart($result);
-		}
-		else {
-			# If there's no such link ID, leave intact:
-			$result = $whole_match;
-		}
-
-		return $result;
-	}
-	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("img", $dummy =& $matches[8]);
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		$url = $this->encodeURLAttribute($url);
-		$result = "\"$alt_text\"";encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
-		}
-		$result .= $attr;
-		$result .= $this->empty_element_suffix;
-
-		return $this->hashPart($result);
-	}
-
-
-	protected function doHeaders($text) {
-	#
-	# Redefined to add id and class attribute support.
-	#
-		# Setext-style headers:
-		#	  Header 1  {#header1}
-		#	  ========
-		#  
-		#	  Header 2  {#header2 .class1 .class2}
-		#	  --------
-		#
-		$text = preg_replace_callback(
-			'{
-				(^.+?)								# $1: Header text
-				(?:[ ]+ '.$this->id_class_attr_catch_re.' )?	 # $3 = id/class attributes
-				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
-			}mx',
-			array($this, '_doHeaders_callback_setext'), $text);
-
-		# atx-style headers:
-		#	# Header 1        {#header1}
-		#	## Header 2       {#header2}
-		#	## Header 2 with closing hashes ##  {#header3.class1.class2}
-		#	...
-		#	###### Header 6   {.class2}
-		#
-		$text = preg_replace_callback('{
-				^(\#{1,6})	# $1 = string of #\'s
-				[ ]*
-				(.+?)		# $2 = Header text
-				[ ]*
-				\#*			# optional closing #\'s (not counted)
-				(?:[ ]+ '.$this->id_class_attr_catch_re.' )?	 # $3 = id/class attributes
-				[ ]*
-				\n+
-			}xm',
-			array($this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-	protected function _doHeaders_callback_setext($matches) {
-		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
-			return $matches[0];
-		$level = $matches[3]{0} == '=' ? 1 : 2;
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[2]);
-		$block = "".$this->runSpanGamut($matches[1])."";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-	protected function _doHeaders_callback_atx($matches) {
-		$level = strlen($matches[1]);
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[3]);
-		$block = "".$this->runSpanGamut($matches[2])."";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-
-	protected function doTables($text) {
-	#
-	# Form HTML tables.
-	#
-		$less_than_tab = $this->tab_width - 1;
-		#
-		# Find tables with leading pipe.
-		#
-		#	| Header 1 | Header 2
-		#	| -------- | --------
-		#	| Cell 1   | Cell 2
-		#	| Cell 3   | Cell 4
-		#
-		$text = preg_replace_callback('
-			{
-				^							# Start of a line
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				[|]							# Optional leading pipe (present)
-				(.+) \n						# $1: Header row (at least one pipe)
-				
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
-				
-				(							# $3: Cells
-					(?>
-						[ ]*				# Allowed whitespace.
-						[|] .* \n			# Row content.
-					)*
-				)
-				(?=\n|\Z)					# Stop at final double newline.
-			}xm',
-			array($this, '_doTable_leadingPipe_callback'), $text);
-		
-		#
-		# Find tables without leading pipe.
-		#
-		#	Header 1 | Header 2
-		#	-------- | --------
-		#	Cell 1   | Cell 2
-		#	Cell 3   | Cell 4
-		#
-		$text = preg_replace_callback('
-			{
-				^							# Start of a line
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
-				
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
-				
-				(							# $3: Cells
-					(?>
-						.* [|] .* \n		# Row content
-					)*
-				)
-				(?=\n|\Z)					# Stop at final double newline.
-			}xm',
-			array($this, '_DoTable_callback'), $text);
-
-		return $text;
-	}
-	protected function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-		
-		# Remove leading pipe for each row.
-		$content	= preg_replace('/^ *[|]/m', '', $content);
-		
-		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
-	}
-	protected function _doTable_makeAlignAttr($alignname)
-	{
-		if (empty($this->table_align_class_tmpl))
-			return " align=\"$alignname\"";
-
-		$classname = str_replace('%%', $alignname, $this->table_align_class_tmpl);
-		return " class=\"$classname\"";
-	}
-	protected function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-
-		# Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
-		
-		# Reading alignement from header underline.
-		$separators	= preg_split('/ *[|] */', $underline);
-		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('right');
-			else if (preg_match('/^ *:-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('center');
-			else if (preg_match('/^ *:-+ *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('left');
-			else
-				$attr[$n] = '';
-		}
-		
-		# Parsing span elements, including code spans, character escapes, 
-		# and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
-		$attr       = array_pad($attr, $col_count, '');
-		
-		# Write column headers.
-		$text = "\n";
-		$text .= "\n";
-		$text .= "\n";
-		foreach ($headers as $n => $header)
-			$text .= "  ".$this->runSpanGamut(trim($header))."\n";
-		$text .= "\n";
-		$text .= "\n";
-		
-		# Split content by row.
-		$rows = explode("\n", trim($content, "\n"));
-		
-		$text .= "\n";
-		foreach ($rows as $row) {
-			# Parsing span elements, including code spans, character escapes, 
-			# and inline HTML tags, so that pipes inside those gets ignored.
-			$row = $this->parseSpan($row);
-			
-			# Split row by cell.
-			$row_cells = preg_split('/ *[|] */', $row, $col_count);
-			$row_cells = array_pad($row_cells, $col_count, '');
-			
-			$text .= "\n";
-			foreach ($row_cells as $n => $cell)
-				$text .= "  ".$this->runSpanGamut(trim($cell))."\n";
-			$text .= "\n";
-		}
-		$text .= "\n";
-		$text .= "
    ";
-		
-		return $this->hashBlock($text) . "\n";
-	}
-
-	
-	protected function doDefLists($text) {
-	#
-	# Form HTML definition lists.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Re-usable pattern to match any entire dl list:
-		$whole_list_re = '(?>
-			(								# $1 = whole list
-			  (								# $2
-				[ ]{0,'.$less_than_tab.'}
-				((?>.*\S.*\n)+)				# $3 = defined term
-				\n?
-				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-			  )
-			  (?s:.+?)
-			  (								# $4
-				  \z
-				|
-				  \n{2,}
-				  (?=\S)
-				  (?!						# Negative lookahead for another term
-					[ ]{0,'.$less_than_tab.'}
-					(?: \S.*\n )+?			# defined term
-					\n?
-					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-				  )
-				  (?!						# Negative lookahead for another definition
-					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-				  )
-			  )
-			)
-		)'; // mx
-
-		$text = preg_replace_callback('{
-				(?>\A\n?|(?<=\n\n))
-				'.$whole_list_re.'
-			}mx',
-			array($this, '_doDefLists_callback'), $text);
-
-		return $text;
-	}
-	protected function _doDefLists_callback($matches) {
-		# Re-usable patterns to match list item bullets and number markers:
-		$list = $matches[1];
-		
-		# Turn double returns into triple returns, so that we can make a
-		# paragraph for the last item in a list, if necessary:
-		$result = trim($this->processDefListItems($list));
-		$result = "
    \n" . $result . "\n
    ";
-		return $this->hashBlock($result) . "\n\n";
-	}
-
-
-	protected function processDefListItems($list_str) {
-	#
-	#	Process the contents of a single definition list, splitting it
-	#	into individual term and definition list items.
-	#
-		$less_than_tab = $this->tab_width - 1;
-		
-		# trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		# Process definition terms.
-		$list_str = preg_replace_callback('{
-			(?>\A\n?|\n\n+)					# leading line
-			(								# definition terms = $1
-				[ ]{0,'.$less_than_tab.'}	# leading whitespace
-				(?!\:[ ]|[ ])				# negative lookahead for a definition
-											#   mark (colon) or more whitespace.
-				(?> \S.* \n)+?				# actual term (not whitespace).	
-			)			
-			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed 
-											#   with a definition mark.
-			}xm',
-			array($this, '_processDefListItems_callback_dt'), $list_str);
-
-		# Process actual definitions.
-		$list_str = preg_replace_callback('{
-			\n(\n+)?						# leading line = $1
-			(								# marker space = $2
-				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
-				\:[ ]+						# definition mark (colon)
-			)
-			((?s:.+?))						# definition text = $3
-			(?= \n+ 						# stop at next definition mark,
-				(?:							# next term or end of text
-					[ ]{0,'.$less_than_tab.'} \:[ ]	|
-					
     | \z
-				)						
-			)					
-			}xm',
-			array($this, '_processDefListItems_callback_dd'), $list_str);
-
-		return $list_str;
-	}
-	protected function _processDefListItems_callback_dt($matches) {
-		$terms = explode("\n", trim($matches[1]));
-		$text = '';
-		foreach ($terms as $term) {
-			$term = $this->runSpanGamut(trim($term));
-			$text .= "\n
    " . $term . "
    ";
-		}
-		return $text . "\n";
-	}
-	protected function _processDefListItems_callback_dd($matches) {
-		$leading_line	= $matches[1];
-		$marker_space	= $matches[2];
-		$def			= $matches[3];
-
-		if ($leading_line || preg_match('/\n{2,}/', $def)) {
-			# Replace marker with the appropriate whitespace indentation
-			$def = str_repeat(' ', strlen($marker_space)) . $def;
-			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
-		}
-		else {
-			$def = rtrim($def);
-			$def = $this->runSpanGamut($this->outdent($def));
-		}
-
-		return "\n
    " . $def . "
    \n";
-	}
-
-
-	protected function doFencedCodeBlocks($text) {
-	#
-	# Adding the fenced code block syntax to regular Markdown:
-	#
-	# ~~~
-	# Code block
-	# ~~~
-	#
-		$less_than_tab = $this->tab_width;
-		
-		$text = preg_replace_callback('{
-				(?:\n|\A)
-				# 1: Opening marker
-				(
-					(?:~{3,}|`{3,}) # 3 or more tildes/backticks.
-				)
-				[ ]*
-				(?:
-					\.?([-_:a-zA-Z0-9]+) # 2: standalone class name
-				|
-					'.$this->id_class_attr_catch_re.' # 3: Extra attributes
-				)?
-				[ ]* \n # Whitespace and newline following marker.
-				
-				# 4: Content
-				(
-					(?>
-						(?!\1 [ ]* \n)	# Not a closing marker.
-						.*\n+
-					)+
-				)
-				
-				# Closing marker.
-				\1 [ ]* (?= \n )
-			}xm',
-			array($this, '_doFencedCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-	protected function _doFencedCodeBlocks_callback($matches) {
-		$classname =& $matches[2];
-		$attrs     =& $matches[3];
-		$codeblock = $matches[4];
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-		$codeblock = preg_replace_callback('/^\n+/',
-			array($this, '_doFencedCodeBlocks_newlines'), $codeblock);
-
-		if ($classname != "") {
-			if ($classname{0} == '.')
-				$classname = substr($classname, 1);
-			$attr_str = ' class="'.$this->code_class_prefix.$classname.'"';
-		} else {
-			$attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs);
-		}
-		$pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
-		$code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
-		$codeblock  = "$codeblock
    ";
-		
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-	protected function _doFencedCodeBlocks_newlines($matches) {
-		return str_repeat("empty_element_suffix", 
-			strlen($matches[0]));
-	}
-
-
-	#
-	# Redefining emphasis markers so that emphasis by underscore does not
-	# work in the middle of a word.
-	#
-	protected $em_relist = array(
-		''  => '(?:(? '(? '(? '(?:(? '(? '(? '(?:(? '(? '(? tags
-	#
-		# Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-		
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		#
-		# Wrap 
     tags and unhashify HTML blocks
-		#
-		foreach ($grafs as $key => $value) {
-			$value = trim($this->runSpanGamut($value));
-			
-			# Check if this should be enclosed in a paragraph.
-			# Clean tag hashes & block tag hashes are left alone.
-			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
-			
-			if ($is_p) {
-				$value = "
    $value
    ";
-			}
-			$grafs[$key] = $value;
-		}
-		
-		# Join grafs in one text, then unhash HTML tags. 
-		$text = implode("\n\n", $grafs);
-		
-		# Finish by removing any tag hashes still present in $text.
-		$text = $this->unhash($text);
-		
-		return $text;
-	}
-	
-	
-	### Footnotes
-	
-	protected function stripFootnotes($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: [^id]: url "optional title"
-		$text = preg_replace_callback('{
-			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
-			  [ ]*
-			  \n?					# maybe *one* newline
-			(						# text = $2 (no blank lines allowed)
-				(?:					
-					.+				# actual text
-				|
-					\n				# newlines but 
-					(?!\[.+?\][ ]?:\s)# negative lookahead for footnote or link definition marker.
-					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
-									# by non-indented content
-				)*
-			)		
-			}xm',
-			array($this, '_stripFootnotes_callback'),
-			$text);
-		return $text;
-	}
-	protected function _stripFootnotes_callback($matches) {
-		$note_id = $this->fn_id_prefix . $matches[1];
-		$this->footnotes[$note_id] = $this->outdent($matches[2]);
-		return ''; # String that will replace the block
-	}
-
-
-	protected function doFootnotes($text) {
-	#
-	# Replace footnote references in $text [^id] with a special text-token 
-	# which will be replaced by the actual footnote marker in appendFootnotes.
-	#
-		if (!$this->in_anchor) {
-			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
-		}
-		return $text;
-	}
-
-	
-	protected function appendFootnotes($text) {
-	#
-	# Append footnote list to text.
-	#
-		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
-			array($this, '_appendFootnotes_callback'), $text);
-	
-		if (!empty($this->footnotes_ordered)) {
-			$text .= "\n\n";
-			$text .= "
    \n";
-			$text .= "empty_element_suffix ."\n";
-			$text .= "
      \n\n";
-
-			$attr = "";
-			if ($this->fn_backlink_class != "") {
-				$class = $this->fn_backlink_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_backlink_title != "") {
-				$title = $this->fn_backlink_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-			$num = 0;
-			
-			while (!empty($this->footnotes_ordered)) {
-				$footnote = reset($this->footnotes_ordered);
-				$note_id = key($this->footnotes_ordered);
-				unset($this->footnotes_ordered[$note_id]);
-				$ref_count = $this->footnotes_ref_count[$note_id];
-				unset($this->footnotes_ref_count[$note_id]);
-				unset($this->footnotes[$note_id]);
-				
-				$footnote .= "\n"; # Need to append newline before parsing.
-				$footnote = $this->runBlockGamut("$footnote\n");				
-				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
-					array($this, '_appendFootnotes_callback'), $footnote);
-				
-				$attr = str_replace("%%", ++$num, $attr);
-				$note_id = $this->encodeAttribute($note_id);
-
-				# Prepare backlink, multiple backlinks if multiple references
-				$backlink = "↩";
-				for ($ref_num = 2; $ref_num <= $ref_count; ++$ref_num) {
-					$backlink .= " ↩";
-				}
-				# Add backlink to last paragraph; create new paragraph if needed.
-				if (preg_match('{
      $}', $footnote)) {
-					$footnote = substr($footnote, 0, -4) . " $backlink
      ";
-				} else {
-					$footnote .= "\n\n
      $backlink
      ";
-				}
-				
-				$text .= "
    1. \n";
-				$text .= $footnote . "\n";
-				$text .= "
      2. \n\n";
-			}
-			
-			$text .= "
    \n";
-			$text .= "
    ";
-		}
-		return $text;
-	}
-	protected function _appendFootnotes_callback($matches) {
-		$node_id = $this->fn_id_prefix . $matches[1];
-		
-		# Create footnote marker only if it has a corresponding footnote *and*
-		# the footnote hasn't been used by another marker.
-		if (isset($this->footnotes[$node_id])) {
-			$num =& $this->footnotes_numbers[$node_id];
-			if (!isset($num)) {
-				# Transfer footnote content to the ordered list and give it its
-				# number
-				$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
-				$this->footnotes_ref_count[$node_id] = 1;
-				$num = $this->footnote_counter++;
-				$ref_count_mark = '';
-			} else {
-				$ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
-			}
-
-			$attr = "";
-			if ($this->fn_link_class != "") {
-				$class = $this->fn_link_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_link_title != "") {
-				$title = $this->fn_link_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-			
-			$attr = str_replace("%%", $num, $attr);
-			$node_id = $this->encodeAttribute($node_id);
-			
-			return
-				"".
-				"$num".
-				"";
-		}
-		
-		return "[^".$matches[1]."]";
-	}
-		
-	
-	### Abbreviations ###
-	
-	protected function stripAbbreviations($text) {
-	#
-	# Strips abbreviations from text, stores titles in hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: [id]*: url "optional title"
-		$text = preg_replace_callback('{
-			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
-			(.*)					# text = $2 (no blank lines allowed)	
-			}xm',
-			array($this, '_stripAbbreviations_callback'),
-			$text);
-		return $text;
-	}
-	protected function _stripAbbreviations_callback($matches) {
-		$abbr_word = $matches[1];
-		$abbr_desc = $matches[2];
-		if ($this->abbr_word_re)
-			$this->abbr_word_re .= '|';
-		$this->abbr_word_re .= preg_quote($abbr_word);
-		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		return ''; # String that will replace the block
-	}
-	
-	
-	protected function doAbbreviations($text) {
-	#
-	# Find defined abbreviations in text and wrap them in  elements.
-	#
-		if ($this->abbr_word_re) {
-			// cannot use the /x modifier because abbr_word_re may 
-			// contain significant spaces:
-			$text = preg_replace_callback('{'.
-				'(?abbr_word_re.')'.
-				'(?![\w\x1A])'.
-				'}', 
-				array($this, '_doAbbreviations_callback'), $text);
-		}
-		return $text;
-	}
-	protected function _doAbbreviations_callback($matches) {
-		$abbr = $matches[0];
-		if (isset($this->abbr_desciptions[$abbr])) {
-			$desc = $this->abbr_desciptions[$abbr];
-			if (empty($desc)) {
-				return $this->hashPart("$abbr");
-			} else {
-				$desc = $this->encodeAttribute($desc);
-				return $this->hashPart("$abbr");
-			}
-		} else {
-			return $matches[0];
-		}
-	}
-
 }
diff --git a/library/php-markdown/Michelf/MarkdownExtra.inc.php b/library/php-markdown/Michelf/MarkdownExtra.inc.php
index e11b1ef97..d09bd7a48 100644
--- a/library/php-markdown/Michelf/MarkdownExtra.inc.php
+++ b/library/php-markdown/Michelf/MarkdownExtra.inc.php
@@ -1,10 +1,10 @@
 
-#
-# Original Markdown
-# Copyright (c) 2004-2006 John Gruber  
-# 
-#
+/**
+ * Markdown Extra - A text-to-HTML conversion tool for web writers
+ *
+ * @package   php-markdown
+ * @author    Michel Fortin 
+ * @copyright 2004-2016 Michel Fortin 
+ * @copyright (Original Markdown) 2004-2006 John Gruber 
+ */
+
 namespace Michelf;
 
+/**
+ * Markdown Extra Parser Class
+ */
+class MarkdownExtra extends \Michelf\Markdown {
+	/**
+	 * Configuration variables
+	 */
 
-# Just force Michelf/Markdown.php to load. This is needed to load
-# the temporary implementation class. See below for details.
-\Michelf\Markdown::MARKDOWNLIB_VERSION;
+	/**
+	 * Prefix for footnote ids.
+	 * @var string
+	 */
+	public $fn_id_prefix = "";
+	
+	/**
+	 * Optional title attribute for footnote links and backlinks.
+	 * @var string
+	 */
+	public $fn_link_title     = "";
+	public $fn_backlink_title = "";
+	
+	/**
+	 * Optional class attribute for footnote links and backlinks.
+	 * @var string
+	 */
+	public $fn_link_class     = "footnote-ref";
+	public $fn_backlink_class = "footnote-backref";
 
-#
-# Markdown Extra Parser Class
-#
-# Note: Currently the implementation resides in the temporary class
-# \Michelf\MarkdownExtra_TmpImpl (in the same file as \Michelf\Markdown).
-# This makes it easier to propagate the changes between the three different
-# packaging styles of PHP Markdown. Once this issue is resolved, the
-# _MarkdownExtra_TmpImpl will disappear and this one will contain the code.
-#
+	/**
+	 * Content to be displayed within footnote backlinks. The default is '↩';
+	 * the U+FE0E on the end is a Unicode variant selector used to prevent iOS
+	 * from displaying the arrow character as an emoji.
+	 * @var string
+	 */
+	public $fn_backlink_html = '↩︎';
 
-class MarkdownExtra extends \Michelf\_MarkdownExtra_TmpImpl {
+	/**
+	 * Class name for table cell alignment (%% replaced left/center/right)
+	 * For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center'
+	 * If empty, the align attribute is used instead of a class name.
+	 * @var string
+	 */
+	public $table_align_class_tmpl = '';
 
-	### Parser Implementation ###
+	/**
+	 * Optional class prefix for fenced code block.
+	 * @var string
+	 */
+	public $code_class_prefix = "";
 
-	# Temporarily, the implemenation is in the _MarkdownExtra_TmpImpl class.
-	# See note above.
+	/**
+	 * Class attribute for code blocks goes on the `code` tag;
+	 * setting this to true will put attributes on the `pre` tag instead.
+	 * @var boolean
+	 */
+	public $code_attr_on_pre = false;
 
+	/**
+	 * Predefined abbreviations.
+	 * @var array
+	 */
+	public $predef_abbr = array();
+
+	/**
+	 * Parser implementation
+	 */
+	
+	/**
+	 * Constructor function. Initialize the parser object.
+	 * @return void
+	 */
+	public function __construct() {
+		// Add extra escapable characters before parent constructor 
+		// initialize the table.
+		$this->escape_chars .= ':|';
+		
+		// Insert extra document, block, and span transformations. 
+		// Parent constructor will do the sorting.
+		$this->document_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"stripFootnotes"     => 15,
+			"stripAbbreviations" => 25,
+			"appendFootnotes"    => 50,
+		);
+		$this->block_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"doTables"           => 15,
+			"doDefLists"         => 45,
+		);
+		$this->span_gamut += array(
+			"doFootnotes"        => 5,
+			"doAbbreviations"    => 70,
+		);
+		
+		$this->enhanced_ordered_list = true;
+		parent::__construct();
+	}
+	
+	
+	/**
+	 * Extra variables used during extra transformations.
+	 * @var array
+	 */
+	protected $footnotes = array();
+	protected $footnotes_ordered = array();
+	protected $footnotes_ref_count = array();
+	protected $footnotes_numbers = array();
+	protected $abbr_desciptions = array();
+	/** @var string */
+	protected $abbr_word_re = '';
+	
+	/**
+	 * Give the current footnote number.
+	 * @var integer
+	 */
+	protected $footnote_counter = 1;
+	
+	/**
+	 * Setting up Extra-specific variables.
+	 */
+	protected function setup() {
+		parent::setup();
+		
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->footnotes_ref_count = array();
+		$this->footnotes_numbers = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		$this->footnote_counter = 1;
+		
+		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
+			if ($this->abbr_word_re)
+				$this->abbr_word_re .= '|';
+			$this->abbr_word_re .= preg_quote($abbr_word);
+			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		}
+	}
+
+	/**
+	 * Clearing Extra-specific variables.
+	 */
+	protected function teardown() {
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->footnotes_ref_count = array();
+		$this->footnotes_numbers = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		
+		parent::teardown();
+	}
+	
+	
+	/**
+	 * Extra attribute parser
+	 */
+
+	/**
+	 * Expression to use to catch attributes (includes the braces)
+	 * @var string
+	 */
+	protected $id_class_attr_catch_re = '\{((?>[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,})[ ]*\}';
+
+	/**
+	 * Expression to use when parsing in a context when no capture is desired
+	 * @var string
+	 */
+	protected $id_class_attr_nocatch_re = '\{(?>[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,}[ ]*\}';
+
+	/**
+	 * Parse attributes caught by the $this->id_class_attr_catch_re expression
+	 * and return the HTML-formatted list of attributes.
+	 *
+	 * Currently supported attributes are .class and #id.
+	 *
+	 * In addition, this method also supports supplying a default Id value,
+	 * which will be used to populate the id attribute in case it was not
+	 * overridden.
+	 * @param  string $tag_name
+	 * @param  string $attr
+	 * @param  mixed  $defaultIdValue
+	 * @param  array  $classes
+	 * @return string
+	 */
+	protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null, $classes = array()) {
+		if (empty($attr) && !$defaultIdValue && empty($classes)) return "";
+		
+		// Split on components
+		preg_match_all('/[#.a-z][-_:a-zA-Z0-9=]+/', $attr, $matches);
+		$elements = $matches[0];
+
+		// Handle classes and IDs (only first ID taken into account)
+		$attributes = array();
+		$id = false;
+		foreach ($elements as $element) {
+			if ($element{0} == '.') {
+				$classes[] = substr($element, 1);
+			} else if ($element{0} == '#') {
+				if ($id === false) $id = substr($element, 1);
+			} else if (strpos($element, '=') > 0) {
+				$parts = explode('=', $element, 2);
+				$attributes[] = $parts[0] . '="' . $parts[1] . '"';
+			}
+		}
+
+		if (!$id) $id = $defaultIdValue;
+
+		// Compose attributes as string
+		$attr_str = "";
+		if (!empty($id)) {
+			$attr_str .= ' id="'.$this->encodeAttribute($id) .'"';
+		}
+		if (!empty($classes)) {
+			$attr_str .= ' class="'. implode(" ", $classes) . '"';
+		}
+		if (!$this->no_markup && !empty($attributes)) {
+			$attr_str .= ' '.implode(" ", $attributes);
+		}
+		return $attr_str;
+	}
+
+	/**
+	 * Strips link definitions from text, stores the URLs and titles in
+	 * hash references.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function stripLinkDefinitions($text) {
+		$less_than_tab = $this->tab_width - 1;
+
+		// Link defs are in the form: ^[id]: url "optional title"
+		$text = preg_replace_callback('{
+							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							  [ ]*
+							  \n?				# maybe *one* newline
+							  [ ]*
+							(?:
+							  <(.+?)>			# url = $2
+							|
+							  (\S+?)			# url = $3
+							)
+							  [ ]*
+							  \n?				# maybe one newline
+							  [ ]*
+							(?:
+								(?<=\s)			# lookbehind for whitespace
+								["(]
+								(.*?)			# title = $4
+								[")]
+								[ ]*
+							)?	# title is optional
+					(?:[ ]* '.$this->id_class_attr_catch_re.' )?  # $5 = extra id & class attr
+							(?:\n+|\Z)
+			}xm',
+			array($this, '_stripLinkDefinitions_callback'),
+			$text);
+		return $text;
+	}
+
+	/**
+	 * Strip link definition callback
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _stripLinkDefinitions_callback($matches) {
+		$link_id = strtolower($matches[1]);
+		$url = $matches[2] == '' ? $matches[3] : $matches[2];
+		$this->urls[$link_id] = $url;
+		$this->titles[$link_id] =& $matches[4];
+		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
+		return ''; // String that will replace the block
+	}
+
+
+	/**
+	 * HTML block parser
+	 */
+	
+	/**
+	 * Tags that are always treated as block tags
+	 * @var string
+	 */
+	protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|figure';
+						   
+	/**
+	 * Tags treated as block tags only if the opening tag is alone on its line
+	 * @var string
+	 */
+	protected $context_block_tags_re = 'script|noscript|style|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
+	
+	/**
+	 * Tags where markdown="1" default to span mode:
+	 * @var string
+	 */
+	protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
+	
+	/**
+	 * Tags which must not have their contents modified, no matter where
+	 * they appear
+	 * @var string
+	 */
+	protected $clean_tags_re = 'script|style|math|svg';
+	
+	/**
+	 * Tags that do not need to be closed.
+	 * @var string
+	 */
+	protected $auto_close_tags_re = 'hr|img|param|source|track';
+	
+	/**
+	 * Hashify HTML Blocks and "clean tags".
+	 *
+	 * We only want to do this for block-level HTML tags, such as headers,
+	 * lists, and tables. That's because we still want to wrap 
    s around
+	 * "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+	 * phrase emphasis, and spans. The list of tags we're looking for is
+	 * hard-coded.
+	 *
+	 * This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+	 * _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
+	 * attribute is found within a tag, _HashHTMLBlocks_InHTML calls back
+	 *  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+	 * These two functions are calling each other. It's recursive!
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function hashHTMLBlocks($text) {
+		if ($this->no_markup) {
+			return $text;
+		}
+
+		// Call the HTML-in-Markdown hasher.
+		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		
+		return $text;
+	}
+
+	/**
+	 * Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+	 *
+	 * *   $indent is the number of space to be ignored when checking for code 
+	 *     blocks. This is important because if we don't take the indent into 
+	 *     account, something like this (which looks right) won't work as expected:
+	 *
+	 *     
    
+	 *         
    
+	 *         Hello World.  <-- Is this a Markdown code block or text?
+	 *         
      <-- Is this a Markdown code block or a real tag?
+	 *     
    
+	 *
+	 *     If you don't like this, just don't indent the tag on which
+	 *     you apply the markdown="1" attribute.
+	 *
+	 * *   If $enclosing_tag_re is not empty, stops at the first unmatched closing 
+	 *     tag with that name. Nested tags supported.
+	 *
+	 * *   If $span is true, text inside must treated as span. So any double 
+	 *     newline will be replaced by a single newline so that it does not create 
+	 *     paragraphs.
+	 *
+	 * Returns an array of that form: ( processed text , remaining text )
+	 *
+	 * @param  string  $text
+	 * @param  integer $indent
+	 * @param  string  $enclosing_tag_re
+	 * @param  boolean $span
+	 * @return array
+	 */
+	protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
+										$enclosing_tag_re = '', $span = false)
+	{
+	
+		if ($text === '') return array('', '');
+
+		// Regex to check for the presense of newlines around a block tag.
+		$newline_before_re = '/(?:^\n?|\n\n)*$/';
+		$newline_after_re = 
+			'{
+				^						# Start of text following the tag.
+				(?>[ ]*)?		# Optional comment.
+				[ ]*\n					# Must be followed by newline.
+			}xs';
+		
+		// Regex to match any tag.
+		$block_tag_re =
+			'{
+				(					# $2: Capture whole tag.
+									# Tag name.
+							' . $this->block_tags_re . '			|
+							' . $this->context_block_tags_re . '	|
+							' . $this->clean_tags_re . '        	|
+							(?!\s)'.$enclosing_tag_re . '
+						)
+						(?:
+							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+						# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+						# CData Block
+				' . ( !$span ? ' # If not in span.
+				|
+					# Indented code block
+					(?: ^[ ]*\n | ^ | \n[ ]*\n )
+					[ ]{' . ($indent + 4) . '}[^\n]* \n
+					(?>
+						(?: [ ]{' . ($indent + 4) . '}[^\n]* | [ ]* ) \n
+					)*
+				|
+					# Fenced code block marker
+					(?<= ^ | \n )
+					[ ]{0,' . ($indent + 3) . '}(?:~{3,}|`{3,})
+					[ ]*
+					(?: \.?[-_:a-zA-Z0-9]+ )? # standalone class name
+					[ ]*
+					(?: ' . $this->id_class_attr_nocatch_re . ' )? # extra attributes
+					[ ]*
+					(?= \n )
+				' : '' ) . ' # End (if not is span).
+				|
+					# Code span marker
+					# Note, this regex needs to go after backtick fenced
+					# code blocks but it should also be kept outside of the
+					# "if not in span" condition adding backticks to the parser
+					`+
+				)
+			}xs';
+
+		
+		$depth = 0;		// Current depth inside the tag tree.
+		$parsed = "";	// Parsed text that will be returned.
+
+		// Loop through every tag until we find the closing tag of the parent
+		// or loop until reaching the end of text if no parent tag specified.
+		do {
+			// Split the text using the first $tag_match pattern found.
+			// Text before  pattern will be first in the array, text after
+			// pattern will be at the end, and between will be any catches made 
+			// by the pattern.
+			$parts = preg_split($block_tag_re, $text, 2, 
+								PREG_SPLIT_DELIM_CAPTURE);
+			
+			// If in Markdown span mode, add a empty-string span-level hash 
+			// after each newline to prevent triggering any block element.
+			if ($span) {
+				$void = $this->hashPart("", ':');
+				$newline = "\n$void";
+				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+			}
+			
+			$parsed .= $parts[0]; // Text before current tag.
+			
+			// If end of $text has been reached. Stop loop.
+			if (count($parts) < 3) {
+				$text = "";
+				break;
+			}
+			
+			$tag  = $parts[1]; // Tag to handle.
+			$text = $parts[2]; // Remaining text after current tag.
+			$tag_re = preg_quote($tag); // For use in a regular expression.
+			
+			// Check for: Fenced code block marker.
+			// Note: need to recheck the whole tag to disambiguate backtick
+			// fences from code spans
+			if (preg_match('{^\n?([ ]{0,' . ($indent + 3) . '})(~{3,}|`{3,})[ ]*(?:\.?[-_:a-zA-Z0-9]+)?[ ]*(?:' . $this->id_class_attr_nocatch_re . ')?[ ]*\n?$}', $tag, $capture)) {
+				// Fenced code block marker: find matching end marker.
+				$fence_indent = strlen($capture[1]); // use captured indent in re
+				$fence_re = $capture[2]; // use captured fence in re
+				if (preg_match('{^(?>.*\n)*?[ ]{' . ($fence_indent) . '}' . $fence_re . '[ ]*(?:\n|$)}', $text,
+					$matches)) 
+				{
+					// End marker found: pass text unchanged until marker.
+					$parsed .= $tag . $matches[0];
+					$text = substr($text, strlen($matches[0]));
+				}
+				else {
+					// No end marker: just skip it.
+					$parsed .= $tag;
+				}
+			}
+			// Check for: Indented code block.
+			else if ($tag{0} == "\n" || $tag{0} == " ") {
+				// Indented code block: pass it unchanged, will be handled 
+				// later.
+				$parsed .= $tag;
+			}
+			// Check for: Code span marker
+			// Note: need to check this after backtick fenced code blocks
+			else if ($tag{0} == "`") {
+				// Find corresponding end marker.
+				$tag_re = preg_quote($tag);
+				if (preg_match('{^(?>.+?|\n(?!\n))*?(?block_tags_re . ')\b}', $tag) ||
+				(	preg_match('{^<(?:' . $this->context_block_tags_re . ')\b}', $tag) &&
+					preg_match($newline_before_re, $parsed) &&
+					preg_match($newline_after_re, $text)	)
+				)
+			{
+				// Need to parse tag and following text using the HTML parser.
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+				
+				// Make sure it stays outside of any paragraph by adding newlines.
+				$parsed .= "\n\n$block_text\n\n";
+			}
+			// Check for: Clean tag (like script, math)
+			//            HTML Comments, processing instructions.
+			else if (preg_match('{^<(?:' . $this->clean_tags_re . ')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				// Need to parse tag and following text using the HTML parser.
+				// (don't check for markdown attribute)
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+				
+				$parsed .= $block_text;
+			}
+			// Check for: Tag with same name as enclosing tag.
+			else if ($enclosing_tag_re !== '' &&
+				// Same name as enclosing tag.
+				preg_match('{^= 0);
+		
+		return array($parsed, $text);
+	}
+
+	/**
+	 * Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+	 *
+	 * *   Calls $hash_method to convert any blocks.
+	 * *   Stops when the first opening tag closes.
+	 * *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+	 *     (it is not inside clean tags)
+	 *
+	 * Returns an array of that form: ( processed text , remaining text )
+	 * @param  string $text
+	 * @param  string $hash_method
+	 * @param  string $md_attr
+	 * @return array
+	 */
+	protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
+		if ($text === '') return array('', '');
+		
+		// Regex to match `markdown` attribute inside of a tag.
+		$markdown_attr_re = '
+			{
+				\s*			# Eat whitespace before the `markdown` attribute
+				markdown
+				\s*=\s*
+				(?>
+					(["\'])		# $1: quote delimiter		
+					(.*?)		# $2: attribute value
+					\1			# matching delimiter	
+				|
+					([^\s>]*)	# $3: unquoted attribute value
+				)
+				()				# $4: make $3 always defined (avoid warnings)
+			}xs';
+		
+		// Regex to match any tag.
+		$tag_re = '{
+				(					# $2: Capture whole tag.
+					
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+						# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+						# CData Block
+				)
+			}xs';
+		
+		$original_text = $text;		// Save original text in case of faliure.
+		
+		$depth		= 0;	// Current depth inside the tag tree.
+		$block_text	= "";	// Temporary text holder for current text.
+		$parsed		= "";	// Parsed text that will be returned.
+
+		// Get the name of the starting tag.
+		// (This pattern makes $base_tag_name_re safe without quoting.)
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
+			$base_tag_name_re = $matches[1];
+
+		// Loop through every tag until we find the corresponding closing tag.
+		do {
+			// Split the text using the first $tag_match pattern found.
+			// Text before  pattern will be first in the array, text after
+			// pattern will be at the end, and between will be any catches made 
+			// by the pattern.
+			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			if (count($parts) < 3) {
+				// End of $text reached with unbalenced tag(s).
+				// In that case, we return original text unchanged and pass the
+				// first character as filtered to prevent an infinite loop in the 
+				// parent function.
+				return array($original_text{0}, substr($original_text, 1));
+			}
+			
+			$block_text .= $parts[0]; // Text before current tag.
+			$tag         = $parts[1]; // Tag to handle.
+			$text        = $parts[2]; // Remaining text after current tag.
+			
+			// Check for: Auto-close tag (like 
    )
+			//			 Comments and Processing Instructions.
+			if (preg_match('{^auto_close_tags_re . ')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				// Just add the tag to the block as if it was text.
+				$block_text .= $tag;
+			}
+			else {
+				// Increase/decrease nested tag count. Only do so if
+				// the tag's name match base tag's.
+				if (preg_match('{^mode = $attr_m[2] . $attr_m[3];
+					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
+						preg_match('{^<(?:' . $this->contain_span_tags_re . ')\b}', $tag);
+					
+					// Calculate indent before tag.
+					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+						$strlen = $this->utf8_strlen;
+						$indent = $strlen($matches[1], 'UTF-8');
+					} else {
+						$indent = 0;
+					}
+					
+					// End preceding block with this tag.
+					$block_text .= $tag;
+					$parsed .= $this->$hash_method($block_text);
+					
+					// Get enclosing tag name for the ParseMarkdown function.
+					// (This pattern makes $tag_name_re safe without quoting.)
+					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+					$tag_name_re = $matches[1];
+					
+					// Parse the content using the HTML-in-Markdown parser.
+					list ($block_text, $text)
+						= $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
+							$tag_name_re, $span_mode);
+					
+					// Outdent markdown text.
+					if ($indent > 0) {
+						$block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
+													$block_text);
+					}
+					
+					// Append tag content to parsed text.
+					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
+					else				$parsed .= "$block_text";
+					
+					// Start over with a new block.
+					$block_text = "";
+				}
+				else $block_text .= $tag;
+			}
+			
+		} while ($depth > 0);
+		
+		// Hash last block text that wasn't processed inside the loop.
+		$parsed .= $this->$hash_method($block_text);
+		
+		return array($parsed, $text);
+	}
+
+	/**
+	 * Called whenever a tag must be hashed when a function inserts a "clean" tag
+	 * in $text, it passes through this function and is automaticaly escaped, 
+	 * blocking invalid nested overlap.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function hashClean($text) {
+		return $this->hashPart($text, 'C');
+	}
+
+	/**
+	 * Turn Markdown link shortcuts into XHTML  tags.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function doAnchors($text) {
+		if ($this->in_anchor) {
+			return $text;
+		}
+		$this->in_anchor = true;
+
+		// First, handle reference-style links: [link text] [id]
+		$text = preg_replace_callback('{
+			(					# wrap whole match in $1
+			  \[
+				(' . $this->nested_brackets_re . ')	# link text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+			)
+			}xs',
+			array($this, '_doAnchors_reference_callback'), $text);
+
+		// Next, inline-style links: [link text](url "optional title")
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  \[
+				(' . $this->nested_brackets_re . ')	# link text = $2
+			  \]
+			  \(			# literal paren
+				[ \n]*
+				(?:
+					<(.+?)>	# href = $3
+				|
+					(' . $this->nested_url_parenthesis_re . ')	# href = $4
+				)
+				[ \n]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# Title = $7
+				  \6		# matching quote
+				  [ \n]*	# ignore any spaces/tabs between closing quote and )
+				)?			# title is optional
+			  \)
+			  (?:[ ]? ' . $this->id_class_attr_catch_re . ' )?	 # $8 = id/class attributes
+			)
+			}xs',
+			array($this, '_doAnchors_inline_callback'), $text);
+
+		// Last, handle reference-style shortcuts: [link text]
+		// These must come last in case you've also got [link text][1]
+		// or [link text](/foo)
+		$text = preg_replace_callback('{
+			(					# wrap whole match in $1
+			  \[
+				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
+			  \]
+			)
+			}xs',
+			array($this, '_doAnchors_reference_callback'), $text);
+
+		$this->in_anchor = false;
+		return $text;
+	}
+
+	/**
+	 * Callback for reference anchors
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doAnchors_reference_callback($matches) {
+		$whole_match =  $matches[1];
+		$link_text   =  $matches[2];
+		$link_id     =& $matches[3];
+
+		if ($link_id == "") {
+			// for shortcut links like [this][] or [this].
+			$link_id = $link_text;
+		}
+		
+		// lower-case and turn embedded newlines into spaces
+		$link_id = strtolower($link_id);
+		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+		if (isset($this->urls[$link_id])) {
+			$url = $this->urls[$link_id];
+			$url = $this->encodeURLAttribute($url);
+			
+			$result = "titles[$link_id] ) ) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+			if (isset($this->ref_attr[$link_id]))
+				$result .= $this->ref_attr[$link_id];
+		
+			$link_text = $this->runSpanGamut($link_text);
+			$result .= ">$link_text";
+			$result = $this->hashPart($result);
+		}
+		else {
+			$result = $whole_match;
+		}
+		return $result;
+	}
+
+	/**
+	 * Callback for inline anchors
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doAnchors_inline_callback($matches) {
+		$whole_match	=  $matches[1];
+		$link_text		=  $this->runSpanGamut($matches[2]);
+		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+		$attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
+
+		// if the URL was of the form  it got caught by the HTML
+		// tag parser and hashed. Need to reverse the process before using the URL.
+		$unhashed = $this->unhash($url);
+		if ($unhashed != $url)
+			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+
+		$url = $this->encodeURLAttribute($url);
+
+		$result = "encodeAttribute($title);
+			$result .=  " title=\"$title\"";
+		}
+		$result .= $attr;
+		
+		$link_text = $this->runSpanGamut($link_text);
+		$result .= ">$link_text";
+
+		return $this->hashPart($result);
+	}
+
+	/**
+	 * Turn Markdown image shortcuts into  tags.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function doImages($text) {
+		// First, handle reference-style labeled images: ![alt text][id]
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				(' . $this->nested_brackets_re . ')		# alt text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+
+			)
+			}xs', 
+			array($this, '_doImages_reference_callback'), $text);
+
+		// Next, handle inline images:  ![alt text](url "optional title")
+		// Don't forget: encode * and _
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				(' . $this->nested_brackets_re . ')		# alt text = $2
+			  \]
+			  \s?			# One optional whitespace character
+			  \(			# literal paren
+				[ \n]*
+				(?:
+					<(\S*)>	# src url = $3
+				|
+					(' . $this->nested_url_parenthesis_re . ')	# src url = $4
+				)
+				[ \n]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# title = $7
+				  \6		# matching quote
+				  [ \n]*
+				)?			# title is optional
+			  \)
+			  (?:[ ]? ' . $this->id_class_attr_catch_re . ' )?	 # $8 = id/class attributes
+			)
+			}xs',
+			array($this, '_doImages_inline_callback'), $text);
+
+		return $text;
+	}
+
+	/**
+	 * Callback for referenced images
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doImages_reference_callback($matches) {
+		$whole_match = $matches[1];
+		$alt_text    = $matches[2];
+		$link_id     = strtolower($matches[3]);
+
+		if ($link_id == "") {
+			$link_id = strtolower($alt_text); // for shortcut links like ![this][].
+		}
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		if (isset($this->urls[$link_id])) {
+			$url = $this->encodeURLAttribute($this->urls[$link_id]);
+			$result = "\"$alt_text\"";titles[$link_id])) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+			if (isset($this->ref_attr[$link_id]))
+				$result .= $this->ref_attr[$link_id];
+			$result .= $this->empty_element_suffix;
+			$result = $this->hashPart($result);
+		}
+		else {
+			// If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Callback for inline images
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doImages_inline_callback($matches) {
+		$whole_match	= $matches[1];
+		$alt_text		= $matches[2];
+		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+		$attr  = $this->doExtraAttributes("img", $dummy =& $matches[8]);
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		$url = $this->encodeURLAttribute($url);
+		$result = "\"$alt_text\"";encodeAttribute($title);
+			$result .=  " title=\"$title\""; // $title already quoted
+		}
+		$result .= $attr;
+		$result .= $this->empty_element_suffix;
+
+		return $this->hashPart($result);
+	}
+
+	/**
+	 * Process markdown headers. Redefined to add ID and class attribute support.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function doHeaders($text) {
+		// Setext-style headers:
+		//  Header 1  {#header1}
+		//	  ========
+		//  
+		//	  Header 2  {#header2 .class1 .class2}
+		//	  --------
+		//
+		$text = preg_replace_callback(
+			'{
+				(^.+?)								# $1: Header text
+				(?:[ ]+ ' . $this->id_class_attr_catch_re . ' )?	 # $3 = id/class attributes
+				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
+			}mx',
+			array($this, '_doHeaders_callback_setext'), $text);
+
+		// atx-style headers:
+		//	# Header 1        {#header1}
+		//	## Header 2       {#header2}
+		//	## Header 2 with closing hashes ##  {#header3.class1.class2}
+		//	...
+		//	###### Header 6   {.class2}
+		//
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				(?:[ ]+ ' . $this->id_class_attr_catch_re . ' )?	 # $3 = id/class attributes
+				[ ]*
+				\n+
+			}xm',
+			array($this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+
+	/**
+	 * Callback for setext headers
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doHeaders_callback_setext($matches) {
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) {
+			return $matches[0];
+		}
+
+		$level = $matches[3]{0} == '=' ? 1 : 2;
+
+		$defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null;
+
+		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[2], $defaultId);
+		$block = "" . $this->runSpanGamut($matches[1]) . "";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+	/**
+	 * Callback for atx headers
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+
+		$defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[2]) : null;
+		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[3], $defaultId);
+		$block = "" . $this->runSpanGamut($matches[2]) . "";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+	/**
+	 * Form HTML tables.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function doTables($text) {
+		$less_than_tab = $this->tab_width - 1;
+		// Find tables with leading pipe.
+		//
+		//	| Header 1 | Header 2
+		//	| -------- | --------
+		//	| Cell 1   | Cell 2
+		//	| Cell 3   | Cell 4
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,' . $less_than_tab . '}	# Allowed whitespace.
+				[|]							# Optional leading pipe (present)
+				(.+) \n						# $1: Header row (at least one pipe)
+				
+				[ ]{0,' . $less_than_tab . '}	# Allowed whitespace.
+				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						[ ]*				# Allowed whitespace.
+						[|] .* \n			# Row content.
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array($this, '_doTable_leadingPipe_callback'), $text);
+
+		// Find tables without leading pipe.
+		//
+		//	Header 1 | Header 2
+		//	-------- | --------
+		//	Cell 1   | Cell 2
+		//	Cell 3   | Cell 4
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,' . $less_than_tab . '}	# Allowed whitespace.
+				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
+				
+				[ ]{0,' . $less_than_tab . '}	# Allowed whitespace.
+				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						.* [|] .* \n		# Row content
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array($this, '_DoTable_callback'), $text);
+
+		return $text;
+	}
+
+	/**
+	 * Callback for removing the leading pipe for each row
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doTable_leadingPipe_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+
+		$content	= preg_replace('/^ *[|]/m', '', $content);
+		
+		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
+	}
+
+	/**
+	 * Make the align attribute in a table
+	 * @param  string $alignname
+	 * @return string
+	 */
+	protected function _doTable_makeAlignAttr($alignname)
+	{
+		if (empty($this->table_align_class_tmpl)) {
+			return " align=\"$alignname\"";
+		}
+
+		$classname = str_replace('%%', $alignname, $this->table_align_class_tmpl);
+		return " class=\"$classname\"";
+	}
+
+	/**
+	 * Calback for processing tables
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doTable_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+
+		// Remove any tailing pipes for each line.
+		$head		= preg_replace('/[|] *$/m', '', $head);
+		$underline	= preg_replace('/[|] *$/m', '', $underline);
+		$content	= preg_replace('/[|] *$/m', '', $content);
+		
+		// Reading alignement from header underline.
+		$separators	= preg_split('/ *[|] */', $underline);
+		foreach ($separators as $n => $s) {
+			if (preg_match('/^ *-+: *$/', $s))
+				$attr[$n] = $this->_doTable_makeAlignAttr('right');
+			else if (preg_match('/^ *:-+: *$/', $s))
+				$attr[$n] = $this->_doTable_makeAlignAttr('center');
+			else if (preg_match('/^ *:-+ *$/', $s))
+				$attr[$n] = $this->_doTable_makeAlignAttr('left');
+			else
+				$attr[$n] = '';
+		}
+		
+		// Parsing span elements, including code spans, character escapes, 
+		// and inline HTML tags, so that pipes inside those gets ignored.
+		$head		= $this->parseSpan($head);
+		$headers	= preg_split('/ *[|] */', $head);
+		$col_count	= count($headers);
+		$attr       = array_pad($attr, $col_count, '');
+		
+		// Write column headers.
+		$text = "\n";
+		$text .= "\n";
+		$text .= "\n";
+		foreach ($headers as $n => $header)
+			$text .= "  " . $this->runSpanGamut(trim($header)) . "\n";
+		$text .= "\n";
+		$text .= "\n";
+		
+		// Split content by row.
+		$rows = explode("\n", trim($content, "\n"));
+		
+		$text .= "\n";
+		foreach ($rows as $row) {
+			// Parsing span elements, including code spans, character escapes, 
+			// and inline HTML tags, so that pipes inside those gets ignored.
+			$row = $this->parseSpan($row);
+			
+			// Split row by cell.
+			$row_cells = preg_split('/ *[|] */', $row, $col_count);
+			$row_cells = array_pad($row_cells, $col_count, '');
+			
+			$text .= "\n";
+			foreach ($row_cells as $n => $cell)
+				$text .= "  " . $this->runSpanGamut(trim($cell)) . "\n";
+			$text .= "\n";
+		}
+		$text .= "\n";
+		$text .= "
    ";
+		
+		return $this->hashBlock($text) . "\n";
+	}
+
+	/**
+	 * Form HTML definition lists.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function doDefLists($text) {
+		$less_than_tab = $this->tab_width - 1;
+
+		// Re-usable pattern to match any entire dl list:
+		$whole_list_re = '(?>
+			(								# $1 = whole list
+			  (								# $2
+				[ ]{0,' . $less_than_tab . '}
+				((?>.*\S.*\n)+)				# $3 = defined term
+				\n?
+				[ ]{0,' . $less_than_tab . '}:[ ]+ # colon starting definition
+			  )
+			  (?s:.+?)
+			  (								# $4
+				  \z
+				|
+				  \n{2,}
+				  (?=\S)
+				  (?!						# Negative lookahead for another term
+					[ ]{0,' . $less_than_tab . '}
+					(?: \S.*\n )+?			# defined term
+					\n?
+					[ ]{0,' . $less_than_tab . '}:[ ]+ # colon starting definition
+				  )
+				  (?!						# Negative lookahead for another definition
+					[ ]{0,' . $less_than_tab . '}:[ ]+ # colon starting definition
+				  )
+			  )
+			)
+		)'; // mx
+
+		$text = preg_replace_callback('{
+				(?>\A\n?|(?<=\n\n))
+				' . $whole_list_re . '
+			}mx',
+			array($this, '_doDefLists_callback'), $text);
+
+		return $text;
+	}
+
+	/**
+	 * Callback for processing definition lists
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doDefLists_callback($matches) {
+		// Re-usable patterns to match list item bullets and number markers:
+		$list = $matches[1];
+		
+		// Turn double returns into triple returns, so that we can make a
+		// paragraph for the last item in a list, if necessary:
+		$result = trim($this->processDefListItems($list));
+		$result = "
    \n" . $result . "\n
    ";
+		return $this->hashBlock($result) . "\n\n";
+	}
+
+	/**
+	 * Process the contents of a single definition list, splitting it
+	 * into individual term and definition list items.
+	 * @param  string $list_str
+	 * @return string
+	 */
+	protected function processDefListItems($list_str) {
+	
+		$less_than_tab = $this->tab_width - 1;
+		
+		// Trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		// Process definition terms.
+		$list_str = preg_replace_callback('{
+			(?>\A\n?|\n\n+)						# leading line
+			(									# definition terms = $1
+				[ ]{0,' . $less_than_tab . '}	# leading whitespace
+				(?!\:[ ]|[ ])					# negative lookahead for a definition
+												#   mark (colon) or more whitespace.
+				(?> \S.* \n)+?					# actual term (not whitespace).	
+			)			
+			(?=\n?[ ]{0,3}:[ ])					# lookahead for following line feed 
+												#   with a definition mark.
+			}xm',
+			array($this, '_processDefListItems_callback_dt'), $list_str);
+
+		// Process actual definitions.
+		$list_str = preg_replace_callback('{
+			\n(\n+)?							# leading line = $1
+			(									# marker space = $2
+				[ ]{0,' . $less_than_tab . '}	# whitespace before colon
+				\:[ ]+							# definition mark (colon)
+			)
+			((?s:.+?))							# definition text = $3
+			(?= \n+ 							# stop at next definition mark,
+				(?:								# next term or end of text
+					[ ]{0,' . $less_than_tab . '} \:[ ]	|
+					
     | \z
+				)						
+			)					
+			}xm',
+			array($this, '_processDefListItems_callback_dd'), $list_str);
+
+		return $list_str;
+	}
+
+	/**
+	 * Callback for 
     elements in definition lists
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _processDefListItems_callback_dt($matches) {
+		$terms = explode("\n", trim($matches[1]));
+		$text = '';
+		foreach ($terms as $term) {
+			$term = $this->runSpanGamut(trim($term));
+			$text .= "\n
    " . $term . "
    ";
+		}
+		return $text . "\n";
+	}
+
+	/**
+	 * Callback for 
     elements in definition lists
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _processDefListItems_callback_dd($matches) {
+		$leading_line	= $matches[1];
+		$marker_space	= $matches[2];
+		$def			= $matches[3];
+
+		if ($leading_line || preg_match('/\n{2,}/', $def)) {
+			// Replace marker with the appropriate whitespace indentation
+			$def = str_repeat(' ', strlen($marker_space)) . $def;
+			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
+			$def = "\n". $def ."\n";
+		}
+		else {
+			$def = rtrim($def);
+			$def = $this->runSpanGamut($this->outdent($def));
+		}
+
+		return "\n
    " . $def . "
    \n";
+	}
+
+	/**
+	 * Adding the fenced code block syntax to regular Markdown:
+	 *
+	 * ~~~
+	 * Code block
+	 * ~~~
+	 * 
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function doFencedCodeBlocks($text) {
+	
+		$less_than_tab = $this->tab_width;
+		
+		$text = preg_replace_callback('{
+				(?:\n|\A)
+				# 1: Opening marker
+				(
+					(?:~{3,}|`{3,}) # 3 or more tildes/backticks.
+				)
+				[ ]*
+				(?:
+					\.?([-_:a-zA-Z0-9]+) # 2: standalone class name
+				)?
+				[ ]*
+				(?:
+					' . $this->id_class_attr_catch_re . ' # 3: Extra attributes
+				)?
+				[ ]* \n # Whitespace and newline following marker.
+				
+				# 4: Content
+				(
+					(?>
+						(?!\1 [ ]* \n)	# Not a closing marker.
+						.*\n+
+					)+
+				)
+				
+				# Closing marker.
+				\1 [ ]* (?= \n )
+			}xm',
+			array($this, '_doFencedCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+
+	/**
+	 * Callback to process fenced code blocks
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doFencedCodeBlocks_callback($matches) {
+		$classname =& $matches[2];
+		$attrs     =& $matches[3];
+		$codeblock = $matches[4];
+
+		if ($this->code_block_content_func) {
+			$codeblock = call_user_func($this->code_block_content_func, $codeblock, $classname);
+		} else {
+			$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		}
+
+		$codeblock = preg_replace_callback('/^\n+/',
+			array($this, '_doFencedCodeBlocks_newlines'), $codeblock);
+
+		$classes = array();
+		if ($classname != "") {
+			if ($classname{0} == '.')
+				$classname = substr($classname, 1);
+			$classes[] = $this->code_class_prefix . $classname;
+		}
+		$attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs, null, $classes);
+		$pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
+		$code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
+		$codeblock  = "$codeblock
    ";
+		
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+
+	/**
+	 * Replace new lines in fenced code blocks
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doFencedCodeBlocks_newlines($matches) {
+		return str_repeat("empty_element_suffix", 
+			strlen($matches[0]));
+	}
+
+	/**
+	 * Redefining emphasis markers so that emphasis by underscore does not
+	 * work in the middle of a word.
+	 * @var array
+	 */
+	protected $em_relist = array(
+		''  => '(?:(? '(? '(? '(?:(? '(? '(? '(?:(? '(? '(? tags
+	 * @return string       HTML output
+	 */
+	protected function formParagraphs($text, $wrap_in_p = true) {
+		// Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		// Wrap 
     tags and unhashify HTML blocks
+		foreach ($grafs as $key => $value) {
+			$value = trim($this->runSpanGamut($value));
+			
+			// Check if this should be enclosed in a paragraph.
+			// Clean tag hashes & block tag hashes are left alone.
+			$is_p = $wrap_in_p && !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
+			
+			if ($is_p) {
+				$value = "
    $value
    ";
+			}
+			$grafs[$key] = $value;
+		}
+		
+		// Join grafs in one text, then unhash HTML tags. 
+		$text = implode("\n\n", $grafs);
+		
+		// Finish by removing any tag hashes still present in $text.
+		$text = $this->unhash($text);
+		
+		return $text;
+	}
+	
+	
+	/**
+	 * Footnotes - Strips link definitions from text, stores the URLs and
+	 * titles in hash references.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function stripFootnotes($text) {
+		$less_than_tab = $this->tab_width - 1;
+
+		// Link defs are in the form: [^id]: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,' . $less_than_tab . '}\[\^(.+?)\][ ]?:	# note_id = $1
+			  [ ]*
+			  \n?					# maybe *one* newline
+			(						# text = $2 (no blank lines allowed)
+				(?:					
+					.+				# actual text
+				|
+					\n				# newlines but 
+					(?!\[.+?\][ ]?:\s)# negative lookahead for footnote or link definition marker.
+					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
+									# by non-indented content
+				)*
+			)		
+			}xm',
+			array($this, '_stripFootnotes_callback'),
+			$text);
+		return $text;
+	}
+
+	/**
+	 * Callback for stripping footnotes
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _stripFootnotes_callback($matches) {
+		$note_id = $this->fn_id_prefix . $matches[1];
+		$this->footnotes[$note_id] = $this->outdent($matches[2]);
+		return ''; // String that will replace the block
+	}
+
+	/**
+	 * Replace footnote references in $text [^id] with a special text-token 
+	 * which will be replaced by the actual footnote marker in appendFootnotes.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function doFootnotes($text) {
+		if (!$this->in_anchor) {
+			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
+		}
+		return $text;
+	}
+
+	/**
+	 * Append footnote list to text
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function appendFootnotes($text) {
+		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+			array($this, '_appendFootnotes_callback'), $text);
+	
+		if (!empty($this->footnotes_ordered)) {
+			$text .= "\n\n";
+			$text .= "
    \n";
+			$text .= "empty_element_suffix . "\n";
+			$text .= "
      \n\n";
+
+			$attr = "";
+			if ($this->fn_backlink_class != "") {
+				$class = $this->fn_backlink_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_backlink_title != "") {
+				$title = $this->fn_backlink_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			$backlink_text = $this->fn_backlink_html;
+			$num = 0;
+			
+			while (!empty($this->footnotes_ordered)) {
+				$footnote = reset($this->footnotes_ordered);
+				$note_id = key($this->footnotes_ordered);
+				unset($this->footnotes_ordered[$note_id]);
+				$ref_count = $this->footnotes_ref_count[$note_id];
+				unset($this->footnotes_ref_count[$note_id]);
+				unset($this->footnotes[$note_id]);
+				
+				$footnote .= "\n"; // Need to append newline before parsing.
+				$footnote = $this->runBlockGamut("$footnote\n");				
+				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+					array($this, '_appendFootnotes_callback'), $footnote);
+				
+				$attr = str_replace("%%", ++$num, $attr);
+				$note_id = $this->encodeAttribute($note_id);
+
+				// Prepare backlink, multiple backlinks if multiple references
+				$backlink = "$backlink_text";
+				for ($ref_num = 2; $ref_num <= $ref_count; ++$ref_num) {
+					$backlink .= " $backlink_text";
+				}
+				// Add backlink to last paragraph; create new paragraph if needed.
+				if (preg_match('{
      $}', $footnote)) {
+					$footnote = substr($footnote, 0, -4) . " $backlink
      ";
+				} else {
+					$footnote .= "\n\n
      $backlink
      ";
+				}
+				
+				$text .= "
    1. \n";
+				$text .= $footnote . "\n";
+				$text .= "
      2. \n\n";
+			}
+			
+			$text .= "
    \n";
+			$text .= "
    ";
+		}
+		return $text;
+	}
+
+	/**
+	 * Callback for appending footnotes
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _appendFootnotes_callback($matches) {
+		$node_id = $this->fn_id_prefix . $matches[1];
+		
+		// Create footnote marker only if it has a corresponding footnote *and*
+		// the footnote hasn't been used by another marker.
+		if (isset($this->footnotes[$node_id])) {
+			$num =& $this->footnotes_numbers[$node_id];
+			if (!isset($num)) {
+				// Transfer footnote content to the ordered list and give it its
+				// number
+				$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+				$this->footnotes_ref_count[$node_id] = 1;
+				$num = $this->footnote_counter++;
+				$ref_count_mark = '';
+			} else {
+				$ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
+			}
+
+			$attr = "";
+			if ($this->fn_link_class != "") {
+				$class = $this->fn_link_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_link_title != "") {
+				$title = $this->fn_link_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			
+			$attr = str_replace("%%", $num, $attr);
+			$node_id = $this->encodeAttribute($node_id);
+			
+			return
+				"".
+				"$num".
+				"";
+		}
+		
+		return "[^" . $matches[1] . "]";
+	}
+		
+	
+	/**
+	 * Abbreviations - strips abbreviations from text, stores titles in hash
+	 * references.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function stripAbbreviations($text) {
+		$less_than_tab = $this->tab_width - 1;
+
+		// Link defs are in the form: [id]*: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,' . $less_than_tab . '}\*\[(.+?)\][ ]?:	# abbr_id = $1
+			(.*)					# text = $2 (no blank lines allowed)	
+			}xm',
+			array($this, '_stripAbbreviations_callback'),
+			$text);
+		return $text;
+	}
+
+	/**
+	 * Callback for stripping abbreviations
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _stripAbbreviations_callback($matches) {
+		$abbr_word = $matches[1];
+		$abbr_desc = $matches[2];
+		if ($this->abbr_word_re) {
+			$this->abbr_word_re .= '|';
+		}
+		$this->abbr_word_re .= preg_quote($abbr_word);
+		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		return ''; // String that will replace the block
+	}
+
+	/**
+	 * Find defined abbreviations in text and wrap them in  elements.
+	 * @param  string $text
+	 * @return string
+	 */
+	protected function doAbbreviations($text) {
+		if ($this->abbr_word_re) {
+			// cannot use the /x modifier because abbr_word_re may 
+			// contain significant spaces:
+			$text = preg_replace_callback('{' .
+				'(?abbr_word_re . ')' .
+				'(?![\w\x1A])' .
+				'}',
+				array($this, '_doAbbreviations_callback'), $text);
+		}
+		return $text;
+	}
+
+	/**
+	 * Callback for processing abbreviations
+	 * @param  array $matches
+	 * @return string
+	 */
+	protected function _doAbbreviations_callback($matches) {
+		$abbr = $matches[0];
+		if (isset($this->abbr_desciptions[$abbr])) {
+			$desc = $this->abbr_desciptions[$abbr];
+			if (empty($desc)) {
+				return $this->hashPart("$abbr");
+			} else {
+				$desc = $this->encodeAttribute($desc);
+				return $this->hashPart("$abbr");
+			}
+		} else {
+			return $matches[0];
+		}
+	}
 }
-
diff --git a/library/php-markdown/Michelf/MarkdownInterface.inc.php b/library/php-markdown/Michelf/MarkdownInterface.inc.php
index a023ed4e3..c4e9ac7f6 100644
--- a/library/php-markdown/Michelf/MarkdownInterface.inc.php
+++ b/library/php-markdown/Michelf/MarkdownInterface.inc.php
@@ -1,9 +1,9 @@
 
-#
-# Original Markdown
-# Copyright (c) 2004-2006 John Gruber
-# 
-#
+/**
+ * Markdown  -  A text-to-HTML conversion tool for web writers
+ *
+ * @package   php-markdown
+ * @author    Michel Fortin 
+ * @copyright 2004-2016 Michel Fortin 
+ * @copyright (Original Markdown) 2004-2006 John Gruber 
+ */
+
 namespace Michelf;
 
-
-#
-# Markdown Parser Interface
-#
-
+/**
+ * Markdown Parser Interface 
+ */
 interface MarkdownInterface {
+	/**
+	 * Initialize the parser and return the result of its transform method.
+	 * This will work fine for derived classes too.
+	 *
+	 * @api
+	 *
+	 * @param  string $text
+	 * @return string
+	 */
+	public static function defaultTransform($text);
 
-  #
-  # Initialize the parser and return the result of its transform method.
-  # This will work fine for derived classes too.
-  #
-  public static function defaultTransform($text);
-
-  #
-  # Main function. Performs some preprocessing on the input text
-  # and pass it through the document gamut.
-  #
-  public function transform($text);
-
+	/**
+	 * Main function. Performs some preprocessing on the input text
+	 * and pass it through the document gamut.
+	 *
+	 * @api
+	 *
+	 * @param  string $text
+	 * @return string
+	 */
+	public function transform($text);
 }
diff --git a/library/php-markdown/Readme.md b/library/php-markdown/Readme.md
index 80504c27c..63e8c1ece 100644
--- a/library/php-markdown/Readme.md
+++ b/library/php-markdown/Readme.md
@@ -1,13 +1,13 @@
 PHP Markdown
 ============
 
-PHP Markdown Lib 1.4.1 - 4 May 2013
+PHP Markdown Lib 1.7.0 - 29 Oct 2016
 
 by Michel Fortin  
-
+
 
 based on Markdown by John Gruber  
-
+
 
 
 Introduction
@@ -25,10 +25,10 @@ software tool, originally written in Perl, that converts the plain text
 markup to HTML. PHP Markdown is a port to PHP of the original Markdown 
 program by John Gruber.
 
-*	[Full documentation of the Markdown syntax]()
-	- Daring Fireball (John Gruber)
-*	[Markdown Extra syntax additions]()
-	- Michel Fortin
+*	[Full documentation of the Markdown syntax]()  
+	— Daring Fireball (John Gruber)
+*	[Markdown Extra syntax additions]()  
+	— Michel Fortin
 
 
 Requirement
@@ -83,7 +83,7 @@ configuration variables:
 
 To learn more, see the full list of [configuration variables].
 
- [configuration variables]: http://michelf.ca/projects/php-markdown/configuration/
+ [configuration variables]: https://michelf.ca/projects/php-markdown/configuration/
 
 
 ### Usage without an autoloader
@@ -149,7 +149,7 @@ Development and Testing
 -----------------------
 
 Pull requests for fixing bugs are welcome. Proposed new features are
-going meticulously reviewed -- taking into account backward compatibility, 
+going to be meticulously reviewed -- taking into account backward compatibility, 
 potential side effects, and future extensibility -- before deciding on
 acceptance or rejection.
 
@@ -174,11 +174,80 @@ PHP Markdown, please visit [michelf.ca/donate] or send Bitcoin to
 Version History
 ---------------
 
-Unreleased
+PHP Markdown Lib 1.7.0 (29 Oct 2016)
 
-*	Added the ability to insert custom HTML attributes everywhere an extra
-	attribute block is allowed (links, images, headers). Credits to
-	Peter Droogmans for providing the implementation.
+*	Added a `hard_wrap` configuration variable to make all newline characters 
+	in the text become `
    ` tags in the HTML output. By default, according 
+	to the standard Markdown syntax these newlines are ignored unless they a 
+	preceded by two spaces. Thanks to Jonathan Cohlmeyer for the implementation.
+
+*	Improved the parsing of list items to fix problematic cases that came to 
+	light with the addition of `hard_wrap`. This should have no effect on the 
+	output except span-level list items that ended with two spaces (and thus 
+	ended with a line break).
+
+*	Added a `code_span_content_func` configuration variable which takes a 
+	function that will convert the content of the code span to HTML. This can
+	be useful to implement syntax highlighting. Although contrary to its 
+	code block equivalent, there is no syntax for specifying a language. 
+	Credits to styxit for the implementation.
+
+*	Fixed a Markdown Extra issue where two-space-at-end-of-line hard breaks 
+	wouldn't work inside of HTML block elements such as `
    ` 
+	where the element expects only span-level content.
+
+*	In the parser code, switched to PHPDoc comment format. Thanks to 
+	Robbie Averill for the help.
+
+
+PHP Markdown Lib 1.6.0 (23 Dec 2015)  
+
+Note: this version was incorrectly released as 1.5.1 on Dec 22, a number 
+that contradicted the versioning policy.
+
+*	For fenced code blocks in Markdown Extra, can now set a class name for the 
+	code block's language before the special attribute block. Previously, this 
+	class name was only allowed in the absence of the special attribute block.
+
+*	Added a `code_block_content_func` configuration variable which takes a 
+	function that will convert the content of the code block to HTML. This is 
+	most useful for syntax highlighting. For fenced code blocks in Markdown 
+	Extra, the function has access to the language class name (the one outside 
+	of the special attribute block). Credits to Mario Konrad for providing the 
+	implementation.
+
+*	The curled arrow character for the backlink in footnotes is now followed
+	by a Unicode variant selector to prevent it from being displayed in emoji
+	form on iOS.
+
+	Note that in older browsers the variant selector is often interpreted as a 
+	separate character, making it visible after the arrow. So there is now a 
+	also a `fn_backlink_html` configuration variable that can be used to set 
+	the link text to something else. Credits to Dana for providing the 
+	implementation.
+
+*	Fixed an issue in MarkdownExtra where long header lines followed by a
+	special attribute block would hit the backtrack limit an cause an empty
+	string to be returned.
+
+
+PHP Markdown Lib 1.5.0 (1 Mar 2015)
+
+*	Added the ability start ordered lists with a number different from 1 and
+	and have that reflected in the HTML output. This can be enabled with
+	the `enhanced_ordered_lists` configuration variable for the Markdown 
+	parser; it is enabled by default for Markdown Extra.
+	Credits to Matt Gorle for providing the implementation.
+
+*	Added the ability to insert custom HTML attributes with simple values 
+	everywhere an extra attribute block is allowed (links, images, headers).
+	The value must be unquoted, cannot contains spaces and is limited to 
+	alphanumeric ASCII characters.
+	Credits to Peter Droogmans for providing the implementation.
+
+*	Added a `header_id_func` configuration variable which takes a function
+	that can generate an `id` attribute value from the header text.
+	Credits to Evert Pot for providing the implementation.
 
 *	Added a `url_filter_func` configuration variable which takes a function
 	that can rewrite any link or image URL to something different.
@@ -239,7 +308,7 @@ PHP Markdown Extra 1.2.6:
 
 *	Plugin interface for WordPress and other systems is no longer present in
 	the Lib package. The classic package is still available if you need it:
-	
+	
 
 *	Added `public` and `protected` protection attributes, plus a section about
 	what is "public API" and what isn't in the Readme file.
@@ -277,13 +346,13 @@ Copyright and License
 ---------------------
 
 PHP Markdown Lib
-Copyright (c) 2004-2014 Michel Fortin
-  
+Copyright (c) 2004-2016 Michel Fortin
+  
 All rights reserved.
 
 Based on Markdown  
 Copyright (c) 2003-2005 John Gruber   
-   
+   
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/library/php-markdown/Readme.php b/library/php-markdown/Readme.php
index d007b119f..89449dea4 100644
--- a/library/php-markdown/Readme.php
+++ b/library/php-markdown/Readme.php
@@ -1,18 +1,18 @@
 
     
 		
     
diff --git a/library/php-markdown/composer.json b/library/php-markdown/composer.json
index 45abc6774..c219e543c 100644
--- a/library/php-markdown/composer.json
+++ b/library/php-markdown/composer.json
@@ -2,19 +2,19 @@
 	"name": "michelf/php-markdown",
 	"type": "library",
 	"description": "PHP Markdown",
-	"homepage": "http://michelf.ca/projects/php-markdown/",
+	"homepage": "https://michelf.ca/projects/php-markdown/",
 	"keywords": ["markdown"],
 	"license": "BSD-3-Clause",
 	"authors": [
 		{
 			"name": "Michel Fortin",
 			"email": "michel.fortin@michelf.ca",
-			"homepage": "http://michelf.ca/",
+			"homepage": "https://michelf.ca/",
 			"role": "Developer"
 		},
 		{
 			"name": "John Gruber",
-			"homepage": "http://daringfireball.net/"
+			"homepage": "https://daringfireball.net/"
 		}
 	],
 	"require": {
@@ -22,10 +22,5 @@
 	},
 	"autoload": {
  		"psr-0": { "Michelf": "" }
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-lib": "1.4.x-dev"
-		}
 	}
 }
diff --git a/library/phpsec/Crypt/AES.php b/library/phpsec/Crypt/AES.php
deleted file mode 100644
index 681800a81..000000000
--- a/library/phpsec/Crypt/AES.php
+++ /dev/null
@@ -1,479 +0,0 @@
-
- * setKey('abcdefghijklmnop');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $aes->decrypt($aes->encrypt($plaintext));
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Crypt
- * @package    Crypt_AES
- * @author     Jim Wigginton 
- * @copyright  MMVIII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: AES.php,v 1.7 2010/02/09 06:10:25 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**
- * Include Crypt_Rijndael
- */
-require_once 'Rijndael.php';
-
-/**#@+
- * @access public
- * @see Crypt_AES::encrypt()
- * @see Crypt_AES::decrypt()
- */
-/**
- * Encrypt / decrypt using the Counter mode.
- *
- * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
- */
-define('CRYPT_AES_MODE_CTR', -1);
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_AES_MODE_ECB', 1);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_AES_MODE_CBC', 2);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Crypt_AES::Crypt_AES()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_AES_MODE_INTERNAL', 1);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_AES_MODE_MCRYPT', 2);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of AES.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Crypt_AES
- */
-class Crypt_AES extends Crypt_Rijndael {
-    /**
-     * mcrypt resource for encryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see Crypt_AES::encrypt()
-     * @var String
-     * @access private
-     */
-    var $enmcrypt;
-
-    /**
-     * mcrypt resource for decryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see Crypt_AES::decrypt()
-     * @var String
-     * @access private
-     */
-    var $demcrypt;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.  $mode should only, at present, be
-     * CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC.  If not explictly set, CRYPT_AES_MODE_CBC will be used.
-     *
-     * @param optional Integer $mode
-     * @return Crypt_AES
-     * @access public
-     */
-    function Crypt_AES($mode = CRYPT_AES_MODE_CBC)
-    {
-        if ( !defined('CRYPT_AES_MODE') ) {
-            switch (true) {
-                case extension_loaded('mcrypt'):
-                    // i'd check to see if aes was supported, by doing in_array('des', mcrypt_list_algorithms('')),
-                    // but since that can be changed after the object has been created, there doesn't seem to be
-                    // a lot of point...
-                    define('CRYPT_AES_MODE', CRYPT_AES_MODE_MCRYPT);
-                    break;
-                default:
-                    define('CRYPT_AES_MODE', CRYPT_AES_MODE_INTERNAL);
-            }
-        }
-
-        switch ( CRYPT_AES_MODE ) {
-            case CRYPT_AES_MODE_MCRYPT:
-                switch ($mode) {
-                    case CRYPT_AES_MODE_ECB:
-                        $this->mode = MCRYPT_MODE_ECB;
-                        break;
-                    case CRYPT_AES_MODE_CTR:
-                        // ctr doesn't have a constant associated with it even though it appears to be fairly widely
-                        // supported.  in lieu of knowing just how widely supported it is, i've, for now, opted not to
-                        // include a compatibility layer.  the layer has been implemented but, for now, is commented out.
-                        $this->mode = 'ctr';
-                        //$this->mode = in_array('ctr', mcrypt_list_modes()) ? 'ctr' : CRYPT_AES_MODE_CTR;
-                        break;
-                    case CRYPT_AES_MODE_CBC:
-                    default:
-                        $this->mode = MCRYPT_MODE_CBC;
-                }
-
-                break;
-            default:
-                switch ($mode) {
-                    case CRYPT_AES_MODE_ECB:
-                        $this->mode = CRYPT_RIJNDAEL_MODE_ECB;
-                        break;
-                    case CRYPT_AES_MODE_CTR:
-                        $this->mode = CRYPT_RIJNDAEL_MODE_CTR;
-                        break;
-                    case CRYPT_AES_MODE_CBC:
-                    default:
-                        $this->mode = CRYPT_RIJNDAEL_MODE_CBC;
-                }
-        }
-
-        if (CRYPT_AES_MODE == CRYPT_AES_MODE_INTERNAL) {
-            parent::Crypt_Rijndael($this->mode);
-        }
-    }
-
-    /**
-     * Dummy function
-     *
-     * Since Crypt_AES extends Crypt_Rijndael, this function is, technically, available, but it doesn't do anything.
-     *
-     * @access public
-     * @param Integer $length
-     */
-    function setBlockLength($length)
-    {
-        return;
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * $plaintext will be padded with up to 16 additional bytes.  Other AES implementations may or may not pad in the
-     * same manner.  Other common approaches to padding and the reasons why it's necessary are discussed in the following
-     * URL:
-     *
-     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-     *
-     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-     * strlen($plaintext) will still need to be a multiple of 16, however, arbitrary values can be added to make it that
-     * length.
-     *
-     * @see Crypt_AES::decrypt()
-     * @access public
-     * @param String $plaintext
-     */
-    function encrypt($plaintext)
-    {
-        if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
-            $this->_mcryptSetup();
-            /*
-            if ($this->mode == CRYPT_AES_MODE_CTR) {
-                $iv = $this->encryptIV;
-                $xor = mcrypt_generic($this->enmcrypt, $this->_generate_xor(strlen($plaintext), $iv));
-                $ciphertext = $plaintext ^ $xor;
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $iv;
-                }
-                return $ciphertext;
-            }
-            */
-
-            if ($this->mode != 'ctr') {
-                $plaintext = $this->_pad($plaintext);
-            }
-
-            $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->iv);
-            }
-
-            return $ciphertext;
-        }
-
-        return parent::encrypt($plaintext);
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * If strlen($ciphertext) is not a multiple of 16, null bytes will be added to the end of the string until it is.
-     *
-     * @see Crypt_AES::encrypt()
-     * @access public
-     * @param String $ciphertext
-     */
-    function decrypt($ciphertext)
-    {
-        if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
-            $this->_mcryptSetup();
-            /*
-            if ($this->mode == CRYPT_AES_MODE_CTR) {
-                $iv = $this->decryptIV;
-                $xor = mcrypt_generic($this->enmcrypt, $this->_generate_xor(strlen($ciphertext), $iv));
-                $plaintext = $ciphertext ^ $xor;
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $iv;
-                }
-                return $plaintext;
-            }
-            */
-
-            if ($this->mode != 'ctr') {
-                // we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-                // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-                $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 15) & 0xFFFFFFF0, chr(0));
-            }
-
-            $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->iv);
-            }
-
-            return $this->mode != 'ctr' ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        return parent::decrypt($ciphertext);
-    }
-
-    /**
-     * Setup mcrypt
-     *
-     * Validates all the variables.
-     *
-     * @access private
-     */
-    function _mcryptSetup()
-    {
-        if (!$this->changed) {
-            return;
-        }
-
-        if (!$this->explicit_key_length) {
-            // this just copied from Crypt_Rijndael::_setup()
-            $length = strlen($this->key) >> 2;
-            if ($length > 8) {
-                $length = 8;
-            } else if ($length < 4) {
-                $length = 4;
-            }
-            $this->Nk = $length;
-            $this->key_size = $length << 2;
-        }
-
-        switch ($this->Nk) {
-            case 4: // 128
-                $this->key_size = 16;
-                break;
-            case 5: // 160
-            case 6: // 192
-                $this->key_size = 24;
-                break;
-            case 7: // 224
-            case 8: // 256
-                $this->key_size = 32;
-        }
-
-        $this->key = substr($this->key, 0, $this->key_size);
-        $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($this->iv, 0, 16), 16, chr(0));
-
-        if (!isset($this->enmcrypt)) {
-            $mode = $this->mode;
-            //$mode = $this->mode == CRYPT_AES_MODE_CTR ? MCRYPT_MODE_ECB : $this->mode;
-
-            $this->demcrypt = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', $mode, '');
-            $this->enmcrypt = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', $mode, '');
-        } // else should mcrypt_generic_deinit be called?
-
-        mcrypt_generic_init($this->demcrypt, $this->key, $this->iv);
-        mcrypt_generic_init($this->enmcrypt, $this->key, $this->iv);
-
-        $this->changed = false;
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * Optimized over Crypt_Rijndael's implementation by means of loop unrolling.
-     *
-     * @see Crypt_Rijndael::_encryptBlock()
-     * @access private
-     * @param String $in
-     * @return String
-     */
-    function _encryptBlock($in)
-    {
-        $state = unpack('N*word', $in);
-
-        $Nr = $this->Nr;
-        $w = $this->w;
-        $t0 = $this->t0;
-        $t1 = $this->t1;
-        $t2 = $this->t2;
-        $t3 = $this->t3;
-
-        // addRoundKey and reindex $state
-        $state = array(
-            $state['word1'] ^ $w[0][0],
-            $state['word2'] ^ $w[0][1],
-            $state['word3'] ^ $w[0][2],
-            $state['word4'] ^ $w[0][3]
-        );
-
-        // shiftRows + subWord + mixColumns + addRoundKey
-        // we could loop unroll this and use if statements to do more rounds as necessary, but, in my tests, that yields
-        // only a marginal improvement.  since that also, imho, hinders the readability of the code, i've opted not to do it.
-        for ($round = 1; $round < $this->Nr; $round++) {
-            $state = array(
-                $t0[$state[0] & 0xFF000000] ^ $t1[$state[1] & 0x00FF0000] ^ $t2[$state[2] & 0x0000FF00] ^ $t3[$state[3] & 0x000000FF] ^ $w[$round][0],
-                $t0[$state[1] & 0xFF000000] ^ $t1[$state[2] & 0x00FF0000] ^ $t2[$state[3] & 0x0000FF00] ^ $t3[$state[0] & 0x000000FF] ^ $w[$round][1],
-                $t0[$state[2] & 0xFF000000] ^ $t1[$state[3] & 0x00FF0000] ^ $t2[$state[0] & 0x0000FF00] ^ $t3[$state[1] & 0x000000FF] ^ $w[$round][2],
-                $t0[$state[3] & 0xFF000000] ^ $t1[$state[0] & 0x00FF0000] ^ $t2[$state[1] & 0x0000FF00] ^ $t3[$state[2] & 0x000000FF] ^ $w[$round][3]
-            );
-
-        }
-
-        // subWord
-        $state = array(
-            $this->_subWord($state[0]),
-            $this->_subWord($state[1]),
-            $this->_subWord($state[2]),
-            $this->_subWord($state[3])
-        );
-
-        // shiftRows + addRoundKey
-        $state = array(
-            ($state[0] & 0xFF000000) ^ ($state[1] & 0x00FF0000) ^ ($state[2] & 0x0000FF00) ^ ($state[3] & 0x000000FF) ^ $this->w[$this->Nr][0],
-            ($state[1] & 0xFF000000) ^ ($state[2] & 0x00FF0000) ^ ($state[3] & 0x0000FF00) ^ ($state[0] & 0x000000FF) ^ $this->w[$this->Nr][1],
-            ($state[2] & 0xFF000000) ^ ($state[3] & 0x00FF0000) ^ ($state[0] & 0x0000FF00) ^ ($state[1] & 0x000000FF) ^ $this->w[$this->Nr][2],
-            ($state[3] & 0xFF000000) ^ ($state[0] & 0x00FF0000) ^ ($state[1] & 0x0000FF00) ^ ($state[2] & 0x000000FF) ^ $this->w[$this->Nr][3]
-        );
-
-        return pack('N*', $state[0], $state[1], $state[2], $state[3]);
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * Optimized over Crypt_Rijndael's implementation by means of loop unrolling.
-     *
-     * @see Crypt_Rijndael::_decryptBlock()
-     * @access private
-     * @param String $in
-     * @return String
-     */
-    function _decryptBlock($in)
-    {
-        $state = unpack('N*word', $in);
-
-        $Nr = $this->Nr;
-        $dw = $this->dw;
-        $dt0 = $this->dt0;
-        $dt1 = $this->dt1;
-        $dt2 = $this->dt2;
-        $dt3 = $this->dt3;
-
-        // addRoundKey and reindex $state
-        $state = array(
-            $state['word1'] ^ $dw[$this->Nr][0],
-            $state['word2'] ^ $dw[$this->Nr][1],
-            $state['word3'] ^ $dw[$this->Nr][2],
-            $state['word4'] ^ $dw[$this->Nr][3]
-        );
-
-
-        // invShiftRows + invSubBytes + invMixColumns + addRoundKey
-        for ($round = $this->Nr - 1; $round > 0; $round--) {
-            $state = array(
-                $dt0[$state[0] & 0xFF000000] ^ $dt1[$state[3] & 0x00FF0000] ^ $dt2[$state[2] & 0x0000FF00] ^ $dt3[$state[1] & 0x000000FF] ^ $dw[$round][0],
-                $dt0[$state[1] & 0xFF000000] ^ $dt1[$state[0] & 0x00FF0000] ^ $dt2[$state[3] & 0x0000FF00] ^ $dt3[$state[2] & 0x000000FF] ^ $dw[$round][1],
-                $dt0[$state[2] & 0xFF000000] ^ $dt1[$state[1] & 0x00FF0000] ^ $dt2[$state[0] & 0x0000FF00] ^ $dt3[$state[3] & 0x000000FF] ^ $dw[$round][2],
-                $dt0[$state[3] & 0xFF000000] ^ $dt1[$state[2] & 0x00FF0000] ^ $dt2[$state[1] & 0x0000FF00] ^ $dt3[$state[0] & 0x000000FF] ^ $dw[$round][3]
-            );
-        }
-
-        // invShiftRows + invSubWord + addRoundKey
-        $state = array(
-            $this->_invSubWord(($state[0] & 0xFF000000) ^ ($state[3] & 0x00FF0000) ^ ($state[2] & 0x0000FF00) ^ ($state[1] & 0x000000FF)) ^ $dw[0][0],
-            $this->_invSubWord(($state[1] & 0xFF000000) ^ ($state[0] & 0x00FF0000) ^ ($state[3] & 0x0000FF00) ^ ($state[2] & 0x000000FF)) ^ $dw[0][1],
-            $this->_invSubWord(($state[2] & 0xFF000000) ^ ($state[1] & 0x00FF0000) ^ ($state[0] & 0x0000FF00) ^ ($state[3] & 0x000000FF)) ^ $dw[0][2],
-            $this->_invSubWord(($state[3] & 0xFF000000) ^ ($state[2] & 0x00FF0000) ^ ($state[1] & 0x0000FF00) ^ ($state[0] & 0x000000FF)) ^ $dw[0][3]
-        );
-
-        return pack('N*', $state[0], $state[1], $state[2], $state[3]);
-    }
-}
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
\ No newline at end of file
diff --git a/library/phpsec/Crypt/DES.php b/library/phpsec/Crypt/DES.php
deleted file mode 100644
index 431ad539b..000000000
--- a/library/phpsec/Crypt/DES.php
+++ /dev/null
@@ -1,945 +0,0 @@
-
- * setKey('abcdefgh');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $des->decrypt($des->encrypt($plaintext));
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Crypt
- * @package    Crypt_DES
- * @author     Jim Wigginton 
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: DES.php,v 1.12 2010/02/09 06:10:26 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**#@+
- * @access private
- * @see Crypt_DES::_prepareKey()
- * @see Crypt_DES::_processBlock()
- */
-/**
- * Contains array_reverse($keys[CRYPT_DES_DECRYPT])
- */
-define('CRYPT_DES_ENCRYPT', 0);
-/**
- * Contains array_reverse($keys[CRYPT_DES_ENCRYPT])
- */
-define('CRYPT_DES_DECRYPT', 1);
-/**#@-*/
-
-/**#@+
- * @access public
- * @see Crypt_DES::encrypt()
- * @see Crypt_DES::decrypt()
- */
-/**
- * Encrypt / decrypt using the Counter mode.
- *
- * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
- */
-define('CRYPT_DES_MODE_CTR', -1);
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_DES_MODE_ECB', 1);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_DES_MODE_CBC', 2);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Crypt_DES::Crypt_DES()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_DES_MODE_INTERNAL', 1);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_DES_MODE_MCRYPT', 2);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of DES.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Crypt_DES
- */
-class Crypt_DES {
-    /**
-     * The Key Schedule
-     *
-     * @see Crypt_DES::setKey()
-     * @var Array
-     * @access private
-     */
-    var $keys = "\0\0\0\0\0\0\0\0";
-
-    /**
-     * The Encryption Mode
-     *
-     * @see Crypt_DES::Crypt_DES()
-     * @var Integer
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * Continuous Buffer status
-     *
-     * @see Crypt_DES::enableContinuousBuffer()
-     * @var Boolean
-     * @access private
-     */
-    var $continuousBuffer = false;
-
-    /**
-     * Padding status
-     *
-     * @see Crypt_DES::enablePadding()
-     * @var Boolean
-     * @access private
-     */
-    var $padding = true;
-
-    /**
-     * The Initialization Vector
-     *
-     * @see Crypt_DES::setIV()
-     * @var String
-     * @access private
-     */
-    var $iv = "\0\0\0\0\0\0\0\0";
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see Crypt_DES::enableContinuousBuffer()
-     * @var String
-     * @access private
-     */
-    var $encryptIV = "\0\0\0\0\0\0\0\0";
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see Crypt_DES::enableContinuousBuffer()
-     * @var String
-     * @access private
-     */
-    var $decryptIV = "\0\0\0\0\0\0\0\0";
-
-    /**
-     * mcrypt resource for encryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see Crypt_AES::encrypt()
-     * @var String
-     * @access private
-     */
-    var $enmcrypt;
-
-    /**
-     * mcrypt resource for decryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see Crypt_AES::decrypt()
-     * @var String
-     * @access private
-     */
-    var $demcrypt;
-
-    /**
-     * Does the (en|de)mcrypt resource need to be (re)initialized?
-     *
-     * @see setKey()
-     * @see setIV()
-     * @var Boolean
-     * @access private
-     */
-    var $changed = true;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.  $mode should only, at present, be
-     * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
-     *
-     * @param optional Integer $mode
-     * @return Crypt_DES
-     * @access public
-     */
-    function Crypt_DES($mode = CRYPT_MODE_DES_CBC)
-    {
-        if ( !defined('CRYPT_DES_MODE') ) {
-            switch (true) {
-                case extension_loaded('mcrypt'):
-                    // i'd check to see if des was supported, by doing in_array('des', mcrypt_list_algorithms('')),
-                    // but since that can be changed after the object has been created, there doesn't seem to be
-                    // a lot of point...
-                    define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
-                    break;
-                default:
-                    define('CRYPT_DES_MODE', CRYPT_DES_MODE_INTERNAL);
-            }
-        }
-
-        switch ( CRYPT_DES_MODE ) {
-            case CRYPT_DES_MODE_MCRYPT:
-                switch ($mode) {
-                    case CRYPT_DES_MODE_ECB:
-                        $this->mode = MCRYPT_MODE_ECB;
-                        break;
-                    case CRYPT_DES_MODE_CTR:
-                        $this->mode = 'ctr';
-                        //$this->mode = in_array('ctr', mcrypt_list_modes()) ? 'ctr' : CRYPT_DES_MODE_CTR;
-                        break;
-                    case CRYPT_DES_MODE_CBC:
-                    default:
-                        $this->mode = MCRYPT_MODE_CBC;
-                }
-
-                break;
-            default:
-                switch ($mode) {
-                    case CRYPT_DES_MODE_ECB:
-                    case CRYPT_DES_MODE_CTR:
-                    case CRYPT_DES_MODE_CBC:
-                        $this->mode = $mode;
-                        break;
-                    default:
-                        $this->mode = CRYPT_DES_MODE_CBC;
-                }
-        }
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Keys can be of any length.  DES, itself, uses 64-bit keys (eg. strlen($key) == 8), however, we
-     * only use the first eight, if $key has more then eight characters in it, and pad $key with the
-     * null byte if it is less then eight characters long.
-     *
-     * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all zero's.
-     *
-     * @access public
-     * @param String $key
-     */
-    function setKey($key)
-    {
-        $this->keys = ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) ? substr($key, 0, 8) : $this->_prepareKey($key);
-        $this->changed = true;
-    }
-
-    /**
-     * Sets the initialization vector. (optional)
-     *
-     * SetIV is not required when CRYPT_DES_MODE_ECB is being used.  If not explictly set, it'll be assumed
-     * to be all zero's.
-     *
-     * @access public
-     * @param String $iv
-     */
-    function setIV($iv)
-    {
-        $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, 8), 8, chr(0));
-        $this->changed = true;
-    }
-
-    /**
-     * Generate CTR XOR encryption key
-     *
-     * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
-     * plaintext / ciphertext in CTR mode.
-     *
-     * @see Crypt_DES::decrypt()
-     * @see Crypt_DES::encrypt()
-     * @access public
-     * @param Integer $length
-     * @param String $iv
-     */
-    function _generate_xor($length, &$iv)
-    {
-        $xor = '';
-        $num_blocks = ($length + 7) >> 3;
-        for ($i = 0; $i < $num_blocks; $i++) {
-            $xor.= $iv;
-            for ($j = 4; $j <= 8; $j+=4) {
-                $temp = substr($iv, -$j, 4);
-                switch ($temp) {
-                    case "\xFF\xFF\xFF\xFF":
-                        $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
-                        break;
-                    case "\x7F\xFF\xFF\xFF":
-                        $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
-                        break 2;
-                    default:
-                        extract(unpack('Ncount', $temp));
-                        $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
-                        break 2;
-                }
-            }
-        }
-
-        return $xor;
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * $plaintext will be padded with up to 8 additional bytes.  Other DES implementations may or may not pad in the
-     * same manner.  Other common approaches to padding and the reasons why it's necessary are discussed in the following
-     * URL:
-     *
-     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-     *
-     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-     * strlen($plaintext) will still need to be a multiple of 8, however, arbitrary values can be added to make it that
-     * length.
-     *
-     * @see Crypt_DES::decrypt()
-     * @access public
-     * @param String $plaintext
-     */
-    function encrypt($plaintext)
-    {
-        if ($this->mode != CRYPT_DES_MODE_CTR && $this->mode != 'ctr') {
-            $plaintext = $this->_pad($plaintext);
-        }
-
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
-            if ($this->changed) {
-                if (!isset($this->enmcrypt)) {
-                    $this->enmcrypt = mcrypt_module_open(MCRYPT_DES, '', $this->mode, '');
-                }
-                mcrypt_generic_init($this->enmcrypt, $this->keys, $this->encryptIV);
-                $this->changed = false;
-            }
-
-            $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->enmcrypt, $this->keys, $this->encryptIV);
-            }
-
-            return $ciphertext;
-        }
-
-        if (!is_array($this->keys)) {
-            $this->keys = $this->_prepareKey("\0\0\0\0\0\0\0\0");
-        }
-
-        $ciphertext = '';
-        switch ($this->mode) {
-            case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $ciphertext.= $this->_processBlock(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
-                }
-                break;
-            case CRYPT_DES_MODE_CBC:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $block = substr($plaintext, $i, 8);
-                    $block = $this->_processBlock($block ^ $xor, CRYPT_DES_ENCRYPT);
-                    $xor = $block;
-                    $ciphertext.= $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-                break;
-            case CRYPT_DES_MODE_CTR:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $block = substr($plaintext, $i, 8);
-                    $key = $this->_processBlock($this->_generate_xor(8, $xor), CRYPT_DES_ENCRYPT);
-                    $ciphertext.= $block ^ $key;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * If strlen($ciphertext) is not a multiple of 8, null bytes will be added to the end of the string until it is.
-     *
-     * @see Crypt_DES::encrypt()
-     * @access public
-     * @param String $ciphertext
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->mode != CRYPT_DES_MODE_CTR && $this->mode != 'ctr') {
-            // we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-            // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-            $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
-        }
-
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
-            if ($this->changed) {
-                if (!isset($this->demcrypt)) {
-                    $this->demcrypt = mcrypt_module_open(MCRYPT_DES, '', $this->mode, '');
-                }
-                mcrypt_generic_init($this->demcrypt, $this->keys, $this->decryptIV);
-                $this->changed = false;
-            }
-
-            $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->demcrypt, $this->keys, $this->decryptIV);
-            }
-
-            return $this->mode != 'ctr' ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        if (!is_array($this->keys)) {
-            $this->keys = $this->_prepareKey("\0\0\0\0\0\0\0\0");
-        }
-
-        $plaintext = '';
-        switch ($this->mode) {
-            case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $plaintext.= $this->_processBlock(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
-                }
-                break;
-            case CRYPT_DES_MODE_CBC:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $block = substr($ciphertext, $i, 8);
-                    $plaintext.= $this->_processBlock($block, CRYPT_DES_DECRYPT) ^ $xor;
-                    $xor = $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-                break;
-            case CRYPT_DES_MODE_CTR:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $block = substr($ciphertext, $i, 8);
-                    $key = $this->_processBlock($this->_generate_xor(8, $xor), CRYPT_DES_ENCRYPT);
-                    $plaintext.= $block ^ $key;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-        }
-
-        return $this->mode != CRYPT_DES_MODE_CTR ? $this->_unpad($plaintext) : $plaintext;
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 16-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * 
-     *    echo $des->encrypt(substr($plaintext, 0, 8));
-     *    echo $des->encrypt(substr($plaintext, 8, 8));
-     * 
-     * 
-     *    echo $des->encrypt($plaintext);
-     * 
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * 
-     *    $des->encrypt(substr($plaintext, 0, 8));
-     *    echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-     * 
-     * 
-     *    echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-     * 
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the Crypt_DES() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * @see Crypt_DES::disableContinuousBuffer()
-     * @access public
-     */
-    function enableContinuousBuffer()
-    {
-        $this->continuousBuffer = true;
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * @see Crypt_DES::enableContinuousBuffer()
-     * @access public
-     */
-    function disableContinuousBuffer()
-    {
-        $this->continuousBuffer = false;
-        $this->encryptIV = $this->iv;
-        $this->decryptIV = $this->iv;
-    }
-
-    /**
-     * Pad "packets".
-     *
-     * DES works by encrypting eight bytes at a time.  If you ever need to encrypt or decrypt something that's not
-     * a multiple of eight, it becomes necessary to pad the input so that it's length is a multiple of eight.
-     *
-     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH1,
-     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-     * transmitted separately)
-     *
-     * @see Crypt_DES::disablePadding()
-     * @access public
-     */
-    function enablePadding()
-    {
-        $this->padding = true;
-    }
-
-    /**
-     * Do not pad packets.
-     *
-     * @see Crypt_DES::enablePadding()
-     * @access public
-     */
-    function disablePadding()
-    {
-        $this->padding = false;
-    }
-
-    /**
-     * Pads a string
-     *
-     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize (8).
-     * 8 - (strlen($text) & 7) bytes are added, each of which is equal to chr(8 - (strlen($text) & 7)
-     *
-     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-     * and padding will, hence forth, be enabled.
-     *
-     * @see Crypt_DES::_unpad()
-     * @access private
-     */
-    function _pad($text)
-    {
-        $length = strlen($text);
-
-        if (!$this->padding) {
-            if (($length & 7) == 0) {
-                return $text;
-            } else {
-                user_error("The plaintext's length ($length) is not a multiple of the block size (8)", E_USER_NOTICE);
-                $this->padding = true;
-            }
-        }
-
-        $pad = 8 - ($length & 7);
-        return str_pad($text, $length + $pad, chr($pad));
-    }
-
-    /**
-     * Unpads a string
-     *
-     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
-     * and false will be returned.
-     *
-     * @see Crypt_DES::_pad()
-     * @access private
-     */
-    function _unpad($text)
-    {
-        if (!$this->padding) {
-            return $text;
-        }
-
-        $length = ord($text[strlen($text) - 1]);
-
-        if (!$length || $length > 8) {
-            return false;
-        }
-
-        return substr($text, 0, -$length);
-    }
-
-    /**
-     * Encrypts or decrypts a 64-bit block
-     *
-     * $mode should be either CRYPT_DES_ENCRYPT or CRYPT_DES_DECRYPT.  See
-     * {@link http://en.wikipedia.org/wiki/Image:Feistel.png Feistel.png} to get a general
-     * idea of what this function does.
-     *
-     * @access private
-     * @param String $block
-     * @param Integer $mode
-     * @return String
-     */
-    function _processBlock($block, $mode)
-    {
-        // s-boxes.  in the official DES docs, they're described as being matrices that
-        // one accesses by using the first and last bits to determine the row and the
-        // middle four bits to determine the column.  in this implementation, they've
-        // been converted to vectors
-        static $sbox = array(
-            array(
-                14,  0,  4, 15, 13,  7,  1,  4,  2, 14, 15,  2, 11, 13,  8,  1,
-                 3, 10 ,10,  6,  6, 12, 12, 11,  5,  9,  9,  5,  0,  3,  7,  8,
-                 4, 15,  1, 12, 14,  8,  8,  2, 13,  4,  6,  9,  2,  1, 11,  7,
-                15,  5, 12, 11,  9,  3,  7, 14,  3, 10, 10,  0,  5,  6,  0, 13
-            ),
-            array(
-                15,  3,  1, 13,  8,  4, 14,  7,  6, 15, 11,  2,  3,  8,  4, 14,
-                 9, 12,  7,  0,  2,  1, 13, 10, 12,  6,  0,  9,  5, 11, 10,  5,
-                 0, 13, 14,  8,  7, 10, 11,  1, 10,  3,  4, 15, 13,  4,  1,  2,
-                 5, 11,  8,  6, 12,  7,  6, 12,  9,  0,  3,  5,  2, 14, 15,  9
-            ),
-            array(
-                10, 13,  0,  7,  9,  0, 14,  9,  6,  3,  3,  4, 15,  6,  5, 10,
-                 1,  2, 13,  8, 12,  5,  7, 14, 11, 12,  4, 11,  2, 15,  8,  1,
-                13,  1,  6, 10,  4, 13,  9,  0,  8,  6, 15,  9,  3,  8,  0,  7,
-                11,  4,  1, 15,  2, 14, 12,  3,  5, 11, 10,  5, 14,  2,  7, 12
-            ),
-            array(
-                 7, 13, 13,  8, 14, 11,  3,  5,  0,  6,  6, 15,  9,  0, 10,  3,
-                 1,  4,  2,  7,  8,  2,  5, 12, 11,  1, 12, 10,  4, 14, 15,  9,
-                10,  3,  6, 15,  9,  0,  0,  6, 12, 10, 11,  1,  7, 13, 13,  8,
-                15,  9,  1,  4,  3,  5, 14, 11,  5, 12,  2,  7,  8,  2,  4, 14
-            ),
-            array(
-                 2, 14, 12, 11,  4,  2,  1, 12,  7,  4, 10,  7, 11, 13,  6,  1,
-                 8,  5,  5,  0,  3, 15, 15, 10, 13,  3,  0,  9, 14,  8,  9,  6,
-                 4, 11,  2,  8,  1, 12, 11,  7, 10,  1, 13, 14,  7,  2,  8, 13,
-                15,  6,  9, 15, 12,  0,  5,  9,  6, 10,  3,  4,  0,  5, 14,  3
-            ),
-            array(
-                12, 10,  1, 15, 10,  4, 15,  2,  9,  7,  2, 12,  6,  9,  8,  5,
-                 0,  6, 13,  1,  3, 13,  4, 14, 14,  0,  7, 11,  5,  3, 11,  8,
-                 9,  4, 14,  3, 15,  2,  5, 12,  2,  9,  8,  5, 12, 15,  3, 10,
-                 7, 11,  0, 14,  4,  1, 10,  7,  1,  6, 13,  0, 11,  8,  6, 13
-            ),
-            array(
-                 4, 13, 11,  0,  2, 11, 14,  7, 15,  4,  0,  9,  8,  1, 13, 10,
-                 3, 14, 12,  3,  9,  5,  7, 12,  5,  2, 10, 15,  6,  8,  1,  6,
-                 1,  6,  4, 11, 11, 13, 13,  8, 12,  1,  3,  4,  7, 10, 14,  7,
-                10,  9, 15,  5,  6,  0,  8, 15,  0, 14,  5,  2,  9,  3,  2, 12
-            ),
-            array(
-                13,  1,  2, 15,  8, 13,  4,  8,  6, 10, 15,  3, 11,  7,  1,  4,
-                10, 12,  9,  5,  3,  6, 14, 11,  5,  0,  0, 14, 12,  9,  7,  2,
-                 7,  2, 11,  1,  4, 14,  1,  7,  9,  4, 12, 10, 14,  8,  2, 13,
-                 0, 15,  6, 12, 10,  9, 13,  0, 15,  3,  3,  5,  5,  6,  8, 11
-            )
-        );
-
-        $keys = $this->keys;
-
-        $temp = unpack('Na/Nb', $block);
-        $block = array($temp['a'], $temp['b']);
-
-        // because php does arithmetic right shifts, if the most significant bits are set, right
-        // shifting those into the correct position will add 1's - not 0's.  this will intefere
-        // with the | operation unless a second & is done.  so we isolate these bits and left shift
-        // them into place.  we then & each block with 0x7FFFFFFF to prevennt 1's from being added
-        // for any other shifts.
-        $msb = array(
-            ($block[0] >> 31) & 1,
-            ($block[1] >> 31) & 1
-        );
-        $block[0] &= 0x7FFFFFFF;
-        $block[1] &= 0x7FFFFFFF;
-
-        // we isolate the appropriate bit in the appropriate integer and shift as appropriate.  in
-        // some cases, there are going to be multiple bits in the same integer that need to be shifted
-        // in the same way.  we combine those into one shift operation.
-        $block = array(
-            (($block[1] & 0x00000040) << 25) | (($block[1] & 0x00004000) << 16) |
-            (($block[1] & 0x00400001) <<  7) | (($block[1] & 0x40000100) >>  2) |
-            (($block[0] & 0x00000040) << 21) | (($block[0] & 0x00004000) << 12) |
-            (($block[0] & 0x00400001) <<  3) | (($block[0] & 0x40000100) >>  6) |
-            (($block[1] & 0x00000010) << 19) | (($block[1] & 0x00001000) << 10) |
-            (($block[1] & 0x00100000) <<  1) | (($block[1] & 0x10000000) >>  8) |
-            (($block[0] & 0x00000010) << 15) | (($block[0] & 0x00001000) <<  6) |
-            (($block[0] & 0x00100000) >>  3) | (($block[0] & 0x10000000) >> 12) |
-            (($block[1] & 0x00000004) << 13) | (($block[1] & 0x00000400) <<  4) |
-            (($block[1] & 0x00040000) >>  5) | (($block[1] & 0x04000000) >> 14) |
-            (($block[0] & 0x00000004) <<  9) | ( $block[0] & 0x00000400       ) |
-            (($block[0] & 0x00040000) >>  9) | (($block[0] & 0x04000000) >> 18) |
-            (($block[1] & 0x00010000) >> 11) | (($block[1] & 0x01000000) >> 20) |
-            (($block[0] & 0x00010000) >> 15) | (($block[0] & 0x01000000) >> 24)
-        ,
-            (($block[1] & 0x00000080) << 24) | (($block[1] & 0x00008000) << 15) |
-            (($block[1] & 0x00800002) <<  6) | (($block[0] & 0x00000080) << 20) |
-            (($block[0] & 0x00008000) << 11) | (($block[0] & 0x00800002) <<  2) |
-            (($block[1] & 0x00000020) << 18) | (($block[1] & 0x00002000) <<  9) |
-            ( $block[1] & 0x00200000       ) | (($block[1] & 0x20000000) >>  9) |
-            (($block[0] & 0x00000020) << 14) | (($block[0] & 0x00002000) <<  5) |
-            (($block[0] & 0x00200000) >>  4) | (($block[0] & 0x20000000) >> 13) |
-            (($block[1] & 0x00000008) << 12) | (($block[1] & 0x00000800) <<  3) |
-            (($block[1] & 0x00080000) >>  6) | (($block[1] & 0x08000000) >> 15) |
-            (($block[0] & 0x00000008) <<  8) | (($block[0] & 0x00000800) >>  1) |
-            (($block[0] & 0x00080000) >> 10) | (($block[0] & 0x08000000) >> 19) |
-            (($block[1] & 0x00000200) >>  3) | (($block[0] & 0x00000200) >>  7) |
-            (($block[1] & 0x00020000) >> 12) | (($block[1] & 0x02000000) >> 21) |
-            (($block[0] & 0x00020000) >> 16) | (($block[0] & 0x02000000) >> 25) |
-            ($msb[1] << 28) | ($msb[0] << 24)
-        );
-
-        for ($i = 0; $i < 16; $i++) {
-            // start of "the Feistel (F) function" - see the following URL:
-            // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
-            $temp = (($sbox[0][((($block[1] >> 27) & 0x1F) | (($block[1] & 1) << 5)) ^ $keys[$mode][$i][0]]) << 28)
-                  | (($sbox[1][(($block[1] & 0x1F800000) >> 23) ^ $keys[$mode][$i][1]]) << 24)
-                  | (($sbox[2][(($block[1] & 0x01F80000) >> 19) ^ $keys[$mode][$i][2]]) << 20)
-                  | (($sbox[3][(($block[1] & 0x001F8000) >> 15) ^ $keys[$mode][$i][3]]) << 16)
-                  | (($sbox[4][(($block[1] & 0x0001F800) >> 11) ^ $keys[$mode][$i][4]]) << 12)
-                  | (($sbox[5][(($block[1] & 0x00001F80) >>  7) ^ $keys[$mode][$i][5]]) <<  8)
-                  | (($sbox[6][(($block[1] & 0x000001F8) >>  3) ^ $keys[$mode][$i][6]]) <<  4)
-                  | ( $sbox[7][((($block[1] & 0x1F) << 1) | (($block[1] >> 31) & 1)) ^ $keys[$mode][$i][7]]);
-
-            $msb = ($temp >> 31) & 1;
-            $temp &= 0x7FFFFFFF;
-            $newBlock = (($temp & 0x00010000) << 15) | (($temp & 0x02020120) <<  5)
-                      | (($temp & 0x00001800) << 17) | (($temp & 0x01000000) >> 10)
-                      | (($temp & 0x00000008) << 24) | (($temp & 0x00100000) <<  6)
-                      | (($temp & 0x00000010) << 21) | (($temp & 0x00008000) <<  9)
-                      | (($temp & 0x00000200) << 12) | (($temp & 0x10000000) >> 27)
-                      | (($temp & 0x00000040) << 14) | (($temp & 0x08000000) >>  8)
-                      | (($temp & 0x00004000) <<  4) | (($temp & 0x00000002) << 16)
-                      | (($temp & 0x00442000) >>  6) | (($temp & 0x40800000) >> 15)
-                      | (($temp & 0x00000001) << 11) | (($temp & 0x20000000) >> 20)
-                      | (($temp & 0x00080000) >> 13) | (($temp & 0x00000004) <<  3)
-                      | (($temp & 0x04000000) >> 22) | (($temp & 0x00000480) >>  7)
-                      | (($temp & 0x00200000) >> 19) | ($msb << 23);
-            // end of "the Feistel (F) function" - $newBlock is F's output
-
-            $temp = $block[1];
-            $block[1] = $block[0] ^ $newBlock;
-            $block[0] = $temp;
-        }
-
-        $msb = array(
-            ($block[0] >> 31) & 1,
-            ($block[1] >> 31) & 1
-        );
-        $block[0] &= 0x7FFFFFFF;
-        $block[1] &= 0x7FFFFFFF;
-
-        $block = array(
-            (($block[0] & 0x01000004) <<  7) | (($block[1] & 0x01000004) <<  6) |
-            (($block[0] & 0x00010000) << 13) | (($block[1] & 0x00010000) << 12) |
-            (($block[0] & 0x00000100) << 19) | (($block[1] & 0x00000100) << 18) |
-            (($block[0] & 0x00000001) << 25) | (($block[1] & 0x00000001) << 24) |
-            (($block[0] & 0x02000008) >>  2) | (($block[1] & 0x02000008) >>  3) |
-            (($block[0] & 0x00020000) <<  4) | (($block[1] & 0x00020000) <<  3) |
-            (($block[0] & 0x00000200) << 10) | (($block[1] & 0x00000200) <<  9) |
-            (($block[0] & 0x00000002) << 16) | (($block[1] & 0x00000002) << 15) |
-            (($block[0] & 0x04000000) >> 11) | (($block[1] & 0x04000000) >> 12) |
-            (($block[0] & 0x00040000) >>  5) | (($block[1] & 0x00040000) >>  6) |
-            (($block[0] & 0x00000400) <<  1) | ( $block[1] & 0x00000400       ) |
-            (($block[0] & 0x08000000) >> 20) | (($block[1] & 0x08000000) >> 21) |
-            (($block[0] & 0x00080000) >> 14) | (($block[1] & 0x00080000) >> 15) |
-            (($block[0] & 0x00000800) >>  8) | (($block[1] & 0x00000800) >>  9)
-        ,
-            (($block[0] & 0x10000040) <<  3) | (($block[1] & 0x10000040) <<  2) |
-            (($block[0] & 0x00100000) <<  9) | (($block[1] & 0x00100000) <<  8) |
-            (($block[0] & 0x00001000) << 15) | (($block[1] & 0x00001000) << 14) |
-            (($block[0] & 0x00000010) << 21) | (($block[1] & 0x00000010) << 20) |
-            (($block[0] & 0x20000080) >>  6) | (($block[1] & 0x20000080) >>  7) |
-            ( $block[0] & 0x00200000       ) | (($block[1] & 0x00200000) >>  1) |
-            (($block[0] & 0x00002000) <<  6) | (($block[1] & 0x00002000) <<  5) |
-            (($block[0] & 0x00000020) << 12) | (($block[1] & 0x00000020) << 11) |
-            (($block[0] & 0x40000000) >> 15) | (($block[1] & 0x40000000) >> 16) |
-            (($block[0] & 0x00400000) >>  9) | (($block[1] & 0x00400000) >> 10) |
-            (($block[0] & 0x00004000) >>  3) | (($block[1] & 0x00004000) >>  4) |
-            (($block[0] & 0x00800000) >> 18) | (($block[1] & 0x00800000) >> 19) |
-            (($block[0] & 0x00008000) >> 12) | (($block[1] & 0x00008000) >> 13) |
-            ($msb[0] <<  7) | ($msb[1] <<  6)
-        );
-
-        return pack('NN', $block[0], $block[1]);
-    }
-
-    /**
-     * Creates the key schedule.
-     *
-     * @access private
-     * @param String $key
-     * @return Array
-     */
-    function _prepareKey($key)
-    {
-        static $shifts = array( // number of key bits shifted per round
-            1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-        );
-
-        // pad the key and remove extra characters as appropriate.
-        $key = str_pad(substr($key, 0, 8), 8, chr(0));
-
-        $temp = unpack('Na/Nb', $key);
-        $key = array($temp['a'], $temp['b']);
-        $msb = array(
-            ($key[0] >> 31) & 1,
-            ($key[1] >> 31) & 1
-        );
-        $key[0] &= 0x7FFFFFFF;
-        $key[1] &= 0x7FFFFFFF;
-
-        $key = array(
-            (($key[1] & 0x00000002) << 26) | (($key[1] & 0x00000204) << 17) |
-            (($key[1] & 0x00020408) <<  8) | (($key[1] & 0x02040800) >>  1) |
-            (($key[0] & 0x00000002) << 22) | (($key[0] & 0x00000204) << 13) |
-            (($key[0] & 0x00020408) <<  4) | (($key[0] & 0x02040800) >>  5) |
-            (($key[1] & 0x04080000) >> 10) | (($key[0] & 0x04080000) >> 14) |
-            (($key[1] & 0x08000000) >> 19) | (($key[0] & 0x08000000) >> 23) |
-            (($key[0] & 0x00000010) >>  1) | (($key[0] & 0x00001000) >> 10) |
-            (($key[0] & 0x00100000) >> 19) | (($key[0] & 0x10000000) >> 28)
-        ,
-            (($key[1] & 0x00000080) << 20) | (($key[1] & 0x00008000) << 11) |
-            (($key[1] & 0x00800000) <<  2) | (($key[0] & 0x00000080) << 16) |
-            (($key[0] & 0x00008000) <<  7) | (($key[0] & 0x00800000) >>  2) |
-            (($key[1] & 0x00000040) << 13) | (($key[1] & 0x00004000) <<  4) |
-            (($key[1] & 0x00400000) >>  5) | (($key[1] & 0x40000000) >> 14) |
-            (($key[0] & 0x00000040) <<  9) | ( $key[0] & 0x00004000       ) |
-            (($key[0] & 0x00400000) >>  9) | (($key[0] & 0x40000000) >> 18) |
-            (($key[1] & 0x00000020) <<  6) | (($key[1] & 0x00002000) >>  3) |
-            (($key[1] & 0x00200000) >> 12) | (($key[1] & 0x20000000) >> 21) |
-            (($key[0] & 0x00000020) <<  2) | (($key[0] & 0x00002000) >>  7) |
-            (($key[0] & 0x00200000) >> 16) | (($key[0] & 0x20000000) >> 25) |
-            (($key[1] & 0x00000010) >>  1) | (($key[1] & 0x00001000) >> 10) |
-            (($key[1] & 0x00100000) >> 19) | (($key[1] & 0x10000000) >> 28) |
-            ($msb[1] << 24) | ($msb[0] << 20)
-        ); 
-
-        $keys = array();
-        for ($i = 0; $i < 16; $i++) {
-            $key[0] <<= $shifts[$i];
-            $temp = ($key[0] & 0xF0000000) >> 28;
-            $key[0] = ($key[0] | $temp) & 0x0FFFFFFF;
-
-            $key[1] <<= $shifts[$i];
-            $temp = ($key[1] & 0xF0000000) >> 28;
-            $key[1] = ($key[1] | $temp) & 0x0FFFFFFF;
-
-            $temp = array(
-                (($key[1] & 0x00004000) >>  9) | (($key[1] & 0x00000800) >>  7) |
-                (($key[1] & 0x00020000) >> 14) | (($key[1] & 0x00000010) >>  2) |
-                (($key[1] & 0x08000000) >> 26) | (($key[1] & 0x00800000) >> 23)
-            ,
-                (($key[1] & 0x02400000) >> 20) | (($key[1] & 0x00000001) <<  4) |
-                (($key[1] & 0x00002000) >> 10) | (($key[1] & 0x00040000) >> 18) |
-                (($key[1] & 0x00000080) >>  6)
-            ,
-                ( $key[1] & 0x00000020       ) | (($key[1] & 0x00000200) >>  5) |
-                (($key[1] & 0x00010000) >> 13) | (($key[1] & 0x01000000) >> 22) |
-                (($key[1] & 0x00000004) >>  1) | (($key[1] & 0x00100000) >> 20)
-            ,
-                (($key[1] & 0x00001000) >>  7) | (($key[1] & 0x00200000) >> 17) |
-                (($key[1] & 0x00000002) <<  2) | (($key[1] & 0x00000100) >>  6) |
-                (($key[1] & 0x00008000) >> 14) | (($key[1] & 0x04000000) >> 26)
-            ,
-                (($key[0] & 0x00008000) >> 10) | ( $key[0] & 0x00000010       ) |
-                (($key[0] & 0x02000000) >> 22) | (($key[0] & 0x00080000) >> 17) |
-                (($key[0] & 0x00000200) >>  8) | (($key[0] & 0x00000002) >>  1)
-            ,
-                (($key[0] & 0x04000000) >> 21) | (($key[0] & 0x00010000) >> 12) |
-                (($key[0] & 0x00000020) >>  2) | (($key[0] & 0x00000800) >>  9) |
-                (($key[0] & 0x00800000) >> 22) | (($key[0] & 0x00000100) >>  8)
-            ,
-                (($key[0] & 0x00001000) >>  7) | (($key[0] & 0x00000088) >>  3) |
-                (($key[0] & 0x00020000) >> 14) | (($key[0] & 0x00000001) <<  2) |
-                (($key[0] & 0x00400000) >> 21)
-            ,
-                (($key[0] & 0x00000400) >>  5) | (($key[0] & 0x00004000) >> 10) |
-                (($key[0] & 0x00000040) >>  3) | (($key[0] & 0x00100000) >> 18) |
-                (($key[0] & 0x08000000) >> 26) | (($key[0] & 0x01000000) >> 24)
-            );
-
-            $keys[] = $temp;
-        }
-
-        $temp = array(
-            CRYPT_DES_ENCRYPT => $keys,
-            CRYPT_DES_DECRYPT => array_reverse($keys)
-        );
-
-        return $temp;
-    }
-}
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
\ No newline at end of file
diff --git a/library/phpsec/Crypt/Hash.php b/library/phpsec/Crypt/Hash.php
deleted file mode 100644
index ef3a85802..000000000
--- a/library/phpsec/Crypt/Hash.php
+++ /dev/null
@@ -1,816 +0,0 @@
-
- * setKey('abcdefg');
- *
- *    echo base64_encode($hash->hash('abcdefg'));
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Crypt
- * @package    Crypt_Hash
- * @author     Jim Wigginton 
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: Hash.php,v 1.6 2009/11/23 23:37:07 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**#@+
- * @access private
- * @see Crypt_Hash::Crypt_Hash()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_HASH_MODE_INTERNAL', 1);
-/**
- * Toggles the mhash() implementation, which has been deprecated on PHP 5.3.0+.
- */
-define('CRYPT_HASH_MODE_MHASH',    2);
-/**
- * Toggles the hash() implementation, which works on PHP 5.1.2+.
- */
-define('CRYPT_HASH_MODE_HASH',     3);
-/**#@-*/
-
-/**
- * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Crypt_Hash
- */
-class Crypt_Hash {
-    /**
-     * Byte-length of compression blocks / key (Internal HMAC)
-     *
-     * @see Crypt_Hash::setAlgorithm()
-     * @var Integer
-     * @access private
-     */
-    var $b;
-
-    /**
-     * Byte-length of hash output (Internal HMAC)
-     *
-     * @see Crypt_Hash::setHash()
-     * @var Integer
-     * @access private
-     */
-    var $l = false;
-
-    /**
-     * Hash Algorithm
-     *
-     * @see Crypt_Hash::setHash()
-     * @var String
-     * @access private
-     */
-    var $hash;
-
-    /**
-     * Key
-     *
-     * @see Crypt_Hash::setKey()
-     * @var String
-     * @access private
-     */
-    var $key = '';
-
-    /**
-     * Outer XOR (Internal HMAC)
-     *
-     * @see Crypt_Hash::setKey()
-     * @var String
-     * @access private
-     */
-    var $opad;
-
-    /**
-     * Inner XOR (Internal HMAC)
-     *
-     * @see Crypt_Hash::setKey()
-     * @var String
-     * @access private
-     */
-    var $ipad;
-
-    /**
-     * Default Constructor.
-     *
-     * @param optional String $hash
-     * @return Crypt_Hash
-     * @access public
-     */
-    function Crypt_Hash($hash = 'sha1')
-    {
-        if ( !defined('CRYPT_HASH_MODE') ) {
-            switch (true) {
-                case extension_loaded('hash'):
-                    define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_HASH);
-                    break;
-                case extension_loaded('mhash'):
-                    define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_MHASH);
-                    break;
-                default:
-                    define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_INTERNAL);
-            }
-        }
-
-        $this->setHash($hash);
-    }
-
-    /**
-     * Sets the key for HMACs
-     *
-     * Keys can be of any length.
-     *
-     * @access public
-     * @param String $key
-     */
-    function setKey($key)
-    {
-        $this->key = $key;
-    }
-
-    /**
-     * Sets the hash function.
-     *
-     * @access public
-     * @param String $hash
-     */
-    function setHash($hash)
-    {
-        switch ($hash) {
-            case 'md5-96':
-            case 'sha1-96':
-                $this->l = 12; // 96 / 8 = 12
-                break;
-            case 'md2':
-            case 'md5':
-                $this->l = 16;
-                break;
-            case 'sha1':
-                $this->l = 20;
-                break;
-            case 'sha256':
-                $this->l = 32;
-                break;
-            case 'sha384':
-                $this->l = 48;
-                break;
-            case 'sha512':
-                $this->l = 64;
-        }
-
-        switch ($hash) {
-            case 'md2':
-                $mode = CRYPT_HASH_MODE_INTERNAL;
-                break;
-            case 'sha384':
-            case 'sha512':
-                $mode = CRYPT_HASH_MODE == CRYPT_HASH_MODE_MHASH ? CRYPT_HASH_MODE_INTERNAL : CRYPT_HASH_MODE;
-                break;
-            default:
-                $mode = CRYPT_HASH_MODE;
-        }
-
-        switch ( $mode ) {
-            case CRYPT_HASH_MODE_MHASH:
-                switch ($hash) {
-                    case 'md5':
-                    case 'md5-96':
-                        $this->hash = MHASH_MD5;
-                        break;
-                    case 'sha256':
-                        $this->hash = MHASH_SHA256;
-                        break;
-                    case 'sha1':
-                    case 'sha1-96':
-                    default:
-                        $this->hash = MHASH_SHA1;
-                }
-                return;
-            case CRYPT_HASH_MODE_HASH:
-                switch ($hash) {
-                    case 'md5':
-                    case 'md5-96':
-                        $this->hash = 'md5';
-                        return;
-                    case 'sha256':
-                    case 'sha384':
-                    case 'sha512':
-                        $this->hash = $hash;
-                        return;
-                    case 'sha1':
-                    case 'sha1-96':
-                    default:
-                        $this->hash = 'sha1';
-                }
-                return;
-        }
-
-        switch ($hash) {
-            case 'md2':
-                 $this->b = 16;
-                 $this->hash = array($this, '_md2');
-                 break;
-            case 'md5':
-            case 'md5-96':
-                 $this->b = 64;
-                 $this->hash = array($this, '_md5');
-                 break;
-            case 'sha256':
-                 $this->b = 64;
-                 $this->hash = array($this, '_sha256');
-                 break;
-            case 'sha384':
-            case 'sha512':
-                 $this->b = 128;
-                 $this->hash = array($this, '_sha512');
-                 break;
-            case 'sha1':
-            case 'sha1-96':
-            default:
-                 $this->b = 64;
-                 $this->hash = array($this, '_sha1');
-        }
-
-        $this->ipad = str_repeat(chr(0x36), $this->b);
-        $this->opad = str_repeat(chr(0x5C), $this->b);
-    }
-
-    /**
-     * Compute the HMAC.
-     *
-     * @access public
-     * @param String $text
-     * @return String
-     */
-    function hash($text)
-    {
-        $mode = is_array($this->hash) ? CRYPT_HASH_MODE_INTERNAL : CRYPT_HASH_MODE;
-
-        if (!empty($this->key)) {
-            switch ( $mode ) {
-                case CRYPT_HASH_MODE_MHASH:
-                    $output = mhash($this->hash, $text, $this->key);
-                    break;
-                case CRYPT_HASH_MODE_HASH:
-                    $output = hash_hmac($this->hash, $text, $this->key, true);
-                    break;
-                case CRYPT_HASH_MODE_INTERNAL:
-                    /* "Applications that use keys longer than B bytes will first hash the key using H and then use the
-                        resultant L byte string as the actual key to HMAC."
-
-                        -- http://tools.ietf.org/html/rfc2104#section-2 */
-                    $key = strlen($this->key) > $this->b ? call_user_func($this->$hash, $this->key) : $this->key;
-
-                    $key    = str_pad($key, $this->b, chr(0));      // step 1
-                    $temp   = $this->ipad ^ $key;                   // step 2
-                    $temp  .= $text;                                // step 3
-                    $temp   = call_user_func($this->hash, $temp);   // step 4
-                    $output = $this->opad ^ $key;                   // step 5
-                    $output.= $temp;                                // step 6
-                    $output = call_user_func($this->hash, $output); // step 7
-            }
-        } else {
-            switch ( $mode ) {
-                case CRYPT_HASH_MODE_MHASH:
-                    $output = mhash($this->hash, $text);
-                    break;
-                case CRYPT_HASH_MODE_HASH:
-                    $output = hash($this->hash, $text, true);
-                    break;
-                case CRYPT_HASH_MODE_INTERNAL:
-                    $output = call_user_func($this->hash, $text);
-            }
-        }
-
-        return substr($output, 0, $this->l);
-    }
-
-    /**
-     * Returns the hash length (in bytes)
-     *
-     * @access private
-     * @return Integer
-     */
-    function getLength()
-    {
-        return $this->l;
-    }
-
-    /**
-     * Wrapper for MD5
-     *
-     * @access private
-     * @param String $text
-     */
-    function _md5($m)
-    {
-        return pack('H*', md5($m));
-    }
-
-    /**
-     * Wrapper for SHA1
-     *
-     * @access private
-     * @param String $text
-     */
-    function _sha1($m)
-    {
-        return pack('H*', sha1($m));
-    }
-
-    /**
-     * Pure-PHP implementation of MD2
-     *
-     * See {@link http://tools.ietf.org/html/rfc1319 RFC1319}.
-     *
-     * @access private
-     * @param String $text
-     */
-    function _md2($m)
-    {
-        static $s = array(
-             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
-             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
-             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
-            138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
-            245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
-            148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
-             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
-            181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
-            150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
-            112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
-             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
-             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
-            234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
-            129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
-              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
-            203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
-            166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
-             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
-        );
-
-        // Step 1. Append Padding Bytes
-        $pad = 16 - (strlen($m) & 0xF);
-        $m.= str_repeat(chr($pad), $pad);
-
-        $length = strlen($m);
-
-        // Step 2. Append Checksum
-        $c = str_repeat(chr(0), 16);
-        $l = chr(0);
-        for ($i = 0; $i < $length; $i+= 16) {
-            for ($j = 0; $j < 16; $j++) {
-                $c[$j] = chr($s[ord($m[$i + $j] ^ $l)]);
-                $l = $c[$j];
-            }
-        }
-        $m.= $c;
-
-        $length+= 16;
-
-        // Step 3. Initialize MD Buffer
-        $x = str_repeat(chr(0), 48);
-
-        // Step 4. Process Message in 16-Byte Blocks
-        for ($i = 0; $i < $length; $i+= 16) {
-            for ($j = 0; $j < 16; $j++) {
-                $x[$j + 16] = $m[$i + $j];
-                $x[$j + 32] = $x[$j + 16] ^ $x[$j];
-            }
-            $t = chr(0);
-            for ($j = 0; $j < 18; $j++) {
-                for ($k = 0; $k < 48; $k++) {
-                    $x[$k] = $t = $x[$k] ^ chr($s[ord($t)]);
-                    //$t = $x[$k] = $x[$k] ^ chr($s[ord($t)]);
-                }
-                $t = chr(ord($t) + $j);
-            }
-        }
-
-        // Step 5. Output
-        return substr($x, 0, 16);
-    }
-
-    /**
-     * Pure-PHP implementation of SHA256
-     *
-     * See {@link http://en.wikipedia.org/wiki/SHA_hash_functions#SHA-256_.28a_SHA-2_variant.29_pseudocode SHA-256 (a SHA-2 variant) pseudocode - Wikipedia}.
-     *
-     * @access private
-     * @param String $text
-     */
-    function _sha256($m)
-    {
-        if (extension_loaded('suhosin')) {
-            return pack('H*', sha256($m));
-        }
-
-        // Initialize variables
-        $hash = array(
-            0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
-        );
-        // Initialize table of round constants
-        // (first 32 bits of the fractional parts of the cube roots of the first 64 primes 2..311)
-        static $k = array(
-            0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-            0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-            0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-            0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-            0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-            0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-            0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-            0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-        );
-
-        // Pre-processing
-        $length = strlen($m);
-        // to round to nearest 56 mod 64, we'll add 64 - (length + (64 - 56)) % 64
-        $m.= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
-        $m[$length] = chr(0x80);
-        // we don't support hashing strings 512MB long
-        $m.= pack('N2', 0, $length << 3);
-
-        // Process the message in successive 512-bit chunks
-        $chunks = str_split($m, 64);
-        foreach ($chunks as $chunk) {
-            $w = array();
-            for ($i = 0; $i < 16; $i++) {
-                extract(unpack('Ntemp', $this->_string_shift($chunk, 4)));
-                $w[] = $temp;
-            }
-
-            // Extend the sixteen 32-bit words into sixty-four 32-bit words
-            for ($i = 16; $i < 64; $i++) {
-                $s0 = $this->_rightRotate($w[$i - 15],  7) ^
-                      $this->_rightRotate($w[$i - 15], 18) ^
-                      $this->_rightShift( $w[$i - 15],  3);
-                $s1 = $this->_rightRotate($w[$i - 2], 17) ^
-                      $this->_rightRotate($w[$i - 2], 19) ^
-                      $this->_rightShift( $w[$i - 2], 10);
-                $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
-
-            }
-
-            // Initialize hash value for this chunk
-            list($a, $b, $c, $d, $e, $f, $g, $h) = $hash;
-
-            // Main loop
-            for ($i = 0; $i < 64; $i++) {
-                $s0 = $this->_rightRotate($a,  2) ^
-                      $this->_rightRotate($a, 13) ^
-                      $this->_rightRotate($a, 22);
-                $maj = ($a & $b) ^
-                       ($a & $c) ^
-                       ($b & $c);
-                $t2 = $this->_add($s0, $maj);
-
-                $s1 = $this->_rightRotate($e,  6) ^
-                      $this->_rightRotate($e, 11) ^
-                      $this->_rightRotate($e, 25);
-                $ch = ($e & $f) ^
-                      ($this->_not($e) & $g);
-                $t1 = $this->_add($h, $s1, $ch, $k[$i], $w[$i]);
-
-                $h = $g;
-                $g = $f;
-                $f = $e;
-                $e = $this->_add($d, $t1);
-                $d = $c;
-                $c = $b;
-                $b = $a;
-                $a = $this->_add($t1, $t2);
-            }
-
-            // Add this chunk's hash to result so far
-            $hash = array(
-                $this->_add($hash[0], $a),
-                $this->_add($hash[1], $b),
-                $this->_add($hash[2], $c),
-                $this->_add($hash[3], $d),
-                $this->_add($hash[4], $e),
-                $this->_add($hash[5], $f),
-                $this->_add($hash[6], $g),
-                $this->_add($hash[7], $h)
-            );
-        }
-
-        // Produce the final hash value (big-endian)
-        return pack('N8', $hash[0], $hash[1], $hash[2], $hash[3], $hash[4], $hash[5], $hash[6], $hash[7]);
-    }
-
-    /**
-     * Pure-PHP implementation of SHA384 and SHA512
-     *
-     * @access private
-     * @param String $text
-     */
-    function _sha512($m)
-    {
-        if (!class_exists('Math_BigInteger')) {
-            require_once('Math/BigInteger.php');
-        }
-
-        static $init384, $init512, $k;
-
-        if (!isset($k)) {
-            // Initialize variables
-            $init384 = array( // initial values for SHA384
-                'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939', 
-                '67332667ffc00b31', '8eb44a8768581511', 'db0c2e0d64f98fa7', '47b5481dbefa4fa4'
-            );
-            $init512 = array( // initial values for SHA512
-                '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1', 
-                '510e527fade682d1', '9b05688c2b3e6c1f', '1f83d9abfb41bd6b', '5be0cd19137e2179'
-            );
-
-            for ($i = 0; $i < 8; $i++) {
-                $init384[$i] = new Math_BigInteger($init384[$i], 16);
-                $init384[$i]->setPrecision(64);
-                $init512[$i] = new Math_BigInteger($init512[$i], 16);
-                $init512[$i]->setPrecision(64);
-            }
-
-            // Initialize table of round constants
-            // (first 64 bits of the fractional parts of the cube roots of the first 80 primes 2..409)
-            $k = array(
-                '428a2f98d728ae22', '7137449123ef65cd', 'b5c0fbcfec4d3b2f', 'e9b5dba58189dbbc',
-                '3956c25bf348b538', '59f111f1b605d019', '923f82a4af194f9b', 'ab1c5ed5da6d8118',
-                'd807aa98a3030242', '12835b0145706fbe', '243185be4ee4b28c', '550c7dc3d5ffb4e2',
-                '72be5d74f27b896f', '80deb1fe3b1696b1', '9bdc06a725c71235', 'c19bf174cf692694',
-                'e49b69c19ef14ad2', 'efbe4786384f25e3', '0fc19dc68b8cd5b5', '240ca1cc77ac9c65',
-                '2de92c6f592b0275', '4a7484aa6ea6e483', '5cb0a9dcbd41fbd4', '76f988da831153b5',
-                '983e5152ee66dfab', 'a831c66d2db43210', 'b00327c898fb213f', 'bf597fc7beef0ee4',
-                'c6e00bf33da88fc2', 'd5a79147930aa725', '06ca6351e003826f', '142929670a0e6e70',
-                '27b70a8546d22ffc', '2e1b21385c26c926', '4d2c6dfc5ac42aed', '53380d139d95b3df',
-                '650a73548baf63de', '766a0abb3c77b2a8', '81c2c92e47edaee6', '92722c851482353b',
-                'a2bfe8a14cf10364', 'a81a664bbc423001', 'c24b8b70d0f89791', 'c76c51a30654be30',
-                'd192e819d6ef5218', 'd69906245565a910', 'f40e35855771202a', '106aa07032bbd1b8',
-                '19a4c116b8d2d0c8', '1e376c085141ab53', '2748774cdf8eeb99', '34b0bcb5e19b48a8',
-                '391c0cb3c5c95a63', '4ed8aa4ae3418acb', '5b9cca4f7763e373', '682e6ff3d6b2b8a3',
-                '748f82ee5defb2fc', '78a5636f43172f60', '84c87814a1f0ab72', '8cc702081a6439ec',
-                '90befffa23631e28', 'a4506cebde82bde9', 'bef9a3f7b2c67915', 'c67178f2e372532b',
-                'ca273eceea26619c', 'd186b8c721c0c207', 'eada7dd6cde0eb1e', 'f57d4f7fee6ed178',
-                '06f067aa72176fba', '0a637dc5a2c898a6', '113f9804bef90dae', '1b710b35131c471b',
-                '28db77f523047d84', '32caab7b40c72493', '3c9ebe0a15c9bebc', '431d67c49c100d4c',
-                '4cc5d4becb3e42b6', '597f299cfc657e2a', '5fcb6fab3ad6faec', '6c44198c4a475817'
-            );
-
-            for ($i = 0; $i < 80; $i++) {
-                $k[$i] = new Math_BigInteger($k[$i], 16);
-            }
-        }
-
-        $hash = $this->l == 48 ? $init384 : $init512;
-
-        // Pre-processing
-        $length = strlen($m);
-        // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
-        $m.= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
-        $m[$length] = chr(0x80);
-        // we don't support hashing strings 512MB long
-        $m.= pack('N4', 0, 0, 0, $length << 3);
-
-        // Process the message in successive 1024-bit chunks
-        $chunks = str_split($m, 128);
-        foreach ($chunks as $chunk) {
-            $w = array();
-            for ($i = 0; $i < 16; $i++) {
-                $temp = new Math_BigInteger($this->_string_shift($chunk, 8), 256);
-                $temp->setPrecision(64);
-                $w[] = $temp;
-            }
-
-            // Extend the sixteen 32-bit words into eighty 32-bit words
-            for ($i = 16; $i < 80; $i++) {
-                $temp = array(
-                          $w[$i - 15]->bitwise_rightRotate(1),
-                          $w[$i - 15]->bitwise_rightRotate(8),
-                          $w[$i - 15]->bitwise_rightShift(7)
-                );
-                $s0 = $temp[0]->bitwise_xor($temp[1]);
-                $s0 = $s0->bitwise_xor($temp[2]);
-                $temp = array(
-                          $w[$i - 2]->bitwise_rightRotate(19),
-                          $w[$i - 2]->bitwise_rightRotate(61),
-                          $w[$i - 2]->bitwise_rightShift(6)
-                );
-                $s1 = $temp[0]->bitwise_xor($temp[1]);
-                $s1 = $s1->bitwise_xor($temp[2]);
-                $w[$i] = $w[$i - 16]->copy();
-                $w[$i] = $w[$i]->add($s0);
-                $w[$i] = $w[$i]->add($w[$i - 7]);
-                $w[$i] = $w[$i]->add($s1);
-            }
-
-            // Initialize hash value for this chunk
-            $a = $hash[0]->copy();
-            $b = $hash[1]->copy();
-            $c = $hash[2]->copy();
-            $d = $hash[3]->copy();
-            $e = $hash[4]->copy();
-            $f = $hash[5]->copy();
-            $g = $hash[6]->copy();
-            $h = $hash[7]->copy();
-
-            // Main loop
-            for ($i = 0; $i < 80; $i++) {
-                $temp = array(
-                    $a->bitwise_rightRotate(28),
-                    $a->bitwise_rightRotate(34),
-                    $a->bitwise_rightRotate(39)
-                );
-                $s0 = $temp[0]->bitwise_xor($temp[1]);
-                $s0 = $s0->bitwise_xor($temp[2]);
-                $temp = array(
-                    $a->bitwise_and($b),
-                    $a->bitwise_and($c),
-                    $b->bitwise_and($c)
-                );
-                $maj = $temp[0]->bitwise_xor($temp[1]);
-                $maj = $maj->bitwise_xor($temp[2]);
-                $t2 = $s0->add($maj);
-
-                $temp = array(
-                    $e->bitwise_rightRotate(14),
-                    $e->bitwise_rightRotate(18),
-                    $e->bitwise_rightRotate(41)
-                );
-                $s1 = $temp[0]->bitwise_xor($temp[1]);
-                $s1 = $s1->bitwise_xor($temp[2]);
-                $temp = array(
-                    $e->bitwise_and($f),
-                    $g->bitwise_and($e->bitwise_not())
-                );
-                $ch = $temp[0]->bitwise_xor($temp[1]);
-                $t1 = $h->add($s1);
-                $t1 = $t1->add($ch);
-                $t1 = $t1->add($k[$i]);
-                $t1 = $t1->add($w[$i]);
-
-                $h = $g->copy();
-                $g = $f->copy();
-                $f = $e->copy();
-                $e = $d->add($t1);
-                $d = $c->copy();
-                $c = $b->copy();
-                $b = $a->copy();
-                $a = $t1->add($t2);
-            }
-
-            // Add this chunk's hash to result so far
-            $hash = array(
-                $hash[0]->add($a),
-                $hash[1]->add($b),
-                $hash[2]->add($c),
-                $hash[3]->add($d),
-                $hash[4]->add($e),
-                $hash[5]->add($f),
-                $hash[6]->add($g),
-                $hash[7]->add($h)
-            );
-        }
-
-        // Produce the final hash value (big-endian)
-        // (Crypt_Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
-        $temp = $hash[0]->toBytes() . $hash[1]->toBytes() . $hash[2]->toBytes() . $hash[3]->toBytes() .
-                $hash[4]->toBytes() . $hash[5]->toBytes();
-        if ($this->l != 48) {
-            $temp.= $hash[6]->toBytes() . $hash[7]->toBytes();
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Right Rotate
-     *
-     * @access private
-     * @param Integer $int
-     * @param Integer $amt
-     * @see _sha256()
-     * @return Integer
-     */
-    function _rightRotate($int, $amt)
-    {
-        $invamt = 32 - $amt;
-        $mask = (1 << $invamt) - 1;
-        return (($int << $invamt) & 0xFFFFFFFF) | (($int >> $amt) & $mask);
-    }
-
-    /**
-     * Right Shift
-     *
-     * @access private
-     * @param Integer $int
-     * @param Integer $amt
-     * @see _sha256()
-     * @return Integer
-     */
-    function _rightShift($int, $amt)
-    {
-        $mask = (1 << (32 - $amt)) - 1;
-        return ($int >> $amt) & $mask;
-    }
-
-    /**
-     * Not
-     *
-     * @access private
-     * @param Integer $int
-     * @see _sha256()
-     * @return Integer
-     */
-    function _not($int)
-    {
-        return ~$int & 0xFFFFFFFF;
-    }
-
-    /**
-     * Add
-     *
-     * _sha256() adds multiple unsigned 32-bit integers.  Since PHP doesn't support unsigned integers and since the
-     * possibility of overflow exists, care has to be taken.  Math_BigInteger() could be used but this should be faster.
-     *
-     * @param String $string
-     * @param optional Integer $index
-     * @return String
-     * @see _sha256()
-     * @access private
-     */
-    function _add()
-    {
-        static $mod;
-        if (!isset($mod)) {
-            $mod = pow(2, 32);
-        }
-
-        $result = 0;
-        $arguments = func_get_args();
-        foreach ($arguments as $argument) {
-            $result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
-        }
-
-        return fmod($result, $mod);
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param String $string
-     * @param optional Integer $index
-     * @return String
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-}
\ No newline at end of file
diff --git a/library/phpsec/Crypt/RC4.php b/library/phpsec/Crypt/RC4.php
deleted file mode 100644
index 6f82b2413..000000000
--- a/library/phpsec/Crypt/RC4.php
+++ /dev/null
@@ -1,493 +0,0 @@
-
- * setKey('abcdefgh');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $rc4->decrypt($rc4->encrypt($plaintext));
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Crypt
- * @package    Crypt_RC4
- * @author     Jim Wigginton 
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: RC4.php,v 1.8 2009/06/09 04:00:38 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**#@+
- * @access private
- * @see Crypt_RC4::Crypt_RC4()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_RC4_MODE_INTERNAL', 1);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_RC4_MODE_MCRYPT', 2);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Crypt_RC4::_crypt()
- */
-define('CRYPT_RC4_ENCRYPT', 0);
-define('CRYPT_RC4_DECRYPT', 1);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of RC4.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Crypt_RC4
- */
-class Crypt_RC4 {
-    /**
-     * The Key
-     *
-     * @see Crypt_RC4::setKey()
-     * @var String
-     * @access private
-     */
-    var $key = "\0";
-
-    /**
-     * The Key Stream for encryption
-     *
-     * If CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT, this will be equal to the mcrypt object
-     *
-     * @see Crypt_RC4::setKey()
-     * @var Array
-     * @access private
-     */
-    var $encryptStream = false;
-
-    /**
-     * The Key Stream for decryption
-     *
-     * If CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT, this will be equal to the mcrypt object
-     *
-     * @see Crypt_RC4::setKey()
-     * @var Array
-     * @access private
-     */
-    var $decryptStream = false;
-
-    /**
-     * The $i and $j indexes for encryption
-     *
-     * @see Crypt_RC4::_crypt()
-     * @var Integer
-     * @access private
-     */
-    var $encryptIndex = 0;
-
-    /**
-     * The $i and $j indexes for decryption
-     *
-     * @see Crypt_RC4::_crypt()
-     * @var Integer
-     * @access private
-     */
-    var $decryptIndex = 0;
-
-    /**
-     * MCrypt parameters
-     *
-     * @see Crypt_RC4::setMCrypt()
-     * @var Array
-     * @access private
-     */
-    var $mcrypt = array('', '');
-
-    /**
-     * The Encryption Algorithm
-     *
-     * Only used if CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT.  Only possible values are MCRYPT_RC4 or MCRYPT_ARCFOUR.
-     *
-     * @see Crypt_RC4::Crypt_RC4()
-     * @var Integer
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.
-     *
-     * @param optional Integer $mode
-     * @return Crypt_RC4
-     * @access public
-     */
-    function Crypt_RC4()
-    {
-        if ( !defined('CRYPT_RC4_MODE') ) {
-            switch (true) {
-                case extension_loaded('mcrypt') && (defined('MCRYPT_ARCFOUR') || defined('MCRYPT_RC4')):
-                    // i'd check to see if rc4 was supported, by doing in_array('arcfour', mcrypt_list_algorithms('')),
-                    // but since that can be changed after the object has been created, there doesn't seem to be
-                    // a lot of point...
-                    define('CRYPT_RC4_MODE', CRYPT_RC4_MODE_MCRYPT);
-                    break;
-                default:
-                    define('CRYPT_RC4_MODE', CRYPT_RC4_MODE_INTERNAL);
-            }
-        }
-
-        switch ( CRYPT_RC4_MODE ) {
-            case CRYPT_RC4_MODE_MCRYPT:
-                switch (true) {
-                    case defined('MCRYPT_ARCFOUR'):
-                        $this->mode = MCRYPT_ARCFOUR;
-                        break;
-                    case defined('MCRYPT_RC4');
-                        $this->mode = MCRYPT_RC4;
-                }
-        }
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Keys can be between 1 and 256 bytes long.  If they are longer then 256 bytes, the first 256 bytes will
-     * be used.  If no key is explicitly set, it'll be assumed to be a single null byte.
-     *
-     * @access public
-     * @param String $key
-     */
-    function setKey($key)
-    {
-        $this->key = $key;
-
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
-            return;
-        }
-
-        $keyLength = strlen($key);
-        $keyStream = array();
-        for ($i = 0; $i < 256; $i++) {
-            $keyStream[$i] = $i;
-        }
-        $j = 0;
-        for ($i = 0; $i < 256; $i++) {
-            $j = ($j + $keyStream[$i] + ord($key[$i % $keyLength])) & 255;
-            $temp = $keyStream[$i];
-            $keyStream[$i] = $keyStream[$j];
-            $keyStream[$j] = $temp;
-        }
-
-        $this->encryptIndex = $this->decryptIndex = array(0, 0);
-        $this->encryptStream = $this->decryptStream = $keyStream;
-    }
-
-    /**
-     * Dummy function.
-     *
-     * Some protocols, such as WEP, prepend an "initialization vector" to the key, effectively creating a new key [1].
-     * If you need to use an initialization vector in this manner, feel free to prepend it to the key, yourself, before
-     * calling setKey().
-     *
-     * [1] WEP's initialization vectors (IV's) are used in a somewhat insecure way.  Since, in that protocol,
-     * the IV's are relatively easy to predict, an attack described by
-     * {@link http://www.drizzle.com/~aboba/IEEE/rc4_ksaproc.pdf Scott Fluhrer, Itsik Mantin, and Adi Shamir}
-     * can be used to quickly guess at the rest of the key.  The following links elaborate:
-     *
-     * {@link http://www.rsa.com/rsalabs/node.asp?id=2009 http://www.rsa.com/rsalabs/node.asp?id=2009}
-     * {@link http://en.wikipedia.org/wiki/Related_key_attack http://en.wikipedia.org/wiki/Related_key_attack}
-     *
-     * @param String $iv
-     * @see Crypt_RC4::setKey()
-     * @access public
-     */
-    function setIV($iv)
-    {
-    }
-
-    /**
-     * Sets MCrypt parameters. (optional)
-     *
-     * If MCrypt is being used, empty strings will be used, unless otherwise specified.
-     *
-     * @link http://php.net/function.mcrypt-module-open#function.mcrypt-module-open
-     * @access public
-     * @param optional Integer $algorithm_directory
-     * @param optional Integer $mode_directory
-     */
-    function setMCrypt($algorithm_directory = '', $mode_directory = '')
-    {
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
-            $this->mcrypt = array($algorithm_directory, $mode_directory);
-            $this->_closeMCrypt();
-        }
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * @see Crypt_RC4::_crypt()
-     * @access public
-     * @param String $plaintext
-     */
-    function encrypt($plaintext)
-    {
-        return $this->_crypt($plaintext, CRYPT_RC4_ENCRYPT);
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
-     * Atleast if the continuous buffer is disabled.
-     *
-     * @see Crypt_RC4::_crypt()
-     * @access public
-     * @param String $ciphertext
-     */
-    function decrypt($ciphertext)
-    {
-        return $this->_crypt($ciphertext, CRYPT_RC4_DECRYPT);
-    }
-
-    /**
-     * Encrypts or decrypts a message.
-     *
-     * @see Crypt_RC4::encrypt()
-     * @see Crypt_RC4::decrypt()
-     * @access private
-     * @param String $text
-     * @param Integer $mode
-     */
-    function _crypt($text, $mode)
-    {
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
-            $keyStream = $mode == CRYPT_RC4_ENCRYPT ? 'encryptStream' : 'decryptStream';
-
-            if ($this->$keyStream === false) {
-                $this->$keyStream = mcrypt_module_open($this->mode, $this->mcrypt[0], MCRYPT_MODE_STREAM, $this->mcrypt[1]);
-                mcrypt_generic_init($this->$keyStream, $this->key, '');
-            } else if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->$keyStream, $this->key, '');
-            }
-            $newText = mcrypt_generic($this->$keyStream, $text);
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_deinit($this->$keyStream);
-            }
-
-            return $newText;
-        }
-
-        if ($this->encryptStream === false) {
-            $this->setKey($this->key);
-        }
-
-        switch ($mode) {
-            case CRYPT_RC4_ENCRYPT:
-                $keyStream = $this->encryptStream;
-                list($i, $j) = $this->encryptIndex;
-                break;
-            case CRYPT_RC4_DECRYPT:
-                $keyStream = $this->decryptStream;
-                list($i, $j) = $this->decryptIndex;
-        }
-
-        $newText = '';
-        for ($k = 0; $k < strlen($text); $k++) {
-            $i = ($i + 1) & 255;
-            $j = ($j + $keyStream[$i]) & 255;
-            $temp = $keyStream[$i];
-            $keyStream[$i] = $keyStream[$j];
-            $keyStream[$j] = $temp;
-            $temp = $keyStream[($keyStream[$i] + $keyStream[$j]) & 255];
-            $newText.= chr(ord($text[$k]) ^ $temp);
-        }
-
-        if ($this->continuousBuffer) {
-            switch ($mode) {
-                case CRYPT_RC4_ENCRYPT:
-                    $this->encryptStream = $keyStream;
-                    $this->encryptIndex = array($i, $j);
-                    break;
-                case CRYPT_RC4_DECRYPT:
-                    $this->decryptStream = $keyStream;
-                    $this->decryptIndex = array($i, $j);
-            }
-        }
-
-        return $newText;
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 16-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * 
-     *    echo $rc4->encrypt(substr($plaintext, 0, 8));
-     *    echo $rc4->encrypt(substr($plaintext, 8, 8));
-     * 
-     * 
-     *    echo $rc4->encrypt($plaintext);
-     * 
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * 
-     *    $rc4->encrypt(substr($plaintext, 0, 8));
-     *    echo $rc4->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-     * 
-     * 
-     *    echo $rc4->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-     * 
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the Crypt_DES() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * @see Crypt_RC4::disableContinuousBuffer()
-     * @access public
-     */
-    function enableContinuousBuffer()
-    {
-        $this->continuousBuffer = true;
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * @see Crypt_RC4::enableContinuousBuffer()
-     * @access public
-     */
-    function disableContinuousBuffer()
-    {
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_INTERNAL ) {
-            $this->encryptIndex = $this->decryptIndex = array(0, 0);
-            $this->setKey($this->key);
-        }
-
-        $this->continuousBuffer = false;
-    }
-
-    /**
-     * Dummy function.
-     *
-     * Since RC4 is a stream cipher and not a block cipher, no padding is necessary.  The only reason this function is
-     * included is so that you can switch between a block cipher and a stream cipher transparently.
-     *
-     * @see Crypt_RC4::disablePadding()
-     * @access public
-     */
-    function enablePadding()
-    {
-    }
-
-    /**
-     * Dummy function.
-     *
-     * @see Crypt_RC4::enablePadding()
-     * @access public
-     */
-    function disablePadding()
-    {
-    }
-
-    /**
-     * Class destructor.
-     *
-     * Will be called, automatically, if you're using PHP5.  If you're using PHP4, call it yourself.  Only really
-     * needs to be called if mcrypt is being used.
-     *
-     * @access public
-     */
-    function __destruct()
-    {
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
-            $this->_closeMCrypt();
-        }
-    }
-
-    /**
-     * Properly close the MCrypt objects.
-     *
-     * @access prviate
-     */
-    function _closeMCrypt()
-    {
-        if ( $this->encryptStream !== false ) {
-            if ( $this->continuousBuffer ) {
-                mcrypt_generic_deinit($this->encryptStream);
-            }
-
-            mcrypt_module_close($this->encryptStream);
-
-            $this->encryptStream = false;
-        }
-
-        if ( $this->decryptStream !== false ) {
-            if ( $this->continuousBuffer ) {
-                mcrypt_generic_deinit($this->decryptStream);
-            }
-
-            mcrypt_module_close($this->decryptStream);
-
-            $this->decryptStream = false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/library/phpsec/Crypt/RSA.php b/library/phpsec/Crypt/RSA.php
deleted file mode 100644
index 1c562082b..000000000
--- a/library/phpsec/Crypt/RSA.php
+++ /dev/null
@@ -1,2119 +0,0 @@
-
- * createKey());
- *
- *    $plaintext = 'terrafrost';
- *
- *    $rsa->loadKey($privatekey);
- *    $ciphertext = $rsa->encrypt($plaintext);
- *
- *    $rsa->loadKey($publickey);
- *    echo $rsa->decrypt($ciphertext);
- * ?>
- * 
- *
- * Here's an example of how to create signatures and verify signatures with this library:
- * 
- * createKey());
- *
- *    $plaintext = 'terrafrost';
- *
- *    $rsa->loadKey($privatekey);
- *    $signature = $rsa->sign($plaintext);
- *
- *    $rsa->loadKey($publickey);
- *    echo $rsa->verify($plaintext, $signature) ? 'verified' : 'unverified';
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Crypt
- * @package    Crypt_RSA
- * @author     Jim Wigginton 
- * @copyright  MMIX Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: RSA.php,v 1.15 2010/04/10 15:57:02 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**
- * Include Math_BigInteger
- */
-require_once('Math/BigInteger.php');
-
-/**
- * Include Crypt_Random
- */
-require_once('Crypt/Random.php');
-
-/**
- * Include Crypt_Hash
- */
-require_once('Crypt/Hash.php');
-
-/**#@+
- * @access public
- * @see Crypt_RSA::encrypt()
- * @see Crypt_RSA::decrypt()
- */
-/**
- * Use {@link http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding Optimal Asymmetric Encryption Padding}
- * (OAEP) for encryption / decryption.
- *
- * Uses sha1 by default.
- *
- * @see Crypt_RSA::setHash()
- * @see Crypt_RSA::setMGFHash()
- */
-define('CRYPT_RSA_ENCRYPTION_OAEP',  1);
-/**
- * Use PKCS#1 padding.
- *
- * Although CRYPT_RSA_ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards
- * compatability with protocols (like SSH-1) written before OAEP's introduction.
- */
-define('CRYPT_RSA_ENCRYPTION_PKCS1', 2);
-/**#@-*/
-
-/**#@+
- * @access public
- * @see Crypt_RSA::sign()
- * @see Crypt_RSA::verify()
- * @see Crypt_RSA::setHash()
- */
-/**
- * Use the Probabilistic Signature Scheme for signing
- *
- * Uses sha1 by default.
- *
- * @see Crypt_RSA::setSaltLength()
- * @see Crypt_RSA::setMGFHash()
- */
-define('CRYPT_RSA_SIGNATURE_PSS',  1);
-/**
- * Use the PKCS#1 scheme by default.
- *
- * Although CRYPT_RSA_SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards
- * compatability with protocols (like SSH-2) written before PSS's introduction.
- */
-define('CRYPT_RSA_SIGNATURE_PKCS1', 2);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Crypt_RSA::createKey()
- */
-/**
- * ASN1 Integer
- */
-define('CRYPT_RSA_ASN1_INTEGER',   2);
-/**
- * ASN1 Sequence (with the constucted bit set)
- */
-define('CRYPT_RSA_ASN1_SEQUENCE', 48);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Crypt_RSA::Crypt_RSA()
- */
-/**
- * To use the pure-PHP implementation
- */
-define('CRYPT_RSA_MODE_INTERNAL', 1);
-/**
- * To use the OpenSSL library
- *
- * (if enabled; otherwise, the internal implementation will be used)
- */
-define('CRYPT_RSA_MODE_OPENSSL', 2);
-/**#@-*/
-
-/**#@+
- * @access public
- * @see Crypt_RSA::createKey()
- * @see Crypt_RSA::setPrivateKeyFormat()
- */
-/**
- * PKCS#1 formatted private key
- *
- * Used by OpenSSH
- */
-define('CRYPT_RSA_PRIVATE_FORMAT_PKCS1', 0);
-/**#@-*/
-
-/**#@+
- * @access public
- * @see Crypt_RSA::createKey()
- * @see Crypt_RSA::setPublicKeyFormat()
- */
-/**
- * Raw public key
- *
- * An array containing two Math_BigInteger objects.
- *
- * The exponent can be indexed with any of the following:
- *
- * 0, e, exponent, publicExponent
- *
- * The modulus can be indexed with any of the following:
- *
- * 1, n, modulo, modulus
- */
-define('CRYPT_RSA_PUBLIC_FORMAT_RAW', 1);
-/**
- * PKCS#1 formatted public key
- */
-define('CRYPT_RSA_PUBLIC_FORMAT_PKCS1', 2);
-/**
- * OpenSSH formatted public key
- *
- * Place in $HOME/.ssh/authorized_keys
- */
-define('CRYPT_RSA_PUBLIC_FORMAT_OPENSSH', 3);
-/**#@-*/
-
-/**
- * Pure-PHP PKCS#1 compliant implementation of RSA.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Crypt_RSA
- */
-class Crypt_RSA {
-    /**
-     * Precomputed Zero
-     *
-     * @var Array
-     * @access private
-     */
-    var $zero;
-
-    /**
-     * Precomputed One
-     *
-     * @var Array
-     * @access private
-     */
-    var $one;
-
-    /**
-     * Private Key Format
-     *
-     * @var Integer
-     * @access private
-     */
-    var $privateKeyFormat = CRYPT_RSA_PRIVATE_FORMAT_PKCS1;
-
-    /**
-     * Public Key Format
-     *
-     * @var Integer
-     * @access public
-     */
-    var $publicKeyFormat = CRYPT_RSA_PUBLIC_FORMAT_PKCS1;
-
-    /**
-     * Modulus (ie. n)
-     *
-     * @var Math_BigInteger
-     * @access private
-     */
-    var $modulus;
-
-    /**
-     * Modulus length
-     *
-     * @var Math_BigInteger
-     * @access private
-     */
-    var $k;
-
-    /**
-     * Exponent (ie. e or d)
-     *
-     * @var Math_BigInteger
-     * @access private
-     */
-    var $exponent;
-
-    /**
-     * Primes for Chinese Remainder Theorem (ie. p and q)
-     *
-     * @var Array
-     * @access private
-     */
-    var $primes;
-
-    /**
-     * Exponents for Chinese Remainder Theorem (ie. dP and dQ)
-     *
-     * @var Array
-     * @access private
-     */
-    var $exponents;
-
-    /**
-     * Coefficients for Chinese Remainder Theorem (ie. qInv)
-     *
-     * @var Array
-     * @access private
-     */
-    var $coefficients;
-
-    /**
-     * Hash name
-     *
-     * @var String
-     * @access private
-     */
-    var $hashName;
-
-    /**
-     * Hash function
-     *
-     * @var Crypt_Hash
-     * @access private
-     */
-    var $hash;
-
-    /**
-     * Length of hash function output
-     *
-     * @var Integer
-     * @access private
-     */
-    var $hLen;
-
-    /**
-     * Length of salt
-     *
-     * @var Integer
-     * @access private
-     */
-    var $sLen;
-
-    /**
-     * Hash function for the Mask Generation Function
-     *
-     * @var Crypt_Hash
-     * @access private
-     */
-    var $mgfHash;
-
-    /**
-     * Length of MGF hash function output
-     *
-     * @var Integer
-     * @access private
-     */
-    var $mgfHLen;
-
-    /**
-     * Encryption mode
-     *
-     * @var Integer
-     * @access private
-     */
-    var $encryptionMode = CRYPT_RSA_ENCRYPTION_OAEP;
-
-    /**
-     * Signature mode
-     *
-     * @var Integer
-     * @access private
-     */
-    var $signatureMode = CRYPT_RSA_SIGNATURE_PSS;
-
-    /**
-     * Public Exponent
-     *
-     * @var Mixed
-     * @access private
-     */
-    var $publicExponent = false;
-
-    /**
-     * Password
-     *
-     * @var String
-     * @access private
-     */
-    var $password = '';
-
-    /**
-     * The constructor
-     *
-     * If you want to make use of the openssl extension, you'll need to set the mode manually, yourself.  The reason
-     * Crypt_RSA doesn't do it is because OpenSSL doesn't fail gracefully.  openssl_pkey_new(), in particular, requires
-     * openssl.cnf be present somewhere and, unfortunately, the only real way to find out is too late.
-     *
-     * @return Crypt_RSA
-     * @access public
-     */
-    function Crypt_RSA()
-    {
-        if ( !defined('CRYPT_RSA_MODE') ) {
-            switch (true) {
-                //case extension_loaded('openssl') && version_compare(PHP_VERSION, '4.2.0', '>='):
-                //    define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_OPENSSL);
-                //    break;
-                default:
-                    define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_INTERNAL);
-            }
-        }
-
-        $this->zero = new Math_BigInteger();
-        $this->one = new Math_BigInteger(1);
-
-        $this->hash = new Crypt_Hash('sha1');
-        $this->hLen = $this->hash->getLength();
-        $this->hashName = 'sha1';
-        $this->mgfHash = new Crypt_Hash('sha1');
-        $this->mgfHLen = $this->mgfHash->getLength();
-    }
-
-    /**
-     * Create public / private key pair
-     *
-     * Returns an array with the following three elements:
-     *  - 'privatekey': The private key.
-     *  - 'publickey':  The public key.
-     *  - 'partialkey': A partially computed key (if the execution time exceeded $timeout).
-     *                  Will need to be passed back to Crypt_RSA::createKey() as the third parameter for further processing.
-     *
-     * @access public
-     * @param optional Integer $bits
-     * @param optional Integer $timeout
-     * @param optional Math_BigInteger $p
-     */
-    function createKey($bits = 1024, $timeout = false, $partial = array())
-    {
-        if ( CRYPT_RSA_MODE == CRYPT_RSA_MODE_OPENSSL ) {
-            $rsa = openssl_pkey_new(array('private_key_bits' => $bits));
-            openssl_pkey_export($rsa, $privatekey);
-            $publickey = openssl_pkey_get_details($rsa);
-            $publickey = $publickey['key'];
-
-            if ($this->privateKeyFormat != CRYPT_RSA_PRIVATE_FORMAT_PKCS1) {
-                $privatekey = call_user_func_array(array($this, '_convertPrivateKey'), array_values($this->_parseKey($privatekey, CRYPT_RSA_PRIVATE_FORMAT_PKCS1)));
-                $publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, CRYPT_RSA_PUBLIC_FORMAT_PKCS1)));
-            }
-
-            return array(
-                'privatekey' => $privatekey,
-                'publickey' => $publickey,
-                'partialkey' => false
-            );
-        }
-
-        static $e;
-        if (!isset($e)) {
-            if (!defined('CRYPT_RSA_EXPONENT')) {
-                // http://en.wikipedia.org/wiki/65537_%28number%29
-                define('CRYPT_RSA_EXPONENT', '65537');
-            }
-            if (!defined('CRYPT_RSA_COMMENT')) {
-                define('CRYPT_RSA_COMMENT', 'phpseclib-generated-key');
-            }
-            // per , this number ought not result in primes smaller
-            // than 256 bits.
-            if (!defined('CRYPT_RSA_SMALLEST_PRIME')) {
-                define('CRYPT_RSA_SMALLEST_PRIME', 4096);
-            }
-
-            $e = new Math_BigInteger(CRYPT_RSA_EXPONENT);
-        }
-
-        extract($this->_generateMinMax($bits));
-        $absoluteMin = $min;
-        $temp = $bits >> 1;
-        if ($temp > CRYPT_RSA_SMALLEST_PRIME) {
-            $num_primes = floor($bits / CRYPT_RSA_SMALLEST_PRIME);
-            $temp = CRYPT_RSA_SMALLEST_PRIME;
-        } else {
-            $num_primes = 2;
-        }
-        extract($this->_generateMinMax($temp + $bits % $temp));
-        $finalMax = $max;
-        extract($this->_generateMinMax($temp));
-
-        $generator = new Math_BigInteger();
-        $generator->setRandomGenerator('crypt_random');
-
-        $n = $this->one->copy();
-        if (!empty($partial)) {
-            extract(unserialize($partial));
-        } else {
-            $exponents = $coefficients = $primes = array();
-            $lcm = array(
-                'top' => $this->one->copy(),
-                'bottom' => false
-            );
-        }
-
-        $start = time();
-        $i0 = count($primes) + 1;
-
-        do {
-            for ($i = $i0; $i <= $num_primes; $i++) {
-                if ($timeout !== false) {
-                    $timeout-= time() - $start;
-                    $start = time();
-                    if ($timeout <= 0) {
-                        return serialize(array(
-                            'privatekey' => '',
-                            'publickey'  => '',
-                            'partialkey' => array(
-                                'primes' => $primes,
-                                'coefficients' => $coefficients,
-                                'lcm' => $lcm,
-                                'exponents' => $exponents
-                            )
-                        ));
-                    }
-                }
-
-                if ($i == $num_primes) {
-                    list($min, $temp) = $absoluteMin->divide($n);
-                    if (!$temp->equals($this->zero)) {
-                        $min = $min->add($this->one); // ie. ceil()
-                    }
-                    $primes[$i] = $generator->randomPrime($min, $finalMax, $timeout);
-                } else {
-                    $primes[$i] = $generator->randomPrime($min, $max, $timeout);
-                }
-
-                if ($primes[$i] === false) { // if we've reached the timeout
-                    return array(
-                        'privatekey' => '',
-                        'publickey'  => '',
-                        'partialkey' => empty($primes) ? '' : serialize(array(
-                            'primes' => array_slice($primes, 0, $i - 1),
-                            'coefficients' => $coefficients,
-                            'lcm' => $lcm,
-                            'exponents' => $exponents
-                        ))
-                    );
-                }
-
-                // the first coefficient is calculated differently from the rest
-                // ie. instead of being $primes[1]->modInverse($primes[2]), it's $primes[2]->modInverse($primes[1])
-                if ($i > 2) {
-                    $coefficients[$i] = $n->modInverse($primes[$i]);
-                }
-
-                $n = $n->multiply($primes[$i]);
-
-                $temp = $primes[$i]->subtract($this->one);
-
-                // textbook RSA implementations use Euler's totient function instead of the least common multiple.
-                // see http://en.wikipedia.org/wiki/Euler%27s_totient_function
-                $lcm['top'] = $lcm['top']->multiply($temp);
-                $lcm['bottom'] = $lcm['bottom'] === false ? $temp : $lcm['bottom']->gcd($temp);
-
-                $exponents[$i] = $e->modInverse($temp);
-            }
-
-            list($lcm) = $lcm['top']->divide($lcm['bottom']);
-            $gcd = $lcm->gcd($e);
-            $i0 = 1;
-        } while (!$gcd->equals($this->one));
-
-        $d = $e->modInverse($lcm);
-
-        $coefficients[2] = $primes[2]->modInverse($primes[1]);
-
-        // from :
-        // RSAPrivateKey ::= SEQUENCE {
-        //     version           Version,
-        //     modulus           INTEGER,  -- n
-        //     publicExponent    INTEGER,  -- e
-        //     privateExponent   INTEGER,  -- d
-        //     prime1            INTEGER,  -- p
-        //     prime2            INTEGER,  -- q
-        //     exponent1         INTEGER,  -- d mod (p-1)
-        //     exponent2         INTEGER,  -- d mod (q-1)
-        //     coefficient       INTEGER,  -- (inverse of q) mod p
-        //     otherPrimeInfos   OtherPrimeInfos OPTIONAL
-        // }
-
-        return array(
-            'privatekey' => $this->_convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients),
-            'publickey'  => $this->_convertPublicKey($n, $e),
-            'partialkey' => false
-        );
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @access private
-     * @see setPrivateKeyFormat()
-     * @param String $RSAPrivateKey
-     * @return String
-     */
-    function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
-    {
-        $num_primes = count($primes);
-        $raw = array(
-            'version' => $num_primes == 2 ? chr(0) : chr(1), // two-prime vs. multi
-            'modulus' => $n->toBytes(true),
-            'publicExponent' => $e->toBytes(true),
-            'privateExponent' => $d->toBytes(true),
-            'prime1' => $primes[1]->toBytes(true),
-            'prime2' => $primes[2]->toBytes(true),
-            'exponent1' => $exponents[1]->toBytes(true),
-            'exponent2' => $exponents[2]->toBytes(true),
-            'coefficient' => $coefficients[2]->toBytes(true)
-        );
-
-        // if the format in question does not support multi-prime rsa and multi-prime rsa was used,
-        // call _convertPublicKey() instead.
-        switch ($this->privateKeyFormat) {
-            default: // eg. CRYPT_RSA_PRIVATE_FORMAT_PKCS1
-                $components = array();
-                foreach ($raw as $name => $value) {
-                    $components[$name] = pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($value)), $value);
-                }
-
-                $RSAPrivateKey = implode('', $components);
-
-                if ($num_primes > 2) {
-                    $OtherPrimeInfos = '';
-                    for ($i = 3; $i <= $num_primes; $i++) {
-                        // OtherPrimeInfos ::= SEQUENCE SIZE(1..MAX) OF OtherPrimeInfo
-                        //
-                        // OtherPrimeInfo ::= SEQUENCE {
-                        //     prime             INTEGER,  -- ri
-                        //     exponent          INTEGER,  -- di
-                        //     coefficient       INTEGER   -- ti
-                        // }
-                        $OtherPrimeInfo = pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($primes[$i]->toBytes(true))), $primes[$i]->toBytes(true));
-                        $OtherPrimeInfo.= pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
-                        $OtherPrimeInfo.= pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
-                        $OtherPrimeInfos.= pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
-                    }
-                    $RSAPrivateKey.= pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
-                }
-
-                $RSAPrivateKey = pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
-
-                if (!empty($this->password)) {
-                    $iv = $this->_random(8);
-                    $symkey = pack('H*', md5($this->password . $iv)); // symkey is short for symmetric key
-                    $symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
-                    if (!class_exists('Crypt_TripleDES')) {
-                        require_once('Crypt/TripleDES.php');
-                    }
-                    $des = new Crypt_TripleDES();
-                    $des->setKey($symkey);
-                    $des->setIV($iv);
-                    $iv = strtoupper(bin2hex($iv));
-                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                                     "Proc-Type: 4,ENCRYPTED\r\n" .
-                                     "DEK-Info: DES-EDE3-CBC,$iv\r\n" .
-                                     "\r\n" .
-                                     chunk_split(base64_encode($des->encrypt($RSAPrivateKey))) .
-                                     '-----END RSA PRIVATE KEY-----';
-                } else {
-                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                                     chunk_split(base64_encode($RSAPrivateKey)) .
-                                     '-----END RSA PRIVATE KEY-----';
-                }
-
-                return $RSAPrivateKey;
-        }
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access private
-     * @see setPublicKeyFormat()
-     * @param String $RSAPrivateKey
-     * @return String
-     */
-    function _convertPublicKey($n, $e)
-    {
-        $modulus = $n->toBytes(true);
-        $publicExponent = $e->toBytes(true);
-
-        switch ($this->publicKeyFormat) {
-            case CRYPT_RSA_PUBLIC_FORMAT_RAW:
-                return array('e' => $e->copy(), 'n' => $n->copy());
-            case CRYPT_RSA_PUBLIC_FORMAT_OPENSSH:
-                // from :
-                // string    "ssh-rsa"
-                // mpint     e
-                // mpint     n
-                $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
-                $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . CRYPT_RSA_COMMENT;
-
-                return $RSAPublicKey;
-            default: // eg. CRYPT_RSA_PUBLIC_FORMAT_PKCS1
-                // from :
-                // RSAPublicKey ::= SEQUENCE {
-                //     modulus           INTEGER,  -- n
-                //     publicExponent    INTEGER   -- e
-                // }
-                $components = array(
-                    'modulus' => pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($modulus)), $modulus),
-                    'publicExponent' => pack('Ca*a*', CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(strlen($publicExponent)), $publicExponent)
-                );
-
-                $RSAPublicKey = pack('Ca*a*a*',
-                    CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($components['modulus']) + strlen($components['publicExponent'])),
-                    $components['modulus'], $components['publicExponent']
-                );
-
-                $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-                                 chunk_split(base64_encode($RSAPublicKey)) .
-                                 '-----END PUBLIC KEY-----';
-
-                return $RSAPublicKey;
-        }
-    }
-
-    /**
-     * Break a public or private key down into its constituant components
-     *
-     * @access private
-     * @see _convertPublicKey()
-     * @see _convertPrivateKey()
-     * @param String $key
-     * @param Integer $type
-     * @return Array
-     */
-    function _parseKey($key, $type)
-    {
-        switch ($type) {
-            case CRYPT_RSA_PUBLIC_FORMAT_RAW:
-                if (!is_array($key)) {
-                    return false;
-                }
-                $components = array();
-                switch (true) {
-                    case isset($key['e']):
-                        $components['publicExponent'] = $key['e']->copy();
-                        break;
-                    case isset($key['exponent']):
-                        $components['publicExponent'] = $key['exponent']->copy();
-                        break;
-                    case isset($key['publicExponent']):
-                        $components['publicExponent'] = $key['publicExponent']->copy();
-                        break;
-                    case isset($key[0]):
-                        $components['publicExponent'] = $key[0]->copy();
-                }
-                switch (true) {
-                    case isset($key['n']):
-                        $components['modulus'] = $key['n']->copy();
-                        break;
-                    case isset($key['modulo']):
-                        $components['modulus'] = $key['modulo']->copy();
-                        break;
-                    case isset($key['modulus']):
-                        $components['modulus'] = $key['modulus']->copy();
-                        break;
-                    case isset($key[1]):
-                        $components['modulus'] = $key[1]->copy();
-                }
-                return $components;
-            case CRYPT_RSA_PRIVATE_FORMAT_PKCS1:
-            case CRYPT_RSA_PUBLIC_FORMAT_PKCS1:
-                /* Although PKCS#1 proposes a format that public and private keys can use, encrypting them is
-                   "outside the scope" of PKCS#1.  PKCS#1 then refers you to PKCS#12 and PKCS#15 if you're wanting to
-                   protect private keys, however, that's not what OpenSSL* does.  OpenSSL protects private keys by adding
-                   two new "fields" to the key - DEK-Info and Proc-Type.  These fields are discussed here:
-
-                   http://tools.ietf.org/html/rfc1421#section-4.6.1.1
-                   http://tools.ietf.org/html/rfc1421#section-4.6.1.3
-
-                   DES-EDE3-CBC as an algorithm, however, is not discussed anywhere, near as I can tell.
-                   DES-CBC and DES-EDE are discussed in RFC1423, however, DES-EDE3-CBC isn't, nor is its key derivation
-                   function.  As is, the definitive authority on this encoding scheme isn't the IETF but rather OpenSSL's
-                   own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that 
-                   implementation are part of the standard, as well.
-
-                   * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
-                if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
-                    $iv = pack('H*', trim($matches[2]));
-                    $symkey = pack('H*', md5($this->password . $iv)); // symkey is short for symmetric key
-                    $symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
-                    $ciphertext = preg_replace('#.+(\r|\n|\r\n)\1|[\r\n]|-.+-#s', '', $key);
-                    $ciphertext = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $ciphertext) ? base64_decode($ciphertext) : false;
-                    if ($ciphertext === false) {
-                        $ciphertext = $key;
-                    }
-                    switch ($matches[1]) {
-                        case 'DES-EDE3-CBC':
-                            if (!class_exists('Crypt_TripleDES')) {
-                                require_once('Crypt/TripleDES.php');
-                            }
-                            $crypto = new Crypt_TripleDES();
-                            break;
-                        case 'DES-CBC':
-                            if (!class_exists('Crypt_DES')) {
-                                require_once('Crypt/DES.php');
-                            }
-                            $crypto = new Crypt_DES();
-                            break;
-                        default:
-                            return false;
-                    }
-                    $crypto->setKey($symkey);
-                    $crypto->setIV($iv);
-                    $decoded = $crypto->decrypt($ciphertext);
-                } else {
-                    $decoded = preg_replace('#-.+-|[\r\n]#', '', $key);
-                    $decoded = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $decoded) ? base64_decode($decoded) : false;
-                }
-
-                if ($decoded !== false) {
-                    $key = $decoded;
-                }
-
-                $components = array();
-
-                if (ord($this->_string_shift($key)) != CRYPT_RSA_ASN1_SEQUENCE) {
-                    return false;
-                }
-                if ($this->_decodeLength($key) != strlen($key)) {
-                    return false;
-                }
-
-                $tag = ord($this->_string_shift($key));
-                if ($tag == CRYPT_RSA_ASN1_SEQUENCE) {
-                    /* intended for keys for which OpenSSL's asn1parse returns the following:
-
-                        0:d=0  hl=4 l= 290 cons: SEQUENCE
-                        4:d=1  hl=2 l=  13 cons:  SEQUENCE
-                        6:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
-                       17:d=2  hl=2 l=   0 prim:   NULL
-                       19:d=1  hl=4 l= 271 prim:  BIT STRING */
-                    $this->_string_shift($key, $this->_decodeLength($key));
-                    $this->_string_shift($key); // skip over the BIT STRING tag
-                    $this->_decodeLength($key); // skip over the BIT STRING length
-                    // "The initial octet shall encode, as an unsigned binary integer wtih bit 1 as the least significant bit, the number of
-                    //  unused bits in teh final subsequent octet. The number shall be in the range zero to seven."
-                    //  -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf (section 8.6.2.2)
-                    $this->_string_shift($key);
-                    if (ord($this->_string_shift($key)) != CRYPT_RSA_ASN1_SEQUENCE) {
-                        return false;
-                    }
-                    if ($this->_decodeLength($key) != strlen($key)) {
-                        return false;
-                    }
-                    $tag = ord($this->_string_shift($key));
-                }
-                if ($tag != CRYPT_RSA_ASN1_INTEGER) {
-                    return false;
-                }
-
-                $length = $this->_decodeLength($key);
-                $temp = $this->_string_shift($key, $length);
-                if (strlen($temp) != 1 || ord($temp) > 2) {
-                    $components['modulus'] = new Math_BigInteger($temp, -256);
-                    $this->_string_shift($key); // skip over CRYPT_RSA_ASN1_INTEGER
-                    $length = $this->_decodeLength($key);
-                    $components[$type == CRYPT_RSA_PUBLIC_FORMAT_PKCS1 ? 'publicExponent' : 'privateExponent'] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-
-                    return $components;
-                }
-                if (ord($this->_string_shift($key)) != CRYPT_RSA_ASN1_INTEGER) {
-                    return false;
-                }
-                $length = $this->_decodeLength($key);
-                $components['modulus'] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['publicExponent'] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['privateExponent'] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['primes'] = array(1 => new Math_BigInteger($this->_string_shift($key, $length), -256));
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['primes'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['exponents'] = array(1 => new Math_BigInteger($this->_string_shift($key, $length), -256));
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['exponents'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['coefficients'] = array(2 => new Math_BigInteger($this->_string_shift($key, $length), -256));
-
-                if (!empty($key)) {
-                    if (ord($this->_string_shift($key)) != CRYPT_RSA_ASN1_SEQUENCE) {
-                        return false;
-                    }
-                    $this->_decodeLength($key);
-                    while (!empty($key)) {
-                        if (ord($this->_string_shift($key)) != CRYPT_RSA_ASN1_SEQUENCE) {
-                            return false;
-                        }
-                        $this->_decodeLength($key);
-                        $key = substr($key, 1);
-                        $length = $this->_decodeLength($key);
-                        $components['primes'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                        $this->_string_shift($key);
-                        $length = $this->_decodeLength($key);
-                        $components['exponents'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                        $this->_string_shift($key);
-                        $length = $this->_decodeLength($key);
-                        $components['coefficients'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                    }
-                }
-
-                return $components;
-            case CRYPT_RSA_PUBLIC_FORMAT_OPENSSH:
-                $key = base64_decode(preg_replace('#^ssh-rsa | .+$#', '', $key));
-                if ($key === false) {
-                    return false;
-                }
-
-                $cleanup = substr($key, 0, 11) == "\0\0\0\7ssh-rsa";
-
-                extract(unpack('Nlength', $this->_string_shift($key, 4)));
-                $publicExponent = new Math_BigInteger($this->_string_shift($key, $length), -256);
-                extract(unpack('Nlength', $this->_string_shift($key, 4)));
-                $modulus = new Math_BigInteger($this->_string_shift($key, $length), -256);
-
-                if ($cleanup && strlen($key)) {
-                    extract(unpack('Nlength', $this->_string_shift($key, 4)));
-                    return array(
-                        'modulus' => new Math_BigInteger($this->_string_shift($key, $length), -256),
-                        'publicExponent' => $modulus
-                    );
-                } else {
-                    return array(
-                        'modulus' => $modulus,
-                        'publicExponent' => $publicExponent
-                    );
-                }
-        }
-    }
-
-    /**
-     * Loads a public or private key
-     *
-     * Returns true on success and false on failure (ie. an incorrect password was provided or the key was malformed)
-     *
-     * @access public
-     * @param String $key
-     * @param Integer $type optional
-     */
-    function loadKey($key, $type = CRYPT_RSA_PRIVATE_FORMAT_PKCS1)
-    {
-        $components = $this->_parseKey($key, $type);
-        if ($components === false) {
-            return false;
-        }
-
-        $this->modulus = $components['modulus'];
-        $this->k = strlen($this->modulus->toBytes());
-        $this->exponent = isset($components['privateExponent']) ? $components['privateExponent'] : $components['publicExponent'];
-        if (isset($components['primes'])) {
-            $this->primes = $components['primes'];
-            $this->exponents = $components['exponents'];
-            $this->coefficients = $components['coefficients'];
-            $this->publicExponent = $components['publicExponent'];
-        } else {
-            $this->primes = array();
-            $this->exponents = array();
-            $this->coefficients = array();
-            $this->publicExponent = false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Sets the password
-     *
-     * Private keys can be encrypted with a password.  To unset the password, pass in the empty string or false.
-     * Or rather, pass in $password such that empty($password) is true.
-     *
-     * @see createKey()
-     * @see loadKey()
-     * @access public
-     * @param String $password
-     */
-    function setPassword($password)
-    {
-        $this->password = $password;
-    }
-
-    /**
-     * Defines the public key
-     *
-     * Some private key formats define the public exponent and some don't.  Those that don't define it are problematic when
-     * used in certain contexts.  For example, in SSH-2, RSA authentication works by sending the public key along with a
-     * message signed by the private key to the server.  The SSH-2 server looks the public key up in an index of public keys
-     * and if it's present then proceeds to verify the signature.  Problem is, if your private key doesn't include the public
-     * exponent this won't work unless you manually add the public exponent.
-     *
-     * Do note that when a new key is loaded the index will be cleared.
-     *
-     * Returns true on success, false on failure
-     *
-     * @see getPublicKey()
-     * @access public
-     * @param String $key
-     * @param Integer $type optional
-     * @return Boolean
-     */
-    function setPublicKey($key, $type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
-    {
-        $components = $this->_parseKey($key, $type);
-        if (empty($this->modulus) || !$this->modulus->equals($components['modulus'])) {
-            return false;
-        }
-        $this->publicExponent = $components['publicExponent'];
-    }
-
-    /**
-     * Returns the public key
-     *
-     * The public key is only returned under two circumstances - if the private key had the public key embedded within it
-     * or if the public key was set via setPublicKey().  If the currently loaded key is supposed to be the public key this
-     * function won't return it since this library, for the most part, doesn't distinguish between public and private keys.
-     *
-     * @see getPublicKey()
-     * @access public
-     * @param String $key
-     * @param Integer $type optional
-     */
-    function getPublicKey($type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
-    {
-        if (empty($this->modulus) || empty($this->publicExponent)) {
-            return false;
-        }
-
-        $oldFormat = $this->publicKeyFormat;
-        $this->publicKeyFormat = $type;
-        $temp = $this->_convertPublicKey($this->modulus, $this->publicExponent);
-        $this->publicKeyFormat = $oldFormat;
-        return $temp;
-    }
-
-    /**
-     * Generates the smallest and largest numbers requiring $bits bits
-     *
-     * @access private
-     * @param Integer $bits
-     * @return Array
-     */
-    function _generateMinMax($bits)
-    {
-        $bytes = $bits >> 3;
-        $min = str_repeat(chr(0), $bytes);
-        $max = str_repeat(chr(0xFF), $bytes);
-        $msb = $bits & 7;
-        if ($msb) {
-            $min = chr(1 << ($msb - 1)) . $min;
-            $max = chr((1 << $msb) - 1) . $max;
-        } else {
-            $min[0] = chr(0x80);
-        }
-
-        return array(
-            'min' => new Math_BigInteger($min, 256),
-            'max' => new Math_BigInteger($max, 256)
-        );
-    }
-
-    /**
-     * DER-decode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690  8.1.3} for more information.
-     *
-     * @access private
-     * @param String $string
-     * @return Integer
-     */
-    function _decodeLength(&$string)
-    {
-        $length = ord($this->_string_shift($string));
-        if ( $length & 0x80 ) { // definite length, long form
-            $length&= 0x7F;
-            $temp = $this->_string_shift($string, $length);
-            list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
-        }
-        return $length;
-    }
-
-    /**
-     * DER-encode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690  8.1.3} for more information.
-     *
-     * @access private
-     * @param Integer $length
-     * @return String
-     */
-    function _encodeLength($length)
-    {
-        if ($length <= 0x7F) {
-            return chr($length);
-        }
-
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param String $string
-     * @param optional Integer $index
-     * @return String
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * Determines the private key format
-     *
-     * @see createKey()
-     * @access public
-     * @param Integer $format
-     */
-    function setPrivateKeyFormat($format)
-    {
-        $this->privateKeyFormat = $format;
-    }
-
-    /**
-     * Determines the public key format
-     *
-     * @see createKey()
-     * @access public
-     * @param Integer $format
-     */
-    function setPublicKeyFormat($format)
-    {
-        $this->publicKeyFormat = $format;
-    }
-
-    /**
-     * Determines which hashing function should be used
-     *
-     * Used with signature production / verification and (if the encryption mode is CRYPT_RSA_ENCRYPTION_OAEP) encryption and
-     * decryption.  If $hash isn't supported, sha1 is used.
-     *
-     * @access public
-     * @param String $hash
-     */
-    function setHash($hash)
-    {
-        // Crypt_Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
-        switch ($hash) {
-            case 'md2':
-            case 'md5':
-            case 'sha1':
-            case 'sha256':
-            case 'sha384':
-            case 'sha512':
-                $this->hash = new Crypt_Hash($hash);
-                $this->hashName = $hash;
-                break;
-            default:
-                $this->hash = new Crypt_Hash('sha1');
-                $this->hashName = 'sha1';
-        }
-        $this->hLen = $this->hash->getLength();
-    }
-
-    /**
-     * Determines which hashing function should be used for the mask generation function
-     *
-     * The mask generation function is used by CRYPT_RSA_ENCRYPTION_OAEP and CRYPT_RSA_SIGNATURE_PSS and although it's
-     * best if Hash and MGFHash are set to the same thing this is not a requirement.
-     *
-     * @access public
-     * @param String $hash
-     */
-    function setMGFHash($hash)
-    {
-        // Crypt_Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
-        switch ($hash) {
-            case 'md2':
-            case 'md5':
-            case 'sha1':
-            case 'sha256':
-            case 'sha384':
-            case 'sha512':
-                $this->mgfHash = new Crypt_Hash($hash);
-                break;
-            default:
-                $this->mgfHash = new Crypt_Hash('sha1');
-        }
-        $this->mgfHLen = $this->mgfHash->getLength();
-    }
-
-    /**
-     * Determines the salt length
-     *
-     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-38 RFC3447#page-38}:
-     *
-     *    Typical salt lengths in octets are hLen (the length of the output
-     *    of the hash function Hash) and 0.
-     *
-     * @access public
-     * @param Integer $format
-     */
-    function setSaltLength($sLen)
-    {
-        $this->sLen = $sLen;
-    }
-
-    /**
-     * Generates a random string x bytes long
-     *
-     * @access public
-     * @param Integer $bytes
-     * @param optional Integer $nonzero
-     * @return String
-     */
-    function _random($bytes, $nonzero = false)
-    {
-        $temp = '';
-        if ($nonzero) {
-            for ($i = 0; $i < $bytes; $i++) {
-                $temp.= chr(crypt_random(1, 255));
-            }
-        } else {
-            $ints = ($bytes + 1) >> 2;
-            for ($i = 0; $i < $ints; $i++) {
-                $temp.= pack('N', crypt_random());
-            }
-            $temp = substr($temp, 0, $bytes);
-        }
-        return $temp;
-    }
-
-    /**
-     * Integer-to-Octet-String primitive
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
-     *
-     * @access private
-     * @param Math_BigInteger $x
-     * @param Integer $xLen
-     * @return String
-     */
-    function _i2osp($x, $xLen)
-    {
-        $x = $x->toBytes();
-        if (strlen($x) > $xLen) {
-            user_error('Integer too large', E_USER_NOTICE);
-            return false;
-        }
-        return str_pad($x, $xLen, chr(0), STR_PAD_LEFT);
-    }
-
-    /**
-     * Octet-String-to-Integer primitive
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-4.2 RFC3447#section-4.2}.
-     *
-     * @access private
-     * @param String $x
-     * @return Math_BigInteger
-     */
-    function _os2ip($x)
-    {
-        return new Math_BigInteger($x, 256);
-    }
-
-    /**
-     * Exponentiate with or without Chinese Remainder Theorem
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.2}.
-     *
-     * @access private
-     * @param Math_BigInteger $x
-     * @return Math_BigInteger
-     */
-    function _exponentiate($x)
-    {
-        if (empty($this->primes) || empty($this->coefficients) || empty($this->exponents)) {
-            return $x->modPow($this->exponent, $this->modulus);
-        }
-
-        $num_primes = count($this->primes);
-
-        if (defined('CRYPT_RSA_DISABLE_BLINDING')) {
-            $m_i = array(
-                1 => $x->modPow($this->exponents[1], $this->primes[1]),
-                2 => $x->modPow($this->exponents[2], $this->primes[2])
-            );
-            $h = $m_i[1]->subtract($m_i[2]);
-            $h = $h->multiply($this->coefficients[2]);
-            list(, $h) = $h->divide($this->primes[1]);
-            $m = $m_i[2]->add($h->multiply($this->primes[2]));
-
-            $r = $this->primes[1];
-            for ($i = 3; $i <= $num_primes; $i++) {
-                $m_i = $x->modPow($this->exponents[$i], $this->primes[$i]);
-
-                $r = $r->multiply($this->primes[$i - 1]);
-
-                $h = $m_i->subtract($m);
-                $h = $h->multiply($this->coefficients[$i]);
-                list(, $h) = $h->divide($this->primes[$i]);
-
-                $m = $m->add($r->multiply($h));
-            }
-        } else {
-            $smallest = $this->primes[1];
-            for ($i = 2; $i <= $num_primes; $i++) {
-                if ($smallest->compare($this->primes[$i]) > 0) {
-                    $smallest = $this->primes[$i];
-                }
-            }
-
-            $one = new Math_BigInteger(1);
-            $one->setRandomGenerator('crypt_random');
-
-            $r = $one->random($one, $smallest->subtract($one));
-
-            $m_i = array(
-                1 => $this->_blind($x, $r, 1),
-                2 => $this->_blind($x, $r, 2)
-            );
-            $h = $m_i[1]->subtract($m_i[2]);
-            $h = $h->multiply($this->coefficients[2]);
-            list(, $h) = $h->divide($this->primes[1]);
-            $m = $m_i[2]->add($h->multiply($this->primes[2]));
-
-            $r = $this->primes[1];
-            for ($i = 3; $i <= $num_primes; $i++) {
-                $m_i = $this->_blind($x, $r, $i);
-
-                $r = $r->multiply($this->primes[$i - 1]);
-
-                $h = $m_i->subtract($m);
-                $h = $h->multiply($this->coefficients[$i]);
-                list(, $h) = $h->divide($this->primes[$i]);
-
-                $m = $m->add($r->multiply($h));
-            }
-        }
-
-        return $m;
-    }
-
-    /**
-     * Performs RSA Blinding
-     *
-     * Protects against timing attacks by employing RSA Blinding.
-     * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
-     *
-     * @access private
-     * @param Math_BigInteger $x
-     * @param Math_BigInteger $r
-     * @param Integer $i
-     * @return Math_BigInteger
-     */
-    function _blind($x, $r, $i)
-    {
-        $x = $x->multiply($r->modPow($this->publicExponent, $this->primes[$i]));
-
-        $x = $x->modPow($this->exponents[$i], $this->primes[$i]);
-
-        $r = $r->modInverse($this->primes[$i]);
-        $x = $x->multiply($r);
-        list(, $x) = $x->divide($this->primes[$i]);
-
-        return $x;
-    }
-
-    /**
-     * RSAEP
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
-     *
-     * @access private
-     * @param Math_BigInteger $m
-     * @return Math_BigInteger
-     */
-    function _rsaep($m)
-    {
-        if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
-            user_error('Message representative out of range', E_USER_NOTICE);
-            return false;
-        }
-        return $this->_exponentiate($m);
-    }
-
-    /**
-     * RSADP
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
-     *
-     * @access private
-     * @param Math_BigInteger $c
-     * @return Math_BigInteger
-     */
-    function _rsadp($c)
-    {
-        if ($c->compare($this->zero) < 0 || $c->compare($this->modulus) > 0) {
-            user_error('Ciphertext representative out of range', E_USER_NOTICE);
-            return false;
-        }
-        return $this->_exponentiate($c);
-    }
-
-    /**
-     * RSASP1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
-     *
-     * @access private
-     * @param Math_BigInteger $m
-     * @return Math_BigInteger
-     */
-    function _rsasp1($m)
-    {
-        if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
-            user_error('Message representative out of range', E_USER_NOTICE);
-            return false;
-        }
-        return $this->_exponentiate($m);
-    }
-
-    /**
-     * RSAVP1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
-     *
-     * @access private
-     * @param Math_BigInteger $s
-     * @return Math_BigInteger
-     */
-    function _rsavp1($s)
-    {
-        if ($s->compare($this->zero) < 0 || $s->compare($this->modulus) > 0) {
-            user_error('Signature representative out of range', E_USER_NOTICE);
-            return false;
-        }
-        return $this->_exponentiate($s);
-    }
-
-    /**
-     * MGF1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#appendix-B.2.1 RFC3447#appendix-B.2.1}.
-     *
-     * @access private
-     * @param String $mgfSeed
-     * @param Integer $mgfLen
-     * @return String
-     */
-    function _mgf1($mgfSeed, $maskLen)
-    {
-        // if $maskLen would yield strings larger than 4GB, PKCS#1 suggests a "Mask too long" error be output.
-
-        $t = '';
-        $count = ceil($maskLen / $this->mgfHLen);
-        for ($i = 0; $i < $count; $i++) {
-            $c = pack('N', $i);
-            $t.= $this->mgfHash->hash($mgfSeed . $c);
-        }
-
-        return substr($t, 0, $maskLen);
-    }
-
-    /**
-     * RSAES-OAEP-ENCRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.1 RFC3447#section-7.1.1} and
-     * {http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding OAES}.
-     *
-     * @access private
-     * @param String $m
-     * @param String $l
-     * @return String
-     */
-    function _rsaes_oaep_encrypt($m, $l = '')
-    {
-        $mLen = strlen($m);
-
-        // Length checking
-
-        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        if ($mLen > $this->k - 2 * $this->hLen - 2) {
-            user_error('Message too long', E_USER_NOTICE);
-            return false;
-        }
-
-        // EME-OAEP encoding
-
-        $lHash = $this->hash->hash($l);
-        $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
-        $db = $lHash . $ps . chr(1) . $m;
-        $seed = $this->_random($this->hLen);
-        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
-        $maskedDB = $db ^ $dbMask;
-        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
-        $maskedSeed = $seed ^ $seedMask;
-        $em = chr(0) . $maskedSeed . $maskedDB;
-
-        // RSA encryption
-
-        $m = $this->_os2ip($em);
-        $c = $this->_rsaep($m);
-        $c = $this->_i2osp($c, $this->k);
-
-        // Output the ciphertext C
-
-        return $c;
-    }
-
-    /**
-     * RSAES-OAEP-DECRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.2 RFC3447#section-7.1.2}.  The fact that the error
-     * messages aren't distinguishable from one another hinders debugging, but, to quote from RFC3447#section-7.1.2:
-     * 
-     *    Note.  Care must be taken to ensure that an opponent cannot
-     *    distinguish the different error conditions in Step 3.g, whether by
-     *    error message or timing, or, more generally, learn partial
-     *    information about the encoded message EM.  Otherwise an opponent may
-     *    be able to obtain useful information about the decryption of the
-     *    ciphertext C, leading to a chosen-ciphertext attack such as the one
-     *    observed by Manger [36].
-     *
-     * As for $l...  to quote from {@link http://tools.ietf.org/html/rfc3447#page-17 RFC3447#page-17}:
-     *
-     *    Both the encryption and the decryption operations of RSAES-OAEP take
-     *    the value of a label L as input.  In this version of PKCS #1, L is
-     *    the empty string; other uses of the label are outside the scope of
-     *    this document.
-     *
-     * @access private
-     * @param String $c
-     * @param String $l
-     * @return String
-     */
-    function _rsaes_oaep_decrypt($c, $l = '')
-    {
-        // Length checking
-
-        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        if (strlen($c) != $this->k || $this->k < 2 * $this->hLen + 2) {
-            user_error('Decryption error', E_USER_NOTICE);
-            return false;
-        }
-
-        // RSA decryption
-
-        $c = $this->_os2ip($c);
-        $m = $this->_rsadp($c);
-        if ($m === false) {
-            user_error('Decryption error', E_USER_NOTICE);
-            return false;
-        }
-        $em = $this->_i2osp($m, $this->k);
-
-        // EME-OAEP decoding
-
-        $lHash = $this->hash->hash($l);
-        $y = ord($em[0]);
-        $maskedSeed = substr($em, 1, $this->hLen);
-        $maskedDB = substr($em, $this->hLen + 1);
-        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
-        $seed = $maskedSeed ^ $seedMask;
-        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
-        $db = $maskedDB ^ $dbMask;
-        $lHash2 = substr($db, 0, $this->hLen);
-        $m = substr($db, $this->hLen);
-        if ($lHash != $lHash2) {
-            user_error('Decryption error', E_USER_NOTICE);
-            return false;
-        }
-        $m = ltrim($m, chr(0));
-        if (ord($m[0]) != 1) {
-            user_error('Decryption error', E_USER_NOTICE);
-            return false;
-        }
-
-        // Output the message M
-
-        return substr($m, 1);
-    }
-
-    /**
-     * RSAES-PKCS1-V1_5-ENCRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.1 RFC3447#section-7.2.1}.
-     *
-     * @access private
-     * @param String $m
-     * @return String
-     */
-    function _rsaes_pkcs1_v1_5_encrypt($m)
-    {
-        $mLen = strlen($m);
-
-        // Length checking
-
-        if ($mLen > $this->k - 11) {
-            user_error('Message too long', E_USER_NOTICE);
-            return false;
-        }
-
-        // EME-PKCS1-v1_5 encoding
-
-        $ps = $this->_random($this->k - $mLen - 3, true);
-        $em = chr(0) . chr(2) . $ps . chr(0) . $m;
-
-        // RSA encryption
-        $m = $this->_os2ip($em);
-        $c = $this->_rsaep($m);
-        $c = $this->_i2osp($c, $this->k);
-
-        // Output the ciphertext C
-
-        return $c;
-    }
-
-    /**
-     * RSAES-PKCS1-V1_5-DECRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
-     *
-     * For compatability purposes, this function departs slightly from the description given in RFC3447.
-     * The reason being that RFC2313#section-8.1 (PKCS#1 v1.5) states that ciphertext's encrypted by the
-     * private key should have the second byte set to either 0 or 1 and that ciphertext's encrypted by the
-     * public key should have the second byte set to 2.  In RFC3447 (PKCS#1 v2.1), the second byte is supposed
-     * to be 2 regardless of which key is used.  for compatability purposes, we'll just check to make sure the
-     * second byte is 2 or less.  If it is, we'll accept the decrypted string as valid.
-     *
-     * As a consequence of this, a private key encrypted ciphertext produced with Crypt_RSA may not decrypt
-     * with a strictly PKCS#1 v1.5 compliant RSA implementation.  Public key encrypted ciphertext's should but
-     * not private key encrypted ciphertext's.
-     *
-     * @access private
-     * @param String $c
-     * @return String
-     */
-    function _rsaes_pkcs1_v1_5_decrypt($c)
-    {
-        // Length checking
-
-        if (strlen($c) != $this->k) { // or if k < 11
-            user_error('Decryption error', E_USER_NOTICE);
-            return false;
-        }
-
-        // RSA decryption
-
-        $c = $this->_os2ip($c);
-        $m = $this->_rsadp($c);
-        if ($m === false) {
-            user_error('Decryption error', E_USER_NOTICE);
-            return false;
-        }
-        $em = $this->_i2osp($m, $this->k);
-
-        // EME-PKCS1-v1_5 decoding
-
-        if (ord($em[0]) != 0 || ord($em[1]) > 2) {
-            user_error('Decryption error', E_USER_NOTICE);
-            return false;
-        }
-
-        $ps = substr($em, 2, strpos($em, chr(0), 2) - 2);
-        $m = substr($em, strlen($ps) + 3);
-
-        if (strlen($ps) < 8) {
-            user_error('Decryption error', E_USER_NOTICE);
-            return false;
-        }
-
-        // Output M
-
-        return $m;
-    }
-
-    /**
-     * EMSA-PSS-ENCODE
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.1 RFC3447#section-9.1.1}.
-     *
-     * @access private
-     * @param String $m
-     * @param Integer $emBits
-     */
-    function _emsa_pss_encode($m, $emBits)
-    {
-        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
-        $sLen = $this->sLen == false ? $this->hLen : $this->sLen;
-
-        $mHash = $this->hash->hash($m);
-        if ($emLen < $this->hLen + $sLen + 2) {
-            user_error('Encoding error', E_USER_NOTICE);
-            return false;
-        }
-
-        $salt = $this->_random($sLen);
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
-        $h = $this->hash->hash($m2);
-        $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
-        $db = $ps . chr(1) . $salt;
-        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
-        $maskedDB = $db ^ $dbMask;
-        $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
-        $em = $maskedDB . $h . chr(0xBC);
-
-        return $em;
-    }
-
-    /**
-     * EMSA-PSS-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.2 RFC3447#section-9.1.2}.
-     *
-     * @access private
-     * @param String $m
-     * @param String $em
-     * @param Integer $emBits
-     * @return String
-     */
-    function _emsa_pss_verify($m, $em, $emBits)
-    {
-        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8);
-        $sLen = $this->sLen == false ? $this->hLen : $this->sLen;
-
-        $mHash = $this->hash->hash($m);
-        if ($emLen < $this->hLen + $sLen + 2) {
-            return false;
-        }
-
-        if ($em[strlen($em) - 1] != chr(0xBC)) {
-            return false;
-        }
-
-        $maskedDB = substr($em, 0, $em - $this->hLen - 1);
-        $h = substr($em, $em - $this->hLen - 1, $this->hLen);
-        $temp = chr(0xFF << ($emBits & 7));
-        if ((~$maskedDB[0] & $temp) != $temp) {
-            return false;
-        }
-        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
-        $db = $maskedDB ^ $dbMask;
-        $db[0] = ~chr(0xFF << ($emBits & 7)) & $db[0];
-        $temp = $emLen - $this->hLen - $sLen - 2;
-        if (substr($db, 0, $temp) != str_repeat(chr(0), $temp) || ord($db[$temp]) != 1) {
-            return false;
-        }
-        $salt = substr($db, $temp + 1); // should be $sLen long
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
-        $h2 = $this->hash->hash($m2);
-        return $h == $h2;
-    }
-
-    /**
-     * RSASSA-PSS-SIGN
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.1 RFC3447#section-8.1.1}.
-     *
-     * @access private
-     * @param String $m
-     * @return String
-     */
-    function _rsassa_pss_sign($m)
-    {
-        // EMSA-PSS encoding
-
-        $em = $this->_emsa_pss_encode($m, 8 * $this->k - 1);
-
-        // RSA signature
-
-        $m = $this->_os2ip($em);
-        $s = $this->_rsasp1($m);
-        $s = $this->_i2osp($s, $this->k);
-
-        // Output the signature S
-
-        return $s;
-    }
-
-    /**
-     * RSASSA-PSS-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.2 RFC3447#section-8.1.2}.
-     *
-     * @access private
-     * @param String $m
-     * @param String $s
-     * @return String
-     */
-    function _rsassa_pss_verify($m, $s)
-    {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            user_error('Invalid signature', E_USER_NOTICE);
-            return false;
-        }
-
-        // RSA verification
-
-        $modBits = 8 * $this->k;
-
-        $s2 = $this->_os2ip($s);
-        $m2 = $this->_rsavp1($s2);
-        if ($m2 === false) {
-            user_error('Invalid signature', E_USER_NOTICE);
-            return false;
-        }
-        $em = $this->_i2osp($m2, $modBits >> 3);
-        if ($em === false) {
-            user_error('Invalid signature', E_USER_NOTICE);
-            return false;
-        }
-
-        // EMSA-PSS verification
-
-        return $this->_emsa_pss_verify($m, $em, $modBits - 1);
-    }
-
-    /**
-     * EMSA-PKCS1-V1_5-ENCODE
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.2 RFC3447#section-9.2}.
-     *
-     * @access private
-     * @param String $m
-     * @param Integer $emLen
-     * @return String
-     */
-    function _emsa_pkcs1_v1_5_encode($m, $emLen)
-    {
-        $h = $this->hash->hash($m);
-        if ($h === false) {
-            return false;
-        }
-
-        // see http://tools.ietf.org/html/rfc3447#page-43
-        switch ($this->hashName) {
-            case 'md2':
-                $t = pack('H*', '3020300c06082a864886f70d020205000410');
-                break;
-            case 'md5':
-                $t = pack('H*', '3020300c06082a864886f70d020505000410');
-                break;
-            case 'sha1':
-                $t = pack('H*', '3021300906052b0e03021a05000414');
-                break;
-            case 'sha256':
-                $t = pack('H*', '3031300d060960864801650304020105000420');
-                break;
-            case 'sha384':
-                $t = pack('H*', '3041300d060960864801650304020205000430');
-                break;
-            case 'sha512':
-                $t = pack('H*', '3051300d060960864801650304020305000440');
-        }
-        $t.= $h;
-        $tLen = strlen($t);
-
-        if ($emLen < $tLen + 11) {
-            user_error('Intended encoded message length too short', E_USER_NOTICE);
-            return false;
-        }
-
-        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
-
-        $em = "\0\1$ps\0$t";
-
-        return $em;
-    }
-
-    /**
-     * RSASSA-PKCS1-V1_5-SIGN
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.1 RFC3447#section-8.2.1}.
-     *
-     * @access private
-     * @param String $m
-     * @return String
-     */
-    function _rsassa_pkcs1_v1_5_sign($m)
-    {
-        // EMSA-PKCS1-v1_5 encoding
-
-        $em = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
-        if ($em === false) {
-            user_error('RSA modulus too short', E_USER_NOTICE);
-            return false;
-        }
-
-        // RSA signature
-
-        $m = $this->_os2ip($em);
-        $s = $this->_rsasp1($m);
-        $s = $this->_i2osp($s, $this->k);
-
-        // Output the signature S
-
-        return $s;
-    }
-
-    /**
-     * RSASSA-PKCS1-V1_5-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.2 RFC3447#section-8.2.2}.
-     *
-     * @access private
-     * @param String $m
-     * @return String
-     */
-    function _rsassa_pkcs1_v1_5_verify($m, $s)
-    {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            user_error('Invalid signature', E_USER_NOTICE);
-            return false;
-        }
-
-        // RSA verification
-
-        $s = $this->_os2ip($s);
-        $m2 = $this->_rsavp1($s);
-        if ($m2 === false) {
-            user_error('Invalid signature', E_USER_NOTICE);
-            return false;
-        }
-        $em = $this->_i2osp($m2, $this->k);
-        if ($em === false) {
-            user_error('Invalid signature', E_USER_NOTICE);
-            return false;
-        }
-
-        // EMSA-PKCS1-v1_5 encoding
-
-        $em2 = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
-        if ($em2 === false) {
-            user_error('RSA modulus too short', E_USER_NOTICE);
-            return false;
-        }
-
-        // Compare
-
-        return $em === $em2;
-    }
-
-    /**
-     * Set Encryption Mode
-     *
-     * Valid values include CRYPT_RSA_ENCRYPTION_OAEP and CRYPT_RSA_ENCRYPTION_PKCS1.
-     *
-     * @access public
-     * @param Integer $mode
-     */
-    function setEncryptionMode($mode)
-    {
-        $this->encryptionMode = $mode;
-    }
-
-    /**
-     * Set Signature Mode
-     *
-     * Valid values include CRYPT_RSA_SIGNATURE_PSS and CRYPT_RSA_SIGNATURE_PKCS1
-     *
-     * @access public
-     * @param Integer $mode
-     */
-    function setSignatureMode($mode)
-    {
-        $this->signatureMode = $mode;
-    }
-
-    /**
-     * Encryption
-     *
-     * Both CRYPT_RSA_ENCRYPTION_OAEP and CRYPT_RSA_ENCRYPTION_PKCS1 both place limits on how long $plaintext can be.
-     * If $plaintext exceeds those limits it will be broken up so that it does and the resultant ciphertext's will
-     * be concatenated together.
-     *
-     * @see decrypt()
-     * @access public
-     * @param String $plaintext
-     * @return String
-     */
-    function encrypt($plaintext)
-    {
-        switch ($this->encryptionMode) {
-            case CRYPT_RSA_ENCRYPTION_PKCS1:
-                $length = $this->k - 11;
-                if ($length <= 0) {
-                    return false;
-                }
-
-                $plaintext = str_split($plaintext, $length);
-                $ciphertext = '';
-                foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_rsaes_pkcs1_v1_5_encrypt($m);
-                }
-                return $ciphertext;
-            //case CRYPT_RSA_ENCRYPTION_OAEP:
-            default:
-                $length = $this->k - 2 * $this->hLen - 2;
-                if ($length <= 0) {
-                    return false;
-                }
-
-                $plaintext = str_split($plaintext, $length);
-                $ciphertext = '';
-                foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_rsaes_oaep_encrypt($m);
-                }
-                return $ciphertext;
-        }
-    }
-
-    /**
-     * Decryption
-     *
-     * @see encrypt()
-     * @access public
-     * @param String $plaintext
-     * @return String
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->k <= 0) {
-            return false;
-        }
-
-        $ciphertext = str_split($ciphertext, $this->k);
-        $plaintext = '';
-
-        switch ($this->encryptionMode) {
-            case CRYPT_RSA_ENCRYPTION_PKCS1:
-                $decrypt = '_rsaes_pkcs1_v1_5_decrypt';
-                break;
-            //case CRYPT_RSA_ENCRYPTION_OAEP:
-            default:
-                $decrypt = '_rsaes_oaep_decrypt';
-        }
-
-        foreach ($ciphertext as $c) {
-            $temp = $this->$decrypt($c);
-            if ($temp === false) {
-                return false;
-            }
-            $plaintext.= $temp;
-        }
-
-        return $plaintext;
-    }
-
-    /**
-     * Create a signature
-     *
-     * @see verify()
-     * @access public
-     * @param String $message
-     * @return String
-     */
-    function sign($message)
-    {
-        if (empty($this->modulus) || empty($this->exponent)) {
-            return false;
-        }
-
-        switch ($this->signatureMode) {
-            case CRYPT_RSA_SIGNATURE_PKCS1:
-                return $this->_rsassa_pkcs1_v1_5_sign($message);
-            //case CRYPT_RSA_SIGNATURE_PSS:
-            default:
-                return $this->_rsassa_pss_sign($message);
-        }
-    }
-
-    /**
-     * Verifies a signature
-     *
-     * @see sign()
-     * @access public
-     * @param String $message
-     * @param String $signature
-     * @return Boolean
-     */
-    function verify($message, $signature)
-    {
-        if (empty($this->modulus) || empty($this->exponent)) {
-            return false;
-        }
-
-        switch ($this->signatureMode) {
-            case CRYPT_RSA_SIGNATURE_PKCS1:
-                return $this->_rsassa_pkcs1_v1_5_verify($message, $signature);
-            //case CRYPT_RSA_SIGNATURE_PSS:
-            default:
-                return $this->_rsassa_pss_verify($message, $signature);
-        }
-    }
-}
\ No newline at end of file
diff --git a/library/phpsec/Crypt/Random.php b/library/phpsec/Crypt/Random.php
deleted file mode 100644
index a91c4d3c5..000000000
--- a/library/phpsec/Crypt/Random.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- * 
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Crypt
- * @package    Crypt_Random
- * @author     Jim Wigginton 
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: Random.php,v 1.9 2010/04/24 06:40:48 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**
- * Generate a random value.
- *
- * On 32-bit machines, the largest distance that can exist between $min and $max is 2**31.
- * If $min and $max are farther apart than that then the last ($max - range) numbers.
- *
- * Depending on how this is being used, it may be worth while to write a replacement.  For example,
- * a PHP-based web app that stores its data in an SQL database can collect more entropy than this function
- * can.
- *
- * @param optional Integer $min
- * @param optional Integer $max
- * @return Integer
- * @access public
- */
-function crypt_random($min = 0, $max = 0x7FFFFFFF)
-{
-    if ($min == $max) {
-        return $min;
-    }
-
-    // see http://en.wikipedia.org/wiki//dev/random
-    // if open_basedir is enabled file_exists() will ouput an "open_basedir restriction in effect" warning,
-    // so we suppress it.
-    if (@file_exists('/dev/urandom')) {
-        static $fp;
-        if (!$fp) {
-            $fp = fopen('/dev/urandom', 'rb');
-        }
-        extract(unpack('Nrandom', fread($fp, 4)));
-
-        // say $min = 0 and $max = 3.  if we didn't do abs() then we could have stuff like this:
-        // -4 % 3 + 0 = -1, even though -1 < $min
-        return abs($random) % ($max - $min) + $min;
-    }
-
-    /* Prior to PHP 4.2.0, mt_srand() had to be called before mt_rand() could be called.
-       Prior to PHP 5.2.6, mt_rand()'s automatic seeding was subpar, as elaborated here:
-
-       http://www.suspekt.org/2008/08/17/mt_srand-and-not-so-random-numbers/
-
-       The seeding routine is pretty much ripped from PHP's own internal GENERATE_SEED() macro:
-
-       http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3_2/ext/standard/php_rand.h?view=markup */
-    if (version_compare(PHP_VERSION, '5.2.5', '<=')) { 
-        static $seeded;
-        if (!isset($seeded)) {
-            $seeded = true;
-            mt_srand(fmod(time() * getmypid(), 0x7FFFFFFF) ^ fmod(1000000 * lcg_value(), 0x7FFFFFFF));
-        }
-    }
-
-    static $crypto;
-
-    // The CSPRNG's Yarrow and Fortuna periodically reseed.  This function can be reseeded by hitting F5
-    // in the browser and reloading the page.
-
-    if (!isset($crypto)) {
-        $key = $iv = '';
-        for ($i = 0; $i < 8; $i++) {
-            $key.= pack('n', mt_rand(0, 0xFFFF));
-            $iv .= pack('n', mt_rand(0, 0xFFFF));
-        }
-        switch (true) {
-            case class_exists('Crypt_AES'):
-                $crypto = new Crypt_AES(CRYPT_AES_MODE_CTR);
-                break;
-            case class_exists('Crypt_TripleDES'):
-                $crypto = new Crypt_TripleDES(CRYPT_DES_MODE_CTR);
-                break;
-            case class_exists('Crypt_DES'):
-                $crypto = new Crypt_DES(CRYPT_DES_MODE_CTR);
-                break;
-            case class_exists('Crypt_RC4'):
-                $crypto = new Crypt_RC4();
-                break;
-            default:
-                extract(unpack('Nrandom', pack('H*', sha1(mt_rand(0, 0x7FFFFFFF)))));
-                return abs($random) % ($max - $min) + $min;
-        }
-        $crypto->setKey($key);
-        $crypto->setIV($iv);
-        $crypto->enableContinuousBuffer();
-    }
-
-    extract(unpack('Nrandom', $crypto->encrypt("\0\0\0\0")));
-    return abs($random) % ($max - $min) + $min;
-}
-?>
\ No newline at end of file
diff --git a/library/phpsec/Crypt/Rijndael.php b/library/phpsec/Crypt/Rijndael.php
deleted file mode 100644
index f141f3762..000000000
--- a/library/phpsec/Crypt/Rijndael.php
+++ /dev/null
@@ -1,1242 +0,0 @@
-
- * setKey('abcdefghijklmnop');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $rijndael->decrypt($rijndael->encrypt($plaintext));
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Crypt
- * @package    Crypt_Rijndael
- * @author     Jim Wigginton 
- * @copyright  MMVIII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: Rijndael.php,v 1.12 2010/02/09 06:10:26 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**#@+
- * @access public
- * @see Crypt_Rijndael::encrypt()
- * @see Crypt_Rijndael::decrypt()
- */
-/**
- * Encrypt / decrypt using the Counter mode.
- *
- * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
- */
-define('CRYPT_RIJNDAEL_MODE_CTR', -1);
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_RIJNDAEL_MODE_ECB', 1);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_RIJNDAEL_MODE_CBC', 2);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Crypt_Rijndael::Crypt_Rijndael()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_RIJNDAEL_MODE_INTERNAL', 1);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_RIJNDAEL_MODE_MCRYPT', 2);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of Rijndael.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Crypt_Rijndael
- */
-class Crypt_Rijndael {
-    /**
-     * The Encryption Mode
-     *
-     * @see Crypt_Rijndael::Crypt_Rijndael()
-     * @var Integer
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * The Key
-     *
-     * @see Crypt_Rijndael::setKey()
-     * @var String
-     * @access private
-     */
-    var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-
-    /**
-     * The Initialization Vector
-     *
-     * @see Crypt_Rijndael::setIV()
-     * @var String
-     * @access private
-     */
-    var $iv = '';
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see Crypt_Rijndael::enableContinuousBuffer()
-     * @var String
-     * @access private
-     */
-    var $encryptIV = '';
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see Crypt_Rijndael::enableContinuousBuffer()
-     * @var String
-     * @access private
-     */
-    var $decryptIV = '';
-
-    /**
-     * Continuous Buffer status
-     *
-     * @see Crypt_Rijndael::enableContinuousBuffer()
-     * @var Boolean
-     * @access private
-     */
-    var $continuousBuffer = false;
-
-    /**
-     * Padding status
-     *
-     * @see Crypt_Rijndael::enablePadding()
-     * @var Boolean
-     * @access private
-     */
-    var $padding = true;
-
-    /**
-     * Does the key schedule need to be (re)calculated?
-     *
-     * @see setKey()
-     * @see setBlockLength()
-     * @see setKeyLength()
-     * @var Boolean
-     * @access private
-     */
-    var $changed = true;
-
-    /**
-     * Has the key length explicitly been set or should it be derived from the key, itself?
-     *
-     * @see setKeyLength()
-     * @var Boolean
-     * @access private
-     */
-    var $explicit_key_length = false;
-
-    /**
-     * The Key Schedule
-     *
-     * @see _setup()
-     * @var Array
-     * @access private
-     */
-    var $w;
-
-    /**
-     * The Inverse Key Schedule
-     *
-     * @see _setup()
-     * @var Array
-     * @access private
-     */
-    var $dw;
-
-    /**
-     * The Block Length
-     *
-     * @see setBlockLength()
-     * @var Integer
-     * @access private
-     * @internal The max value is 32, the min value is 16.  All valid values are multiples of 4.  Exists in conjunction with
-     *     $Nb because we need this value and not $Nb to pad strings appropriately.  
-     */
-    var $block_size = 16;
-
-    /**
-     * The Block Length divided by 32
-     *
-     * @see setBlockLength()
-     * @var Integer
-     * @access private
-     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size 
-     *    because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could 
-     *    derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
-     *
-     */
-    var $Nb = 4;
-
-    /**
-     * The Key Length
-     *
-     * @see setKeyLength()
-     * @var Integer
-     * @access private
-     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $key_size
-     *    because the encryption / decryption / key schedule creation requires this number and not $key_size.  We could 
-     *    derive this from $key_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
-     */
-    var $key_size = 16;
-
-    /**
-     * The Key Length divided by 32
-     *
-     * @see setKeyLength()
-     * @var Integer
-     * @access private
-     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4
-     */
-    var $Nk = 4;
-
-    /**
-     * The Number of Rounds
-     *
-     * @var Integer
-     * @access private
-     * @internal The max value is 14, the min value is 10.
-     */
-    var $Nr;
-
-    /**
-     * Shift offsets
-     *
-     * @var Array
-     * @access private
-     */
-    var $c;
-
-    /**
-     * Precomputed mixColumns table
-     *
-     * @see Crypt_Rijndael()
-     * @var Array
-     * @access private
-     */
-    var $t0;
-
-    /**
-     * Precomputed mixColumns table
-     *
-     * @see Crypt_Rijndael()
-     * @var Array
-     * @access private
-     */
-    var $t1;
-
-    /**
-     * Precomputed mixColumns table
-     *
-     * @see Crypt_Rijndael()
-     * @var Array
-     * @access private
-     */
-    var $t2;
-
-    /**
-     * Precomputed mixColumns table
-     *
-     * @see Crypt_Rijndael()
-     * @var Array
-     * @access private
-     */
-    var $t3;
-
-    /**
-     * Precomputed invMixColumns table
-     *
-     * @see Crypt_Rijndael()
-     * @var Array
-     * @access private
-     */
-    var $dt0;
-
-    /**
-     * Precomputed invMixColumns table
-     *
-     * @see Crypt_Rijndael()
-     * @var Array
-     * @access private
-     */
-    var $dt1;
-
-    /**
-     * Precomputed invMixColumns table
-     *
-     * @see Crypt_Rijndael()
-     * @var Array
-     * @access private
-     */
-    var $dt2;
-
-    /**
-     * Precomputed invMixColumns table
-     *
-     * @see Crypt_Rijndael()
-     * @var Array
-     * @access private
-     */
-    var $dt3;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.  $mode should only, at present, be
-     * CRYPT_RIJNDAEL_MODE_ECB or CRYPT_RIJNDAEL_MODE_CBC.  If not explictly set, CRYPT_RIJNDAEL_MODE_CBC will be used.
-     *
-     * @param optional Integer $mode
-     * @return Crypt_Rijndael
-     * @access public
-     */
-    function Crypt_Rijndael($mode = CRYPT_RIJNDAEL_MODE_CBC)
-    {
-        switch ($mode) {
-            case CRYPT_RIJNDAEL_MODE_ECB:
-            case CRYPT_RIJNDAEL_MODE_CBC:
-            case CRYPT_RIJNDAEL_MODE_CTR:
-                $this->mode = $mode;
-                break;
-            default:
-                $this->mode = CRYPT_RIJNDAEL_MODE_CBC;
-        }
-
-        $t3 = &$this->t3;
-        $t2 = &$this->t2;
-        $t1 = &$this->t1;
-        $t0 = &$this->t0;
-
-        $dt3 = &$this->dt3;
-        $dt2 = &$this->dt2;
-        $dt1 = &$this->dt1;
-        $dt0 = &$this->dt0;
-
-        // according to  (section 5.2.1), 
-        // precomputed tables can be used in the mixColumns phase.  in that example, they're assigned t0...t3, so
-        // those are the names we'll use.
-        $t3 = array(
-            0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491, 
-            0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC, 
-            0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB, 
-            0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B, 
-            0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83, 
-            0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A, 
-            0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F, 
-            0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA, 
-            0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B, 
-            0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713, 
-            0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6, 
-            0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85, 
-            0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411, 
-            0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B, 
-            0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1, 
-            0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF, 
-            0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E, 
-            0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6, 
-            0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B, 
-            0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD, 
-            0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8, 
-            0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2, 
-            0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049, 
-            0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810, 
-            0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197, 
-            0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F, 
-            0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C, 
-            0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927, 
-            0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733, 
-            0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5, 
-            0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0, 
-            0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
-        );
-
-        $dt3 = array(
-            0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B, 
-            0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5, 
-            0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B, 
-            0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E, 
-            0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D, 
-            0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9, 
-            0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66, 
-            0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED, 
-            0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4, 
-            0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD, 
-            0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60, 
-            0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79, 
-            0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C, 
-            0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24, 
-            0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C, 
-            0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814, 
-            0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B, 
-            0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084, 
-            0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077, 
-            0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22, 
-            0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F, 
-            0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582, 
-            0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB, 
-            0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF, 
-            0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035, 
-            0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17, 
-            0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46, 
-            0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D, 
-            0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A, 
-            0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678, 
-            0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF, 
-            0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
-        );
-
-        for ($i = 0; $i < 256; $i++) {
-            $t2[$i <<  8] = (($t3[$i] <<  8) & 0xFFFFFF00) | (($t3[$i] >> 24) & 0x000000FF);
-            $t1[$i << 16] = (($t3[$i] << 16) & 0xFFFF0000) | (($t3[$i] >> 16) & 0x0000FFFF);
-            $t0[$i << 24] = (($t3[$i] << 24) & 0xFF000000) | (($t3[$i] >>  8) & 0x00FFFFFF);
-
-            $dt2[$i <<  8] = (($this->dt3[$i] <<  8) & 0xFFFFFF00) | (($dt3[$i] >> 24) & 0x000000FF);
-            $dt1[$i << 16] = (($this->dt3[$i] << 16) & 0xFFFF0000) | (($dt3[$i] >> 16) & 0x0000FFFF);
-            $dt0[$i << 24] = (($this->dt3[$i] << 24) & 0xFF000000) | (($dt3[$i] >>  8) & 0x00FFFFFF);
-        }
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Keys can be of any length.  Rijndael, itself, requires the use of a key that's between 128-bits and 256-bits long and
-     * whose length is a multiple of 32.  If the key is less than 256-bits and the key length isn't set, we round the length
-     * up to the closest valid key length, padding $key with null bytes.  If the key is more than 256-bits, we trim the
-     * excess bits.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all null bytes.
-     *
-     * @access public
-     * @param String $key
-     */
-    function setKey($key)
-    {
-        $this->key = $key;
-        $this->changed = true;
-    }
-
-    /**
-     * Sets the initialization vector. (optional)
-     *
-     * SetIV is not required when CRYPT_RIJNDAEL_MODE_ECB is being used.  If not explictly set, it'll be assumed
-     * to be all zero's.
-     *
-     * @access public
-     * @param String $iv
-     */
-    function setIV($iv)
-    {
-        $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, $this->block_size), $this->block_size, chr(0));;
-    }
-
-    /**
-     * Sets the key length
-     *
-     * Valid key lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater then 128 and invalid, it will be rounded down to the closest valid amount.
-     *
-     * @access public
-     * @param Integer $length
-     */
-    function setKeyLength($length)
-    {
-        $length >>= 5;
-        if ($length > 8) {
-            $length = 8;
-        } else if ($length < 4) {
-            $length = 4;
-        }
-        $this->Nk = $length;
-        $this->key_size = $length << 2;
-
-        $this->explicit_key_length = true;
-        $this->changed = true;
-    }
-
-    /**
-     * Sets the block length
-     *
-     * Valid block lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater then 128 and invalid, it will be rounded down to the closest valid amount.
-     *
-     * @access public
-     * @param Integer $length
-     */
-    function setBlockLength($length)
-    {
-        $length >>= 5;
-        if ($length > 8) {
-            $length = 8;
-        } else if ($length < 4) {
-            $length = 4;
-        }
-        $this->Nb = $length;
-        $this->block_size = $length << 2;
-        $this->changed = true;
-    }
-
-    /**
-     * Generate CTR XOR encryption key
-     *
-     * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
-     * plaintext / ciphertext in CTR mode.
-     *
-     * @see Crypt_Rijndael::decrypt()
-     * @see Crypt_Rijndael::encrypt()
-     * @access public
-     * @param Integer $length
-     * @param String $iv
-     */
-    function _generate_xor($length, &$iv)
-    {
-        $xor = '';
-        $block_size = $this->block_size;
-        $num_blocks = floor(($length + ($block_size - 1)) / $block_size);
-        for ($i = 0; $i < $num_blocks; $i++) {
-            $xor.= $iv;
-            for ($j = 4; $j <= $block_size; $j+=4) {
-                $temp = substr($iv, -$j, 4);
-                switch ($temp) {
-                    case "\xFF\xFF\xFF\xFF":
-                        $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
-                        break;
-                    case "\x7F\xFF\xFF\xFF":
-                        $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
-                        break 2;
-                    default:
-                        extract(unpack('Ncount', $temp));
-                        $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
-                        break 2;
-                }
-            }
-        }
-
-        return $xor;
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size.  Other Rjindael
-     * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
-     * necessary are discussed in the following
-     * URL:
-     *
-     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-     *
-     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-     * strlen($plaintext) will still need to be a multiple of 8, however, arbitrary values can be added to make it that
-     * length.
-     *
-     * @see Crypt_Rijndael::decrypt()
-     * @access public
-     * @param String $plaintext
-     */
-    function encrypt($plaintext)
-    {
-        $this->_setup();
-        if ($this->mode != CRYPT_RIJNDAEL_MODE_CTR) {
-            $plaintext = $this->_pad($plaintext);
-        }
-
-        $block_size = $this->block_size;
-        $ciphertext = '';
-        switch ($this->mode) {
-            case CRYPT_RIJNDAEL_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
-                }
-                break;
-            case CRYPT_RIJNDAEL_MODE_CBC:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $block = $this->_encryptBlock($block ^ $xor);
-                    $xor = $block;
-                    $ciphertext.= $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-                break;
-            case CRYPT_RIJNDAEL_MODE_CTR:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $key = $this->_encryptBlock($this->_generate_xor($block_size, $xor));
-                    $ciphertext.= $block ^ $key;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
-     * it is.
-     *
-     * @see Crypt_Rijndael::encrypt()
-     * @access public
-     * @param String $ciphertext
-     */
-    function decrypt($ciphertext)
-    {
-        $this->_setup();
-
-        if ($this->mode != CRYPT_RIJNDAEL_MODE_CTR) {
-            // we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-            // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-            $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + $this->block_size - 1) % $this->block_size, chr(0));
-        }
-
-        $block_size = $this->block_size;
-        $plaintext = '';
-        switch ($this->mode) {
-            case CRYPT_RIJNDAEL_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
-                }
-                break;
-            case CRYPT_RIJNDAEL_MODE_CBC:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $block = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
-                    $xor = $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-                break;
-            case CRYPT_RIJNDAEL_MODE_CTR:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $block = substr($ciphertext, $i, $block_size);
-                    $key = $this->_encryptBlock($this->_generate_xor($block_size, $xor));
-                    $plaintext.= $block ^ $key;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-        }
-
-        return $this->mode != CRYPT_RIJNDAEL_MODE_CTR ? $this->_unpad($plaintext) : $plaintext;
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @access private
-     * @param String $in
-     * @return String
-     */
-    function _encryptBlock($in)
-    {
-        $state = array();
-        $words = unpack('N*word', $in);
-
-        $w = $this->w;
-        $t0 = $this->t0;
-        $t1 = $this->t1;
-        $t2 = $this->t2;
-        $t3 = $this->t3;
-        $Nb = $this->Nb;
-        $Nr = $this->Nr;
-        $c = $this->c;
-
-        // addRoundKey
-        $i = 0;
-        foreach ($words as $word) {
-            $state[] = $word ^ $w[0][$i++];
-        }
-
-        // fips-197.pdf#page=19, "Figure 5. Pseudo Code for the Cipher", states that this loop has four components - 
-        // subBytes, shiftRows, mixColumns, and addRoundKey. fips-197.pdf#page=30, "Implementation Suggestions Regarding 
-        // Various Platforms" suggests that performs enhanced implementations are described in Rijndael-ammended.pdf.
-        // Rijndael-ammended.pdf#page=20, "Implementation aspects / 32-bit processor", discusses such an optimization.
-        // Unfortunately, the description given there is not quite correct.  Per aes.spec.v316.pdf#page=19 [1], 
-        // equation (7.4.7) is supposed to use addition instead of subtraction, so we'll do that here, as well.
-
-        // [1] http://fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.v316.pdf
-        $temp = array();
-        for ($round = 1; $round < $Nr; $round++) {
-            $i = 0; // $c[0] == 0
-            $j = $c[1];
-            $k = $c[2];
-            $l = $c[3];
-
-            while ($i < $this->Nb) {
-                $temp[$i] = $t0[$state[$i] & 0xFF000000] ^ 
-                            $t1[$state[$j] & 0x00FF0000] ^ 
-                            $t2[$state[$k] & 0x0000FF00] ^ 
-                            $t3[$state[$l] & 0x000000FF] ^ 
-                            $w[$round][$i];
-                $i++;
-                $j = ($j + 1) % $Nb;
-                $k = ($k + 1) % $Nb;
-                $l = ($l + 1) % $Nb;
-            }
-
-            for ($i = 0; $i < $Nb; $i++) {
-                $state[$i] = $temp[$i];
-            }
-        }
-
-        // subWord
-        for ($i = 0; $i < $Nb; $i++) {
-            $state[$i] = $this->_subWord($state[$i]);
-        }
-
-        // shiftRows + addRoundKey
-        $i = 0; // $c[0] == 0
-        $j = $c[1];
-        $k = $c[2];
-        $l = $c[3];
-        while ($i < $this->Nb) {
-            $temp[$i] = ($state[$i] & 0xFF000000) ^ 
-                        ($state[$j] & 0x00FF0000) ^ 
-                        ($state[$k] & 0x0000FF00) ^ 
-                        ($state[$l] & 0x000000FF) ^
-                         $w[$Nr][$i];
-            $i++;
-            $j = ($j + 1) % $Nb;
-            $k = ($k + 1) % $Nb;
-            $l = ($l + 1) % $Nb;
-        }
-        $state = $temp;
-
-        array_unshift($state, 'N*');
-
-        return call_user_func_array('pack', $state);
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @access private
-     * @param String $in
-     * @return String
-     */
-    function _decryptBlock($in)
-    {
-        $state = array();
-        $words = unpack('N*word', $in);
-
-        $num_states = count($state);
-        $dw = $this->dw;
-        $dt0 = $this->dt0;
-        $dt1 = $this->dt1;
-        $dt2 = $this->dt2;
-        $dt3 = $this->dt3;
-        $Nb = $this->Nb;
-        $Nr = $this->Nr;
-        $c = $this->c;
-
-        // addRoundKey
-        $i = 0;
-        foreach ($words as $word) {
-            $state[] = $word ^ $dw[$Nr][$i++];
-        }
-
-        $temp = array();
-        for ($round = $Nr - 1; $round > 0; $round--) {
-            $i = 0; // $c[0] == 0
-            $j = $Nb - $c[1];
-            $k = $Nb - $c[2];
-            $l = $Nb - $c[3];
-
-            while ($i < $Nb) {
-                $temp[$i] = $dt0[$state[$i] & 0xFF000000] ^ 
-                            $dt1[$state[$j] & 0x00FF0000] ^ 
-                            $dt2[$state[$k] & 0x0000FF00] ^ 
-                            $dt3[$state[$l] & 0x000000FF] ^ 
-                            $dw[$round][$i];
-                $i++;
-                $j = ($j + 1) % $Nb;
-                $k = ($k + 1) % $Nb;
-                $l = ($l + 1) % $Nb;
-            }
-
-            for ($i = 0; $i < $Nb; $i++) {
-                $state[$i] = $temp[$i];
-            }
-        }
-
-        // invShiftRows + invSubWord + addRoundKey
-        $i = 0; // $c[0] == 0
-        $j = $Nb - $c[1];
-        $k = $Nb - $c[2];
-        $l = $Nb - $c[3];
-
-        while ($i < $Nb) {
-            $temp[$i] = $dw[0][$i] ^ 
-                        $this->_invSubWord(($state[$i] & 0xFF000000) | 
-                                           ($state[$j] & 0x00FF0000) | 
-                                           ($state[$k] & 0x0000FF00) | 
-                                           ($state[$l] & 0x000000FF));
-            $i++;
-            $j = ($j + 1) % $Nb;
-            $k = ($k + 1) % $Nb;
-            $l = ($l + 1) % $Nb;
-        }
-
-        $state = $temp;
-
-        array_unshift($state, 'N*');
-
-        return call_user_func_array('pack', $state);
-    }
-
-    /**
-     * Setup Rijndael
-     *
-     * Validates all the variables and calculates $Nr - the number of rounds that need to be performed - and $w - the key
-     * key schedule.
-     *
-     * @access private
-     */
-    function _setup()
-    {
-        // Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
-        // See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
-        static $rcon = array(0,
-            0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
-            0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
-            0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
-            0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
-            0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
-            0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
-        );
-
-        if (!$this->changed) {
-            return;
-        }
-
-        if (!$this->explicit_key_length) {
-            // we do >> 2, here, and not >> 5, as we do above, since strlen($this->key) tells us the number of bytes - not bits
-            $length = strlen($this->key) >> 2;
-            if ($length > 8) {
-                $length = 8;
-            } else if ($length < 4) {
-                $length = 4;
-            }
-            $this->Nk = $length;
-            $this->key_size = $length << 2;
-        }
-
-        $this->key = str_pad(substr($this->key, 0, $this->key_size), $this->key_size, chr(0));
-        $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, chr(0));
-
-        // see Rijndael-ammended.pdf#page=44
-        $this->Nr = max($this->Nk, $this->Nb) + 6;
-
-        // shift offsets for Nb = 5, 7 are defined in Rijndael-ammended.pdf#page=44,
-        //     "Table 8: Shift offsets in Shiftrow for the alternative block lengths"
-        // shift offsets for Nb = 4, 6, 8 are defined in Rijndael-ammended.pdf#page=14,
-        //     "Table 2: Shift offsets for different block lengths"
-        switch ($this->Nb) {
-            case 4:
-            case 5:
-            case 6:
-                $this->c = array(0, 1, 2, 3);
-                break;
-            case 7:
-                $this->c = array(0, 1, 2, 4);
-                break;
-            case 8:
-                $this->c = array(0, 1, 3, 4);
-        }
-
-        $key = $this->key;
-
-        $w = array_values(unpack('N*words', $key));
-
-        $length = $this->Nb * ($this->Nr + 1);
-        for ($i = $this->Nk; $i < $length; $i++) {
-            $temp = $w[$i - 1];
-            if ($i % $this->Nk == 0) {
-                // according to , "the size of an integer is platform-dependent".
-                // on a 32-bit machine, it's 32-bits, and on a 64-bit machine, it's 64-bits. on a 32-bit machine,
-                // 0xFFFFFFFF << 8 == 0xFFFFFF00, but on a 64-bit machine, it equals 0xFFFFFFFF00. as such, doing 'and'
-                // with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
-                $temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
-                $temp = $this->_subWord($temp) ^ $rcon[$i / $this->Nk];
-            } else if ($this->Nk > 6 && $i % $this->Nk == 4) {
-                $temp = $this->_subWord($temp);
-            }
-            $w[$i] = $w[$i - $this->Nk] ^ $temp;
-        }
-
-        // convert the key schedule from a vector of $Nb * ($Nr + 1) length to a matrix with $Nr + 1 rows and $Nb columns
-        // and generate the inverse key schedule.  more specifically,
-        // according to  (section 5.3.3), 
-        // "The key expansion for the Inverse Cipher is defined as follows:
-        //        1. Apply the Key Expansion.
-        //        2. Apply InvMixColumn to all Round Keys except the first and the last one."
-        // also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
-        $temp = array();
-        for ($i = $row = $col = 0; $i < $length; $i++, $col++) {
-            if ($col == $this->Nb) {
-                if ($row == 0) {
-                    $this->dw[0] = $this->w[0];
-                } else {
-                    // subWord + invMixColumn + invSubWord = invMixColumn
-                    $j = 0;
-                    while ($j < $this->Nb) {
-                        $dw = $this->_subWord($this->w[$row][$j]);
-                        $temp[$j] = $this->dt0[$dw & 0xFF000000] ^ 
-                                    $this->dt1[$dw & 0x00FF0000] ^ 
-                                    $this->dt2[$dw & 0x0000FF00] ^ 
-                                    $this->dt3[$dw & 0x000000FF];
-                        $j++;
-                    }
-                    $this->dw[$row] = $temp;
-                }
-
-                $col = 0;
-                $row++;
-            }
-            $this->w[$row][$col] = $w[$i];
-        }
-
-        $this->dw[$row] = $this->w[$row];
-
-        $this->changed = false;
-    }
-
-    /**
-     * Performs S-Box substitutions
-     *
-     * @access private
-     */
-    function _subWord($word)
-    {
-        static $sbox0, $sbox1, $sbox2, $sbox3;
-
-        if (empty($sbox0)) {
-            $sbox0 = array(
-                0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
-                0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
-                0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
-                0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
-                0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
-                0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
-                0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
-                0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
-                0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
-                0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
-                0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
-                0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
-                0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
-                0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
-                0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-                0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
-            );
-
-            $sbox1 = array();
-            $sbox2 = array();
-            $sbox3 = array();
-
-            for ($i = 0; $i < 256; $i++) {
-                $sbox1[$i <<  8] = $sbox0[$i] <<  8;
-                $sbox2[$i << 16] = $sbox0[$i] << 16;
-                $sbox3[$i << 24] = $sbox0[$i] << 24;
-            }
-        }
-
-        return $sbox0[$word & 0x000000FF] | 
-               $sbox1[$word & 0x0000FF00] | 
-               $sbox2[$word & 0x00FF0000] | 
-               $sbox3[$word & 0xFF000000];
-    }
-
-    /**
-     * Performs inverse S-Box substitutions
-     *
-     * @access private
-     */
-    function _invSubWord($word)
-    {
-        static $sbox0, $sbox1, $sbox2, $sbox3;
-
-        if (empty($sbox0)) {
-            $sbox0 = array(
-                0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
-                0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
-                0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
-                0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
-                0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
-                0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
-                0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
-                0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
-                0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
-                0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
-                0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
-                0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
-                0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
-                0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
-                0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-                0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
-            );
-
-            $sbox1 = array();
-            $sbox2 = array();
-            $sbox3 = array();
-
-            for ($i = 0; $i < 256; $i++) {
-                $sbox1[$i <<  8] = $sbox0[$i] <<  8;
-                $sbox2[$i << 16] = $sbox0[$i] << 16;
-                $sbox3[$i << 24] = $sbox0[$i] << 24;
-            }
-        }
-
-        return $sbox0[$word & 0x000000FF] | 
-               $sbox1[$word & 0x0000FF00] | 
-               $sbox2[$word & 0x00FF0000] | 
-               $sbox3[$word & 0xFF000000];
-    }
-
-    /**
-     * Pad "packets".
-     *
-     * Rijndael works by encrypting between sixteen and thirty-two bytes at a time, provided that number is also a multiple
-     * of four.  If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
-     * pad the input so that it is of the proper length.
-     *
-     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
-     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-     * transmitted separately)
-     *
-     * @see Crypt_Rijndael::disablePadding()
-     * @access public
-     */
-    function enablePadding()
-    {
-        $this->padding = true;
-    }
-
-    /**
-     * Do not pad packets.
-     *
-     * @see Crypt_Rijndael::enablePadding()
-     * @access public
-     */
-    function disablePadding()
-    {
-        $this->padding = false;
-    }
-
-    /**
-     * Pads a string
-     *
-     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
-     * $block_size - (strlen($text) % $block_size) bytes are added, each of which is equal to 
-     * chr($block_size - (strlen($text) % $block_size)
-     *
-     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-     * and padding will, hence forth, be enabled.
-     *
-     * @see Crypt_Rijndael::_unpad()
-     * @access private
-     */
-    function _pad($text)
-    {
-        $length = strlen($text);
-
-        if (!$this->padding) {
-            if ($length % $this->block_size == 0) {
-                return $text;
-            } else {
-                user_error("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size})", E_USER_NOTICE);
-                $this->padding = true;
-            }
-        }
-
-        $pad = $this->block_size - ($length % $this->block_size);
-
-        return str_pad($text, $length + $pad, chr($pad));
-    }
-
-    /**
-     * Unpads a string.
-     *
-     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
-     * and false will be returned.
-     *
-     * @see Crypt_Rijndael::_pad()
-     * @access private
-     */
-    function _unpad($text)
-    {
-        if (!$this->padding) {
-            return $text;
-        }
-
-        $length = ord($text[strlen($text) - 1]);
-
-        if (!$length || $length > $this->block_size) {
-            return false;
-        }
-
-        return substr($text, 0, -$length);
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * 
-     *    echo $rijndael->encrypt(substr($plaintext,  0, 16));
-     *    echo $rijndael->encrypt(substr($plaintext, 16, 16));
-     * 
-     * 
-     *    echo $rijndael->encrypt($plaintext);
-     * 
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * 
-     *    $rijndael->encrypt(substr($plaintext, 0, 16));
-     *    echo $rijndael->decrypt($des->encrypt(substr($plaintext, 16, 16)));
-     * 
-     * 
-     *    echo $rijndael->decrypt($des->encrypt(substr($plaintext, 16, 16)));
-     * 
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the Crypt_Rijndael() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * @see Crypt_Rijndael::disableContinuousBuffer()
-     * @access public
-     */
-    function enableContinuousBuffer()
-    {
-        $this->continuousBuffer = true;
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * @see Crypt_Rijndael::enableContinuousBuffer()
-     * @access public
-     */
-    function disableContinuousBuffer()
-    {
-        $this->continuousBuffer = false;
-        $this->encryptIV = $this->iv;
-        $this->decryptIV = $this->iv;
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param String $string
-     * @param optional Integer $index
-     * @return String
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-}
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
\ No newline at end of file
diff --git a/library/phpsec/Crypt/TripleDES.php b/library/phpsec/Crypt/TripleDES.php
deleted file mode 100644
index 4d0dbbca0..000000000
--- a/library/phpsec/Crypt/TripleDES.php
+++ /dev/null
@@ -1,690 +0,0 @@
-
- * setKey('abcdefghijklmnopqrstuvwx');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $des->decrypt($des->encrypt($plaintext));
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Crypt
- * @package    Crypt_TripleDES
- * @author     Jim Wigginton 
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: TripleDES.php,v 1.13 2010/02/26 03:40:25 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**
- * Include Crypt_DES
- */
-require_once 'DES.php';
-
-/**
- * Encrypt / decrypt using inner chaining
- *
- * Inner chaining is used by SSH-1 and is generally considered to be less secure then outer chaining (CRYPT_DES_MODE_CBC3).
- */
-define('CRYPT_DES_MODE_3CBC', 3);
-
-/**
- * Encrypt / decrypt using outer chaining
- *
- * Outer chaining is used by SSH-2 and when the mode is set to CRYPT_DES_MODE_CBC.
- */
-define('CRYPT_DES_MODE_CBC3', CRYPT_DES_MODE_CBC);
-
-/**
- * Pure-PHP implementation of Triple DES.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Crypt_TerraDES
- */
-class Crypt_TripleDES {
-    /**
-     * The Three Keys
-     *
-     * @see Crypt_TripleDES::setKey()
-     * @var String
-     * @access private
-     */
-    var $key = "\0\0\0\0\0\0\0\0";
-
-    /**
-     * The Encryption Mode
-     *
-     * @see Crypt_TripleDES::Crypt_TripleDES()
-     * @var Integer
-     * @access private
-     */
-    var $mode = CRYPT_DES_MODE_CBC;
-
-    /**
-     * Continuous Buffer status
-     *
-     * @see Crypt_TripleDES::enableContinuousBuffer()
-     * @var Boolean
-     * @access private
-     */
-    var $continuousBuffer = false;
-
-    /**
-     * Padding status
-     *
-     * @see Crypt_TripleDES::enablePadding()
-     * @var Boolean
-     * @access private
-     */
-    var $padding = true;
-
-    /**
-     * The Initialization Vector
-     *
-     * @see Crypt_TripleDES::setIV()
-     * @var String
-     * @access private
-     */
-    var $iv = "\0\0\0\0\0\0\0\0";
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see Crypt_TripleDES::enableContinuousBuffer()
-     * @var String
-     * @access private
-     */
-    var $encryptIV = "\0\0\0\0\0\0\0\0";
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see Crypt_TripleDES::enableContinuousBuffer()
-     * @var String
-     * @access private
-     */
-    var $decryptIV = "\0\0\0\0\0\0\0\0";
-
-    /**
-     * The Crypt_DES objects
-     *
-     * @var Array
-     * @access private
-     */
-    var $des;
-
-    /**
-     * mcrypt resource for encryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see Crypt_AES::encrypt()
-     * @var String
-     * @access private
-     */
-    var $enmcrypt;
-
-    /**
-     * mcrypt resource for decryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see Crypt_AES::decrypt()
-     * @var String
-     * @access private
-     */
-    var $demcrypt;
-
-    /**
-     * Does the (en|de)mcrypt resource need to be (re)initialized?
-     *
-     * @see setKey()
-     * @see setIV()
-     * @var Boolean
-     * @access private
-     */
-    var $changed = true;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.  $mode should only, at present, be
-     * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
-     *
-     * @param optional Integer $mode
-     * @return Crypt_TripleDES
-     * @access public
-     */
-    function Crypt_TripleDES($mode = CRYPT_DES_MODE_CBC)
-    {
-        if ( !defined('CRYPT_DES_MODE') ) {
-            switch (true) {
-                case extension_loaded('mcrypt'):
-                    // i'd check to see if des was supported, by doing in_array('des', mcrypt_list_algorithms('')),
-                    // but since that can be changed after the object has been created, there doesn't seem to be
-                    // a lot of point...
-                    define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
-                    break;
-                default:
-                    define('CRYPT_DES_MODE', CRYPT_DES_MODE_INTERNAL);
-            }
-        }
-
-        if ( $mode == CRYPT_DES_MODE_3CBC ) {
-            $this->mode = CRYPT_DES_MODE_3CBC;
-            $this->des = array(
-                new Crypt_DES(CRYPT_DES_MODE_CBC),
-                new Crypt_DES(CRYPT_DES_MODE_CBC),
-                new Crypt_DES(CRYPT_DES_MODE_CBC)
-            );
-
-            // we're going to be doing the padding, ourselves, so disable it in the Crypt_DES objects
-            $this->des[0]->disablePadding();
-            $this->des[1]->disablePadding();
-            $this->des[2]->disablePadding();
-
-            return;
-        }
-
-        switch ( CRYPT_DES_MODE ) {
-            case CRYPT_DES_MODE_MCRYPT:
-                switch ($mode) {
-                    case CRYPT_DES_MODE_ECB:
-                        $this->mode = MCRYPT_MODE_ECB;
-                        break;
-                    case CRYPT_DES_MODE_CTR:
-                        $this->mode = 'ctr';
-                        break;
-                    case CRYPT_DES_MODE_CBC:
-                    default:
-                        $this->mode = MCRYPT_MODE_CBC;
-                }
-
-                break;
-            default:
-                $this->des = array(
-                    new Crypt_DES(CRYPT_DES_MODE_ECB),
-                    new Crypt_DES(CRYPT_DES_MODE_ECB),
-                    new Crypt_DES(CRYPT_DES_MODE_ECB)
-                );
- 
-                // we're going to be doing the padding, ourselves, so disable it in the Crypt_DES objects
-                $this->des[0]->disablePadding();
-                $this->des[1]->disablePadding();
-                $this->des[2]->disablePadding();
-
-                switch ($mode) {
-                    case CRYPT_DES_MODE_ECB:
-                    case CRYPT_DES_MODE_CTR:
-                    case CRYPT_DES_MODE_CBC:
-                        $this->mode = $mode;
-                        break;
-                    default:
-                        $this->mode = CRYPT_DES_MODE_CBC;
-                }
-        }
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Keys can be of any length.  Triple DES, itself, can use 128-bit (eg. strlen($key) == 16) or
-     * 192-bit (eg. strlen($key) == 24) keys.  This function pads and truncates $key as appropriate.
-     *
-     * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all zero's.
-     *
-     * @access public
-     * @param String $key
-     */
-    function setKey($key)
-    {
-        $length = strlen($key);
-        if ($length > 8) {
-            $key = str_pad($key, 24, chr(0));
-            // if $key is between 64 and 128-bits, use the first 64-bits as the last, per this:
-            // http://php.net/function.mcrypt-encrypt#47973
-            //$key = $length <= 16 ? substr_replace($key, substr($key, 0, 8), 16) : substr($key, 0, 24);
-        }
-        $this->key = $key;
-        switch (true) {
-            case CRYPT_DES_MODE == CRYPT_DES_MODE_INTERNAL:
-            case $this->mode == CRYPT_DES_MODE_3CBC:
-                $this->des[0]->setKey(substr($key,  0, 8));
-                $this->des[1]->setKey(substr($key,  8, 8));
-                $this->des[2]->setKey(substr($key, 16, 8));
-        }
-        $this->changed = true;
-    }
-
-    /**
-     * Sets the initialization vector. (optional)
-     *
-     * SetIV is not required when CRYPT_DES_MODE_ECB is being used.  If not explictly set, it'll be assumed
-     * to be all zero's.
-     *
-     * @access public
-     * @param String $iv
-     */
-    function setIV($iv)
-    {
-        $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, 8), 8, chr(0));
-        if ($this->mode == CRYPT_DES_MODE_3CBC) {
-            $this->des[0]->setIV($iv);
-            $this->des[1]->setIV($iv);
-            $this->des[2]->setIV($iv);
-        }
-        $this->changed = true;
-    }
-
-    /**
-     * Generate CTR XOR encryption key
-     *
-     * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
-     * plaintext / ciphertext in CTR mode.
-     *
-     * @see Crypt_DES::decrypt()
-     * @see Crypt_DES::encrypt()
-     * @access public
-     * @param Integer $length
-     * @param String $iv
-     */
-    function _generate_xor($length, &$iv)
-    {
-        $xor = '';
-        $num_blocks = ($length + 7) >> 3;
-        for ($i = 0; $i < $num_blocks; $i++) {
-            $xor.= $iv;
-            for ($j = 4; $j <= 8; $j+=4) {
-                $temp = substr($iv, -$j, 4);
-                switch ($temp) {
-                    case "\xFF\xFF\xFF\xFF":
-                        $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
-                        break;
-                    case "\x7F\xFF\xFF\xFF":
-                        $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
-                        break 2;
-                    default:
-                        extract(unpack('Ncount', $temp));
-                        $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
-                        break 2;
-                }
-            }
-        }
-
-        return $xor;
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * @access public
-     * @param String $plaintext
-     */
-    function encrypt($plaintext)
-    {
-        if ($this->mode != CRYPT_DES_MODE_CTR && $this->mode != 'ctr') {
-            $plaintext = $this->_pad($plaintext);
-        }
-
-        // if the key is smaller then 8, do what we'd normally do
-        if ($this->mode == CRYPT_DES_MODE_3CBC && strlen($this->key) > 8) {
-            $ciphertext = $this->des[2]->encrypt($this->des[1]->decrypt($this->des[0]->encrypt($plaintext)));
-
-            return $ciphertext;
-        }
-
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
-            if ($this->changed) {
-                if (!isset($this->enmcrypt)) {
-                    $this->enmcrypt = mcrypt_module_open(MCRYPT_3DES, '', $this->mode, '');
-                }
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
-                $this->changed = false;
-            }
-
-            $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
-            }
-
-            return $ciphertext;
-        }
-
-        if (strlen($this->key) <= 8) {
-            $this->des[0]->mode = $this->mode;
-
-            return $this->des[0]->encrypt($plaintext);
-        }
-
-        // we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-        // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-        $plaintext = str_pad($plaintext, ceil(strlen($plaintext) / 8) * 8, chr(0));
-
-        $des = $this->des;
-
-        $ciphertext = '';
-        switch ($this->mode) {
-            case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $block = substr($plaintext, $i, 8);
-                    $block = $des[0]->_processBlock($block, CRYPT_DES_ENCRYPT);
-                    $block = $des[1]->_processBlock($block, CRYPT_DES_DECRYPT);
-                    $block = $des[2]->_processBlock($block, CRYPT_DES_ENCRYPT);
-                    $ciphertext.= $block;
-                }
-                break;
-            case CRYPT_DES_MODE_CBC:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $block = substr($plaintext, $i, 8) ^ $xor;
-                    $block = $des[0]->_processBlock($block, CRYPT_DES_ENCRYPT);
-                    $block = $des[1]->_processBlock($block, CRYPT_DES_DECRYPT);
-                    $block = $des[2]->_processBlock($block, CRYPT_DES_ENCRYPT);
-                    $xor = $block;
-                    $ciphertext.= $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-                break;
-            case CRYPT_DES_MODE_CTR:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $key = $this->_generate_xor(8, $xor);
-                    $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
-                    $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
-                    $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
-                    $block = substr($plaintext, $i, 8);
-                    $ciphertext.= $block ^ $key;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * @access public
-     * @param String $ciphertext
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->mode == CRYPT_DES_MODE_3CBC && strlen($this->key) > 8) {
-            $plaintext = $this->des[0]->decrypt($this->des[1]->encrypt($this->des[2]->decrypt($ciphertext)));
-
-            return $this->_unpad($plaintext);
-        }
-
-        // we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-        // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-        $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
-
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
-            if ($this->changed) {
-                if (!isset($this->demcrypt)) {
-                    $this->demcrypt = mcrypt_module_open(MCRYPT_3DES, '', $this->mode, '');
-                }
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
-                $this->changed = false;
-            }
-
-            $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
-            }
-
-            return $this->mode != 'ctr' ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        if (strlen($this->key) <= 8) {
-            $this->des[0]->mode = $this->mode;
-
-            return $this->_unpad($this->des[0]->decrypt($plaintext));
-        }
-
-        $des = $this->des;
-
-        $plaintext = '';
-        switch ($this->mode) {
-            case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $block = substr($ciphertext, $i, 8);
-                    $block = $des[2]->_processBlock($block, CRYPT_DES_DECRYPT);
-                    $block = $des[1]->_processBlock($block, CRYPT_DES_ENCRYPT);
-                    $block = $des[0]->_processBlock($block, CRYPT_DES_DECRYPT);
-                    $plaintext.= $block;
-                }
-                break;
-            case CRYPT_DES_MODE_CBC:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $orig = $block = substr($ciphertext, $i, 8);
-                    $block = $des[2]->_processBlock($block, CRYPT_DES_DECRYPT);
-                    $block = $des[1]->_processBlock($block, CRYPT_DES_ENCRYPT);
-                    $block = $des[0]->_processBlock($block, CRYPT_DES_DECRYPT);
-                    $plaintext.= $block ^ $xor;
-                    $xor = $orig;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-                break;
-            case CRYPT_DES_MODE_CTR:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $key = $this->_generate_xor(8, $xor);
-                    $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
-                    $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
-                    $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
-                    $block = substr($ciphertext, $i, 8);
-                    $plaintext.= $block ^ $key;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-        }
-
-        return $this->mode != CRYPT_DES_MODE_CTR ? $this->_unpad($plaintext) : $plaintext;
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 16-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * 
-     *    echo $des->encrypt(substr($plaintext, 0, 8));
-     *    echo $des->encrypt(substr($plaintext, 8, 8));
-     * 
-     * 
-     *    echo $des->encrypt($plaintext);
-     * 
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * 
-     *    $des->encrypt(substr($plaintext, 0, 8));
-     *    echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-     * 
-     * 
-     *    echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-     * 
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the Crypt_DES() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * @see Crypt_TripleDES::disableContinuousBuffer()
-     * @access public
-     */
-    function enableContinuousBuffer()
-    {
-        $this->continuousBuffer = true;
-        if ($this->mode == CRYPT_DES_MODE_3CBC) {
-            $this->des[0]->enableContinuousBuffer();
-            $this->des[1]->enableContinuousBuffer();
-            $this->des[2]->enableContinuousBuffer();
-        }
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * @see Crypt_TripleDES::enableContinuousBuffer()
-     * @access public
-     */
-    function disableContinuousBuffer()
-    {
-        $this->continuousBuffer = false;
-        $this->encryptIV = $this->iv;
-        $this->decryptIV = $this->iv;
-
-        if ($this->mode == CRYPT_DES_MODE_3CBC) {
-            $this->des[0]->disableContinuousBuffer();
-            $this->des[1]->disableContinuousBuffer();
-            $this->des[2]->disableContinuousBuffer();
-        }
-    }
-
-    /**
-     * Pad "packets".
-     *
-     * DES works by encrypting eight bytes at a time.  If you ever need to encrypt or decrypt something that's not
-     * a multiple of eight, it becomes necessary to pad the input so that it's length is a multiple of eight.
-     *
-     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH1,
-     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-     * transmitted separately)
-     *
-     * @see Crypt_TripleDES::disablePadding()
-     * @access public
-     */
-    function enablePadding()
-    {
-        $this->padding = true;
-    }
-
-    /**
-     * Do not pad packets.
-     *
-     * @see Crypt_TripleDES::enablePadding()
-     * @access public
-     */
-    function disablePadding()
-    {
-        $this->padding = false;
-    }
-
-    /**
-     * Pads a string
-     *
-     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize (8).
-     * 8 - (strlen($text) & 7) bytes are added, each of which is equal to chr(8 - (strlen($text) & 7)
-     *
-     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-     * and padding will, hence forth, be enabled.
-     *
-     * @see Crypt_TripleDES::_unpad()
-     * @access private
-     */
-    function _pad($text)
-    {
-        $length = strlen($text);
-
-        if (!$this->padding) {
-            if (($length & 7) == 0) {
-                return $text;
-            } else {
-                user_error("The plaintext's length ($length) is not a multiple of the block size (8)", E_USER_NOTICE);
-                $this->padding = true;
-            }
-        }
-
-        $pad = 8 - ($length & 7);
-        return str_pad($text, $length + $pad, chr($pad));
-    }
-
-    /**
-     * Unpads a string
-     *
-     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
-     * and false will be returned.
-     *
-     * @see Crypt_TripleDES::_pad()
-     * @access private
-     */
-    function _unpad($text)
-    {
-        if (!$this->padding) {
-            return $text;
-        }
-
-        $length = ord($text[strlen($text) - 1]);
-
-        if (!$length || $length > 8) {
-            return false;
-        }
-
-        return substr($text, 0, -$length);
-    }
-}
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
\ No newline at end of file
diff --git a/library/phpsec/Math/BigInteger.php b/library/phpsec/Math/BigInteger.php
deleted file mode 100644
index 5b3a4fc8b..000000000
--- a/library/phpsec/Math/BigInteger.php
+++ /dev/null
@@ -1,3545 +0,0 @@
-> and << cannot be used, nor can the modulo operator %,
- * which only supports integers.  Although this fact will slow this library down, the fact that such a high
- * base is being used should more than compensate.
- *
- * When PHP version 6 is officially released, we'll be able to use 64-bit integers.  This should, once again,
- * allow bitwise operators, and will increase the maximum possible base to 2**31 (or 2**62 for addition /
- * subtraction).
- *
- * Numbers are stored in {@link http://en.wikipedia.org/wiki/Endianness little endian} format.  ie.
- * (new Math_BigInteger(pow(2, 26)))->value = array(0, 1)
- *
- * Useful resources are as follows:
- *
- *  - {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf Handbook of Applied Cryptography (HAC)}
- *  - {@link http://math.libtomcrypt.com/files/tommath.pdf Multi-Precision Math (MPM)}
- *  - Java's BigInteger classes.  See /j2se/src/share/classes/java/math in jdk-1_5_0-src-jrl.zip
- *
- * Here's an example of how to use this library:
- * 
- * add($b);
- *
- *    echo $c->toString(); // outputs 5
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Math
- * @package    Math_BigInteger
- * @author     Jim Wigginton 
- * @copyright  MMVI Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: BigInteger.php,v 1.33 2010/03/22 22:32:03 terrafrost Exp $
- * @link       http://pear.php.net/package/Math_BigInteger
- */
-
-/**#@+
- * Reduction constants
- *
- * @access private
- * @see Math_BigInteger::_reduce()
- */
-/**
- * @see Math_BigInteger::_montgomery()
- * @see Math_BigInteger::_prepMontgomery()
- */
-define('MATH_BIGINTEGER_MONTGOMERY', 0);
-/**
- * @see Math_BigInteger::_barrett()
- */
-define('MATH_BIGINTEGER_BARRETT', 1);
-/**
- * @see Math_BigInteger::_mod2()
- */
-define('MATH_BIGINTEGER_POWEROF2', 2);
-/**
- * @see Math_BigInteger::_remainder()
- */
-define('MATH_BIGINTEGER_CLASSIC', 3);
-/**
- * @see Math_BigInteger::__clone()
- */
-define('MATH_BIGINTEGER_NONE', 4);
-/**#@-*/
-
-/**#@+
- * Array constants
- *
- * Rather than create a thousands and thousands of new Math_BigInteger objects in repeated function calls to add() and
- * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
- *
- * @access private
- */
-/**
- * $result[MATH_BIGINTEGER_VALUE] contains the value.
- */
-define('MATH_BIGINTEGER_VALUE', 0);
-/**
- * $result[MATH_BIGINTEGER_SIGN] contains the sign.
- */
-define('MATH_BIGINTEGER_SIGN', 1);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Math_BigInteger::_montgomery()
- * @see Math_BigInteger::_barrett()
- */
-/**
- * Cache constants
- *
- * $cache[MATH_BIGINTEGER_VARIABLE] tells us whether or not the cached data is still valid.
- */
-define('MATH_BIGINTEGER_VARIABLE', 0);
-/**
- * $cache[MATH_BIGINTEGER_DATA] contains the cached data.
- */
-define('MATH_BIGINTEGER_DATA', 1);
-/**#@-*/
-
-/**#@+
- * Mode constants.
- *
- * @access private
- * @see Math_BigInteger::Math_BigInteger()
- */
-/**
- * To use the pure-PHP implementation
- */
-define('MATH_BIGINTEGER_MODE_INTERNAL', 1);
-/**
- * To use the BCMath library
- *
- * (if enabled; otherwise, the internal implementation will be used)
- */
-define('MATH_BIGINTEGER_MODE_BCMATH', 2);
-/**
- * To use the GMP library
- *
- * (if present; otherwise, either the BCMath or the internal implementation will be used)
- */
-define('MATH_BIGINTEGER_MODE_GMP', 3);
-/**#@-*/
-
-/**
- * The largest digit that may be used in addition / subtraction
- *
- * (we do pow(2, 52) instead of using 4503599627370496, directly, because some PHP installations
- *  will truncate 4503599627370496)
- *
- * @access private
- */
-define('MATH_BIGINTEGER_MAX_DIGIT52', pow(2, 52));
-
-/**
- * Karatsuba Cutoff
- *
- * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
- *
- * @access private
- */
-define('MATH_BIGINTEGER_KARATSUBA_CUTOFF', 25);
-
-/**
- * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
- * numbers.
- *
- * @author  Jim Wigginton 
- * @version 1.0.0RC4
- * @access  public
- * @package Math_BigInteger
- */
-class Math_BigInteger {
-    /**
-     * Holds the BigInteger's value.
-     *
-     * @var Array
-     * @access private
-     */
-    var $value;
-
-    /**
-     * Holds the BigInteger's magnitude.
-     *
-     * @var Boolean
-     * @access private
-     */
-    var $is_negative = false;
-
-    /**
-     * Random number generator function
-     *
-     * @see setRandomGenerator()
-     * @access private
-     */
-    var $generator = 'mt_rand';
-
-    /**
-     * Precision
-     *
-     * @see setPrecision()
-     * @access private
-     */
-    var $precision = -1;
-
-    /**
-     * Precision Bitmask
-     *
-     * @see setPrecision()
-     * @access private
-     */
-    var $bitmask = false;
-
-    /**
-     * Mode independant value used for serialization.
-     *
-     * If the bcmath or gmp extensions are installed $this->value will be a non-serializable resource, hence the need for 
-     * a variable that'll be serializable regardless of whether or not extensions are being used.  Unlike $this->value,
-     * however, $this->hex is only calculated when $this->__sleep() is called.
-     *
-     * @see __sleep()
-     * @see __wakeup()
-     * @var String
-     * @access private
-     */
-    var $hex;
-
-    /**
-     * Converts base-2, base-10, base-16, and binary strings (eg. base-256) to BigIntegers.
-     *
-     * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
-     * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
-     *
-     * Here's an example:
-     * 
-     * toString(); // outputs 50
-     * ?>
-     * 
-     *
-     * @param optional $x base-10 number or base-$base number if $base set.
-     * @param optional integer $base
-     * @return Math_BigInteger
-     * @access public
-     */
-    function Math_BigInteger($x = 0, $base = 10)
-    {
-        if ( !defined('MATH_BIGINTEGER_MODE') ) {
-            switch (true) {
-                case extension_loaded('gmp'):
-                    define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_GMP);
-                    break;
-                case extension_loaded('bcmath'):
-                    define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_BCMATH);
-                    break;
-                default:
-                    define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_INTERNAL);
-            }
-        }
-
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                if (is_resource($x) && get_resource_type($x) == 'GMP integer') {
-                    $this->value = $x;
-                    return;
-                }
-                $this->value = gmp_init(0);
-                break;
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $this->value = '0';
-                break;
-            default:
-                $this->value = array();
-        }
-
-        if (empty($x)) {
-            return;
-        }
-
-        switch ($base) {
-            case -256:
-                if (ord($x[0]) & 0x80) {
-                    $x = ~$x;
-                    $this->is_negative = true;
-                }
-            case  256:
-                switch ( MATH_BIGINTEGER_MODE ) {
-                    case MATH_BIGINTEGER_MODE_GMP:
-                        $sign = $this->is_negative ? '-' : '';
-                        $this->value = gmp_init($sign . '0x' . bin2hex($x));
-                        break;
-                    case MATH_BIGINTEGER_MODE_BCMATH:
-                        // round $len to the nearest 4 (thanks, DavidMJ!)
-                        $len = (strlen($x) + 3) & 0xFFFFFFFC;
-
-                        $x = str_pad($x, $len, chr(0), STR_PAD_LEFT);
-
-                        for ($i = 0; $i < $len; $i+= 4) {
-                            $this->value = bcmul($this->value, '4294967296', 0); // 4294967296 == 2**32
-                            $this->value = bcadd($this->value, 0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord($x[$i + 2]) << 8) | ord($x[$i + 3])), 0);
-                        }
-
-                        if ($this->is_negative) {
-                            $this->value = '-' . $this->value;
-                        }
-
-                        break;
-                    // converts a base-2**8 (big endian / msb) number to base-2**26 (little endian / lsb)
-                    default:
-                        while (strlen($x)) {
-                            $this->value[] = $this->_bytes2int($this->_base256_rshift($x, 26));
-                        }
-                }
-
-                if ($this->is_negative) {
-                    if (MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_INTERNAL) {
-                        $this->is_negative = false;
-                    }
-                    $temp = $this->add(new Math_BigInteger('-1'));
-                    $this->value = $temp->value;
-                }
-                break;
-            case  16:
-            case -16:
-                if ($base > 0 && $x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#', '$1', $x);
-
-                $is_negative = false;
-                if ($base < 0 && hexdec($x[0]) >= 8) {
-                    $this->is_negative = $is_negative = true;
-                    $x = bin2hex(~pack('H*', $x));
-                }
-
-                switch ( MATH_BIGINTEGER_MODE ) {
-                    case MATH_BIGINTEGER_MODE_GMP:
-                        $temp = $this->is_negative ? '-0x' . $x : '0x' . $x;
-                        $this->value = gmp_init($temp);
-                        $this->is_negative = false;
-                        break;
-                    case MATH_BIGINTEGER_MODE_BCMATH:
-                        $x = ( strlen($x) & 1 ) ? '0' . $x : $x;
-                        $temp = new Math_BigInteger(pack('H*', $x), 256);
-                        $this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
-                        $this->is_negative = false;
-                        break;
-                    default:
-                        $x = ( strlen($x) & 1 ) ? '0' . $x : $x;
-                        $temp = new Math_BigInteger(pack('H*', $x), 256);
-                        $this->value = $temp->value;
-                }
-
-                if ($is_negative) {
-                    $temp = $this->add(new Math_BigInteger('-1'));
-                    $this->value = $temp->value;
-                }
-                break;
-            case  10:
-            case -10:
-                $x = preg_replace('#^(-?[0-9]*).*#', '$1', $x);
-
-                switch ( MATH_BIGINTEGER_MODE ) {
-                    case MATH_BIGINTEGER_MODE_GMP:
-                        $this->value = gmp_init($x);
-                        break;
-                    case MATH_BIGINTEGER_MODE_BCMATH:
-                        // explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
-                        // results then doing it on '-1' does (modInverse does $x[0])
-                        $this->value = (string) $x;
-                        break;
-                    default:
-                        $temp = new Math_BigInteger();
-
-                        // array(10000000) is 10**7 in base-2**26.  10**7 is the closest to 2**26 we can get without passing it.
-                        $multiplier = new Math_BigInteger();
-                        $multiplier->value = array(10000000);
-
-                        if ($x[0] == '-') {
-                            $this->is_negative = true;
-                            $x = substr($x, 1);
-                        }
-
-                        $x = str_pad($x, strlen($x) + (6 * strlen($x)) % 7, 0, STR_PAD_LEFT);
-
-                        while (strlen($x)) {
-                            $temp = $temp->multiply($multiplier);
-                            $temp = $temp->add(new Math_BigInteger($this->_int2bytes(substr($x, 0, 7)), 256));
-                            $x = substr($x, 7);
-                        }
-
-                        $this->value = $temp->value;
-                }
-                break;
-            case  2: // base-2 support originally implemented by Lluis Pamies - thanks!
-            case -2:
-                if ($base > 0 && $x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = preg_replace('#^([01]*).*#', '$1', $x);
-                $x = str_pad($x, strlen($x) + (3 * strlen($x)) % 4, 0, STR_PAD_LEFT);
-
-                $str = '0x';
-                while (strlen($x)) {
-                    $part = substr($x, 0, 4);
-                    $str.= dechex(bindec($part));
-                    $x = substr($x, 4);
-                }
-
-                if ($this->is_negative) {
-                    $str = '-' . $str;
-                }
-
-                $temp = new Math_BigInteger($str, 8 * $base); // ie. either -16 or +16
-                $this->value = $temp->value;
-                $this->is_negative = $temp->is_negative;
-
-                break;
-            default:
-                // base not supported, so we'll let $this == 0
-        }
-    }
-
-    /**
-     * Converts a BigInteger to a byte string (eg. base-256).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * 
-     * toBytes(); // outputs chr(65)
-     * ?>
-     * 
-     *
-     * @param Boolean $twos_compliment
-     * @return String
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**8
-     */
-    function toBytes($twos_compliment = false)
-    {
-        if ($twos_compliment) {
-            $comparison = $this->compare(new Math_BigInteger());
-            if ($comparison == 0) {
-                return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-            }
-
-            $temp = $comparison < 0 ? $this->add(new Math_BigInteger(1)) : $this->copy();
-            $bytes = $temp->toBytes();
-
-            if (empty($bytes)) { // eg. if the number we're trying to convert is -1
-                $bytes = chr(0);
-            }
-
-            if (ord($bytes[0]) & 0x80) {
-                $bytes = chr(0) . $bytes;
-            }
-
-            return $comparison < 0 ? ~$bytes : $bytes;
-        }
-
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                if (gmp_cmp($this->value, gmp_init(0)) == 0) {
-                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-                }
-
-                $temp = gmp_strval(gmp_abs($this->value), 16);
-                $temp = ( strlen($temp) & 1 ) ? '0' . $temp : $temp;
-                $temp = pack('H*', $temp);
-
-                return $this->precision > 0 ?
-                    substr(str_pad($temp, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
-                    ltrim($temp, chr(0));
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                if ($this->value === '0') {
-                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-                }
-
-                $value = '';
-                $current = $this->value;
-
-                if ($current[0] == '-') {
-                    $current = substr($current, 1);
-                }
-
-                while (bccomp($current, '0', 0) > 0) {
-                    $temp = bcmod($current, '16777216');
-                    $value = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $value;
-                    $current = bcdiv($current, '16777216', 0);
-                }
-
-                return $this->precision > 0 ?
-                    substr(str_pad($value, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
-                    ltrim($value, chr(0));
-        }
-
-        if (!count($this->value)) {
-            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-        }
-        $result = $this->_int2bytes($this->value[count($this->value) - 1]);
-
-        $temp = $this->copy();
-
-        for ($i = count($temp->value) - 2; $i >= 0; --$i) {
-            $temp->_base256_lshift($result, 26);
-            $result = $result | str_pad($temp->_int2bytes($temp->value[$i]), strlen($result), chr(0), STR_PAD_LEFT);
-        }
-
-        return $this->precision > 0 ?
-            str_pad(substr($result, -(($this->precision + 7) >> 3)), ($this->precision + 7) >> 3, chr(0), STR_PAD_LEFT) :
-            $result;
-    }
-
-    /**
-     * Converts a BigInteger to a hex string (eg. base-16)).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * 
-     * toHex(); // outputs '41'
-     * ?>
-     * 
-     *
-     * @param Boolean $twos_compliment
-     * @return String
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**8
-     */
-    function toHex($twos_compliment = false)
-    {
-        return bin2hex($this->toBytes($twos_compliment));
-    }
-
-    /**
-     * Converts a BigInteger to a bit string (eg. base-2).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * 
-     * toBits(); // outputs '1000001'
-     * ?>
-     * 
-     *
-     * @param Boolean $twos_compliment
-     * @return String
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**2
-     */
-    function toBits($twos_compliment = false)
-    {
-        $hex = $this->toHex($twos_compliment);
-        $bits = '';
-        for ($i = 0; $i < strlen($hex); $i+=8) {
-            $bits.= str_pad(decbin(hexdec(substr($hex, $i, 8))), 32, '0', STR_PAD_LEFT);
-        }
-        return $this->precision > 0 ? substr($bits, -$this->precision) : ltrim($bits, '0');
-    }
-
-    /**
-     * Converts a BigInteger to a base-10 number.
-     *
-     * Here's an example:
-     * 
-     * toString(); // outputs 50
-     * ?>
-     * 
-     *
-     * @return String
-     * @access public
-     * @internal Converts a base-2**26 number to base-10**7 (which is pretty much base-10)
-     */
-    function toString()
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                return gmp_strval($this->value);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                if ($this->value === '0') {
-                    return '0';
-                }
-
-                return ltrim($this->value, '0');
-        }
-
-        if (!count($this->value)) {
-            return '0';
-        }
-
-        $temp = $this->copy();
-        $temp->is_negative = false;
-
-        $divisor = new Math_BigInteger();
-        $divisor->value = array(10000000); // eg. 10**7
-        $result = '';
-        while (count($temp->value)) {
-            list($temp, $mod) = $temp->divide($divisor);
-            $result = str_pad(isset($mod->value[0]) ? $mod->value[0] : '', 7, '0', STR_PAD_LEFT) . $result;
-        }
-        $result = ltrim($result, '0');
-        if (empty($result)) {
-            $result = '0';
-        }
-
-        if ($this->is_negative) {
-            $result = '-' . $result;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Copy an object
-     *
-     * PHP5 passes objects by reference while PHP4 passes by value.  As such, we need a function to guarantee
-     * that all objects are passed by value, when appropriate.  More information can be found here:
-     *
-     * {@link http://php.net/language.oop5.basic#51624}
-     *
-     * @access public
-     * @see __clone()
-     * @return Math_BigInteger
-     */
-    function copy()
-    {
-        $temp = new Math_BigInteger();
-        $temp->value = $this->value;
-        $temp->is_negative = $this->is_negative;
-        $temp->generator = $this->generator;
-        $temp->precision = $this->precision;
-        $temp->bitmask = $this->bitmask;
-        return $temp;
-    }
-
-    /**
-     *  __toString() magic method
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * toString().
-     *
-     * @access public
-     * @internal Implemented per a suggestion by Techie-Michael - thanks!
-     */
-    function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * __clone() magic method
-     *
-     * Although you can call Math_BigInteger::__toString() directly in PHP5, you cannot call Math_BigInteger::__clone()
-     * directly in PHP5.  You can in PHP4 since it's not a magic method, but in PHP5, you have to call it by using the PHP5
-     * only syntax of $y = clone $x.  As such, if you're trying to write an application that works on both PHP4 and PHP5,
-     * call Math_BigInteger::copy(), instead.
-     *
-     * @access public
-     * @see copy()
-     * @return Math_BigInteger
-     */
-    function __clone()
-    {
-        return $this->copy();
-    }
-
-    /**
-     *  __sleep() magic method
-     *
-     * Will be called, automatically, when serialize() is called on a Math_BigInteger object.
-     *
-     * @see __wakeup()
-     * @access public
-     */
-    function __sleep()
-    {
-        $this->hex = $this->toHex(true);
-        $vars = array('hex');
-        if ($this->generator != 'mt_rand') {
-            $vars[] = 'generator';
-        }
-        if ($this->precision > 0) {
-            $vars[] = 'precision';
-        }
-        return $vars;
-        
-    }
-
-    /**
-     *  __wakeup() magic method
-     *
-     * Will be called, automatically, when unserialize() is called on a Math_BigInteger object.
-     *
-     * @see __sleep()
-     * @access public
-     */
-    function __wakeup()
-    {
-        $temp = new Math_BigInteger($this->hex, -16);
-        $this->value = $temp->value;
-        $this->is_negative = $temp->is_negative;
-        $this->setRandomGenerator($this->generator);
-        if ($this->precision > 0) {
-            // recalculate $this->bitmask
-            $this->setPrecision($this->precision);
-        }
-    }
-
-    /**
-     * Adds two BigIntegers.
-     *
-     * Here's an example:
-     * 
-     * add($b);
-     *
-     *    echo $c->toString(); // outputs 30
-     * ?>
-     * 
-     *
-     * @param Math_BigInteger $y
-     * @return Math_BigInteger
-     * @access public
-     * @internal Performs base-2**52 addition
-     */
-    function add($y)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp = new Math_BigInteger();
-                $temp->value = gmp_add($this->value, $y->value);
-
-                return $this->_normalize($temp);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $temp = new Math_BigInteger();
-                $temp->value = bcadd($this->value, $y->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_add($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        $result = new Math_BigInteger();
-        $result->value = $temp[MATH_BIGINTEGER_VALUE];
-        $result->is_negative = $temp[MATH_BIGINTEGER_SIGN];
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs addition.
-     *
-     * @param Array $x_value
-     * @param Boolean $x_negative
-     * @param Array $y_value
-     * @param Boolean $y_negative
-     * @return Array
-     * @access private
-     */
-    function _add($x_value, $x_negative, $y_value, $y_negative)
-    {
-        $x_size = count($x_value);
-        $y_size = count($y_value);
-
-        if ($x_size == 0) {
-            return array(
-                MATH_BIGINTEGER_VALUE => $y_value,
-                MATH_BIGINTEGER_SIGN => $y_negative
-            );
-        } else if ($y_size == 0) {
-            return array(
-                MATH_BIGINTEGER_VALUE => $x_value,
-                MATH_BIGINTEGER_SIGN => $x_negative
-            );
-        }
-
-        // subtract, if appropriate
-        if ( $x_negative != $y_negative ) {
-            if ( $x_value == $y_value ) {
-                return array(
-                    MATH_BIGINTEGER_VALUE => array(),
-                    MATH_BIGINTEGER_SIGN => false
-                );
-            }
-
-            $temp = $this->_subtract($x_value, false, $y_value, false);
-            $temp[MATH_BIGINTEGER_SIGN] = $this->_compare($x_value, false, $y_value, false) > 0 ?
-                                          $x_negative : $y_negative;
-
-            return $temp;
-        }
-
-        if ($x_size < $y_size) {
-            $size = $x_size;
-            $value = $y_value;
-        } else {
-            $size = $y_size;
-            $value = $x_value;
-        }
-
-        $value[] = 0; // just in case the carry adds an extra digit
-
-        $carry = 0;
-        for ($i = 0, $j = 1; $j < $size; $i+=2, $j+=2) {
-            $sum = $x_value[$j] * 0x4000000 + $x_value[$i] + $y_value[$j] * 0x4000000 + $y_value[$i] + $carry;
-            $carry = $sum >= MATH_BIGINTEGER_MAX_DIGIT52; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-            $sum = $carry ? $sum - MATH_BIGINTEGER_MAX_DIGIT52 : $sum;
-
-            $temp = (int) ($sum / 0x4000000);
-
-            $value[$i] = (int) ($sum - 0x4000000 * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
-            $value[$j] = $temp;
-        }
-
-        if ($j == $size) { // ie. if $y_size is odd
-            $sum = $x_value[$i] + $y_value[$i] + $carry;
-            $carry = $sum >= 0x4000000;
-            $value[$i] = $carry ? $sum - 0x4000000 : $sum;
-            ++$i; // ie. let $i = $j since we've just done $value[$i]
-        }
-
-        if ($carry) {
-            for (; $value[$i] == 0x3FFFFFF; ++$i) {
-                $value[$i] = 0;
-            }
-            ++$value[$i];
-        }
-
-        return array(
-            MATH_BIGINTEGER_VALUE => $this->_trim($value),
-            MATH_BIGINTEGER_SIGN => $x_negative
-        );
-    }
-
-    /**
-     * Subtracts two BigIntegers.
-     *
-     * Here's an example:
-     * 
-     * subtract($b);
-     *
-     *    echo $c->toString(); // outputs -10
-     * ?>
-     * 
-     *
-     * @param Math_BigInteger $y
-     * @return Math_BigInteger
-     * @access public
-     * @internal Performs base-2**52 subtraction
-     */
-    function subtract($y)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp = new Math_BigInteger();
-                $temp->value = gmp_sub($this->value, $y->value);
-
-                return $this->_normalize($temp);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $temp = new Math_BigInteger();
-                $temp->value = bcsub($this->value, $y->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_subtract($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        $result = new Math_BigInteger();
-        $result->value = $temp[MATH_BIGINTEGER_VALUE];
-        $result->is_negative = $temp[MATH_BIGINTEGER_SIGN];
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs subtraction.
-     *
-     * @param Array $x_value
-     * @param Boolean $x_negative
-     * @param Array $y_value
-     * @param Boolean $y_negative
-     * @return Array
-     * @access private
-     */
-    function _subtract($x_value, $x_negative, $y_value, $y_negative)
-    {
-        $x_size = count($x_value);
-        $y_size = count($y_value);
-
-        if ($x_size == 0) {
-            return array(
-                MATH_BIGINTEGER_VALUE => $y_value,
-                MATH_BIGINTEGER_SIGN => !$y_negative
-            );
-        } else if ($y_size == 0) {
-            return array(
-                MATH_BIGINTEGER_VALUE => $x_value,
-                MATH_BIGINTEGER_SIGN => $x_negative
-            );
-        }
-
-        // add, if appropriate (ie. -$x - +$y or +$x - -$y)
-        if ( $x_negative != $y_negative ) {
-            $temp = $this->_add($x_value, false, $y_value, false);
-            $temp[MATH_BIGINTEGER_SIGN] = $x_negative;
-
-            return $temp;
-        }
-
-        $diff = $this->_compare($x_value, $x_negative, $y_value, $y_negative);
-
-        if ( !$diff ) {
-            return array(
-                MATH_BIGINTEGER_VALUE => array(),
-                MATH_BIGINTEGER_SIGN => false
-            );
-        }
-
-        // switch $x and $y around, if appropriate.
-        if ( (!$x_negative && $diff < 0) || ($x_negative && $diff > 0) ) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_negative = !$x_negative;
-
-            $x_size = count($x_value);
-            $y_size = count($y_value);
-        }
-
-        // at this point, $x_value should be at least as big as - if not bigger than - $y_value
-
-        $carry = 0;
-        for ($i = 0, $j = 1; $j < $y_size; $i+=2, $j+=2) {
-            $sum = $x_value[$j] * 0x4000000 + $x_value[$i] - $y_value[$j] * 0x4000000 - $y_value[$i] - $carry;
-            $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-            $sum = $carry ? $sum + MATH_BIGINTEGER_MAX_DIGIT52 : $sum;
-
-            $temp = (int) ($sum / 0x4000000);
-
-            $x_value[$i] = (int) ($sum - 0x4000000 * $temp);
-            $x_value[$j] = $temp;
-        }
-
-        if ($j == $y_size) { // ie. if $y_size is odd
-            $sum = $x_value[$i] - $y_value[$i] - $carry;
-            $carry = $sum < 0;
-            $x_value[$i] = $carry ? $sum + 0x4000000 : $sum;
-            ++$i;
-        }
-
-        if ($carry) {
-            for (; !$x_value[$i]; ++$i) {
-                $x_value[$i] = 0x3FFFFFF;
-            }
-            --$x_value[$i];
-        }
-
-        return array(
-            MATH_BIGINTEGER_VALUE => $this->_trim($x_value),
-            MATH_BIGINTEGER_SIGN => $x_negative
-        );
-    }
-
-    /**
-     * Multiplies two BigIntegers
-     *
-     * Here's an example:
-     * 
-     * multiply($b);
-     *
-     *    echo $c->toString(); // outputs 200
-     * ?>
-     * 
-     *
-     * @param Math_BigInteger $x
-     * @return Math_BigInteger
-     * @access public
-     */
-    function multiply($x)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp = new Math_BigInteger();
-                $temp->value = gmp_mul($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $temp = new Math_BigInteger();
-                $temp->value = bcmul($this->value, $x->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_multiply($this->value, $this->is_negative, $x->value, $x->is_negative);
-
-        $product = new Math_BigInteger();
-        $product->value = $temp[MATH_BIGINTEGER_VALUE];
-        $product->is_negative = $temp[MATH_BIGINTEGER_SIGN];
-
-        return $this->_normalize($product);
-    }
-
-    /**
-     * Performs multiplication.
-     *
-     * @param Array $x_value
-     * @param Boolean $x_negative
-     * @param Array $y_value
-     * @param Boolean $y_negative
-     * @return Array
-     * @access private
-     */
-    function _multiply($x_value, $x_negative, $y_value, $y_negative)
-    {
-        //if ( $x_value == $y_value ) {
-        //    return array(
-        //        MATH_BIGINTEGER_VALUE => $this->_square($x_value),
-        //        MATH_BIGINTEGER_SIGN => $x_sign != $y_value
-        //    );
-        //}
-
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if ( !$x_length || !$y_length ) { // a 0 is being multiplied
-            return array(
-                MATH_BIGINTEGER_VALUE => array(),
-                MATH_BIGINTEGER_SIGN => false
-            );
-        }
-
-        return array(
-            MATH_BIGINTEGER_VALUE => min($x_length, $y_length) < 2 * MATH_BIGINTEGER_KARATSUBA_CUTOFF ?
-                $this->_trim($this->_regularMultiply($x_value, $y_value)) :
-                $this->_trim($this->_karatsuba($x_value, $y_value)),
-            MATH_BIGINTEGER_SIGN => $x_negative != $y_negative
-        );
-    }
-
-    /**
-     * Performs long multiplication on two BigIntegers
-     *
-     * Modeled after 'multiply' in MutableBigInteger.java.
-     *
-     * @param Array $x_value
-     * @param Array $y_value
-     * @return Array
-     * @access private
-     */
-    function _regularMultiply($x_value, $y_value)
-    {
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if ( !$x_length || !$y_length ) { // a 0 is being multiplied
-            return array();
-        }
-
-        if ( $x_length < $y_length ) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_length = count($x_value);
-            $y_length = count($y_value);
-        }
-
-        $product_value = $this->_array_repeat(0, $x_length + $y_length);
-
-        // the following for loop could be removed if the for loop following it
-        // (the one with nested for loops) initially set $i to 0, but
-        // doing so would also make the result in one set of unnecessary adds,
-        // since on the outermost loops first pass, $product->value[$k] is going
-        // to always be 0
-
-        $carry = 0;
-
-        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
-            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = (int) ($temp / 0x4000000);
-            $product_value[$j] = (int) ($temp - 0x4000000 * $carry);
-        }
-
-        $product_value[$j] = $carry;
-
-        // the above for loop is what the previous comment was talking about.  the
-        // following for loop is the "one with nested for loops"
-        for ($i = 1; $i < $y_length; ++$i) {
-            $carry = 0;
-
-            for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
-                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = (int) ($temp / 0x4000000);
-                $product_value[$k] = (int) ($temp - 0x4000000 * $carry);
-            }
-
-            $product_value[$k] = $carry;
-        }
-
-        return $product_value;
-    }
-
-    /**
-     * Performs Karatsuba multiplication on two BigIntegers
-     *
-     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=120 MPM 5.2.3}.
-     *
-     * @param Array $x_value
-     * @param Array $y_value
-     * @return Array
-     * @access private
-     */
-    function _karatsuba($x_value, $y_value)
-    {
-        $m = min(count($x_value) >> 1, count($y_value) >> 1);
-
-        if ($m < MATH_BIGINTEGER_KARATSUBA_CUTOFF) {
-            return $this->_regularMultiply($x_value, $y_value);
-        }
-
-        $x1 = array_slice($x_value, $m);
-        $x0 = array_slice($x_value, 0, $m);
-        $y1 = array_slice($y_value, $m);
-        $y0 = array_slice($y_value, 0, $m);
-
-        $z2 = $this->_karatsuba($x1, $y1);
-        $z0 = $this->_karatsuba($x0, $y0);
-
-        $z1 = $this->_add($x1, false, $x0, false);
-        $temp = $this->_add($y1, false, $y0, false);
-        $z1 = $this->_karatsuba($z1[MATH_BIGINTEGER_VALUE], $temp[MATH_BIGINTEGER_VALUE]);
-        $temp = $this->_add($z2, false, $z0, false);
-        $z1 = $this->_subtract($z1, false, $temp[MATH_BIGINTEGER_VALUE], false);
-
-        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
-        $z1[MATH_BIGINTEGER_VALUE] = array_merge(array_fill(0, $m, 0), $z1[MATH_BIGINTEGER_VALUE]);
-
-        $xy = $this->_add($z2, false, $z1[MATH_BIGINTEGER_VALUE], $z1[MATH_BIGINTEGER_SIGN]);
-        $xy = $this->_add($xy[MATH_BIGINTEGER_VALUE], $xy[MATH_BIGINTEGER_SIGN], $z0, false);
-
-        return $xy[MATH_BIGINTEGER_VALUE];
-    }
-
-    /**
-     * Performs squaring
-     *
-     * @param Array $x
-     * @return Array
-     * @access private
-     */
-    function _square($x = false)
-    {
-        return count($x) < 2 * MATH_BIGINTEGER_KARATSUBA_CUTOFF ?
-            $this->_trim($this->_baseSquare($x)) :
-            $this->_trim($this->_karatsubaSquare($x));
-    }
-
-    /**
-     * Performs traditional squaring on two BigIntegers
-     *
-     * Squaring can be done faster than multiplying a number by itself can be.  See
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
-     *
-     * @param Array $value
-     * @return Array
-     * @access private
-     */
-    function _baseSquare($value)
-    {
-        if ( empty($value) ) {
-            return array();
-        }
-        $square_value = $this->_array_repeat(0, 2 * count($value));
-
-        for ($i = 0, $max_index = count($value) - 1; $i <= $max_index; ++$i) {
-            $i2 = $i << 1;
-
-            $temp = $square_value[$i2] + $value[$i] * $value[$i];
-            $carry = (int) ($temp / 0x4000000);
-            $square_value[$i2] = (int) ($temp - 0x4000000 * $carry);
-
-            // note how we start from $i+1 instead of 0 as we do in multiplication.
-            for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
-                $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
-                $carry = (int) ($temp / 0x4000000);
-                $square_value[$k] = (int) ($temp - 0x4000000 * $carry);
-            }
-
-            // the following line can yield values larger 2**15.  at this point, PHP should switch
-            // over to floats.
-            $square_value[$i + $max_index + 1] = $carry;
-        }
-
-        return $square_value;
-    }
-
-    /**
-     * Performs Karatsuba "squaring" on two BigIntegers
-     *
-     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=151 MPM 5.3.4}.
-     *
-     * @param Array $value
-     * @return Array
-     * @access private
-     */
-    function _karatsubaSquare($value)
-    {
-        $m = count($value) >> 1;
-
-        if ($m < MATH_BIGINTEGER_KARATSUBA_CUTOFF) {
-            return $this->_baseSquare($value);
-        }
-
-        $x1 = array_slice($value, $m);
-        $x0 = array_slice($value, 0, $m);
-
-        $z2 = $this->_karatsubaSquare($x1);
-        $z0 = $this->_karatsubaSquare($x0);
-
-        $z1 = $this->_add($x1, false, $x0, false);
-        $z1 = $this->_karatsubaSquare($z1[MATH_BIGINTEGER_VALUE]);
-        $temp = $this->_add($z2, false, $z0, false);
-        $z1 = $this->_subtract($z1, false, $temp[MATH_BIGINTEGER_VALUE], false);
-
-        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
-        $z1[MATH_BIGINTEGER_VALUE] = array_merge(array_fill(0, $m, 0), $z1[MATH_BIGINTEGER_VALUE]);
-
-        $xx = $this->_add($z2, false, $z1[MATH_BIGINTEGER_VALUE], $z1[MATH_BIGINTEGER_SIGN]);
-        $xx = $this->_add($xx[MATH_BIGINTEGER_VALUE], $xx[MATH_BIGINTEGER_SIGN], $z0, false);
-
-        return $xx[MATH_BIGINTEGER_VALUE];
-    }
-
-    /**
-     * Divides two BigIntegers.
-     *
-     * Returns an array whose first element contains the quotient and whose second element contains the
-     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-     * and the divisor (basically, the "common residue" is the first positive modulo).
-     *
-     * Here's an example:
-     * 
-     * divide($b);
-     *
-     *    echo $quotient->toString(); // outputs 0
-     *    echo "\r\n";
-     *    echo $remainder->toString(); // outputs 10
-     * ?>
-     * 
-     *
-     * @param Math_BigInteger $y
-     * @return Array
-     * @access public
-     * @internal This function is based off of {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}.
-     */
-    function divide($y)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $quotient = new Math_BigInteger();
-                $remainder = new Math_BigInteger();
-
-                list($quotient->value, $remainder->value) = gmp_div_qr($this->value, $y->value);
-
-                if (gmp_sign($remainder->value) < 0) {
-                    $remainder->value = gmp_add($remainder->value, gmp_abs($y->value));
-                }
-
-                return array($this->_normalize($quotient), $this->_normalize($remainder));
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $quotient = new Math_BigInteger();
-                $remainder = new Math_BigInteger();
-
-                $quotient->value = bcdiv($this->value, $y->value, 0);
-                $remainder->value = bcmod($this->value, $y->value);
-
-                if ($remainder->value[0] == '-') {
-                    $remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value, 0);
-                }
-
-                return array($this->_normalize($quotient), $this->_normalize($remainder));
-        }
-
-        if (count($y->value) == 1) {
-            list($q, $r) = $this->_divide_digit($this->value, $y->value[0]);
-            $quotient = new Math_BigInteger();
-            $remainder = new Math_BigInteger();
-            $quotient->value = $q;
-            $remainder->value = array($r);
-            $quotient->is_negative = $this->is_negative != $y->is_negative;
-            return array($this->_normalize($quotient), $this->_normalize($remainder));
-        }
-
-        static $zero;
-        if ( !isset($zero) ) {
-            $zero = new Math_BigInteger();
-        }
-
-        $x = $this->copy();
-        $y = $y->copy();
-
-        $x_sign = $x->is_negative;
-        $y_sign = $y->is_negative;
-
-        $x->is_negative = $y->is_negative = false;
-
-        $diff = $x->compare($y);
-
-        if ( !$diff ) {
-            $temp = new Math_BigInteger();
-            $temp->value = array(1);
-            $temp->is_negative = $x_sign != $y_sign;
-            return array($this->_normalize($temp), $this->_normalize(new Math_BigInteger()));
-        }
-
-        if ( $diff < 0 ) {
-            // if $x is negative, "add" $y.
-            if ( $x_sign ) {
-                $x = $y->subtract($x);
-            }
-            return array($this->_normalize(new Math_BigInteger()), $this->_normalize($x));
-        }
-
-        // normalize $x and $y as described in HAC 14.23 / 14.24
-        $msb = $y->value[count($y->value) - 1];
-        for ($shift = 0; !($msb & 0x2000000); ++$shift) {
-            $msb <<= 1;
-        }
-        $x->_lshift($shift);
-        $y->_lshift($shift);
-        $y_value = &$y->value;
-
-        $x_max = count($x->value) - 1;
-        $y_max = count($y->value) - 1;
-
-        $quotient = new Math_BigInteger();
-        $quotient_value = &$quotient->value;
-        $quotient_value = $this->_array_repeat(0, $x_max - $y_max + 1);
-
-        static $temp, $lhs, $rhs;
-        if (!isset($temp)) {
-            $temp = new Math_BigInteger();
-            $lhs =  new Math_BigInteger();
-            $rhs =  new Math_BigInteger();
-        }
-        $temp_value = &$temp->value;
-        $rhs_value =  &$rhs->value;
-
-        // $temp = $y << ($x_max - $y_max-1) in base 2**26
-        $temp_value = array_merge($this->_array_repeat(0, $x_max - $y_max), $y_value);
-
-        while ( $x->compare($temp) >= 0 ) {
-            // calculate the "common residue"
-            ++$quotient_value[$x_max - $y_max];
-            $x = $x->subtract($temp);
-            $x_max = count($x->value) - 1;
-        }
-
-        for ($i = $x_max; $i >= $y_max + 1; --$i) {
-            $x_value = &$x->value;
-            $x_window = array(
-                isset($x_value[$i]) ? $x_value[$i] : 0,
-                isset($x_value[$i - 1]) ? $x_value[$i - 1] : 0,
-                isset($x_value[$i - 2]) ? $x_value[$i - 2] : 0
-            );
-            $y_window = array(
-                $y_value[$y_max],
-                ( $y_max > 0 ) ? $y_value[$y_max - 1] : 0
-            );
-
-            $q_index = $i - $y_max - 1;
-            if ($x_window[0] == $y_window[0]) {
-                $quotient_value[$q_index] = 0x3FFFFFF;
-            } else {
-                $quotient_value[$q_index] = (int) (
-                    ($x_window[0] * 0x4000000 + $x_window[1])
-                    /
-                    $y_window[0]
-                );
-            }
-
-            $temp_value = array($y_window[1], $y_window[0]);
-
-            $lhs->value = array($quotient_value[$q_index]);
-            $lhs = $lhs->multiply($temp);
-
-            $rhs_value = array($x_window[2], $x_window[1], $x_window[0]);
-
-            while ( $lhs->compare($rhs) > 0 ) {
-                --$quotient_value[$q_index];
-
-                $lhs->value = array($quotient_value[$q_index]);
-                $lhs = $lhs->multiply($temp);
-            }
-
-            $adjust = $this->_array_repeat(0, $q_index);
-            $temp_value = array($quotient_value[$q_index]);
-            $temp = $temp->multiply($y);
-            $temp_value = &$temp->value;
-            $temp_value = array_merge($adjust, $temp_value);
-
-            $x = $x->subtract($temp);
-
-            if ($x->compare($zero) < 0) {
-                $temp_value = array_merge($adjust, $y_value);
-                $x = $x->add($temp);
-
-                --$quotient_value[$q_index];
-            }
-
-            $x_max = count($x_value) - 1;
-        }
-
-        // unnormalize the remainder
-        $x->_rshift($shift);
-
-        $quotient->is_negative = $x_sign != $y_sign;
-
-        // calculate the "common residue", if appropriate
-        if ( $x_sign ) {
-            $y->_rshift($shift);
-            $x = $y->subtract($x);
-        }
-
-        return array($this->_normalize($quotient), $this->_normalize($x));
-    }
-
-    /**
-     * Divides a BigInteger by a regular integer
-     *
-     * abc / x = a00 / x + b0 / x + c / x
-     *
-     * @param Array $dividend
-     * @param Array $divisor
-     * @return Array
-     * @access private
-     */
-    function _divide_digit($dividend, $divisor)
-    {
-        $carry = 0;
-        $result = array();
-
-        for ($i = count($dividend) - 1; $i >= 0; --$i) {
-            $temp = 0x4000000 * $carry + $dividend[$i];
-            $result[$i] = (int) ($temp / $divisor);
-            $carry = (int) ($temp - $divisor * $result[$i]);
-        }
-
-        return array($result, $carry);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Here's an example:
-     * 
-     * modPow($b, $c);
-     *
-     *    echo $c->toString(); // outputs 10
-     * ?>
-     * 
-     *
-     * @param Math_BigInteger $e
-     * @param Math_BigInteger $n
-     * @return Math_BigInteger
-     * @access public
-     * @internal The most naive approach to modular exponentiation has very unreasonable requirements, and
-     *    and although the approach involving repeated squaring does vastly better, it, too, is impractical
-     *    for our purposes.  The reason being that division - by far the most complicated and time-consuming
-     *    of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
-     *
-     *    Modular reductions resolve this issue.  Although an individual modular reduction takes more time
-     *    then an individual division, when performed in succession (with the same modulo), they're a lot faster.
-     *
-     *    The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
-     *    although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
-     *    base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
-     *    the product of two odd numbers is odd), but what about when RSA isn't used?
-     *
-     *    In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
-     *    Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
-     *    modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
-     *    uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
-     *    the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
-     *    {@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
-     */
-    function modPow($e, $n)
-    {
-        $n = $this->bitmask !== false && $this->bitmask->compare($n) < 0 ? $this->bitmask : $n->abs();
-
-        if ($e->compare(new Math_BigInteger()) < 0) {
-            $e = $e->abs();
-
-            $temp = $this->modInverse($n);
-            if ($temp === false) {
-                return false;
-            }
-
-            return $this->_normalize($temp->modPow($e, $n));
-        }
-
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp = new Math_BigInteger();
-                $temp->value = gmp_powm($this->value, $e->value, $n->value);
-
-                return $this->_normalize($temp);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $temp = new Math_BigInteger();
-                $temp->value = bcpowmod($this->value, $e->value, $n->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        if ( empty($e->value) ) {
-            $temp = new Math_BigInteger();
-            $temp->value = array(1);
-            return $this->_normalize($temp);
-        }
-
-        if ( $e->value == array(1) ) {
-            list(, $temp) = $this->divide($n);
-            return $this->_normalize($temp);
-        }
-
-        if ( $e->value == array(2) ) {
-            $temp = new Math_BigInteger();
-            $temp->value = $this->_square($this->value);
-            list(, $temp) = $temp->divide($n);
-            return $this->_normalize($temp);
-        }
-
-        return $this->_normalize($this->_slidingWindow($e, $n, MATH_BIGINTEGER_BARRETT));
-
-        // is the modulo odd?
-        if ( $n->value[0] & 1 ) {
-            return $this->_normalize($this->_slidingWindow($e, $n, MATH_BIGINTEGER_MONTGOMERY));
-        }
-        // if it's not, it's even
-
-        // find the lowest set bit (eg. the max pow of 2 that divides $n)
-        for ($i = 0; $i < count($n->value); ++$i) {
-            if ( $n->value[$i] ) {
-                $temp = decbin($n->value[$i]);
-                $j = strlen($temp) - strrpos($temp, '1') - 1;
-                $j+= 26 * $i;
-                break;
-            }
-        }
-        // at this point, 2^$j * $n/(2^$j) == $n
-
-        $mod1 = $n->copy();
-        $mod1->_rshift($j);
-        $mod2 = new Math_BigInteger();
-        $mod2->value = array(1);
-        $mod2->_lshift($j);
-
-        $part1 = ( $mod1->value != array(1) ) ? $this->_slidingWindow($e, $mod1, MATH_BIGINTEGER_MONTGOMERY) : new Math_BigInteger();
-        $part2 = $this->_slidingWindow($e, $mod2, MATH_BIGINTEGER_POWEROF2);
-
-        $y1 = $mod2->modInverse($mod1);
-        $y2 = $mod1->modInverse($mod2);
-
-        $result = $part1->multiply($mod2);
-        $result = $result->multiply($y1);
-
-        $temp = $part2->multiply($mod1);
-        $temp = $temp->multiply($y2);
-
-        $result = $result->add($temp);
-        list(, $result) = $result->divide($n);
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Alias for Math_BigInteger::modPow()
-     *
-     * @param Math_BigInteger $e
-     * @param Math_BigInteger $n
-     * @return Math_BigInteger
-     * @access public
-     */
-    function powMod($e, $n)
-    {
-        return $this->modPow($e, $n);
-    }
-
-    /**
-     * Sliding Window k-ary Modular Exponentiation
-     *
-     * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
-     * however, this function performs a modular reduction after every multiplication and squaring operation.
-     * As such, this function has the same preconditions that the reductions being used do.
-     *
-     * @param Math_BigInteger $e
-     * @param Math_BigInteger $n
-     * @param Integer $mode
-     * @return Math_BigInteger
-     * @access private
-     */
-    function _slidingWindow($e, $n, $mode)
-    {
-        static $window_ranges = array(7, 25, 81, 241, 673, 1793); // from BigInteger.java's oddModPow function
-        //static $window_ranges = array(0, 7, 36, 140, 450, 1303, 3529); // from MPM 7.3.1
-
-        $e_value = $e->value;
-        $e_length = count($e_value) - 1;
-        $e_bits = decbin($e_value[$e_length]);
-        for ($i = $e_length - 1; $i >= 0; --$i) {
-            $e_bits.= str_pad(decbin($e_value[$i]), 26, '0', STR_PAD_LEFT);
-        }
-
-        $e_length = strlen($e_bits);
-
-        // calculate the appropriate window size.
-        // $window_size == 3 if $window_ranges is between 25 and 81, for example.
-        for ($i = 0, $window_size = 1; $e_length > $window_ranges[$i] && $i < count($window_ranges); ++$window_size, ++$i);
-
-        $n_value = $n->value;
-
-        // precompute $this^0 through $this^$window_size
-        $powers = array();
-        $powers[1] = $this->_prepareReduce($this->value, $n_value, $mode);
-        $powers[2] = $this->_squareReduce($powers[1], $n_value, $mode);
-
-        // we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
-        // in a 1.  ie. it's supposed to be odd.
-        $temp = 1 << ($window_size - 1);
-        for ($i = 1; $i < $temp; ++$i) {
-            $i2 = $i << 1;
-            $powers[$i2 + 1] = $this->_multiplyReduce($powers[$i2 - 1], $powers[2], $n_value, $mode);
-        }
-
-        $result = array(1);
-        $result = $this->_prepareReduce($result, $n_value, $mode);
-
-        for ($i = 0; $i < $e_length; ) {
-            if ( !$e_bits[$i] ) {
-                $result = $this->_squareReduce($result, $n_value, $mode);
-                ++$i;
-            } else {
-                for ($j = $window_size - 1; $j > 0; --$j) {
-                    if ( !empty($e_bits[$i + $j]) ) {
-                        break;
-                    }
-                }
-
-                for ($k = 0; $k <= $j; ++$k) {// eg. the length of substr($e_bits, $i, $j+1)
-                    $result = $this->_squareReduce($result, $n_value, $mode);
-                }
-
-                $result = $this->_multiplyReduce($result, $powers[bindec(substr($e_bits, $i, $j + 1))], $n_value, $mode);
-
-                $i+=$j + 1;
-            }
-        }
-
-        $temp = new Math_BigInteger();
-        $temp->value = $this->_reduce($result, $n_value, $mode);
-
-        return $temp;
-    }
-
-    /**
-     * Modular reduction
-     *
-     * For most $modes this will return the remainder.
-     *
-     * @see _slidingWindow()
-     * @access private
-     * @param Array $x
-     * @param Array $n
-     * @param Integer $mode
-     * @return Array
-     */
-    function _reduce($x, $n, $mode)
-    {
-        switch ($mode) {
-            case MATH_BIGINTEGER_MONTGOMERY:
-                return $this->_montgomery($x, $n);
-            case MATH_BIGINTEGER_BARRETT:
-                return $this->_barrett($x, $n);
-            case MATH_BIGINTEGER_POWEROF2:
-                $lhs = new Math_BigInteger();
-                $lhs->value = $x;
-                $rhs = new Math_BigInteger();
-                $rhs->value = $n;
-                return $x->_mod2($n);
-            case MATH_BIGINTEGER_CLASSIC:
-                $lhs = new Math_BigInteger();
-                $lhs->value = $x;
-                $rhs = new Math_BigInteger();
-                $rhs->value = $n;
-                list(, $temp) = $lhs->divide($rhs);
-                return $temp->value;
-            case MATH_BIGINTEGER_NONE:
-                return $x;
-            default:
-                // an invalid $mode was provided
-        }
-    }
-
-    /**
-     * Modular reduction preperation
-     *
-     * @see _slidingWindow()
-     * @access private
-     * @param Array $x
-     * @param Array $n
-     * @param Integer $mode
-     * @return Array
-     */
-    function _prepareReduce($x, $n, $mode)
-    {
-        if ($mode == MATH_BIGINTEGER_MONTGOMERY) {
-            return $this->_prepMontgomery($x, $n);
-        }
-        return $this->_reduce($x, $n, $mode);
-    }
-
-    /**
-     * Modular multiply
-     *
-     * @see _slidingWindow()
-     * @access private
-     * @param Array $x
-     * @param Array $y
-     * @param Array $n
-     * @param Integer $mode
-     * @return Array
-     */
-    function _multiplyReduce($x, $y, $n, $mode)
-    {
-        if ($mode == MATH_BIGINTEGER_MONTGOMERY) {
-            return $this->_montgomeryMultiply($x, $y, $n);
-        }
-        $temp = $this->_multiply($x, false, $y, false);
-        return $this->_reduce($temp[MATH_BIGINTEGER_VALUE], $n, $mode);
-    }
-
-    /**
-     * Modular square
-     *
-     * @see _slidingWindow()
-     * @access private
-     * @param Array $x
-     * @param Array $n
-     * @param Integer $mode
-     * @return Array
-     */
-    function _squareReduce($x, $n, $mode)
-    {
-        if ($mode == MATH_BIGINTEGER_MONTGOMERY) {
-            return $this->_montgomeryMultiply($x, $x, $n);
-        }
-        return $this->_reduce($this->_square($x), $n, $mode);
-    }
-
-    /**
-     * Modulos for Powers of Two
-     *
-     * Calculates $x%$n, where $n = 2**$e, for some $e.  Since this is basically the same as doing $x & ($n-1),
-     * we'll just use this function as a wrapper for doing that.
-     *
-     * @see _slidingWindow()
-     * @access private
-     * @param Math_BigInteger
-     * @return Math_BigInteger
-     */
-    function _mod2($n)
-    {
-        $temp = new Math_BigInteger();
-        $temp->value = array(1);
-        return $this->bitwise_and($n->subtract($temp));
-    }
-
-    /**
-     * Barrett Modular Reduction
-     *
-     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
-     * so as not to require negative numbers (initially, this script didn't support negative numbers).
-     *
-     * Employs "folding", as described at
-     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
-     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
-     *
-     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
-     * usable on account of (1) its not using reasonable radix points as discussed in
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
-     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
-     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
-     * comments for details.
-     *
-     * @see _slidingWindow()
-     * @access private
-     * @param Array $n
-     * @param Array $m
-     * @return Array
-     */
-    function _barrett($n, $m)
-    {
-        static $cache = array(
-            MATH_BIGINTEGER_VARIABLE => array(),
-            MATH_BIGINTEGER_DATA => array()
-        );
-
-        $m_length = count($m);
-
-        // if ($this->_compare($n, $this->_square($m)) >= 0) {
-        if (count($n) > 2 * $m_length) {
-            $lhs = new Math_BigInteger();
-            $rhs = new Math_BigInteger();
-            $lhs->value = $n;
-            $rhs->value = $m;
-            list(, $temp) = $lhs->divide($rhs);
-            return $temp->value;
-        }
-
-        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
-        if ($m_length < 5) {
-            return $this->_regularBarrett($n, $m);
-        }
-
-        // n = 2 * m.length
-
-        if ( ($key = array_search($m, $cache[MATH_BIGINTEGER_VARIABLE])) === false ) {
-            $key = count($cache[MATH_BIGINTEGER_VARIABLE]);
-            $cache[MATH_BIGINTEGER_VARIABLE][] = $m;
-
-            $lhs = new Math_BigInteger();
-            $lhs_value = &$lhs->value;
-            $lhs_value = $this->_array_repeat(0, $m_length + ($m_length >> 1));
-            $lhs_value[] = 1;
-            $rhs = new Math_BigInteger();
-            $rhs->value = $m;
-
-            list($u, $m1) = $lhs->divide($rhs);
-            $u = $u->value;
-            $m1 = $m1->value;
-
-            $cache[MATH_BIGINTEGER_DATA][] = array(
-                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
-                'm1'=> $m1 // m.length
-            );
-        } else {
-            extract($cache[MATH_BIGINTEGER_DATA][$key]);
-        }
-
-        $cutoff = $m_length + ($m_length >> 1);
-        $lsd = array_slice($n, 0, $cutoff); // m.length + (m.length >> 1)
-        $msd = array_slice($n, $cutoff);    // m.length >> 1
-        $lsd = $this->_trim($lsd);
-        $temp = $this->_multiply($msd, false, $m1, false);
-        $n = $this->_add($lsd, false, $temp[MATH_BIGINTEGER_VALUE], false); // m.length + (m.length >> 1) + 1
-
-        if ($m_length & 1) {
-            return $this->_regularBarrett($n[MATH_BIGINTEGER_VALUE], $m);
-        }
-
-        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
-        $temp = array_slice($n[MATH_BIGINTEGER_VALUE], $m_length - 1);
-        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
-        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
-        $temp = $this->_multiply($temp, false, $u, false);
-        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
-        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
-        $temp = array_slice($temp[MATH_BIGINTEGER_VALUE], ($m_length >> 1) + 1);
-        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
-        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
-        $temp = $this->_multiply($temp, false, $m, false);
-
-        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
-        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
-        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
-
-        $result = $this->_subtract($n[MATH_BIGINTEGER_VALUE], false, $temp[MATH_BIGINTEGER_VALUE], false);
-
-        while ($this->_compare($result[MATH_BIGINTEGER_VALUE], $result[MATH_BIGINTEGER_SIGN], $m, false) >= 0) {
-            $result = $this->_subtract($result[MATH_BIGINTEGER_VALUE], $result[MATH_BIGINTEGER_SIGN], $m, false);
-        }
-
-        return $result[MATH_BIGINTEGER_VALUE];
-    }
-
-    /**
-     * (Regular) Barrett Modular Reduction
-     *
-     * For numbers with more than four digits Math_BigInteger::_barrett() is faster.  The difference between that and this
-     * is that this function does not fold the denominator into a smaller form.
-     *
-     * @see _slidingWindow()
-     * @access private
-     * @param Array $x
-     * @param Array $n
-     * @return Array
-     */
-    function _regularBarrett($x, $n)
-    {
-        static $cache = array(
-            MATH_BIGINTEGER_VARIABLE => array(),
-            MATH_BIGINTEGER_DATA => array()
-        );
-
-        $n_length = count($n);
-
-        if (count($x) > 2 * $n_length) {
-            $lhs = new Math_BigInteger();
-            $rhs = new Math_BigInteger();
-            $lhs->value = $x;
-            $rhs->value = $n;
-            list(, $temp) = $lhs->divide($rhs);
-            return $temp->value;
-        }
-
-        if ( ($key = array_search($n, $cache[MATH_BIGINTEGER_VARIABLE])) === false ) {
-            $key = count($cache[MATH_BIGINTEGER_VARIABLE]);
-            $cache[MATH_BIGINTEGER_VARIABLE][] = $n;
-            $lhs = new Math_BigInteger();
-            $lhs_value = &$lhs->value;
-            $lhs_value = $this->_array_repeat(0, 2 * $n_length);
-            $lhs_value[] = 1;
-            $rhs = new Math_BigInteger();
-            $rhs->value = $n;
-            list($temp, ) = $lhs->divide($rhs); // m.length
-            $cache[MATH_BIGINTEGER_DATA][] = $temp->value;
-        }
-
-        // 2 * m.length - (m.length - 1) = m.length + 1
-        $temp = array_slice($x, $n_length - 1);
-        // (m.length + 1) + m.length = 2 * m.length + 1
-        $temp = $this->_multiply($temp, false, $cache[MATH_BIGINTEGER_DATA][$key], false);
-        // (2 * m.length + 1) - (m.length - 1) = m.length + 2
-        $temp = array_slice($temp[MATH_BIGINTEGER_VALUE], $n_length + 1);
-
-        // m.length + 1
-        $result = array_slice($x, 0, $n_length + 1);
-        // m.length + 1
-        $temp = $this->_multiplyLower($temp, false, $n, false, $n_length + 1);
-        // $temp == array_slice($temp->_multiply($temp, false, $n, false)->value, 0, $n_length + 1)
-
-        if ($this->_compare($result, false, $temp[MATH_BIGINTEGER_VALUE], $temp[MATH_BIGINTEGER_SIGN]) < 0) {
-            $corrector_value = $this->_array_repeat(0, $n_length + 1);
-            $corrector_value[] = 1;
-            $result = $this->_add($result, false, $corrector, false);
-            $result = $result[MATH_BIGINTEGER_VALUE];
-        }
-
-        // at this point, we're subtracting a number with m.length + 1 digits from another number with m.length + 1 digits
-        $result = $this->_subtract($result, false, $temp[MATH_BIGINTEGER_VALUE], $temp[MATH_BIGINTEGER_SIGN]);
-        while ($this->_compare($result[MATH_BIGINTEGER_VALUE], $result[MATH_BIGINTEGER_SIGN], $n, false) > 0) {
-            $result = $this->_subtract($result[MATH_BIGINTEGER_VALUE], $result[MATH_BIGINTEGER_SIGN], $n, false);
-        }
-
-        return $result[MATH_BIGINTEGER_VALUE];
-    }
-
-    /**
-     * Performs long multiplication up to $stop digits
-     *
-     * If you're going to be doing array_slice($product->value, 0, $stop), some cycles can be saved.
-     *
-     * @see _regularBarrett()
-     * @param Array $x_value
-     * @param Boolean $x_negative
-     * @param Array $y_value
-     * @param Boolean $y_negative
-     * @return Array
-     * @access private
-     */
-    function _multiplyLower($x_value, $x_negative, $y_value, $y_negative, $stop)
-    {
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if ( !$x_length || !$y_length ) { // a 0 is being multiplied
-            return array(
-                MATH_BIGINTEGER_VALUE => array(),
-                MATH_BIGINTEGER_SIGN => false
-            );
-        }
-
-        if ( $x_length < $y_length ) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_length = count($x_value);
-            $y_length = count($y_value);
-        }
-
-        $product_value = $this->_array_repeat(0, $x_length + $y_length);
-
-        // the following for loop could be removed if the for loop following it
-        // (the one with nested for loops) initially set $i to 0, but
-        // doing so would also make the result in one set of unnecessary adds,
-        // since on the outermost loops first pass, $product->value[$k] is going
-        // to always be 0
-
-        $carry = 0;
-
-        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
-            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = (int) ($temp / 0x4000000);
-            $product_value[$j] = (int) ($temp - 0x4000000 * $carry);
-        }
-
-        if ($j < $stop) {
-            $product_value[$j] = $carry;
-        }
-
-        // the above for loop is what the previous comment was talking about.  the
-        // following for loop is the "one with nested for loops"
-
-        for ($i = 1; $i < $y_length; ++$i) {
-            $carry = 0;
-
-            for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
-                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = (int) ($temp / 0x4000000);
-                $product_value[$k] = (int) ($temp - 0x4000000 * $carry);
-            }
-
-            if ($k < $stop) {
-                $product_value[$k] = $carry;
-            }
-        }
-
-        return array(
-            MATH_BIGINTEGER_VALUE => $this->_trim($product_value),
-            MATH_BIGINTEGER_SIGN => $x_negative != $y_negative
-        );
-    }
-
-    /**
-     * Montgomery Modular Reduction
-     *
-     * ($x->_prepMontgomery($n))->_montgomery($n) yields $x % $n.
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=170 MPM 6.3} provides insights on how this can be
-     * improved upon (basically, by using the comba method).  gcd($n, 2) must be equal to one for this function
-     * to work correctly.
-     *
-     * @see _prepMontgomery()
-     * @see _slidingWindow()
-     * @access private
-     * @param Array $x
-     * @param Array $n
-     * @return Array
-     */
-    function _montgomery($x, $n)
-    {
-        static $cache = array(
-            MATH_BIGINTEGER_VARIABLE => array(),
-            MATH_BIGINTEGER_DATA => array()
-        );
-
-        if ( ($key = array_search($n, $cache[MATH_BIGINTEGER_VARIABLE])) === false ) {
-            $key = count($cache[MATH_BIGINTEGER_VARIABLE]);
-            $cache[MATH_BIGINTEGER_VARIABLE][] = $x;
-            $cache[MATH_BIGINTEGER_DATA][] = $this->_modInverse67108864($n);
-        }
-
-        $k = count($n);
-
-        $result = array(MATH_BIGINTEGER_VALUE => $x);
-
-        for ($i = 0; $i < $k; ++$i) {
-            $temp = $result[MATH_BIGINTEGER_VALUE][$i] * $cache[MATH_BIGINTEGER_DATA][$key];
-            $temp = (int) ($temp - 0x4000000 * ((int) ($temp / 0x4000000)));
-            $temp = $this->_regularMultiply(array($temp), $n);
-            $temp = array_merge($this->_array_repeat(0, $i), $temp);
-            $result = $this->_add($result[MATH_BIGINTEGER_VALUE], false, $temp, false);
-        }
-
-        $result[MATH_BIGINTEGER_VALUE] = array_slice($result[MATH_BIGINTEGER_VALUE], $k);
-
-        if ($this->_compare($result, false, $n, false) >= 0) {
-            $result = $this->_subtract($result[MATH_BIGINTEGER_VALUE], false, $n, false);
-        }
-
-        return $result[MATH_BIGINTEGER_VALUE];
-    }
-
-    /**
-     * Montgomery Multiply
-     *
-     * Interleaves the montgomery reduction and long multiplication algorithms together as described in 
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
-     *
-     * @see _prepMontgomery()
-     * @see _montgomery()
-     * @access private
-     * @param Array $x
-     * @param Array $y
-     * @param Array $m
-     * @return Array
-     */
-    function _montgomeryMultiply($x, $y, $m)
-    {
-        $temp = $this->_multiply($x, false, $y, false);
-        return $this->_montgomery($temp[MATH_BIGINTEGER_VALUE], $m);
-
-        static $cache = array(
-            MATH_BIGINTEGER_VARIABLE => array(),
-            MATH_BIGINTEGER_DATA => array()
-        );
-
-        if ( ($key = array_search($m, $cache[MATH_BIGINTEGER_VARIABLE])) === false ) {
-            $key = count($cache[MATH_BIGINTEGER_VARIABLE]);
-            $cache[MATH_BIGINTEGER_VARIABLE][] = $m;
-            $cache[MATH_BIGINTEGER_DATA][] = $this->_modInverse67108864($m);
-        }
-
-        $n = max(count($x), count($y), count($m));
-        $x = array_pad($x, $n, 0);
-        $y = array_pad($y, $n, 0);
-        $m = array_pad($m, $n, 0);
-        $a = array(MATH_BIGINTEGER_VALUE => $this->_array_repeat(0, $n + 1));
-        for ($i = 0; $i < $n; ++$i) {
-            $temp = $a[MATH_BIGINTEGER_VALUE][0] + $x[$i] * $y[0];
-            $temp = (int) ($temp - 0x4000000 * ((int) ($temp / 0x4000000)));
-            $temp = $temp * $cache[MATH_BIGINTEGER_DATA][$key];
-            $temp = (int) ($temp - 0x4000000 * ((int) ($temp / 0x4000000)));
-            $temp = $this->_add($this->_regularMultiply(array($x[$i]), $y), false, $this->_regularMultiply(array($temp), $m), false);
-            $a = $this->_add($a[MATH_BIGINTEGER_VALUE], false, $temp[MATH_BIGINTEGER_VALUE], false);
-            $a[MATH_BIGINTEGER_VALUE] = array_slice($a[MATH_BIGINTEGER_VALUE], 1);
-        }
-        if ($this->_compare($a[MATH_BIGINTEGER_VALUE], false, $m, false) >= 0) {
-            $a = $this->_subtract($a[MATH_BIGINTEGER_VALUE], false, $m, false);
-        }
-        return $a[MATH_BIGINTEGER_VALUE];
-    }
-
-    /**
-     * Prepare a number for use in Montgomery Modular Reductions
-     *
-     * @see _montgomery()
-     * @see _slidingWindow()
-     * @access private
-     * @param Array $x
-     * @param Array $n
-     * @return Array
-     */
-    function _prepMontgomery($x, $n)
-    {
-        $lhs = new Math_BigInteger();
-        $lhs->value = array_merge($this->_array_repeat(0, count($n)), $x);
-        $rhs = new Math_BigInteger();
-        $rhs->value = $n;
-
-        list(, $temp) = $lhs->divide($rhs);
-        return $temp->value;
-    }
-
-    /**
-     * Modular Inverse of a number mod 2**26 (eg. 67108864)
-     *
-     * Based off of the bnpInvDigit function implemented and justified in the following URL:
-     *
-     * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
-     *
-     * The following URL provides more info:
-     *
-     * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
-     *
-     * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
-     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields 
-     * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
-     * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
-     * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
-     * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
-     * 40 bits, which only 64-bit floating points will support.
-     *
-     * Thanks to Pedro Gimeno Fortea for input!
-     *
-     * @see _montgomery()
-     * @access private
-     * @param Array $x
-     * @return Integer
-     */
-    function _modInverse67108864($x) // 2**26 == 67108864
-    {
-        $x = -$x[0];
-        $result = $x & 0x3; // x**-1 mod 2**2
-        $result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
-        $result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
-        $result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
-        $result = fmod($result * (2 - fmod($x * $result, 0x4000000)), 0x4000000); // x**-1 mod 2**26
-        return $result & 0x3FFFFFF;
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     *
-     * Here's an example:
-     * 
-     * modInverse($b);
-     *    echo $c->toString(); // outputs 4
-     *
-     *    echo "\r\n";
-     *
-     *    $d = $a->multiply($c);
-     *    list(, $d) = $d->divide($b);
-     *    echo $d; // outputs 1 (as per the definition of modular inverse)
-     * ?>
-     * 
-     *
-     * @param Math_BigInteger $n
-     * @return mixed false, if no modular inverse exists, Math_BigInteger, otherwise.
-     * @access public
-     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.
-     */
-    function modInverse($n)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp = new Math_BigInteger();
-                $temp->value = gmp_invert($this->value, $n->value);
-
-                return ( $temp->value === false ) ? false : $this->_normalize($temp);
-        }
-
-        static $zero, $one;
-        if (!isset($zero)) {
-            $zero = new Math_BigInteger();
-            $one = new Math_BigInteger(1);
-        }
-
-        // $x mod $n == $x mod -$n.
-        $n = $n->abs();
-
-        if ($this->compare($zero) < 0) {
-            $temp = $this->abs();
-            $temp = $temp->modInverse($n);
-            return $negated === false ? false : $this->_normalize($n->subtract($temp));
-        }
-
-        extract($this->extendedGCD($n));
-
-        if (!$gcd->equals($one)) {
-            return false;
-        }
-
-        $x = $x->compare($zero) < 0 ? $x->add($n) : $x;
-
-        return $this->compare($zero) < 0 ? $this->_normalize($n->subtract($x)) : $this->_normalize($x);
-    }
-
-    /**
-     * Calculates the greatest common divisor and Bzout's identity.
-     *
-     * Say you have 693 and 609.  The GCD is 21.  Bzout's identity states that there exist integers x and y such that
-     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
-     * combination is returned is dependant upon which mode is in use.  See
-     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bzout's identity - Wikipedia} for more information.
-     *
-     * Here's an example:
-     * 
-     * extendedGCD($b));
-     *
-     *    echo $gcd->toString() . "\r\n"; // outputs 21
-     *    echo $a->toString() * $x->toString() + $b->toString() * $y->toString(); // outputs 21
-     * ?>
-     * 
-     *
-     * @param Math_BigInteger $n
-     * @return Math_BigInteger
-     * @access public
-     * @internal Calculates the GCD using the binary xGCD algorithim described in
-     *    {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=19 HAC 14.61}.  As the text above 14.61 notes,
-     *    the more traditional algorithim requires "relatively costly multiple-precision divisions".
-     */
-    function extendedGCD($n)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                extract(gmp_gcdext($this->value, $n->value));
-
-                return array(
-                    'gcd' => $this->_normalize(new Math_BigInteger($g)),
-                    'x'   => $this->_normalize(new Math_BigInteger($s)),
-                    'y'   => $this->_normalize(new Math_BigInteger($t))
-                );
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                // it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
-                // best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
-                // the basic extended euclidean algorithim is what we're using.
-
-                $u = $this->value;
-                $v = $n->value;
-
-                $a = '1';
-                $b = '0';
-                $c = '0';
-                $d = '1';
-
-                while (bccomp($v, '0', 0) != 0) {
-                    $q = bcdiv($u, $v, 0);
-
-                    $temp = $u;
-                    $u = $v;
-                    $v = bcsub($temp, bcmul($v, $q, 0), 0);
-
-                    $temp = $a;
-                    $a = $c;
-                    $c = bcsub($temp, bcmul($a, $q, 0), 0);
-
-                    $temp = $b;
-                    $b = $d;
-                    $d = bcsub($temp, bcmul($b, $q, 0), 0);
-                }
-
-                return array(
-                    'gcd' => $this->_normalize(new Math_BigInteger($u)),
-                    'x'   => $this->_normalize(new Math_BigInteger($a)),
-                    'y'   => $this->_normalize(new Math_BigInteger($b))
-                );
-        }
-
-        $y = $n->copy();
-        $x = $this->copy();
-        $g = new Math_BigInteger();
-        $g->value = array(1);
-
-        while ( !(($x->value[0] & 1)|| ($y->value[0] & 1)) ) {
-            $x->_rshift(1);
-            $y->_rshift(1);
-            $g->_lshift(1);
-        }
-
-        $u = $x->copy();
-        $v = $y->copy();
-
-        $a = new Math_BigInteger();
-        $b = new Math_BigInteger();
-        $c = new Math_BigInteger();
-        $d = new Math_BigInteger();
-
-        $a->value = $d->value = $g->value = array(1);
-        $b->value = $c->value = array();
-
-        while ( !empty($u->value) ) {
-            while ( !($u->value[0] & 1) ) {
-                $u->_rshift(1);
-                if ( (!empty($a->value) && ($a->value[0] & 1)) || (!empty($b->value) && ($b->value[0] & 1)) ) {
-                    $a = $a->add($y);
-                    $b = $b->subtract($x);
-                }
-                $a->_rshift(1);
-                $b->_rshift(1);
-            }
-
-            while ( !($v->value[0] & 1) ) {
-                $v->_rshift(1);
-                if ( (!empty($d->value) && ($d->value[0] & 1)) || (!empty($c->value) && ($c->value[0] & 1)) ) {
-                    $c = $c->add($y);
-                    $d = $d->subtract($x);
-                }
-                $c->_rshift(1);
-                $d->_rshift(1);
-            }
-
-            if ($u->compare($v) >= 0) {
-                $u = $u->subtract($v);
-                $a = $a->subtract($c);
-                $b = $b->subtract($d);
-            } else {
-                $v = $v->subtract($u);
-                $c = $c->subtract($a);
-                $d = $d->subtract($b);
-            }
-        }
-
-        return array(
-            'gcd' => $this->_normalize($g->multiply($v)),
-            'x'   => $this->_normalize($c),
-            'y'   => $this->_normalize($d)
-        );
-    }
-
-    /**
-     * Calculates the greatest common divisor
-     *
-     * Say you have 693 and 609.  The GCD is 21.
-     *
-     * Here's an example:
-     * 
-     * extendedGCD($b);
-     *
-     *    echo $gcd->toString() . "\r\n"; // outputs 21
-     * ?>
-     * 
-     *
-     * @param Math_BigInteger $n
-     * @return Math_BigInteger
-     * @access public
-     */
-    function gcd($n)
-    {
-        extract($this->extendedGCD($n));
-        return $gcd;
-    }
-
-    /**
-     * Absolute value.
-     *
-     * @return Math_BigInteger
-     * @access public
-     */
-    function abs()
-    {
-        $temp = new Math_BigInteger();
-
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp->value = gmp_abs($this->value);
-                break;
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $temp->value = (bccomp($this->value, '0', 0) < 0) ? substr($this->value, 1) : $this->value;
-                break;
-            default:
-                $temp->value = $this->value;
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
-     * demonstrated thusly:
-     *
-     * $x  > $y: $x->compare($y)  > 0
-     * $x  < $y: $x->compare($y)  < 0
-     * $x == $y: $x->compare($y) == 0
-     *
-     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
-     *
-     * @param Math_BigInteger $x
-     * @return Integer < 0 if $this is less than $x; > 0 if $this is greater than $x, and 0 if they are equal.
-     * @access public
-     * @see equals()
-     * @internal Could return $this->subtract($x), but that's not as fast as what we do do.
-     */
-    function compare($y)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                return gmp_cmp($this->value, $y->value);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                return bccomp($this->value, $y->value, 0);
-        }
-
-        return $this->_compare($this->value, $this->is_negative, $y->value, $y->is_negative);
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * @param Array $x_value
-     * @param Boolean $x_negative
-     * @param Array $y_value
-     * @param Boolean $y_negative
-     * @return Integer
-     * @see compare()
-     * @access private
-     */
-    function _compare($x_value, $x_negative, $y_value, $y_negative)
-    {
-        if ( $x_negative != $y_negative ) {
-            return ( !$x_negative && $y_negative ) ? 1 : -1;
-        }
-
-        $result = $x_negative ? -1 : 1;
-
-        if ( count($x_value) != count($y_value) ) {
-            return ( count($x_value) > count($y_value) ) ? $result : -$result;
-        }
-        $size = max(count($x_value), count($y_value));
-
-        $x_value = array_pad($x_value, $size, 0);
-        $y_value = array_pad($y_value, $size, 0);
-
-        for ($i = count($x_value) - 1; $i >= 0; --$i) {
-            if ($x_value[$i] != $y_value[$i]) {
-                return ( $x_value[$i] > $y_value[$i] ) ? $result : -$result;
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * If you need to see if one number is greater than or less than another number, use Math_BigInteger::compare()
-     *
-     * @param Math_BigInteger $x
-     * @return Boolean
-     * @access public
-     * @see compare()
-     */
-    function equals($x)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                return gmp_cmp($this->value, $x->value) == 0;
-            default:
-                return $this->value === $x->value && $this->is_negative == $x->is_negative;
-        }
-    }
-
-    /**
-     * Set Precision
-     *
-     * Some bitwise operations give different results depending on the precision being used.  Examples include left
-     * shift, not, and rotates.
-     *
-     * @param Math_BigInteger $x
-     * @access public
-     * @return Math_BigInteger
-     */
-    function setPrecision($bits)
-    {
-        $this->precision = $bits;
-        if ( MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_BCMATH ) {
-            $this->bitmask = new Math_BigInteger(chr((1 << ($bits & 0x7)) - 1) . str_repeat(chr(0xFF), $bits >> 3), 256);
-        } else {
-            $this->bitmask = new Math_BigInteger(bcpow('2', $bits, 0));
-        }
-
-        $temp = $this->_normalize($this);
-        $this->value = $temp->value;
-    }
-
-    /**
-     * Logical And
-     *
-     * @param Math_BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez 
-     * @return Math_BigInteger
-     */
-    function bitwise_and($x)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp = new Math_BigInteger();
-                $temp->value = gmp_and($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new Math_BigInteger($left & $right, 256));
-        }
-
-        $result = $this->copy();
-
-        $length = min(count($x->value), count($this->value));
-
-        $result->value = array_slice($result->value, 0, $length);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i] = $result->value[$i] & $x->value[$i];
-        }
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Logical Or
-     *
-     * @param Math_BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez 
-     * @return Math_BigInteger
-     */
-    function bitwise_or($x)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp = new Math_BigInteger();
-                $temp->value = gmp_or($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new Math_BigInteger($left | $right, 256));
-        }
-
-        $length = max(count($this->value), count($x->value));
-        $result = $this->copy();
-        $result->value = array_pad($result->value, 0, $length);
-        $x->value = array_pad($x->value, 0, $length);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i] = $this->value[$i] | $x->value[$i];
-        }
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Logical Exclusive-Or
-     *
-     * @param Math_BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez 
-     * @return Math_BigInteger
-     */
-    function bitwise_xor($x)
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                $temp = new Math_BigInteger();
-                $temp->value = gmp_xor($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new Math_BigInteger($left ^ $right, 256));
-        }
-
-        $length = max(count($this->value), count($x->value));
-        $result = $this->copy();
-        $result->value = array_pad($result->value, 0, $length);
-        $x->value = array_pad($x->value, 0, $length);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i] = $this->value[$i] ^ $x->value[$i];
-        }
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Logical Not
-     *
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez 
-     * @return Math_BigInteger
-     */
-    function bitwise_not()
-    {
-        // calculuate "not" without regard to $this->precision
-        // (will always result in a smaller number.  ie. ~1 isn't 1111 1110 - it's 0)
-        $temp = $this->toBytes();
-        $pre_msb = decbin(ord($temp[0]));
-        $temp = ~$temp;
-        $msb = decbin(ord($temp[0]));
-        if (strlen($msb) == 8) {
-            $msb = substr($msb, strpos($msb, '0'));
-        }
-        $temp[0] = chr(bindec($msb));
-
-        // see if we need to add extra leading 1's
-        $current_bits = strlen($pre_msb) + 8 * strlen($temp) - 8;
-        $new_bits = $this->precision - $current_bits;
-        if ($new_bits <= 0) {
-            return $this->_normalize(new Math_BigInteger($temp, 256));
-        }
-
-        // generate as many leading 1's as we need to.
-        $leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
-        $this->_base256_lshift($leading_ones, $current_bits);
-
-        $temp = str_pad($temp, ceil($this->bits / 8), chr(0), STR_PAD_LEFT);
-
-        return $this->_normalize(new Math_BigInteger($leading_ones | $temp, 256));
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
-     *
-     * @param Integer $shift
-     * @return Math_BigInteger
-     * @access public
-     * @internal The only version that yields any speed increases is the internal version.
-     */
-    function bitwise_rightShift($shift)
-    {
-        $temp = new Math_BigInteger();
-
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                static $two;
-
-                if (!isset($two)) {
-                    $two = gmp_init('2');
-                }
-
-                $temp->value = gmp_div_q($this->value, gmp_pow($two, $shift));
-
-                break;
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $temp->value = bcdiv($this->value, bcpow('2', $shift, 0), 0);
-
-                break;
-            default: // could just replace _lshift with this, but then all _lshift() calls would need to be rewritten
-                     // and I don't want to do that...
-                $temp->value = $this->value;
-                $temp->_rshift($shift);
-        }
-
-        return $this->_normalize($temp);
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
-     *
-     * @param Integer $shift
-     * @return Math_BigInteger
-     * @access public
-     * @internal The only version that yields any speed increases is the internal version.
-     */
-    function bitwise_leftShift($shift)
-    {
-        $temp = new Math_BigInteger();
-
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                static $two;
-
-                if (!isset($two)) {
-                    $two = gmp_init('2');
-                }
-
-                $temp->value = gmp_mul($this->value, gmp_pow($two, $shift));
-
-                break;
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                $temp->value = bcmul($this->value, bcpow('2', $shift, 0), 0);
-
-                break;
-            default: // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
-                     // and I don't want to do that...
-                $temp->value = $this->value;
-                $temp->_lshift($shift);
-        }
-
-        return $this->_normalize($temp);
-    }
-
-    /**
-     * Logical Left Rotate
-     *
-     * Instead of the top x bits being dropped they're appended to the shifted bit string.
-     *
-     * @param Integer $shift
-     * @return Math_BigInteger
-     * @access public
-     */
-    function bitwise_leftRotate($shift)
-    {
-        $bits = $this->toBytes();
-
-        if ($this->precision > 0) {
-            $precision = $this->precision;
-            if ( MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_BCMATH ) {
-                $mask = $this->bitmask->subtract(new Math_BigInteger(1));
-                $mask = $mask->toBytes();
-            } else {
-                $mask = $this->bitmask->toBytes();
-            }
-        } else {
-            $temp = ord($bits[0]);
-            for ($i = 0; $temp >> $i; ++$i);
-            $precision = 8 * strlen($bits) - 8 + $i;
-            $mask = chr((1 << ($precision & 0x7)) - 1) . str_repeat(chr(0xFF), $precision >> 3);
-        }
-
-        if ($shift < 0) {
-            $shift+= $precision;
-        }
-        $shift%= $precision;
-
-        if (!$shift) {
-            return $this->copy();
-        }
-
-        $left = $this->bitwise_leftShift($shift);
-        $left = $left->bitwise_and(new Math_BigInteger($mask, 256));
-        $right = $this->bitwise_rightShift($precision - $shift);
-        $result = MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_BCMATH ? $left->bitwise_or($right) : $left->add($right);
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Logical Right Rotate
-     *
-     * Instead of the bottom x bits being dropped they're prepended to the shifted bit string.
-     *
-     * @param Integer $shift
-     * @return Math_BigInteger
-     * @access public
-     */
-    function bitwise_rightRotate($shift)
-    {
-        return $this->bitwise_leftRotate(-$shift);
-    }
-
-    /**
-     * Set random number generator function
-     *
-     * $generator should be the name of a random generating function whose first parameter is the minimum
-     * value and whose second parameter is the maximum value.  If this function needs to be seeded, it should
-     * be seeded prior to calling Math_BigInteger::random() or Math_BigInteger::randomPrime()
-     *
-     * If the random generating function is not explicitly set, it'll be assumed to be mt_rand().
-     *
-     * @see random()
-     * @see randomPrime()
-     * @param optional String $generator
-     * @access public
-     */
-    function setRandomGenerator($generator)
-    {
-        $this->generator = $generator;
-    }
-
-    /**
-     * Generate a random number
-     *
-     * @param optional Integer $min
-     * @param optional Integer $max
-     * @return Math_BigInteger
-     * @access public
-     */
-    function random($min = false, $max = false)
-    {
-        if ($min === false) {
-            $min = new Math_BigInteger(0);
-        }
-
-        if ($max === false) {
-            $max = new Math_BigInteger(0x7FFFFFFF);
-        }
-
-        $compare = $max->compare($min);
-
-        if (!$compare) {
-            return $this->_normalize($min);
-        } else if ($compare < 0) {
-            // if $min is bigger then $max, swap $min and $max
-            $temp = $max;
-            $max = $min;
-            $min = $temp;
-        }
-
-        $generator = $this->generator;
-
-        $max = $max->subtract($min);
-        $max = ltrim($max->toBytes(), chr(0));
-        $size = strlen($max) - 1;
-        $random = '';
-
-        $bytes = $size & 1;
-        for ($i = 0; $i < $bytes; ++$i) {
-            $random.= chr($generator(0, 255));
-        }
-
-        $blocks = $size >> 1;
-        for ($i = 0; $i < $blocks; ++$i) {
-            // mt_rand(-2147483648, 0x7FFFFFFF) always produces -2147483648 on some systems
-            $random.= pack('n', $generator(0, 0xFFFF));
-        }
-
-        $temp = new Math_BigInteger($random, 256);
-        if ($temp->compare(new Math_BigInteger(substr($max, 1), 256)) > 0) {
-            $random = chr($generator(0, ord($max[0]) - 1)) . $random;
-        } else {
-            $random = chr($generator(0, ord($max[0])    )) . $random;
-        }
-
-        $random = new Math_BigInteger($random, 256);
-
-        return $this->_normalize($random->add($min));
-    }
-
-    /**
-     * Generate a random prime number.
-     *
-     * If there's not a prime within the given range, false will be returned.  If more than $timeout seconds have elapsed,
-     * give up and return false.
-     *
-     * @param optional Integer $min
-     * @param optional Integer $max
-     * @param optional Integer $timeout
-     * @return Math_BigInteger
-     * @access public
-     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=15 HAC 4.44}.
-     */
-    function randomPrime($min = false, $max = false, $timeout = false)
-    {
-        $compare = $max->compare($min);
-
-        if (!$compare) {
-            return $min;
-        } else if ($compare < 0) {
-            // if $min is bigger then $max, swap $min and $max
-            $temp = $max;
-            $max = $min;
-            $min = $temp;
-        }
-
-        // gmp_nextprime() requires PHP 5 >= 5.2.0 per .
-        if ( MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_GMP && function_exists('gmp_nextprime') ) {
-            // we don't rely on Math_BigInteger::random()'s min / max when gmp_nextprime() is being used since this function
-            // does its own checks on $max / $min when gmp_nextprime() is used.  When gmp_nextprime() is not used, however,
-            // the same $max / $min checks are not performed.
-            if ($min === false) {
-                $min = new Math_BigInteger(0);
-            }
-
-            if ($max === false) {
-                $max = new Math_BigInteger(0x7FFFFFFF);
-            }
-
-            $x = $this->random($min, $max);
-
-            $x->value = gmp_nextprime($x->value);
-
-            if ($x->compare($max) <= 0) {
-                return $x;
-            }
-
-            $x->value = gmp_nextprime($min->value);
-
-            if ($x->compare($max) <= 0) {
-                return $x;
-            }
-
-            return false;
-        }
-
-        static $one, $two;
-        if (!isset($one)) {
-            $one = new Math_BigInteger(1);
-            $two = new Math_BigInteger(2);
-        }
-
-        $start = time();
-
-        $x = $this->random($min, $max);
-        if ($x->equals($two)) {
-            return $x;
-        }
-
-        $x->_make_odd();
-        if ($x->compare($max) > 0) {
-            // if $x > $max then $max is even and if $min == $max then no prime number exists between the specified range
-            if ($min->equals($max)) {
-                return false;
-            }
-            $x = $min->copy();
-            $x->_make_odd();
-        }
-
-        $initial_x = $x->copy();
-
-        while (true) {
-            if ($timeout !== false && time() - $start > $timeout) {
-                return false;
-            }
-
-            if ($x->isPrime()) {
-                return $x;
-            }
-
-            $x = $x->add($two);
-
-            if ($x->compare($max) > 0) {
-                $x = $min->copy();
-                if ($x->equals($two)) {
-                    return $x;
-                }
-                $x->_make_odd();
-            }
-
-            if ($x->equals($initial_x)) {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Make the current number odd
-     *
-     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
-     *
-     * @see randomPrime()
-     * @access private
-     */
-    function _make_odd()
-    {
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                gmp_setbit($this->value, 0);
-                break;
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
-                    $this->value = bcadd($this->value, '1');
-                }
-                break;
-            default:
-                $this->value[0] |= 1;
-        }
-    }
-
-    /**
-     * Checks a numer to see if it's prime
-     *
-     * Assuming the $t parameter is not set, this function has an error rate of 2**-80.  The main motivation for the
-     * $t parameter is distributability.  Math_BigInteger::randomPrime() can be distributed accross multiple pageloads
-     * on a website instead of just one.
-     *
-     * @param optional Integer $t
-     * @return Boolean
-     * @access public
-     * @internal Uses the
-     *     {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.  See 
-     *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24}.
-     */
-    function isPrime($t = false)
-    {
-        $length = strlen($this->toBytes());
-
-        if (!$t) {
-            // see HAC 4.49 "Note (controlling the error probability)"
-                 if ($length >= 163) { $t =  2; } // floor(1300 / 8)
-            else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
-            else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
-            else if ($length >= 68 ) { $t =  5; } // floor( 550 / 8)
-            else if ($length >= 56 ) { $t =  6; } // floor( 450 / 8)
-            else if ($length >= 50 ) { $t =  7; } // floor( 400 / 8)
-            else if ($length >= 43 ) { $t =  8; } // floor( 350 / 8)
-            else if ($length >= 37 ) { $t =  9; } // floor( 300 / 8)
-            else if ($length >= 31 ) { $t = 12; } // floor( 250 / 8)
-            else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
-            else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
-            else                     { $t = 27; }
-        }
-
-        // ie. gmp_testbit($this, 0)
-        // ie. isEven() or !isOdd()
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                return gmp_prob_prime($this->value, $t) != 0;
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                if ($this->value === '2') {
-                    return true;
-                }
-                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
-                    return false;
-                }
-                break;
-            default:
-                if ($this->value == array(2)) {
-                    return true;
-                }
-                if (~$this->value[0] & 1) {
-                    return false;
-                }
-        }
-
-        static $primes, $zero, $one, $two;
-
-        if (!isset($primes)) {
-            $primes = array(
-                3,    5,    7,    11,   13,   17,   19,   23,   29,   31,   37,   41,   43,   47,   53,   59,   
-                61,   67,   71,   73,   79,   83,   89,   97,   101,  103,  107,  109,  113,  127,  131,  137,  
-                139,  149,  151,  157,  163,  167,  173,  179,  181,  191,  193,  197,  199,  211,  223,  227,  
-                229,  233,  239,  241,  251,  257,  263,  269,  271,  277,  281,  283,  293,  307,  311,  313,  
-                317,  331,  337,  347,  349,  353,  359,  367,  373,  379,  383,  389,  397,  401,  409,  419,  
-                421,  431,  433,  439,  443,  449,  457,  461,  463,  467,  479,  487,  491,  499,  503,  509,  
-                521,  523,  541,  547,  557,  563,  569,  571,  577,  587,  593,  599,  601,  607,  613,  617,  
-                619,  631,  641,  643,  647,  653,  659,  661,  673,  677,  683,  691,  701,  709,  719,  727,  
-                733,  739,  743,  751,  757,  761,  769,  773,  787,  797,  809,  811,  821,  823,  827,  829,  
-                839,  853,  857,  859,  863,  877,  881,  883,  887,  907,  911,  919,  929,  937,  941,  947,  
-                953,  967,  971,  977,  983,  991,  997
-            );
-
-            if ( MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_INTERNAL ) {
-                for ($i = 0; $i < count($primes); ++$i) {
-                    $primes[$i] = new Math_BigInteger($primes[$i]);
-                }
-            }
-
-            $zero = new Math_BigInteger();
-            $one = new Math_BigInteger(1);
-            $two = new Math_BigInteger(2);
-        }
-
-        if ($this->equals($one)) {
-            return false;
-        }
-
-        // see HAC 4.4.1 "Random search for probable primes"
-        if ( MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_INTERNAL ) {
-            foreach ($primes as $prime) {
-                list(, $r) = $this->divide($prime);
-                if ($r->equals($zero)) {
-                    return $this->equals($prime);
-                }
-            }
-        } else {
-            $value = $this->value;
-            foreach ($primes as $prime) {
-                list(, $r) = $this->_divide_digit($value, $prime);
-                if (!$r) {
-                    return count($value) == 1 && $value[0] == $prime;
-                }
-            }
-        }
-
-        $n   = $this->copy();
-        $n_1 = $n->subtract($one);
-        $n_2 = $n->subtract($two);
-
-        $r = $n_1->copy();
-        $r_value = $r->value;
-        // ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
-        if ( MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_BCMATH ) {
-            $s = 0;
-            // if $n was 1, $r would be 0 and this would be an infinite loop, hence our $this->equals($one) check earlier
-            while ($r->value[strlen($r->value) - 1] % 2 == 0) {
-                $r->value = bcdiv($r->value, '2', 0);
-                ++$s;
-            }
-        } else {
-            for ($i = 0, $r_length = count($r_value); $i < $r_length; ++$i) {
-                $temp = ~$r_value[$i] & 0xFFFFFF;
-                for ($j = 1; ($temp >> $j) & 1; ++$j);
-                if ($j != 25) {
-                    break;
-                }
-            }
-            $s = 26 * $i + $j - 1;
-            $r->_rshift($s);
-        }
-
-        for ($i = 0; $i < $t; ++$i) {
-            $a = $this->random($two, $n_2);
-            $y = $a->modPow($r, $n);
-
-            if (!$y->equals($one) && !$y->equals($n_1)) {
-                for ($j = 1; $j < $s && !$y->equals($n_1); ++$j) {
-                    $y = $y->modPow($two, $n);
-                    if ($y->equals($one)) {
-                        return false;
-                    }
-                }
-
-                if (!$y->equals($n_1)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts BigInteger's by $shift bits.
-     *
-     * @param Integer $shift
-     * @access private
-     */
-    function _lshift($shift)
-    {
-        if ( $shift == 0 ) {
-            return;
-        }
-
-        $num_digits = (int) ($shift / 26);
-        $shift %= 26;
-        $shift = 1 << $shift;
-
-        $carry = 0;
-
-        for ($i = 0; $i < count($this->value); ++$i) {
-            $temp = $this->value[$i] * $shift + $carry;
-            $carry = (int) ($temp / 0x4000000);
-            $this->value[$i] = (int) ($temp - $carry * 0x4000000);
-        }
-
-        if ( $carry ) {
-            $this->value[] = $carry;
-        }
-
-        while ($num_digits--) {
-            array_unshift($this->value, 0);
-        }
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits.
-     *
-     * @param Integer $shift
-     * @access private
-     */
-    function _rshift($shift)
-    {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_digits = (int) ($shift / 26);
-        $shift %= 26;
-        $carry_shift = 26 - $shift;
-        $carry_mask = (1 << $shift) - 1;
-
-        if ( $num_digits ) {
-            $this->value = array_slice($this->value, $num_digits);
-        }
-
-        $carry = 0;
-
-        for ($i = count($this->value) - 1; $i >= 0; --$i) {
-            $temp = $this->value[$i] >> $shift | $carry;
-            $carry = ($this->value[$i] & $carry_mask) << $carry_shift;
-            $this->value[$i] = $temp;
-        }
-
-        $this->value = $this->_trim($this->value);
-    }
-
-    /**
-     * Normalize
-     *
-     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
-     *
-     * @param Math_BigInteger
-     * @return Math_BigInteger
-     * @see _trim()
-     * @access private
-     */
-    function _normalize($result)
-    {
-        $result->precision = $this->precision;
-        $result->bitmask = $this->bitmask;
-
-        switch ( MATH_BIGINTEGER_MODE ) {
-            case MATH_BIGINTEGER_MODE_GMP:
-                if (!empty($result->bitmask->value)) {
-                    $result->value = gmp_and($result->value, $result->bitmask->value);
-                }
-
-                return $result;
-            case MATH_BIGINTEGER_MODE_BCMATH:
-                if (!empty($result->bitmask->value)) {
-                    $result->value = bcmod($result->value, $result->bitmask->value);
-                }
-
-                return $result;
-        }
-
-        $value = &$result->value;
-
-        if ( !count($value) ) {
-            return $result;
-        }
-
-        $value = $this->_trim($value);
-
-        if (!empty($result->bitmask->value)) {
-            $length = min(count($value), count($this->bitmask->value));
-            $value = array_slice($value, 0, $length);
-
-            for ($i = 0; $i < $length; ++$i) {
-                $value[$i] = $value[$i] & $this->bitmask->value[$i];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Trim
-     *
-     * Removes leading zeros
-     *
-     * @return Math_BigInteger
-     * @access private
-     */
-    function _trim($value)
-    {
-        for ($i = count($value) - 1; $i >= 0; --$i) {
-            if ( $value[$i] ) {
-                break;
-            }
-            unset($value[$i]);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Array Repeat
-     *
-     * @param $input Array
-     * @param $multiplier mixed
-     * @return Array
-     * @access private
-     */
-    function _array_repeat($input, $multiplier)
-    {
-        return ($multiplier) ? array_fill(0, $multiplier, $input) : array();
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
-     *
-     * @param $x String
-     * @param $shift Integer
-     * @return String
-     * @access private
-     */
-    function _base256_lshift(&$x, $shift)
-    {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_bytes = $shift >> 3; // eg. floor($shift/8)
-        $shift &= 7; // eg. $shift % 8
-
-        $carry = 0;
-        for ($i = strlen($x) - 1; $i >= 0; --$i) {
-            $temp = ord($x[$i]) << $shift | $carry;
-            $x[$i] = chr($temp);
-            $carry = $temp >> 8;
-        }
-        $carry = ($carry != 0) ? chr($carry) : '';
-        $x = $carry . $x . str_repeat(chr(0), $num_bytes);
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts binary strings $shift bits, essentially dividing by 2**$shift and returning the remainder.
-     *
-     * @param $x String
-     * @param $shift Integer
-     * @return String
-     * @access private
-     */
-    function _base256_rshift(&$x, $shift)
-    {
-        if ($shift == 0) {
-            $x = ltrim($x, chr(0));
-            return '';
-        }
-
-        $num_bytes = $shift >> 3; // eg. floor($shift/8)
-        $shift &= 7; // eg. $shift % 8
-
-        $remainder = '';
-        if ($num_bytes) {
-            $start = $num_bytes > strlen($x) ? -strlen($x) : -$num_bytes;
-            $remainder = substr($x, $start);
-            $x = substr($x, 0, -$num_bytes);
-        }
-
-        $carry = 0;
-        $carry_shift = 8 - $shift;
-        for ($i = 0; $i < strlen($x); ++$i) {
-            $temp = (ord($x[$i]) >> $shift) | $carry;
-            $carry = (ord($x[$i]) << $carry_shift) & 0xFF;
-            $x[$i] = chr($temp);
-        }
-        $x = ltrim($x, chr(0));
-
-        $remainder = chr($carry >> $carry_shift) . $remainder;
-
-        return ltrim($remainder, chr(0));
-    }
-
-    // one quirk about how the following functions are implemented is that PHP defines N to be an unsigned long
-    // at 32-bits, while java's longs are 64-bits.
-
-    /**
-     * Converts 32-bit integers to bytes.
-     *
-     * @param Integer $x
-     * @return String
-     * @access private
-     */
-    function _int2bytes($x)
-    {
-        return ltrim(pack('N', $x), chr(0));
-    }
-
-    /**
-     * Converts bytes to 32-bit integers
-     *
-     * @param String $x
-     * @return Integer
-     * @access private
-     */
-    function _bytes2int($x)
-    {
-        $temp = unpack('Nint', str_pad($x, 4, chr(0), STR_PAD_LEFT));
-        return $temp['int'];
-    }
-}
\ No newline at end of file
diff --git a/library/phpsec/Net/SFTP.php b/library/phpsec/Net/SFTP.php
deleted file mode 100644
index 06812ada3..000000000
--- a/library/phpsec/Net/SFTP.php
+++ /dev/null
@@ -1,1461 +0,0 @@
-
- * login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $sftp->pwd() . "\r\n";
- *    $sftp->put('filename.ext', 'hello, world!');
- *    print_r($sftp->nlist());
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Net
- * @package    Net_SFTP
- * @author     Jim Wigginton 
- * @copyright  MMIX Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: SFTP.php,v 1.21 2010/04/09 02:31:34 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**
- * Include Net_SSH2
- */
-require_once('Net/SSH2.php');
-
-/**#@+
- * @access public
- * @see Net_SFTP::getLog()
- */
-/**
- * Returns the message numbers
- */
-define('NET_SFTP_LOG_SIMPLE',  NET_SSH2_LOG_SIMPLE);
-/**
- * Returns the message content
- */
-define('NET_SFTP_LOG_COMPLEX', NET_SSH2_LOG_COMPLEX);
-/**#@-*/
-
-/**
- * SFTP channel constant
- *
- * Net_SSH2::exec() uses 0 and Net_SSH2::interactiveRead() / Net_SSH2::interactiveWrite() use 1.
- *
- * @see Net_SSH2::_send_channel_packet()
- * @see Net_SSH2::_get_channel_packet()
- * @access private
- */
-define('NET_SFTP_CHANNEL', 2);
-
-/**#@+
- * @access public
- * @see Net_SFTP::put()
- */
-/**
- * Reads data from a local file.
- */
-define('NET_SFTP_LOCAL_FILE', 1);
-/**
- * Reads data from a string.
- */
-define('NET_SFTP_STRING',  2);
-/**#@-*/
-
-/**
- * Pure-PHP implementations of SFTP.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Net_SFTP
- */
-class Net_SFTP extends Net_SSH2 {
-    /**
-     * Packet Types
-     *
-     * @see Net_SFTP::Net_SFTP()
-     * @var Array
-     * @access private
-     */
-    var $packet_types = array();
-
-    /**
-     * Status Codes
-     *
-     * @see Net_SFTP::Net_SFTP()
-     * @var Array
-     * @access private
-     */
-    var $status_codes = array();
-
-    /**
-     * The Request ID
-     *
-     * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
-     * concurrent actions, so it's somewhat academic, here.
-     *
-     * @var Integer
-     * @see Net_SFTP::_send_sftp_packet()
-     * @access private
-     */
-    var $request_id = false;
-
-    /**
-     * The Packet Type
-     *
-     * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
-     * concurrent actions, so it's somewhat academic, here.
-     *
-     * @var Integer
-     * @see Net_SFTP::_get_sftp_packet()
-     * @access private
-     */
-    var $packet_type = -1;
-
-    /**
-     * Packet Buffer
-     *
-     * @var String
-     * @see Net_SFTP::_get_sftp_packet()
-     * @access private
-     */
-    var $packet_buffer = '';
-
-    /**
-     * Extensions supported by the server
-     *
-     * @var Array
-     * @see Net_SFTP::_initChannel()
-     * @access private
-     */
-    var $extensions = array();
-
-    /**
-     * Server SFTP version
-     *
-     * @var Integer
-     * @see Net_SFTP::_initChannel()
-     * @access private
-     */
-    var $version;
-
-    /**
-     * Current working directory
-     *
-     * @var String
-     * @see Net_SFTP::_realpath()
-     * @see Net_SFTP::chdir()
-     * @access private
-     */
-    var $pwd = false;
-
-    /**
-     * Packet Type Log
-     *
-     * @see Net_SFTP::getLog()
-     * @var Array
-     * @access private
-     */
-    var $packet_type_log = array();
-
-    /**
-     * Packet Log
-     *
-     * @see Net_SFTP::getLog()
-     * @var Array
-     * @access private
-     */
-    var $packet_log = array();
-
-    /**
-     * Error information
-     *
-     * @see Net_SFTP::getSFTPErrors()
-     * @see Net_SFTP::getLastSFTPError()
-     * @var String
-     * @access private
-     */
-    var $errors = array();
-
-    /**
-     * Default Constructor.
-     *
-     * Connects to an SFTP server
-     *
-     * @param String $host
-     * @param optional Integer $port
-     * @param optional Integer $timeout
-     * @return Net_SFTP
-     * @access public
-     */
-    function Net_SFTP($host, $port = 22, $timeout = 10)
-    {
-        parent::Net_SSH2($host, $port, $timeout);
-        $this->packet_types = array(
-            1  => 'NET_SFTP_INIT',
-            2  => 'NET_SFTP_VERSION',
-            /* the format of SSH_FXP_OPEN changed between SFTPv4 and SFTPv5+:
-                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.1
-               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3 */
-            3  => 'NET_SFTP_OPEN',
-            4  => 'NET_SFTP_CLOSE',
-            5  => 'NET_SFTP_READ',
-            6  => 'NET_SFTP_WRITE',
-            8  => 'NET_SFTP_FSTAT',
-            9  => 'NET_SFTP_SETSTAT',
-            11 => 'NET_SFTP_OPENDIR',
-            12 => 'NET_SFTP_READDIR',
-            13 => 'NET_SFTP_REMOVE',
-            14 => 'NET_SFTP_MKDIR',
-            15 => 'NET_SFTP_RMDIR',
-            16 => 'NET_SFTP_REALPATH',
-            17 => 'NET_SFTP_STAT',
-            /* the format of SSH_FXP_RENAME changed between SFTPv4 and SFTPv5+:
-                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.5 */
-            18 => 'NET_SFTP_RENAME',
-
-            101=> 'NET_SFTP_STATUS',
-            102=> 'NET_SFTP_HANDLE',
-            /* the format of SSH_FXP_NAME changed between SFTPv3 and SFTPv4+:
-                   SFTPv4+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.4
-               pre-SFTPv4 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02#section-7 */
-            103=> 'NET_SFTP_DATA',
-            104=> 'NET_SFTP_NAME',
-            105=> 'NET_SFTP_ATTRS',
-
-            200=> 'NET_SFTP_EXTENDED'
-        );
-        $this->status_codes = array(
-            0 => 'NET_SFTP_STATUS_OK',
-            1 => 'NET_SFTP_STATUS_EOF',
-            2 => 'NET_SFTP_STATUS_NO_SUCH_FILE',
-            3 => 'NET_SFTP_STATUS_PERMISSION_DENIED',
-            4 => 'NET_SFTP_STATUS_FAILURE',
-            5 => 'NET_SFTP_STATUS_BAD_MESSAGE',
-            6 => 'NET_SFTP_STATUS_NO_CONNECTION',
-            7 => 'NET_SFTP_STATUS_CONNECTION_LOST',
-            8 => 'NET_SFTP_STATUS_OP_UNSUPPORTED'
-        );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
-        // the order, in this case, matters quite a lot - see Net_SFTP::_parseAttributes() to understand why
-        $this->attributes = array(
-            0x00000001 => 'NET_SFTP_ATTR_SIZE',
-            0x00000002 => 'NET_SFTP_ATTR_UIDGID', // defined in SFTPv3, removed in SFTPv4+
-            0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
-            0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
-                    -1 => 'NET_SFTP_ATTR_EXTENDED' // unpack('N', "\xFF\xFF\xFF\xFF") == array(1 => int(-1))
-        );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
-        // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
-        // the array for that $this->open5_flags and similarily alter the constant names.
-        $this->open_flags = array(
-            0x00000001 => 'NET_SFTP_OPEN_READ',
-            0x00000002 => 'NET_SFTP_OPEN_WRITE',
-            0x00000008 => 'NET_SFTP_OPEN_CREATE',
-            0x00000010 => 'NET_SFTP_OPEN_TRUNCATE'
-        );
-        $this->_define_array(
-            $this->packet_types,
-            $this->status_codes,
-            $this->attributes,
-            $this->open_flags
-        );
-    }
-
-    /**
-     * Login
-     *
-     * @param String $username
-     * @param optional String $password
-     * @return Boolean
-     * @access public
-     */
-    function login($username, $password = '')
-    {
-        if (!parent::login($username, $password)) {
-            return false;
-        }
-
-        $this->window_size_client_to_server[NET_SFTP_CHANNEL] = $this->window_size;
-
-        $packet = pack('CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN, strlen('session'), 'session', NET_SFTP_CHANNEL, $this->window_size, 0x4000);
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[NET_SFTP_CHANNEL] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $response = $this->_get_channel_packet(NET_SFTP_CHANNEL);
-        if ($response === false) {
-            return false;
-        }
-
-        $packet = pack('CNNa*CNa*',
-            NET_SSH2_MSG_CHANNEL_REQUEST, $this->server_channels[NET_SFTP_CHANNEL], strlen('subsystem'), 'subsystem', 1, strlen('sftp'), 'sftp');
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[NET_SFTP_CHANNEL] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        $response = $this->_get_channel_packet(NET_SFTP_CHANNEL);
-        if ($response === false) {
-            return false;
-        }
-
-        $this->channel_status[NET_SFTP_CHANNEL] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        if (!$this->_send_sftp_packet(NET_SFTP_INIT, "\0\0\0\3")) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_VERSION) {
-            user_error('Expected SSH_FXP_VERSION', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Nversion', $this->_string_shift($response, 4)));
-        $this->version = $version;
-        while (!empty($response)) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $key = $this->_string_shift($response, $length);
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $value = $this->_string_shift($response, $length);
-            $this->extensions[$key] = $value;
-        }
-
-        /*
-         SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
-         however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
-         not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
-         one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
-         'newline@vandyke.com' would.
-        */
-        /*
-        if (isset($this->extensions['newline@vandyke.com'])) {
-            $this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
-            unset($this->extensions['newline@vandyke.com']);
-        }
-        */
-
-        $this->request_id = 1;
-
-        /*
-         A Note on SFTPv4/5/6 support:
-          states the following:
-
-         "If the client wishes to interoperate with servers that support noncontiguous version
-          numbers it SHOULD send '3'"
-
-         Given that the server only sends its version number after the client has already done so, the above
-         seems to be suggesting that v3 should be the default version.  This makes sense given that v3 is the
-         most popular.
-
-          states the following;
-
-         "If the server did not send the "versions" extension, or the version-from-list was not included, the
-          server MAY send a status response describing the failure, but MUST then close the channel without
-          processing any further requests."
-
-         So what do you do if you have a client whose initial SSH_FXP_INIT packet says it implements v3 and
-         a server whose initial SSH_FXP_VERSION reply says it implements v4 and only v4?  If it only implements
-         v4, the "versions" extension is likely not going to have been sent so version re-negotiation as discussed
-         in draft-ietf-secsh-filexfer-13 would be quite impossible.  As such, what Net_SFTP would do is close the
-         channel and reopen it with a new and updated SSH_FXP_INIT packet.
-        */
-        if ($this->version != 3) {
-            return false;
-        }
-
-        $this->pwd = $this->_realpath('.');
-
-        return true;
-    }
-
-    /**
-     * Returns the current directory name
-     *
-     * @return Mixed
-     * @access public
-     */
-    function pwd()
-    {
-        return $this->pwd;
-    }
-
-    /**
-     * Canonicalize the Server-Side Path Name
-     *
-     * SFTP doesn't provide a mechanism by which the current working directory can be changed, so we'll emulate it.  Returns
-     * the absolute (canonicalized) path.  If $mode is set to NET_SFTP_CONFIRM_DIR (as opposed to NET_SFTP_CONFIRM_NONE,
-     * which is what it is set to by default), false is returned if $dir is not a valid directory.
-     *
-     * @see Net_SFTP::chdir()
-     * @param String $dir
-     * @param optional Integer $mode
-     * @return Mixed
-     * @access private
-     */
-    function _realpath($dir)
-    {
-        /*
-        "This protocol represents file names as strings.  File names are
-         assumed to use the slash ('/') character as a directory separator.
-
-         File names starting with a slash are "absolute", and are relative to
-         the root of the file system.  Names starting with any other character
-         are relative to the user's default directory (home directory).  Note
-         that identifying the user is assumed to take place outside of this
-         protocol."
-
-         -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-6
-        */
-        $file = '';
-        if ($this->pwd !== false) {
-            // if the SFTP server returned the canonicalized path even for non-existant files this wouldn't be necessary
-            // on OpenSSH it isn't necessary but on other SFTP servers it is.  that and since the specs say nothing on
-            // the subject, we'll go ahead and work around it with the following.
-            if ($dir[strlen($dir) - 1] != '/') {
-                $file = basename($dir);
-                $dir = dirname($dir);
-            }
-
-            if ($dir == '.' || $dir == $this->pwd) {
-                return $this->pwd . $file;
-            }
-
-            if ($dir[0] != '/') {
-                $dir = $this->pwd . '/' . $dir;
-            }
-            // on the surface it seems like maybe resolving a path beginning with / is unnecessary, but such paths
-            // can contain .'s and ..'s just like any other.  we could parse those out as appropriate or we can let
-            // the server do it.  we'll do the latter.
-        }
-
-        /*
-         that SSH_FXP_REALPATH returns SSH_FXP_NAME does not necessarily mean that anything actually exists at the
-         specified path.  generally speaking, no attributes are returned with this particular SSH_FXP_NAME packet
-         regardless of whether or not a file actually exists.  and in SFTPv3, the longname field and the filename
-         field match for this particular SSH_FXP_NAME packet.  for other SSH_FXP_NAME packets, this will likely
-         not be the case, but for this one, it is.
-        */
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.9
-        if (!$this->_send_sftp_packet(NET_SFTP_REALPATH, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_NAME:
-                // although SSH_FXP_NAME is implemented differently in SFTPv3 than it is in SFTPv4+, the following
-                // should work on all SFTP versions since the only part of the SSH_FXP_NAME packet the following looks
-                // at is the first part and that part is defined the same in SFTP versions 3 through 6.
-                $this->_string_shift($response, 4); // skip over the count - it should be 1, anyway
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $realpath = $this->_string_shift($response, $length);
-                break;
-            case NET_SFTP_STATUS:
-                extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS', E_USER_NOTICE);
-                return false;
-        }
-
-        // if $this->pwd isn't set than the only thing $realpath could be is for '.', which is pretty much guaranteed to
-        // be a bonafide directory
-        return $realpath . '/' . $file;
-    }
-
-    /**
-     * Changes the current directory
-     *
-     * @param String $dir
-     * @return Boolean
-     * @access public
-     */
-    function chdir($dir)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        if ($dir[strlen($dir) - 1] != '/') {
-            $dir.= '/';
-        }
-        $dir = $this->_realpath($dir);
-
-        // confirm that $dir is, in fact, a valid directory
-        if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
-
-        // see Net_SFTP::nlist() for a more thorough explanation of the following
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                $handle = substr($response, 4);
-                break;
-            case NET_SFTP_STATUS:
-                extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS', E_USER_NOTICE);
-                return false;
-        }
-
-        if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-            return false;
-        }
-
-        $this->pwd = $dir;
-        return true;
-    }
-
-    /**
-     * Returns a list of files in the given directory
-     *
-     * @param optional String $dir
-     * @return Mixed
-     * @access public
-     */
-    function nlist($dir = '.')
-    {
-        return $this->_list($dir, false);
-    }
-
-    /**
-     * Returns a list of files in the given directory
-     *
-     * @param optional String $dir
-     * @return Mixed
-     * @access public
-     */
-    function rawlist($dir = '.')
-    {
-        return $this->_list($dir, true);
-    }
-
-    function _list($dir, $raw = true)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $dir = $this->_realpath($dir);
-        if ($dir === false) {
-            return false;
-        }
-
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.2
-        if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.2
-                // since 'handle' is the last field in the SSH_FXP_HANDLE packet, we'll just remove the first four bytes that
-                // represent the length of the string and leave it at that
-                $handle = substr($response, 4);
-                break;
-            case NET_SFTP_STATUS:
-                // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS', E_USER_NOTICE);
-                return false;
-        }
-
-        $contents = array();
-        while (true) {
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.2
-            // why multiple SSH_FXP_READDIR packets would be sent when the response to a single one can span arbitrarily many
-            // SSH_MSG_CHANNEL_DATA messages is not known to me.
-            if (!$this->_send_sftp_packet(NET_SFTP_READDIR, pack('Na*', strlen($handle), $handle))) {
-                return false;
-            }
-
-            $response = $this->_get_sftp_packet();
-            switch ($this->packet_type) {
-                case NET_SFTP_NAME:
-                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
-                    for ($i = 0; $i < $count; $i++) {
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $shortname = $this->_string_shift($response, $length);
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $this->_string_shift($response, $length); // SFTPv4+ drop this field - the "longname" field
-                        $attributes = $this->_parseAttributes($response); // we also don't care about the attributes
-                        if (!$raw) {
-                            $contents[] = $shortname;
-                        } else {
-                            $contents[$shortname] = $attributes;
-                        }
-                        // SFTPv6 has an optional boolean end-of-list field, but we'll ignore that, since the
-                        // final SSH_FXP_STATUS packet should tell us that, already.
-                    }
-                    break;
-                case NET_SFTP_STATUS:
-                    extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-                    if ($status != NET_SFTP_STATUS_EOF) {
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                        return false;
-                    }
-                    break 2;
-                default:
-                    user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS', E_USER_NOTICE);
-                    return false;
-            }
-        }
-
-        if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle))) {
-            return false;
-        }
-
-        // "The client MUST release all resources associated with the handle regardless of the status."
-        //  -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.3
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-            return false;
-        }
-
-        return $contents;
-    }
-
-    /**
-     * Returns the file size, in bytes, or false, on failure
-     *
-     * Files larger than 4GB will show up as being exactly 4GB.
-     *
-     * @param optional String $dir
-     * @return Mixed
-     * @access public
-     */
-    function size($filename)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $filename = $this->_realpath($filename);
-        if ($filename === false) {
-            return false;
-        }
-
-        // SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
-        $packet = pack('Na*', strlen($filename), $filename);
-        if (!$this->_send_sftp_packet(NET_SFTP_STAT, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_ATTRS:
-                $attrs = $this->_parseAttributes($response);
-                return $attrs['size'];
-            case NET_SFTP_STATUS:
-                extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                return false;
-        }
-
-        user_error('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS', E_USER_NOTICE);
-        return false;
-    }
-
-    /**
-     * Set permissions on a file.
-     *
-     * Returns the new file permissions on success or FALSE on error.
-     *
-     * @param Integer $mode
-     * @param String $filename
-     * @return Mixed
-     * @access public
-     */
-    function chmod($mode, $filename)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $filename = $this->_realpath($filename);
-        if ($filename === false) {
-            return false;
-        }
-
-        // SFTPv4+ has an additional byte field - type - that would need to be sent, as well. setting it to
-        // SSH_FILEXFER_TYPE_UNKNOWN might work. if not, we'd have to do an SSH_FXP_STAT before doing an SSH_FXP_SETSTAT.
-        $attr = pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
-        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($filename), $filename, $attr))) {
-            return false;
-        }
-
-        /*
-         "Because some systems must use separate system calls to set various attributes, it is possible that a failure 
-          response will be returned, but yet some of the attributes may be have been successfully modified.  If possible,
-          servers SHOULD avoid this situation; however, clients MUST be aware that this is possible."
-
-          -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.6
-        */
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_EOF) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-        }
-
-        // rather than return what the permissions *should* be, we'll return what they actually are.  this will also
-        // tell us if the file actually exists.
-        // incidentally, SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
-        $packet = pack('Na*', strlen($filename), $filename);
-        if (!$this->_send_sftp_packet(NET_SFTP_STAT, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_ATTRS:
-                $attrs = $this->_parseAttributes($response);
-                return $attrs['permissions'];
-            case NET_SFTP_STATUS:
-                extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                return false;
-        }
-
-        user_error('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS', E_USER_NOTICE);
-        return false;
-    }
-
-    /**
-     * Creates a directory.
-     *
-     * @param String $dir
-     * @return Boolean
-     * @access public
-     */
-    function mkdir($dir)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $dir = $this->_realpath(rtrim($dir, '/'));
-        if ($dir === false) {
-            return false;
-        }
-
-        // by not providing any permissions, hopefully the server will use the logged in users umask - their 
-        // default permissions.
-        if (!$this->_send_sftp_packet(NET_SFTP_MKDIR, pack('Na*N', strlen($dir), $dir, 0))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Removes a directory.
-     *
-     * @param String $dir
-     * @return Boolean
-     * @access public
-     */
-    function rmdir($dir)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $dir = $this->_realpath($dir);
-        if ($dir === false) {
-            return false;
-        }
-
-        if (!$this->_send_sftp_packet(NET_SFTP_RMDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED?
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Uploads a file to the SFTP server.
-     *
-     * By default, Net_SFTP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
-     * So, for example, if you set $data to 'filename.ext' and then do Net_SFTP::get(), you will get a file, twelve bytes
-     * long, containing 'filename.ext' as its contents.
-     *
-     * Setting $mode to NET_SFTP_LOCAL_FILE will change the above behavior.  With NET_SFTP_LOCAL_FILE, $remote_file will 
-     * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
-     * large $remote_file will be, as well.
-     *
-     * Currently, only binary mode is supported.  As such, if the line endings need to be adjusted, you will need to take
-     * care of that, yourself.
-     *
-     * @param String $remote_file
-     * @param String $data
-     * @param optional Integer $flags
-     * @return Boolean
-     * @access public
-     * @internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - Net_SFTP::setMode().
-     */
-    function put($remote_file, $data, $mode = NET_SFTP_STRING)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $remote_file = $this->_realpath($remote_file);
-        if ($remote_file === false) {
-            return false;
-        }
-
-        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_TRUNCATE, 0);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                $handle = substr($response, 4);
-                break;
-            case NET_SFTP_STATUS:
-                extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS', E_USER_NOTICE);
-                return false;
-        }
-
-        $initialize = true;
-
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.3
-        if ($mode == NET_SFTP_LOCAL_FILE) {
-            if (!is_file($data)) {
-                user_error("$data is not a valid file", E_USER_NOTICE);
-                return false;
-            }
-            $fp = fopen($data, 'rb');
-            if (!$fp) {
-                return false;
-            }
-            $sent = 0;
-            $size = filesize($data);
-        } else {
-            $sent = 0;
-            $size = strlen($data);
-        }
-
-        $size = $size < 0 ? ($size & 0x7FFFFFFF) + 0x80000000 : $size;
-
-        $sftp_packet_size = 34000; // PuTTY uses 4096
-        $i = 0;
-        while ($sent < $size) {
-            $temp = $mode == NET_SFTP_LOCAL_FILE ? fread($fp, $sftp_packet_size) : $this->_string_shift($data, $sftp_packet_size);
-            $packet = pack('Na*N3a*', strlen($handle), $handle, 0, $sent, strlen($temp), $temp);
-            if (!$this->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
-                fclose($fp);
-                return false;
-            }
-            $sent+= strlen($temp);
-
-            $i++;
-
-            if ($i == 50) {
-                if (!$this->_read_put_responses($i)) {
-                    $i = 0;
-                    break;
-                }
-                $i = 0;
-            }
-        }
-
-        $this->_read_put_responses($i);
-
-        if ($mode == NET_SFTP_LOCAL_FILE) {
-            fclose($fp);
-        }
-
-        if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Reads multiple successive SSH_FXP_WRITE responses
-     *
-     * Sending an SSH_FXP_WRITE packet and immediately reading its response isn't as efficient as blindly sending out $i
-     * SSH_FXP_WRITEs, in succession, and then reading $i responses.
-     *
-     * @param Integer $i
-     * @return Boolean
-     * @access private
-     */
-    function _read_put_responses($i)
-    {
-        while ($i--) {
-            $response = $this->_get_sftp_packet();
-            if ($this->packet_type != NET_SFTP_STATUS) {
-                user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-                return false;
-            }
-
-            extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-            if ($status != NET_SFTP_STATUS_OK) {
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                break;
-            }
-        }
-
-        return $i < 0;
-    }
-
-    /**
-     * Downloads a file from the SFTP server.
-     *
-     * Returns a string containing the contents of $remote_file if $local_file is left undefined or a boolean false if
-     * the operation was unsuccessful.  If $local_file is defined, returns true or false depending on the success of the
-     * operation
-     *
-     * @param String $remote_file
-     * @param optional String $local_file
-     * @return Mixed
-     * @access public
-     */
-    function get($remote_file, $local_file = false)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $remote_file = $this->_realpath($remote_file);
-        if ($remote_file === false) {
-            return false;
-        }
-
-        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                $handle = substr($response, 4);
-                break;
-            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS', E_USER_NOTICE);
-                return false;
-        }
-
-        $packet = pack('Na*', strlen($handle), $handle);
-        if (!$this->_send_sftp_packet(NET_SFTP_FSTAT, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_ATTRS:
-                $attrs = $this->_parseAttributes($response);
-                break;
-            case NET_SFTP_STATUS:
-                extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS', E_USER_NOTICE);
-                return false;
-        }
-
-        if ($local_file !== false) {
-            $fp = fopen($local_file, 'wb');
-            if (!$fp) {
-                return false;
-            }
-        } else {
-            $content = '';
-        }
-
-        $read = 0;
-        while ($read < $attrs['size']) {
-            $packet = pack('Na*N3', strlen($handle), $handle, 0, $read, 1 << 20);
-            if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) {
-                return false;
-            }
-
-            $response = $this->_get_sftp_packet();
-            switch ($this->packet_type) {
-                case NET_SFTP_DATA:
-                    $temp = substr($response, 4);
-                    $read+= strlen($temp);
-                    if ($local_file === false) {
-                        $content.= $temp;
-                    } else {
-                        fputs($fp, $temp);
-                    }
-                    break;
-                case NET_SFTP_STATUS:
-                    extract(unpack('Nstatus/Nlength', $this->_string_shift($response, 8)));
-                    $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-                    break 2;
-                default:
-                    user_error('Expected SSH_FXP_DATA or SSH_FXP_STATUS', E_USER_NOTICE);
-                    return false;
-            }
-        }
-
-        if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-            return false;
-        }
-
-        if (isset($content)) {
-            return $content;
-        }
-
-        fclose($fp);
-        return true;
-    }
-
-    /**
-     * Deletes a file on the SFTP server.
-     *
-     * @param String $path
-     * @return Boolean
-     * @access public
-     */
-    function delete($path)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $remote_file = $this->_realpath($path);
-        if ($path === false) {
-            return false;
-        }
-
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-        if (!$this->_send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($path), $path))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Renames a file or a directory on the SFTP server
-     *
-     * @param String $oldname
-     * @param String $newname
-     * @return Boolean
-     * @access public
-     */
-    function rename($oldname, $newname)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        $oldname = $this->_realpath($oldname);
-        $newname = $this->_realpath($newname);
-        if ($oldname === false || $newname === false) {
-            return false;
-        }
-
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-        $packet = pack('Na*Na*', strlen($oldname), $oldname, strlen($newname), $newname);
-        if (!$this->_send_sftp_packet(NET_SFTP_RENAME, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS', E_USER_NOTICE);
-            return false;
-        }
-
-        // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $this->status_codes[$status] . ': ' . $this->_string_shift($response, $length);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Parse Attributes
-     *
-     * See '7.  File Attributes' of draft-ietf-secsh-filexfer-13 for more info.
-     *
-     * @param String $response
-     * @return Array
-     * @access private
-     */
-    function _parseAttributes(&$response)
-    {
-        $attr = array();
-        extract(unpack('Nflags', $this->_string_shift($response, 4)));
-        // SFTPv4+ have a type field (a byte) that follows the above flag field
-        foreach ($this->attributes as $key => $value) {
-            switch ($flags & $key) {
-                case NET_SFTP_ATTR_SIZE: // 0x00000001
-                    // size is represented by a 64-bit integer, so we perhaps ought to be doing the following:
-                    // $attr['size'] = new Math_BigInteger($this->_string_shift($response, 8), 256);
-                    // of course, you shouldn't be using Net_SFTP to transfer files that are in excess of 4GB
-                    // (0xFFFFFFFF bytes), anyway.  as such, we'll just represent all file sizes that are bigger than
-                    // 4GB as being 4GB.
-                    extract(unpack('Nupper/Nsize', $this->_string_shift($response, 8)));
-                    if ($upper) {
-                        $attr['size'] = 0xFFFFFFFF;
-                    } else {
-                        $attr['size'] = $size < 0 ? ($size & 0x7FFFFFFF) + 0x80000000 : $size;
-                    }
-                    break;
-                case NET_SFTP_ATTR_UIDGID: // 0x00000002 (SFTPv3 only)
-                    $attr+= unpack('Nuid/Ngid', $this->_string_shift($response, 8));
-                    break;
-                case NET_SFTP_ATTR_PERMISSIONS: // 0x00000004
-                    $attr+= unpack('Npermissions', $this->_string_shift($response, 4));
-                    break;
-                case NET_SFTP_ATTR_ACCESSTIME: // 0x00000008
-                    $attr+= unpack('Natime/Nmtime', $this->_string_shift($response, 8));
-                    break;
-                case NET_SFTP_ATTR_EXTENDED: // 0x80000000
-                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
-                    for ($i = 0; $i < $count; $i++) {
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $key = $this->_string_shift($response, $length);
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $attr[$key] = $this->_string_shift($response, $length);                        
-                    }
-            }
-        }
-        return $attr;
-    }
-
-    /**
-     * Sends SFTP Packets
-     *
-     * See '6. General Packet Format' of draft-ietf-secsh-filexfer-13 for more info.
-     *
-     * @param Integer $type
-     * @param String $data
-     * @see Net_SFTP::_get_sftp_packet()
-     * @see Net_SSH2::_send_channel_packet()
-     * @return Boolean
-     * @access private
-     */
-    function _send_sftp_packet($type, $data)
-    {
-        $packet = $this->request_id !== false ?
-            pack('NCNa*', strlen($data) + 5, $type, $this->request_id, $data) :
-            pack('NCa*',  strlen($data) + 1, $type, $data);
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $result = $this->_send_channel_packet(NET_SFTP_CHANNEL, $packet);
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        if (defined('NET_SFTP_LOGGING')) {
-            $this->packet_type_log[] = '-> ' . $this->packet_types[$type] . 
-                                       ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX) {
-                $this->packet_log[] = $data;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Receives SFTP Packets
-     *
-     * See '6. General Packet Format' of draft-ietf-secsh-filexfer-13 for more info.
-     *
-     * Incidentally, the number of SSH_MSG_CHANNEL_DATA messages has no bearing on the number of SFTP packets present.
-     * There can be one SSH_MSG_CHANNEL_DATA messages containing two SFTP packets or there can be two SSH_MSG_CHANNEL_DATA
-     * messages containing one SFTP packet.
-     *
-     * @see Net_SFTP::_send_sftp_packet()
-     * @return String
-     * @access private
-     */
-    function _get_sftp_packet()
-    {
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-
-        // SFTP packet length
-        while (strlen($this->packet_buffer) < 4) {
-            $temp = $this->_get_channel_packet(NET_SFTP_CHANNEL);
-            if (is_bool($temp)) {
-                $this->packet_type = false;
-                $this->packet_buffer = '';
-                return false;
-            }
-            $this->packet_buffer.= $temp;
-        }
-        extract(unpack('Nlength', $this->_string_shift($this->packet_buffer, 4)));
-        $tempLength = $length;
-        $tempLength-= strlen($this->packet_buffer);
-
-        // SFTP packet type and data payload
-        while ($tempLength > 0) {
-            $temp = $this->_get_channel_packet(NET_SFTP_CHANNEL);
-            if (is_bool($temp)) {
-                $this->packet_type = false;
-                $this->packet_buffer = '';
-                return false;
-            }
-            $this->packet_buffer.= $temp;
-            $tempLength-= strlen($temp);
-        }
-
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        $this->packet_type = ord($this->_string_shift($this->packet_buffer));
-
-        if ($this->request_id !== false) {
-            $this->_string_shift($this->packet_buffer, 4); // remove the request id
-            $length-= 5; // account for the request id and the packet type
-        } else {
-            $length-= 1; // account for the packet type
-        }
-
-        $packet = $this->_string_shift($this->packet_buffer, $length);
-
-        if (defined('NET_SFTP_LOGGING')) {
-            $this->packet_type_log[] = '<- ' . $this->packet_types[$this->packet_type] . 
-                                       ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX) {
-                $this->packet_log[] = $packet;
-            }
-        }
-
-        return $packet;
-    }
-
-    /**
-     * Returns a log of the packets that have been sent and received.
-     *
-     * Returns a string if NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX, an array if NET_SFTP_LOGGING == NET_SFTP_LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
-     *
-     * @access public
-     * @return String or Array
-     */
-    function getSFTPLog()
-    {
-        if (!defined('NET_SFTP_LOGGING')) {
-            return false;
-        }
-
-        switch (NET_SFTP_LOGGING) {
-            case NET_SFTP_LOG_COMPLEX:
-                return $this->_format_log($this->packet_log, $this->packet_type_log);
-                break;
-            //case NET_SFTP_LOG_SIMPLE:
-            default:
-                return $this->packet_type_log;
-        }
-    }
-
-    /**
-     * Returns all errors
-     *
-     * @return String
-     * @access public
-     */
-    function getSFTPErrors()
-    {
-        return $this->sftp_errors;
-    }
-
-    /**
-     * Returns the last error
-     *
-     * @return String
-     * @access public
-     */
-    function getLastSFTPError()
-    {
-        return $this->sftp_errors[count($this->sftp_errors) - 1];
-    }
-
-    /**
-     * Get supported SFTP versions
-     *
-     * @return Array
-     * @access public
-     */
-    function getSupportedVersions()
-    {
-        $temp = array('version' => $this->version);
-        if (isset($this->extensions['versions'])) {
-            $temp['extensions'] = $this->extensions['versions'];
-        }
-        return $temp;
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param Integer $reason
-     * @return Boolean
-     * @access private
-     */
-    function _disconnect($reason)
-    {
-        $this->pwd = false;
-        parent::_disconnect($reason);
-    }
-}
\ No newline at end of file
diff --git a/library/phpsec/Net/SSH1.php b/library/phpsec/Net/SSH1.php
deleted file mode 100644
index 7220ee402..000000000
--- a/library/phpsec/Net/SSH1.php
+++ /dev/null
@@ -1,1160 +0,0 @@
-
- * login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    while (true) {
- *        echo $ssh->interactiveRead();
- *
- *        $read = array(STDIN);
- *        $write = $except = NULL;
- *        if (stream_select($read, $write, $except, 0)) {
- *            $ssh->interactiveWrite(fread(STDIN, 1));
- *        }
- *    }
- * ?>
- * 
- *
- * Here's another short example:
- * 
- * login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->exec('ls -la');
- * ?>
- * 
- *
- * More information on the SSHv1 specification can be found by reading 
- * {@link http://www.snailbook.com/docs/protocol-1.5.txt protocol-1.5.txt}.
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Net
- * @package    Net_SSH1
- * @author     Jim Wigginton 
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: SSH1.php,v 1.15 2010/03/22 22:01:38 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**
- * Include Math_BigInteger
- *
- * Used to do RSA encryption.
- */
-require_once('Math/BigInteger.php');
-
-/**
- * Include Crypt_Null
- */
-//require_once('Crypt/Null.php');
-
-/**
- * Include Crypt_DES
- */
-require_once('Crypt/DES.php');
-
-/**
- * Include Crypt_TripleDES
- */
-require_once('Crypt/TripleDES.php');
-
-/**
- * Include Crypt_RC4
- */
-require_once('Crypt/RC4.php');
-
-/**
- * Include Crypt_Random
- */
-require_once('Crypt/Random.php');
-
-/**#@+
- * Protocol Flags
- *
- * @access private
- */
-define('NET_SSH1_MSG_DISCONNECT',          1);
-define('NET_SSH1_SMSG_PUBLIC_KEY',         2);
-define('NET_SSH1_CMSG_SESSION_KEY',        3);
-define('NET_SSH1_CMSG_USER',               4);
-define('NET_SSH1_CMSG_AUTH_PASSWORD',      9);
-define('NET_SSH1_CMSG_REQUEST_PTY',       10);
-define('NET_SSH1_CMSG_EXEC_SHELL',        12);
-define('NET_SSH1_CMSG_EXEC_CMD',          13);
-define('NET_SSH1_SMSG_SUCCESS',           14);
-define('NET_SSH1_SMSG_FAILURE',           15);
-define('NET_SSH1_CMSG_STDIN_DATA',        16);
-define('NET_SSH1_SMSG_STDOUT_DATA',       17);
-define('NET_SSH1_SMSG_STDERR_DATA',       18);
-define('NET_SSH1_SMSG_EXITSTATUS',        20);
-define('NET_SSH1_CMSG_EXIT_CONFIRMATION', 33);
-/**#@-*/
-
-/**#@+
- * Encryption Methods
- *
- * @see Net_SSH1::getSupportedCiphers()
- * @access public
- */
-/**
- * No encryption
- *
- * Not supported.
- */
-define('NET_SSH1_CIPHER_NONE',       0);
-/**
- * IDEA in CFB mode
- *
- * Not supported.
- */
-define('NET_SSH1_CIPHER_IDEA',       1);
-/**
- * DES in CBC mode
- */
-define('NET_SSH1_CIPHER_DES',        2);
-/**
- * Triple-DES in CBC mode
- *
- * All implementations are required to support this
- */
-define('NET_SSH1_CIPHER_3DES',       3);
-/**
- * TRI's Simple Stream encryption CBC
- *
- * Not supported nor is it defined in the official SSH1 specs.  OpenSSH, however, does define it (see cipher.h),
- * although it doesn't use it (see cipher.c)
- */
-define('NET_SSH1_CIPHER_BROKEN_TSS', 4);
-/**
- * RC4
- *
- * Not supported.
- *
- * @internal According to the SSH1 specs:
- *
- *        "The first 16 bytes of the session key are used as the key for
- *         the server to client direction.  The remaining 16 bytes are used
- *         as the key for the client to server direction.  This gives
- *         independent 128-bit keys for each direction."
- *
- *     This library currently only supports encryption when the same key is being used for both directions.  This is
- *     because there's only one $crypto object.  Two could be added ($encrypt and $decrypt, perhaps).
- */
-define('NET_SSH1_CIPHER_RC4',        5);
-/**
- * Blowfish
- *
- * Not supported nor is it defined in the official SSH1 specs.  OpenSSH, however, defines it (see cipher.h) and
- * uses it (see cipher.c)
- */
-define('NET_SSH1_CIPHER_BLOWFISH',   6);
-/**#@-*/
-
-/**#@+
- * Authentication Methods
- *
- * @see Net_SSH1::getSupportedAuthentications()
- * @access public
- */
-/**
- * .rhosts or /etc/hosts.equiv
- */
-define('NET_SSH1_AUTH_RHOSTS',     1);
-/**
- * pure RSA authentication
- */
-define('NET_SSH1_AUTH_RSA',        2);
-/**
- * password authentication
- *
- * This is the only method that is supported by this library.
- */
-define('NET_SSH1_AUTH_PASSWORD',   3);
-/**
- * .rhosts with RSA host authentication
- */
-define('NET_SSH1_AUTH_RHOSTS_RSA', 4);
-/**#@-*/
-
-/**#@+
- * Terminal Modes
- *
- * @link http://3sp.com/content/developer/maverick-net/docs/Maverick.SSH.PseudoTerminalModesMembers.html
- * @access private
- */
-define('NET_SSH1_TTY_OP_END',  0);
-/**#@-*/
-
-/**
- * The Response Type
- *
- * @see Net_SSH1::_get_binary_packet()
- * @access private
- */
-define('NET_SSH1_RESPONSE_TYPE', 1);
-
-/**
- * The Response Data
- *
- * @see Net_SSH1::_get_binary_packet()
- * @access private
- */
-define('NET_SSH1_RESPONSE_DATA', 2);
-
-/**#@+
- * Execution Bitmap Masks
- *
- * @see Net_SSH1::bitmap
- * @access private
- */
-define('NET_SSH1_MASK_CONSTRUCTOR', 0x00000001);
-define('NET_SSH1_MASK_LOGIN',       0x00000002);
-define('NET_SSH1_MASK_SHELL',       0x00000004);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of SSHv1.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Net_SSH1
- */
-class Net_SSH1 {
-    /**
-     * The SSH identifier
-     *
-     * @var String
-     * @access private
-     */
-    var $identifier = 'SSH-1.5-phpseclib';
-
-    /**
-     * The Socket Object
-     *
-     * @var Object
-     * @access private
-     */
-    var $fsock;
-
-    /**
-     * The cryptography object
-     *
-     * @var Object
-     * @access private
-     */
-    var $crypto = false;
-
-    /**
-     * Execution Bitmap
-     *
-     * The bits that are set reprsent functions that have been called already.  This is used to determine
-     * if a requisite function has been successfully executed.  If not, an error should be thrown.
-     *
-     * @var Integer
-     * @access private
-     */
-    var $bitmap = 0;
-
-    /**
-     * The Server Key Public Exponent
-     *
-     * Logged for debug purposes
-     *
-     * @see Net_SSH1::getServerKeyPublicExponent()
-     * @var String
-     * @access private
-     */
-    var $server_key_public_exponent;
-
-    /**
-     * The Server Key Public Modulus
-     *
-     * Logged for debug purposes
-     *
-     * @see Net_SSH1::getServerKeyPublicModulus()
-     * @var String
-     * @access private
-     */
-    var $server_key_public_modulus;
-
-    /**
-     * The Host Key Public Exponent
-     *
-     * Logged for debug purposes
-     *
-     * @see Net_SSH1::getHostKeyPublicExponent()
-     * @var String
-     * @access private
-     */
-    var $host_key_public_exponent;
-
-    /**
-     * The Host Key Public Modulus
-     *
-     * Logged for debug purposes
-     *
-     * @see Net_SSH1::getHostKeyPublicModulus()
-     * @var String
-     * @access private
-     */
-    var $host_key_public_modulus;
-
-    /**
-     * Supported Ciphers
-     *
-     * Logged for debug purposes
-     *
-     * @see Net_SSH1::getSupportedCiphers()
-     * @var Array
-     * @access private
-     */
-    var $supported_ciphers = array(
-        NET_SSH1_CIPHER_NONE       => 'No encryption',
-        NET_SSH1_CIPHER_IDEA       => 'IDEA in CFB mode',
-        NET_SSH1_CIPHER_DES        => 'DES in CBC mode',
-        NET_SSH1_CIPHER_3DES       => 'Triple-DES in CBC mode',
-        NET_SSH1_CIPHER_BROKEN_TSS => 'TRI\'s Simple Stream encryption CBC',
-        NET_SSH1_CIPHER_RC4        => 'RC4',
-        NET_SSH1_CIPHER_BLOWFISH   => 'Blowfish'
-    );
-
-    /**
-     * Supported Authentications
-     *
-     * Logged for debug purposes
-     *
-     * @see Net_SSH1::getSupportedAuthentications()
-     * @var Array
-     * @access private
-     */
-    var $supported_authentications = array(
-        NET_SSH1_AUTH_RHOSTS     => '.rhosts or /etc/hosts.equiv',
-        NET_SSH1_AUTH_RSA        => 'pure RSA authentication',
-        NET_SSH1_AUTH_PASSWORD   => 'password authentication',
-        NET_SSH1_AUTH_RHOSTS_RSA => '.rhosts with RSA host authentication'
-    );
-
-    /**
-     * Server Identification
-     *
-     * @see Net_SSH1::getServerIdentification()
-     * @var String
-     * @access private
-     */
-    var $server_identification = '';
-
-    /**
-     * Default Constructor.
-     *
-     * Connects to an SSHv1 server
-     *
-     * @param String $host
-     * @param optional Integer $port
-     * @param optional Integer $timeout
-     * @param optional Integer $cipher
-     * @return Net_SSH1
-     * @access public
-     */
-    function Net_SSH1($host, $port = 22, $timeout = 10, $cipher = NET_SSH1_CIPHER_3DES)
-    {
-        $this->fsock = @fsockopen($host, $port, $errno, $errstr, $timeout);
-        if (!$this->fsock) {
-            user_error(rtrim("Cannot connect to $host. Error $errno. $errstr"), E_USER_NOTICE);
-            return;
-        }
-
-        $this->server_identification = $init_line = fgets($this->fsock, 255);
-        if (!preg_match('#SSH-([0-9\.]+)-(.+)#', $init_line, $parts)) {
-            user_error('Can only connect to SSH servers', E_USER_NOTICE);
-            return;
-        }
-        if ($parts[1][0] != 1) {
-            user_error("Cannot connect to SSH $parts[1] servers", E_USER_NOTICE);
-            return;
-        }
-
-        fputs($this->fsock, $this->identifier."\r\n");
-
-        $response = $this->_get_binary_packet();
-        if ($response[NET_SSH1_RESPONSE_TYPE] != NET_SSH1_SMSG_PUBLIC_KEY) {
-            user_error('Expected SSH_SMSG_PUBLIC_KEY', E_USER_NOTICE);
-            return;
-        }
-
-        $anti_spoofing_cookie = $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 8);
-
-        $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 4);
-
-        $temp = unpack('nlen', $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 2));
-        $server_key_public_exponent = new Math_BigInteger($this->_string_shift($response[NET_SSH1_RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->server_key_public_exponent = $server_key_public_exponent;
-
-        $temp = unpack('nlen', $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 2));
-        $server_key_public_modulus = new Math_BigInteger($this->_string_shift($response[NET_SSH1_RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->server_key_public_modulus = $server_key_public_modulus;
-
-        $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 4);
-
-        $temp = unpack('nlen', $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 2));
-        $host_key_public_exponent = new Math_BigInteger($this->_string_shift($response[NET_SSH1_RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->host_key_public_exponent = $host_key_public_exponent;
-
-        $temp = unpack('nlen', $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 2));
-        $host_key_public_modulus = new Math_BigInteger($this->_string_shift($response[NET_SSH1_RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->host_key_public_modulus = $host_key_public_modulus;
-
-        $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 4);
-
-        // get a list of the supported ciphers
-        extract(unpack('Nsupported_ciphers_mask', $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 4)));
-        foreach ($this->supported_ciphers as $mask=>$name) {
-            if (($supported_ciphers_mask & (1 << $mask)) == 0) {
-                unset($this->supported_ciphers[$mask]);
-            }
-        }
-
-        // get a list of the supported authentications
-        extract(unpack('Nsupported_authentications_mask', $this->_string_shift($response[NET_SSH1_RESPONSE_DATA], 4)));
-        foreach ($this->supported_authentications as $mask=>$name) {
-            if (($supported_authentications_mask & (1 << $mask)) == 0) {
-                unset($this->supported_authentications[$mask]);
-            }
-        }
-
-        $session_id = pack('H*', md5($host_key_public_modulus->toBytes() . $server_key_public_modulus->toBytes() . $anti_spoofing_cookie));
-
-        $session_key = '';
-        for ($i = 0; $i < 32; $i++) {
-            $session_key.= chr(crypt_random(0, 255));
-        }
-        $double_encrypted_session_key = $session_key ^ str_pad($session_id, 32, chr(0));
-
-        if ($server_key_public_modulus->compare($host_key_public_modulus) < 0) {
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $server_key_public_exponent,
-                    $server_key_public_modulus
-                )
-            );
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $host_key_public_exponent,
-                    $host_key_public_modulus
-                )
-            );
-        } else {
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $host_key_public_exponent,
-                    $host_key_public_modulus
-                )
-            );
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $server_key_public_exponent,
-                    $server_key_public_modulus
-                )
-            );
-        }
-
-        $cipher = isset($this->supported_ciphers[$cipher]) ? $cipher : NET_SSH1_CIPHER_3DES;
-        $data = pack('C2a*na*N', NET_SSH1_CMSG_SESSION_KEY, $cipher, $anti_spoofing_cookie, 8 * strlen($double_encrypted_session_key), $double_encrypted_session_key, 0);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_SESSION_KEY', E_USER_NOTICE);
-            return;
-        }
-
-        switch ($cipher) {
-            //case NET_SSH1_CIPHER_NONE:
-            //    $this->crypto = new Crypt_Null();
-            //    break;
-            case NET_SSH1_CIPHER_DES:
-                $this->crypto = new Crypt_DES();
-                $this->crypto->disablePadding();
-                $this->crypto->enableContinuousBuffer();
-                $this->crypto->setKey(substr($session_key, 0,  8));
-                break;
-            case NET_SSH1_CIPHER_3DES:
-                $this->crypto = new Crypt_TripleDES(CRYPT_DES_MODE_3CBC);
-                $this->crypto->disablePadding();
-                $this->crypto->enableContinuousBuffer();
-                $this->crypto->setKey(substr($session_key, 0, 24));
-                break;
-            //case NET_SSH1_CIPHER_RC4:
-            //    $this->crypto = new Crypt_RC4();
-            //    $this->crypto->enableContinuousBuffer();
-            //    $this->crypto->setKey(substr($session_key, 0,  16));
-            //    break;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response[NET_SSH1_RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
-            user_error('Expected SSH_SMSG_SUCCESS', E_USER_NOTICE);
-            return;
-        }
-
-        $this->bitmap = NET_SSH1_MASK_CONSTRUCTOR;
-    }
-
-    /**
-     * Login
-     *
-     * @param String $username
-     * @param optional String $password
-     * @return Boolean
-     * @access public
-     */
-    function login($username, $password = '')
-    {
-        if (!($this->bitmap & NET_SSH1_MASK_CONSTRUCTOR)) {
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_USER, strlen($username), $username);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_USER', E_USER_NOTICE);
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response[NET_SSH1_RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
-            $this->bitmap |= NET_SSH1_MASK_LOGIN;
-            return true;
-        } else if ($response[NET_SSH1_RESPONSE_TYPE] != NET_SSH1_SMSG_FAILURE) {
-            user_error('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE', E_USER_NOTICE);
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen($password), $password);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_AUTH_PASSWORD', E_USER_NOTICE);
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response[NET_SSH1_RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
-            $this->bitmap |= NET_SSH1_MASK_LOGIN;
-            return true;
-        } else if ($response[NET_SSH1_RESPONSE_TYPE] == NET_SSH1_SMSG_FAILURE) {
-            return false;
-        } else {
-            user_error('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE', E_USER_NOTICE);
-            return false;
-        }
-    }
-
-    /**
-     * Executes a command on a non-interactive shell, returns the output, and quits.
-     *
-     * An SSH1 server will close the connection after a command has been executed on a non-interactive shell.  SSH2
-     * servers don't, however, this isn't an SSH2 client.  The way this works, on the server, is by initiating a
-     * shell with the -s option, as discussed in the following links:
-     *
-     * {@link http://www.faqs.org/docs/bashman/bashref_65.html http://www.faqs.org/docs/bashman/bashref_65.html}
-     * {@link http://www.faqs.org/docs/bashman/bashref_62.html http://www.faqs.org/docs/bashman/bashref_62.html}
-     *
-     * To execute further commands, a new Net_SSH1 object will need to be created.
-     *
-     * Returns false on failure and the output, otherwise.
-     *
-     * @see Net_SSH1::interactiveRead()
-     * @see Net_SSH1::interactiveWrite()
-     * @param String $cmd
-     * @return mixed
-     * @access public
-     */
-    function exec($cmd)
-    {
-        if (!($this->bitmap & NET_SSH1_MASK_LOGIN)) {
-            user_error('Operation disallowed prior to login()', E_USER_NOTICE);
-            return false;
-        }
-
-        // connect using the sample parameters in protocol-1.5.txt.
-        // according to wikipedia.org's entry on text terminals, "the fundamental type of application running on a text
-        // terminal is a command line interpreter or shell".  thus, opening a terminal session to run the shell.
-        $data = pack('CNa*N4C', NET_SSH1_CMSG_REQUEST_PTY, strlen('vt100'), 'vt100', 24, 80, 0, 0, NET_SSH1_TTY_OP_END);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_REQUEST_PTY', E_USER_NOTICE);
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response[NET_SSH1_RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
-            user_error('Expected SSH_SMSG_SUCCESS', E_USER_NOTICE);
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_EXEC_CMD, strlen($cmd), $cmd);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_EXEC_CMD', E_USER_NOTICE);
-            return false;
-        }
-
-        $output = '';
-        $response = $this->_get_binary_packet();
-
-        do {
-            $output.= substr($response[NET_SSH1_RESPONSE_DATA], 4);
-            $response = $this->_get_binary_packet();
-        } while ($response[NET_SSH1_RESPONSE_TYPE] != NET_SSH1_SMSG_EXITSTATUS);
-
-        $data = pack('C', NET_SSH1_CMSG_EXIT_CONFIRMATION);
-
-        // i don't think it's really all that important if this packet gets sent or not.
-        $this->_send_binary_packet($data);
-
-        fclose($this->fsock);
-
-        // reset the execution bitmap - a new Net_SSH1 object needs to be created.
-        $this->bitmap = 0;
-
-        return $output;
-    }
-
-    /**
-     * Creates an interactive shell
-     *
-     * @see Net_SSH1::interactiveRead()
-     * @see Net_SSH1::interactiveWrite()
-     * @return Boolean
-     * @access private
-     */
-    function _initShell()
-    {
-        $data = pack('CNa*N4C', NET_SSH1_CMSG_REQUEST_PTY, strlen('vt100'), 'vt100', 24, 80, 0, 0, NET_SSH1_TTY_OP_END);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_REQUEST_PTY', E_USER_NOTICE);
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response[NET_SSH1_RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
-            user_error('Expected SSH_SMSG_SUCCESS', E_USER_NOTICE);
-            return false;
-        }
-
-        $data = pack('C', NET_SSH1_CMSG_EXEC_SHELL);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_EXEC_SHELL', E_USER_NOTICE);
-            return false;
-        }
-
-        $this->bitmap |= NET_SSH1_MASK_SHELL;
-
-        //stream_set_blocking($this->fsock, 0);
-
-        return true;
-    }
-
-    /**
-     * Inputs a command into an interactive shell.
-     *
-     * @see Net_SSH1::interactiveRead()
-     * @param String $cmd
-     * @return Boolean
-     * @access public
-     */
-    function interactiveWrite($cmd)
-    {
-        if (!($this->bitmap & NET_SSH1_MASK_LOGIN)) {
-            user_error('Operation disallowed prior to login()', E_USER_NOTICE);
-            return false;
-        }
-
-        if (!($this->bitmap & NET_SSH1_MASK_SHELL) && !$this->_initShell()) {
-            user_error('Unable to initiate an interactive shell session', E_USER_NOTICE);
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($cmd), $cmd);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_STDIN', E_USER_NOTICE);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Reads the output of an interactive shell.
-     *
-     * Requires PHP 4.3.0 or later due to the use of the stream_select() function.  If you see crap, 
-     * you're seeing ANSI escape codes.  According to
-     * {@link http://support.microsoft.com/kb/101875 How to Enable ANSI.SYS in a Command Window}, "Windows NT
-     * does not support ANSI escape sequences in Win32 Console applications", so if you're a Windows user,
-     * there's not going to be much recourse.
-     *
-     * @see Net_SSH1::interactiveRead()
-     * @return String
-     * @access public
-     */
-    function interactiveRead()
-    {
-        if (!($this->bitmap & NET_SSH1_MASK_LOGIN)) {
-            user_error('Operation disallowed prior to login()', E_USER_NOTICE);
-            return false;
-        }
-
-        if (!($this->bitmap & NET_SSH1_MASK_SHELL) && !$this->_initShell()) {
-            user_error('Unable to initiate an interactive shell session', E_USER_NOTICE);
-            return false;
-        }
-
-        $read = array($this->fsock);
-        $write = $except = null;
-        if (stream_select($read, $write, $except, 0)) {
-            $response = $this->_get_binary_packet();
-            return substr($response[NET_SSH1_RESPONSE_DATA], 4);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Disconnect
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        $this->_disconnect();
-    }
-
-    /**
-     * Destructor.
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * disconnect().
-     *
-     * @access public
-     */
-    function __destruct()
-    {
-        $this->_disconnect();
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param String $msg
-     * @access private
-     */
-    function _disconnect($msg = 'Client Quit')
-    {
-        if ($this->bitmap) {
-            $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
-            $this->_send_binary_packet($data);
-            fclose($this->fsock);
-            $this->bitmap = 0;
-        }
-    }
-
-    /**
-     * Gets Binary Packets
-     *
-     * See 'The Binary Packet Protocol' of protocol-1.5.txt for more info.
-     *
-     * Also, this function could be improved upon by adding detection for the following exploit:
-     * http://www.securiteam.com/securitynews/5LP042K3FY.html
-     *
-     * @see Net_SSH1::_send_binary_packet()
-     * @return Array
-     * @access private
-     */
-    function _get_binary_packet()
-    {
-        if (feof($this->fsock)) {
-            //user_error('connection closed prematurely', E_USER_NOTICE);
-            return false;
-        }
-
-        $temp = unpack('Nlength', fread($this->fsock, 4));
-
-        $padding_length = 8 - ($temp['length'] & 7);
-        $length = $temp['length'] + $padding_length;
-
-        $raw = fread($this->fsock, $length);
-
-        if ($this->crypto !== false) {
-            $raw = $this->crypto->decrypt($raw);
-        }
-
-        $padding = substr($raw, 0, $padding_length);
-        $type = $raw[$padding_length];
-        $data = substr($raw, $padding_length + 1, -4);
-
-        $temp = unpack('Ncrc', substr($raw, -4));
-
-        //if ( $temp['crc'] != $this->_crc($padding . $type . $data) ) {
-        //    user_error('Bad CRC in packet from server', E_USER_NOTICE);
-        //    return false;
-        //}
-
-        return array(
-            NET_SSH1_RESPONSE_TYPE => ord($type),
-            NET_SSH1_RESPONSE_DATA => $data
-        );
-    }
-
-    /**
-     * Sends Binary Packets
-     *
-     * Returns true on success, false on failure.
-     *
-     * @see Net_SSH1::_get_binary_packet()
-     * @param String $data
-     * @return Boolean
-     * @access private
-     */
-    function _send_binary_packet($data) {
-        if (feof($this->fsock)) {
-            //user_error('connection closed prematurely', E_USER_NOTICE);
-            return false;
-        }
-
-        $length = strlen($data) + 4;
-
-        $padding_length = 8 - ($length & 7);
-        $padding = '';
-        for ($i = 0; $i < $padding_length; $i++) {
-            $padding.= chr(crypt_random(0, 255));
-        }
-
-        $data = $padding . $data;
-        $data.= pack('N', $this->_crc($data));
-
-        if ($this->crypto !== false) {
-            $data = $this->crypto->encrypt($data);
-        }
-
-        $packet = pack('Na*', $length, $data);
-
-        return strlen($packet) == fputs($this->fsock, $packet);
-    }
-
-    /**
-     * Cyclic Redundancy Check (CRC)
-     *
-     * PHP's crc32 function is implemented slightly differently than the one that SSH v1 uses, so
-     * we've reimplemented it. A more detailed discussion of the differences can be found after
-     * $crc_lookup_table's initialization.
-     *
-     * @see Net_SSH1::_get_binary_packet()
-     * @see Net_SSH1::_send_binary_packet()
-     * @param String $data
-     * @return Integer
-     * @access private
-     */
-    function _crc($data)
-    {
-        static $crc_lookup_table = array(
-            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-            0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-            0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-            0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-            0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-            0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-            0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-            0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-            0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-            0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-            0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-            0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-            0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-            0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-            0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-            0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-            0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-            0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-            0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-            0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-            0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-            0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-            0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-            0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-            0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-            0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-            0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-            0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-            0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-            0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-            0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-            0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-            0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-            0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-            0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-            0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-            0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-            0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-            0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-        );
-
-        // For this function to yield the same output as PHP's crc32 function, $crc would have to be
-        // set to 0xFFFFFFFF, initially - not 0x00000000 as it currently is.
-        $crc = 0x00000000;
-        $length = strlen($data);
-
-        for ($i=0;$i<$length;$i++) {
-            // We AND $crc >> 8 with 0x00FFFFFF because we want the eight newly added bits to all
-            // be zero.  PHP, unfortunately, doesn't always do this.  0x80000000 >> 8, as an example,
-            // yields 0xFF800000 - not 0x00800000.  The following link elaborates:
-            // http://www.php.net/manual/en/language.operators.bitwise.php#57281
-            $crc = (($crc >> 8) & 0x00FFFFFF) ^ $crc_lookup_table[($crc & 0xFF) ^ ord($data[$i])];
-        }
-
-        // In addition to having to set $crc to 0xFFFFFFFF, initially, the return value must be XOR'd with
-        // 0xFFFFFFFF for this function to return the same thing that PHP's crc32 function would.
-        return $crc;
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param String $string
-     * @param optional Integer $index
-     * @return String
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * RSA Encrypt
-     *
-     * Returns mod(pow($m, $e), $n), where $n should be the product of two (large) primes $p and $q and where $e
-     * should be a number with the property that gcd($e, ($p - 1) * ($q - 1)) == 1.  Could just make anything that
-     * calls this call modexp, instead, but I think this makes things clearer, maybe...
-     *
-     * @see Net_SSH1::Net_SSH1()
-     * @param Math_BigInteger $m
-     * @param Array $key
-     * @return Math_BigInteger
-     * @access private
-     */
-    function _rsa_crypt($m, $key)
-    {
-        /*
-        if (!class_exists('Crypt_RSA')) {
-            require_once('Crypt/RSA.php');
-        }
-
-        $rsa = new Crypt_RSA();
-        $rsa->loadKey($key, CRYPT_RSA_PUBLIC_FORMAT_RAW);
-        $rsa->setEncryptionMode(CRYPT_RSA_ENCRYPTION_PKCS1);
-        return $rsa->encrypt($m);
-        */
-
-        // To quote from protocol-1.5.txt:
-        // The most significant byte (which is only partial as the value must be
-        // less than the public modulus, which is never a power of two) is zero.
-        //
-        // The next byte contains the value 2 (which stands for public-key
-        // encrypted data in the PKCS standard [PKCS#1]).  Then, there are non-
-        // zero random bytes to fill any unused space, a zero byte, and the data
-        // to be encrypted in the least significant bytes, the last byte of the
-        // data in the least significant byte.
-
-        // Presumably the part of PKCS#1 they're refering to is "Section 7.2.1 Encryption Operation",
-        // under "7.2 RSAES-PKCS1-v1.5" and "7 Encryption schemes" of the following URL:
-        // ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
-        $temp = chr(0) . chr(2);
-        $modulus = $key[1]->toBytes();
-        $length = strlen($modulus) - strlen($m) - 3;
-        for ($i = 0; $i < $length; $i++) {
-            $temp.= chr(crypt_random(1, 255));
-        }
-        $temp.= chr(0) . $m;
-
-        $m = new Math_BigInteger($temp, 256);
-        $m = $m->modPow($key[0], $key[1]);
-
-        return $m->toBytes();
-    }
-
-    /**
-     * Return the server key public exponent
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param optional Boolean $raw_output
-     * @return String
-     * @access public
-     */
-    function getServerKeyPublicExponent($raw_output = false)
-    {
-        return $raw_output ? $this->server_key_public_exponent->toBytes() : $this->server_key_public_exponent->toString();
-    }
-
-    /**
-     * Return the server key public modulus
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param optional Boolean $raw_output
-     * @return String
-     * @access public
-     */
-    function getServerKeyPublicModulus($raw_output = false)
-    {
-        return $raw_output ? $this->server_key_public_modulus->toBytes() : $this->server_key_public_modulus->toString();
-    }
-
-    /**
-     * Return the host key public exponent
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param optional Boolean $raw_output
-     * @return String
-     * @access public
-     */
-    function getHostKeyPublicExponent($raw_output = false)
-    {
-        return $raw_output ? $this->host_key_public_exponent->toBytes() : $this->host_key_public_exponent->toString();
-    }
-
-    /**
-     * Return the host key public modulus
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param optional Boolean $raw_output
-     * @return String
-     * @access public
-     */
-    function getHostKeyPublicModulus($raw_output = false)
-    {
-        return $raw_output ? $this->host_key_public_modulus->toBytes() : $this->host_key_public_modulus->toString();
-    }
-
-    /**
-     * Return a list of ciphers supported by SSH1 server.
-     *
-     * Just because a cipher is supported by an SSH1 server doesn't mean it's supported by this library. If $raw_output
-     * is set to true, returns, instead, an array of constants.  ie. instead of array('Triple-DES in CBC mode'), you'll
-     * get array(NET_SSH1_CIPHER_3DES).
-     *
-     * @param optional Boolean $raw_output
-     * @return Array
-     * @access public
-     */
-    function getSupportedCiphers($raw_output = false)
-    {
-        return $raw_output ? array_keys($this->supported_ciphers) : array_values($this->supported_ciphers);
-    }
-
-    /**
-     * Return a list of authentications supported by SSH1 server.
-     *
-     * Just because a cipher is supported by an SSH1 server doesn't mean it's supported by this library. If $raw_output
-     * is set to true, returns, instead, an array of constants.  ie. instead of array('password authentication'), you'll
-     * get array(NET_SSH1_AUTH_PASSWORD).
-     *
-     * @param optional Boolean $raw_output
-     * @return Array
-     * @access public
-     */
-    function getSupportedAuthentications($raw_output = false)
-    {
-        return $raw_output ? array_keys($this->supported_authentications) : array_values($this->supported_authentications);
-    }
-
-    /**
-     * Return the server identification.
-     *
-     * @return String
-     * @access public
-     */
-    function getServerIdentification()
-    {
-        return rtrim($this->server_identification);
-    }
-}
-?>
\ No newline at end of file
diff --git a/library/phpsec/Net/SSH2.php b/library/phpsec/Net/SSH2.php
deleted file mode 100644
index aa9f6dbe5..000000000
--- a/library/phpsec/Net/SSH2.php
+++ /dev/null
@@ -1,2302 +0,0 @@
-
- * login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->exec('pwd');
- *    echo $ssh->exec('ls -la');
- * ?>
- * 
- *
- * 
- * setPassword('whatever');
- *    $key->loadKey(file_get_contents('privatekey'));
- *
- *    $ssh = new Net_SSH2('www.domain.tld');
- *    if (!$ssh->login('username', $key)) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->exec('pwd');
- *    echo $ssh->exec('ls -la');
- * ?>
- * 
- *
- * LICENSE: This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA  02111-1307  USA
- *
- * @category   Net
- * @package    Net_SSH2
- * @author     Jim Wigginton 
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: SSH2.php,v 1.46 2010/04/27 21:29:36 terrafrost Exp $
- * @link       http://phpseclib.sourceforge.net
- */
-
-/**
- * Include Math_BigInteger
- *
- * Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.
- */
-require_once('Math/BigInteger.php');
-
-/**
- * Include Crypt_Random
- */
-require_once('Crypt/Random.php');
-
-/**
- * Include Crypt_Hash
- */
-require_once('Crypt/Hash.php');
-
-/**
- * Include Crypt_TripleDES
- */
-require_once('Crypt/TripleDES.php');
-
-/**
- * Include Crypt_RC4
- */
-require_once('Crypt/RC4.php');
-
-/**
- * Include Crypt_AES
- */
-require_once('Crypt/AES.php');
-
-/**#@+
- * Execution Bitmap Masks
- *
- * @see Net_SSH2::bitmap
- * @access private
- */
-define('NET_SSH2_MASK_CONSTRUCTOR', 0x00000001);
-define('NET_SSH2_MASK_LOGIN',       0x00000002);
-/**#@-*/
-
-/**#@+
- * Channel constants
- *
- * RFC4254 refers not to client and server channels but rather to sender and recipient channels.  we don't refer
- * to them in that way because RFC4254 toggles the meaning. the client sends a SSH_MSG_CHANNEL_OPEN message with
- * a sender channel and the server sends a SSH_MSG_CHANNEL_OPEN_CONFIRMATION in response, with a sender and a
- * recepient channel.  at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
- * would be the same thing as SSH_MSG_CHANNEL_OPEN's sender channel, but it's not, per this snipet:
- *     The 'recipient channel' is the channel number given in the original
- *     open request, and 'sender channel' is the channel number allocated by
- *     the other side.
- *
- * @see Net_SSH2::_send_channel_packet()
- * @see Net_SSH2::_get_channel_packet()
- * @access private
- */
-define('NET_SSH2_CHANNEL_EXEC', 0); // PuTTy uses 0x100
-/**#@-*/
-
-/**#@+
- * @access public
- * @see Net_SSH2::getLog()
- */
-/**
- * Returns the message numbers
- */
-define('NET_SSH2_LOG_SIMPLE',  1);
-/**
- * Returns the message content
- */
-define('NET_SSH2_LOG_COMPLEX', 2);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of SSHv2.
- *
- * @author  Jim Wigginton 
- * @version 0.1.0
- * @access  public
- * @package Net_SSH2
- */
-class Net_SSH2 {
-    /**
-     * The SSH identifier
-     *
-     * @var String
-     * @access private
-     */
-    var $identifier = 'SSH-2.0-phpseclib_0.2';
-
-    /**
-     * The Socket Object
-     *
-     * @var Object
-     * @access private
-     */
-    var $fsock;
-
-    /**
-     * Execution Bitmap
-     *
-     * The bits that are set reprsent functions that have been called already.  This is used to determine
-     * if a requisite function has been successfully executed.  If not, an error should be thrown.
-     *
-     * @var Integer
-     * @access private
-     */
-    var $bitmap = 0;
-
-    /**
-     * Error information
-     *
-     * @see Net_SSH2::getErrors()
-     * @see Net_SSH2::getLastError()
-     * @var String
-     * @access private
-     */
-    var $errors = array();
-
-    /**
-     * Server Identifier
-     *
-     * @see Net_SSH2::getServerIdentification()
-     * @var String
-     * @access private
-     */
-    var $server_identifier = '';
-
-    /**
-     * Key Exchange Algorithms
-     *
-     * @see Net_SSH2::getKexAlgorithims()
-     * @var Array
-     * @access private
-     */
-    var $kex_algorithms;
-
-    /**
-     * Server Host Key Algorithms
-     *
-     * @see Net_SSH2::getServerHostKeyAlgorithms()
-     * @var Array
-     * @access private
-     */
-    var $server_host_key_algorithms;
-
-    /**
-     * Encryption Algorithms: Client to Server
-     *
-     * @see Net_SSH2::getEncryptionAlgorithmsClient2Server()
-     * @var Array
-     * @access private
-     */
-    var $encryption_algorithms_client_to_server;
-
-    /**
-     * Encryption Algorithms: Server to Client
-     *
-     * @see Net_SSH2::getEncryptionAlgorithmsServer2Client()
-     * @var Array
-     * @access private
-     */
-    var $encryption_algorithms_server_to_client;
-
-    /**
-     * MAC Algorithms: Client to Server
-     *
-     * @see Net_SSH2::getMACAlgorithmsClient2Server()
-     * @var Array
-     * @access private
-     */
-    var $mac_algorithms_client_to_server;
-
-    /**
-     * MAC Algorithms: Server to Client
-     *
-     * @see Net_SSH2::getMACAlgorithmsServer2Client()
-     * @var Array
-     * @access private
-     */
-    var $mac_algorithms_server_to_client;
-
-    /**
-     * Compression Algorithms: Client to Server
-     *
-     * @see Net_SSH2::getCompressionAlgorithmsClient2Server()
-     * @var Array
-     * @access private
-     */
-    var $compression_algorithms_client_to_server;
-
-    /**
-     * Compression Algorithms: Server to Client
-     *
-     * @see Net_SSH2::getCompressionAlgorithmsServer2Client()
-     * @var Array
-     * @access private
-     */
-    var $compression_algorithms_server_to_client;
-
-    /**
-     * Languages: Server to Client
-     *
-     * @see Net_SSH2::getLanguagesServer2Client()
-     * @var Array
-     * @access private
-     */
-    var $languages_server_to_client;
-
-    /**
-     * Languages: Client to Server
-     *
-     * @see Net_SSH2::getLanguagesClient2Server()
-     * @var Array
-     * @access private
-     */
-    var $languages_client_to_server;
-
-    /**
-     * Block Size for Server to Client Encryption
-     *
-     * "Note that the length of the concatenation of 'packet_length',
-     *  'padding_length', 'payload', and 'random padding' MUST be a multiple
-     *  of the cipher block size or 8, whichever is larger.  This constraint
-     *  MUST be enforced, even when using stream ciphers."
-     *
-     *  -- http://tools.ietf.org/html/rfc4253#section-6
-     *
-     * @see Net_SSH2::Net_SSH2()
-     * @see Net_SSH2::_send_binary_packet()
-     * @var Integer
-     * @access private
-     */
-    var $encrypt_block_size = 8;
-
-    /**
-     * Block Size for Client to Server Encryption
-     *
-     * @see Net_SSH2::Net_SSH2()
-     * @see Net_SSH2::_get_binary_packet()
-     * @var Integer
-     * @access private
-     */
-    var $decrypt_block_size = 8;
-
-    /**
-     * Server to Client Encryption Object
-     *
-     * @see Net_SSH2::_get_binary_packet()
-     * @var Object
-     * @access private
-     */
-    var $decrypt = false;
-
-    /**
-     * Client to Server Encryption Object
-     *
-     * @see Net_SSH2::_send_binary_packet()
-     * @var Object
-     * @access private
-     */
-    var $encrypt = false;
-
-    /**
-     * Client to Server HMAC Object
-     *
-     * @see Net_SSH2::_send_binary_packet()
-     * @var Object
-     * @access private
-     */
-    var $hmac_create = false;
-
-    /**
-     * Server to Client HMAC Object
-     *
-     * @see Net_SSH2::_get_binary_packet()
-     * @var Object
-     * @access private
-     */
-    var $hmac_check = false;
-
-    /**
-     * Size of server to client HMAC
-     *
-     * We need to know how big the HMAC will be for the server to client direction so that we know how many bytes to read.
-     * For the client to server side, the HMAC object will make the HMAC as long as it needs to be.  All we need to do is
-     * append it.
-     *
-     * @see Net_SSH2::_get_binary_packet()
-     * @var Integer
-     * @access private
-     */
-    var $hmac_size = false;
-
-    /**
-     * Server Public Host Key
-     *
-     * @see Net_SSH2::getServerPublicHostKey()
-     * @var String
-     * @access private
-     */
-    var $server_public_host_key;
-
-    /**
-     * Session identifer
-     *
-     * "The exchange hash H from the first key exchange is additionally
-     *  used as the session identifier, which is a unique identifier for
-     *  this connection."
-     *
-     *  -- http://tools.ietf.org/html/rfc4253#section-7.2
-     *
-     * @see Net_SSH2::_key_exchange()
-     * @var String
-     * @access private
-     */
-    var $session_id = false;
-
-    /**
-     * Message Numbers
-     *
-     * @see Net_SSH2::Net_SSH2()
-     * @var Array
-     * @access private
-     */
-    var $message_numbers = array();
-
-    /**
-     * Disconnection Message 'reason codes' defined in RFC4253
-     *
-     * @see Net_SSH2::Net_SSH2()
-     * @var Array
-     * @access private
-     */
-    var $disconnect_reasons = array();
-
-    /**
-     * SSH_MSG_CHANNEL_OPEN_FAILURE 'reason codes', defined in RFC4254
-     *
-     * @see Net_SSH2::Net_SSH2()
-     * @var Array
-     * @access private
-     */
-    var $channel_open_failure_reasons = array();
-
-    /**
-     * Terminal Modes
-     *
-     * @link http://tools.ietf.org/html/rfc4254#section-8
-     * @see Net_SSH2::Net_SSH2()
-     * @var Array
-     * @access private
-     */
-    var $terminal_modes = array();
-
-    /**
-     * SSH_MSG_CHANNEL_EXTENDED_DATA's data_type_codes
-     *
-     * @link http://tools.ietf.org/html/rfc4254#section-5.2
-     * @see Net_SSH2::Net_SSH2()
-     * @var Array
-     * @access private
-     */
-    var $channel_extended_data_type_codes = array();
-
-    /**
-     * Send Sequence Number
-     *
-     * See 'Section 6.4.  Data Integrity' of rfc4253 for more info.
-     *
-     * @see Net_SSH2::_send_binary_packet()
-     * @var Integer
-     * @access private
-     */
-    var $send_seq_no = 0;
-
-    /**
-     * Get Sequence Number
-     *
-     * See 'Section 6.4.  Data Integrity' of rfc4253 for more info.
-     *
-     * @see Net_SSH2::_get_binary_packet()
-     * @var Integer
-     * @access private
-     */
-    var $get_seq_no = 0;
-
-    /**
-     * Server Channels
-     *
-     * Maps client channels to server channels
-     *
-     * @see Net_SSH2::_get_channel_packet()
-     * @see Net_SSH2::exec()
-     * @var Array
-     * @access private
-     */
-    var $server_channels = array();
-
-    /**
-     * Channel Buffers
-     *
-     * If a client requests a packet from one channel but receives two packets from another those packets should
-     * be placed in a buffer
-     *
-     * @see Net_SSH2::_get_channel_packet()
-     * @see Net_SSH2::exec()
-     * @var Array
-     * @access private
-     */
-    var $channel_buffers = array();
-
-    /**
-     * Channel Status
-     *
-     * Contains the type of the last sent message
-     *
-     * @see Net_SSH2::_get_channel_packet()
-     * @var Array
-     * @access private
-     */
-    var $channel_status = array();
-
-    /**
-     * Packet Size
-     *
-     * Maximum packet size indexed by channel
-     *
-     * @see Net_SSH2::_send_channel_packet()
-     * @var Array
-     * @access private
-     */
-    var $packet_size_client_to_server = array();
-
-    /**
-     * Message Number Log
-     *
-     * @see Net_SSH2::getLog()
-     * @var Array
-     * @access private
-     */
-    var $message_number_log = array();
-
-    /**
-     * Message Log
-     *
-     * @see Net_SSH2::getLog()
-     * @var Array
-     * @access private
-     */
-    var $message_log = array();
-
-    /**
-     * The Window Size
-     *
-     * Bytes the other party can send before it must wait for the window to be adjusted (0x7FFFFFFF = 4GB)
-     *
-     * @var Integer
-     * @see Net_SSH2::_send_channel_packet()
-     * @see Net_SSH2::exec()
-     * @access private
-     */
-    var $window_size = 0x7FFFFFFF;
-
-    /**
-     * Window size
-     *
-     * Window size indexed by channel
-     *
-     * @see Net_SSH2::_send_channel_packet()
-     * @var Array
-     * @access private
-     */
-    var $window_size_client_to_server = array();
-
-    /**
-     * Server signature
-     *
-     * Verified against $this->session_id
-     *
-     * @see Net_SSH2::getServerPublicHostKey()
-     * @var String
-     * @access private
-     */
-    var $signature = '';
-
-    /**
-     * Server signature format
-     *
-     * ssh-rsa or ssh-dss.
-     *
-     * @see Net_SSH2::getServerPublicHostKey()
-     * @var String
-     * @access private
-     */
-    var $signature_format = '';
-
-    /**
-     * Default Constructor.
-     *
-     * Connects to an SSHv2 server
-     *
-     * @param String $host
-     * @param optional Integer $port
-     * @param optional Integer $timeout
-     * @return Net_SSH2
-     * @access public
-     */
-    function Net_SSH2($host, $port = 22, $timeout = 10)
-    {
-        $this->message_numbers = array(
-            1 => 'NET_SSH2_MSG_DISCONNECT',
-            2 => 'NET_SSH2_MSG_IGNORE',
-            3 => 'NET_SSH2_MSG_UNIMPLEMENTED',
-            4 => 'NET_SSH2_MSG_DEBUG',
-            5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
-            6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
-            20 => 'NET_SSH2_MSG_KEXINIT',
-            21 => 'NET_SSH2_MSG_NEWKEYS',
-            30 => 'NET_SSH2_MSG_KEXDH_INIT',
-            31 => 'NET_SSH2_MSG_KEXDH_REPLY',
-            50 => 'NET_SSH2_MSG_USERAUTH_REQUEST',
-            51 => 'NET_SSH2_MSG_USERAUTH_FAILURE',
-            52 => 'NET_SSH2_MSG_USERAUTH_SUCCESS',
-            53 => 'NET_SSH2_MSG_USERAUTH_BANNER',
-
-            80 => 'NET_SSH2_MSG_GLOBAL_REQUEST',
-            81 => 'NET_SSH2_MSG_REQUEST_SUCCESS',
-            82 => 'NET_SSH2_MSG_REQUEST_FAILURE',
-            90 => 'NET_SSH2_MSG_CHANNEL_OPEN',
-            91 => 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
-            92 => 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
-            93 => 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
-            94 => 'NET_SSH2_MSG_CHANNEL_DATA',
-            95 => 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
-            96 => 'NET_SSH2_MSG_CHANNEL_EOF',
-            97 => 'NET_SSH2_MSG_CHANNEL_CLOSE',
-            98 => 'NET_SSH2_MSG_CHANNEL_REQUEST',
-            99 => 'NET_SSH2_MSG_CHANNEL_SUCCESS',
-            100 => 'NET_SSH2_MSG_CHANNEL_FAILURE'
-        );
-        $this->disconnect_reasons = array(
-            1 => 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
-            2 => 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
-            3 => 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
-            4 => 'NET_SSH2_DISCONNECT_RESERVED',
-            5 => 'NET_SSH2_DISCONNECT_MAC_ERROR',
-            6 => 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
-            7 => 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
-            8 => 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
-            9 => 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
-            10 => 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
-            11 => 'NET_SSH2_DISCONNECT_BY_APPLICATION',
-            12 => 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
-            13 => 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
-            14 => 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
-            15 => 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
-        );
-        $this->channel_open_failure_reasons = array(
-            1 => 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
-        );
-        $this->terminal_modes = array(
-            0 => 'NET_SSH2_TTY_OP_END'
-        );
-        $this->channel_extended_data_type_codes = array(
-            1 => 'NET_SSH2_EXTENDED_DATA_STDERR'
-        );
-
-        $this->_define_array(
-            $this->message_numbers,
-            $this->disconnect_reasons,
-            $this->channel_open_failure_reasons,
-            $this->terminal_modes,
-            $this->channel_extended_data_type_codes,
-            array(60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'),
-            array(60 => 'NET_SSH2_MSG_USERAUTH_PK_OK')
-        );
-
-        $this->fsock = @fsockopen($host, $port, $errno, $errstr, $timeout);
-        if (!$this->fsock) {
-            user_error(rtrim("Cannot connect to $host. Error $errno. $errstr"), E_USER_NOTICE);
-            return;
-        }
-
-        /* According to the SSH2 specs,
-
-          "The server MAY send other lines of data before sending the version
-           string.  Each line SHOULD be terminated by a Carriage Return and Line
-           Feed.  Such lines MUST NOT begin with "SSH-", and SHOULD be encoded
-           in ISO-10646 UTF-8 [RFC3629] (language is not specified).  Clients
-           MUST be able to process such lines." */
-        $temp = '';
-        $extra = '';
-        while (!feof($this->fsock) && !preg_match('#^SSH-(\d\.\d+)#', $temp, $matches)) {
-            if (substr($temp, -2) == "\r\n") {
-                $extra.= $temp;
-                $temp = '';
-            }
-            $temp.= fgets($this->fsock, 255);
-        }
-
-        $ext = array();
-        if (extension_loaded('mcrypt')) {
-            $ext[] = 'mcrypt';
-        }
-        if (extension_loaded('gmp')) {
-            $ext[] = 'gmp';
-        } else if (extension_loaded('bcmath')) {
-            $ext[] = 'bcmath';
-        }
-
-        if (!empty($ext)) {
-            $this->identifier.= ' (' . implode(', ', $ext) . ')';
-        }
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $this->message_number_log[] = '<-';
-            $this->message_number_log[] = '->';
-
-            if (NET_SSH2_LOGGING == NET_SSH2_LOG_COMPLEX) {
-                $this->message_log[] = $temp;
-                $this->message_log[] = $this->identifier . "\r\n";
-            }
-        }
-
-        $this->server_identifier = trim($temp, "\r\n");
-        if (!empty($extra)) {
-            $this->errors[] = utf8_decode($extra);
-        }
-
-        if ($matches[1] != '1.99' && $matches[1] != '2.0') {
-            user_error("Cannot connect to SSH $matches[1] servers", E_USER_NOTICE);
-            return;
-        }
-
-        fputs($this->fsock, $this->identifier . "\r\n");
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server', E_USER_NOTICE);
-            return;
-        }
-
-        if (ord($response[0]) != NET_SSH2_MSG_KEXINIT) {
-            user_error('Expected SSH_MSG_KEXINIT', E_USER_NOTICE);
-            return;
-        }
-
-        if (!$this->_key_exchange($response)) {
-            return;
-        }
-
-        $this->bitmap = NET_SSH2_MASK_CONSTRUCTOR;
-    }
-
-    /**
-     * Key Exchange
-     *
-     * @param String $kexinit_payload_server
-     * @access private
-     */
-    function _key_exchange($kexinit_payload_server)
-    {
-        static $kex_algorithms = array(
-            'diffie-hellman-group1-sha1', // REQUIRED
-            'diffie-hellman-group14-sha1' // REQUIRED
-        );
-
-        static $server_host_key_algorithms = array(
-            'ssh-rsa', // RECOMMENDED  sign   Raw RSA Key
-            'ssh-dss'  // REQUIRED     sign   Raw DSS Key
-        );
-
-        static $encryption_algorithms = array(
-            // from :
-            'arcfour256',
-            'arcfour128',
-
-            'arcfour',    // OPTIONAL          the ARCFOUR stream cipher with a 128-bit key
-
-            'aes128-cbc', // RECOMMENDED       AES with a 128-bit key
-            'aes192-cbc', // OPTIONAL          AES with a 192-bit key
-            'aes256-cbc', // OPTIONAL          AES in CBC mode, with a 256-bit key
-
-            // from :
-            'aes128-ctr', // RECOMMENDED       AES (Rijndael) in SDCTR mode, with 128-bit key
-            'aes192-ctr', // RECOMMENDED       AES with 192-bit key
-            'aes256-ctr', // RECOMMENDED       AES with 256-bit key
-            '3des-ctr',   // RECOMMENDED       Three-key 3DES in SDCTR mode
-
-            '3des-cbc',   // REQUIRED          three-key 3DES in CBC mode
-            'none'        // OPTIONAL          no encryption; NOT RECOMMENDED
-        );
-
-        static $mac_algorithms = array(
-            'hmac-sha1-96', // RECOMMENDED     first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
-            'hmac-sha1',    // REQUIRED        HMAC-SHA1 (digest length = key length = 20)
-            'hmac-md5-96',  // OPTIONAL        first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
-            'hmac-md5',     // OPTIONAL        HMAC-MD5 (digest length = key length = 16)
-            'none'          // OPTIONAL        no MAC; NOT RECOMMENDED
-        );
-
-        static $compression_algorithms = array(
-            'none'   // REQUIRED        no compression
-            //'zlib' // OPTIONAL        ZLIB (LZ77) compression
-        );
-
-        static $str_kex_algorithms, $str_server_host_key_algorithms,
-               $encryption_algorithms_server_to_client, $mac_algorithms_server_to_client, $compression_algorithms_server_to_client,
-               $encryption_algorithms_client_to_server, $mac_algorithms_client_to_server, $compression_algorithms_client_to_server;
-
-        if (empty($str_kex_algorithms)) {
-            $str_kex_algorithms = implode(',', $kex_algorithms);
-            $str_server_host_key_algorithms = implode(',', $server_host_key_algorithms);
-            $encryption_algorithms_server_to_client = $encryption_algorithms_client_to_server = implode(',', $encryption_algorithms);
-            $mac_algorithms_server_to_client = $mac_algorithms_client_to_server = implode(',', $mac_algorithms);
-            $compression_algorithms_server_to_client = $compression_algorithms_client_to_server = implode(',', $compression_algorithms);
-        }
-
-        $client_cookie = '';
-        for ($i = 0; $i < 16; $i++) {
-            $client_cookie.= chr(crypt_random(0, 255));
-        }
-
-        $response = $kexinit_payload_server;
-        $this->_string_shift($response, 1); // skip past the message number (it should be SSH_MSG_KEXINIT)
-        $server_cookie = $this->_string_shift($response, 16);
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->kex_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->server_host_key_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->encryption_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->encryption_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->mac_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->mac_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->compression_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->compression_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->languages_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->languages_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        extract(unpack('Cfirst_kex_packet_follows', $this->_string_shift($response, 1)));
-        $first_kex_packet_follows = $first_kex_packet_follows != 0;
-
-        // the sending of SSH2_MSG_KEXINIT could go in one of two places.  this is the second place.
-        $kexinit_payload_client = pack('Ca*Na*Na*Na*Na*Na*Na*Na*Na*Na*Na*CN',
-            NET_SSH2_MSG_KEXINIT, $client_cookie, strlen($str_kex_algorithms), $str_kex_algorithms,
-            strlen($str_server_host_key_algorithms), $str_server_host_key_algorithms, strlen($encryption_algorithms_client_to_server),
-            $encryption_algorithms_client_to_server, strlen($encryption_algorithms_server_to_client), $encryption_algorithms_server_to_client,
-            strlen($mac_algorithms_client_to_server), $mac_algorithms_client_to_server, strlen($mac_algorithms_server_to_client),
-            $mac_algorithms_server_to_client, strlen($compression_algorithms_client_to_server), $compression_algorithms_client_to_server,
-            strlen($compression_algorithms_server_to_client), $compression_algorithms_server_to_client, 0, '', 0, '',
-            0, 0
-        );
-
-        if (!$this->_send_binary_packet($kexinit_payload_client)) {
-            return false;
-        }
-        // here ends the second place.
-
-        // we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange
-        for ($i = 0; $i < count($encryption_algorithms) && !in_array($encryption_algorithms[$i], $this->encryption_algorithms_server_to_client); $i++);
-        if ($i == count($encryption_algorithms)) {
-            user_error('No compatible server to client encryption algorithms found', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
-        // diffie-hellman key exchange as fast as possible
-        $decrypt = $encryption_algorithms[$i];
-        switch ($decrypt) {
-            case '3des-cbc':
-            case '3des-ctr':
-                $decryptKeyLength = 24; // eg. 192 / 8
-                break;
-            case 'aes256-cbc':
-            case 'aes256-ctr':
-                $decryptKeyLength = 32; // eg. 256 / 8
-                break;
-            case 'aes192-cbc':
-            case 'aes192-ctr':
-                $decryptKeyLength = 24; // eg. 192 / 8
-                break;
-            case 'aes128-cbc':
-            case 'aes128-ctr':
-                $decryptKeyLength = 16; // eg. 128 / 8
-                break;
-            case 'arcfour':
-            case 'arcfour128':
-                $decryptKeyLength = 16; // eg. 128 / 8
-                break;
-            case 'arcfour256':
-                $decryptKeyLength = 32; // eg. 128 / 8
-                break;
-            case 'none';
-                $decryptKeyLength = 0;
-        }
-
-        for ($i = 0; $i < count($encryption_algorithms) && !in_array($encryption_algorithms[$i], $this->encryption_algorithms_client_to_server); $i++);
-        if ($i == count($encryption_algorithms)) {
-            user_error('No compatible client to server encryption algorithms found', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        $encrypt = $encryption_algorithms[$i];
-        switch ($encrypt) {
-            case '3des-cbc':
-            case '3des-ctr':
-                $encryptKeyLength = 24;
-                break;
-            case 'aes256-cbc':
-            case 'aes256-ctr':
-                $encryptKeyLength = 32;
-                break;
-            case 'aes192-cbc':
-            case 'aes192-ctr':
-                $encryptKeyLength = 24;
-                break;
-            case 'aes128-cbc':
-            case 'aes128-ctr':
-                $encryptKeyLength = 16;
-                break;
-            case 'arcfour':
-            case 'arcfour128':
-                $encryptKeyLength = 16;
-                break;
-            case 'arcfour256':
-                $encryptKeyLength = 32;
-                break;
-            case 'none';
-                $encryptKeyLength = 0;
-        }
-
-        $keyLength = $decryptKeyLength > $encryptKeyLength ? $decryptKeyLength : $encryptKeyLength;
-
-        // through diffie-hellman key exchange a symmetric key is obtained
-        for ($i = 0; $i < count($kex_algorithms) && !in_array($kex_algorithms[$i], $this->kex_algorithms); $i++);
-        if ($i == count($kex_algorithms)) {
-            user_error('No compatible key exchange algorithms found', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        switch ($kex_algorithms[$i]) {
-            // see http://tools.ietf.org/html/rfc2409#section-6.2 and 
-            // http://tools.ietf.org/html/rfc2412, appendex E
-            case 'diffie-hellman-group1-sha1':
-                $p = pack('H256', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' . 
-                                  '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' . 
-                                  '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' . 
-                                  'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF');
-                $keyLength = $keyLength < 160 ? $keyLength : 160;
-                $hash = 'sha1';
-                break;
-            // see http://tools.ietf.org/html/rfc3526#section-3
-            case 'diffie-hellman-group14-sha1':
-                $p = pack('H512', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' . 
-                                  '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' . 
-                                  '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' . 
-                                  'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' . 
-                                  '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' . 
-                                  '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' . 
-                                  'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' . 
-                                  '3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF');
-                $keyLength = $keyLength < 160 ? $keyLength : 160;
-                $hash = 'sha1';
-        }
-
-        $p = new Math_BigInteger($p, 256);
-        //$q = $p->bitwise_rightShift(1);
-
-        /* To increase the speed of the key exchange, both client and server may
-           reduce the size of their private exponents.  It should be at least
-           twice as long as the key material that is generated from the shared
-           secret.  For more details, see the paper by van Oorschot and Wiener
-           [VAN-OORSCHOT].
-
-           -- http://tools.ietf.org/html/rfc4419#section-6.2 */
-        $q = new Math_BigInteger(1);
-        $q = $q->bitwise_leftShift(2 * $keyLength);
-        $q = $q->subtract(new Math_BigInteger(1));
-
-        $g = new Math_BigInteger(2);
-        $x = new Math_BigInteger();
-        $x->setRandomGenerator('crypt_random');
-        $x = $x->random(new Math_BigInteger(1), $q);
-        $e = $g->modPow($x, $p);
-
-        $eBytes = $e->toBytes(true);
-        $data = pack('CNa*', NET_SSH2_MSG_KEXDH_INIT, strlen($eBytes), $eBytes);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Connection closed by server', E_USER_NOTICE);
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server', E_USER_NOTICE);
-            return false;
-        }
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        if ($type != NET_SSH2_MSG_KEXDH_REPLY) {
-            user_error('Expected SSH_MSG_KEXDH_REPLY', E_USER_NOTICE);
-            return false;
-        }
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->server_public_host_key = $server_public_host_key = $this->_string_shift($response, $temp['length']);
-
-        $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-        $public_key_format = $this->_string_shift($server_public_host_key, $temp['length']);
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $fBytes = $this->_string_shift($response, $temp['length']);
-        $f = new Math_BigInteger($fBytes, -256);
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->signature = $this->_string_shift($response, $temp['length']);
-
-        $temp = unpack('Nlength', $this->_string_shift($this->signature, 4));
-        $this->signature_format = $this->_string_shift($this->signature, $temp['length']);
-
-        $key = $f->modPow($x, $p);
-        $keyBytes = $key->toBytes(true);
-
-        if ($this->session_id === false) {
-            $source = pack('Na*Na*Na*Na*Na*Na*Na*Na*',
-                strlen($this->identifier), $this->identifier, strlen($this->server_identifier), $this->server_identifier,
-                strlen($kexinit_payload_client), $kexinit_payload_client, strlen($kexinit_payload_server),
-                $kexinit_payload_server, strlen($this->server_public_host_key), $this->server_public_host_key, strlen($eBytes),
-                $eBytes, strlen($fBytes), $fBytes, strlen($keyBytes), $keyBytes
-            );
-
-            $source = pack('H*', $hash($source));
-
-            $this->session_id = $source;
-        }
-
-        for ($i = 0; $i < count($server_host_key_algorithms) && !in_array($server_host_key_algorithms[$i], $this->server_host_key_algorithms); $i++);
-        if ($i == count($server_host_key_algorithms)) {
-            user_error('No compatible server host key algorithms found', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        if ($public_key_format != $server_host_key_algorithms[$i] || $this->signature_format != $server_host_key_algorithms[$i]) {
-            user_error('Sever Host Key Algorithm Mismatch', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        $packet = pack('C',
-            NET_SSH2_MSG_NEWKEYS
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response === false) {
-            user_error('Connection closed by server', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        if ($type != NET_SSH2_MSG_NEWKEYS) {
-            user_error('Expected SSH_MSG_NEWKEYS', E_USER_NOTICE);
-            return false;
-        }
-
-        switch ($encrypt) {
-            case '3des-cbc':
-                $this->encrypt = new Crypt_TripleDES();
-                // $this->encrypt_block_size = 64 / 8 == the default
-                break;
-            case '3des-ctr':
-                $this->encrypt = new Crypt_TripleDES(CRYPT_DES_MODE_CTR);
-                // $this->encrypt_block_size = 64 / 8 == the default
-                break;
-            case 'aes256-cbc':
-            case 'aes192-cbc':
-            case 'aes128-cbc':
-                $this->encrypt = new Crypt_AES();
-                $this->encrypt_block_size = 16; // eg. 128 / 8
-                break;
-            case 'aes256-ctr':
-            case 'aes192-ctr':
-            case 'aes128-ctr':
-                $this->encrypt = new Crypt_AES(CRYPT_AES_MODE_CTR);
-                $this->encrypt_block_size = 16; // eg. 128 / 8
-                break;
-            case 'arcfour':
-            case 'arcfour128':
-            case 'arcfour256':
-                $this->encrypt = new Crypt_RC4();
-                break;
-            case 'none';
-                //$this->encrypt = new Crypt_Null();
-        }
-
-        switch ($decrypt) {
-            case '3des-cbc':
-                $this->decrypt = new Crypt_TripleDES();
-                break;
-            case '3des-ctr':
-                $this->decrypt = new Crypt_TripleDES(CRYPT_DES_MODE_CTR);
-                break;
-            case 'aes256-cbc':
-            case 'aes192-cbc':
-            case 'aes128-cbc':
-                $this->decrypt = new Crypt_AES();
-                $this->decrypt_block_size = 16;
-                break;
-            case 'aes256-ctr':
-            case 'aes192-ctr':
-            case 'aes128-ctr':
-                $this->decrypt = new Crypt_AES(CRYPT_AES_MODE_CTR);
-                $this->decrypt_block_size = 16;
-                break;
-            case 'arcfour':
-            case 'arcfour128':
-            case 'arcfour256':
-                $this->decrypt = new Crypt_RC4();
-                break;
-            case 'none';
-                //$this->decrypt = new Crypt_Null();
-        }
-
-        $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
-
-        if ($this->encrypt) {
-            $this->encrypt->enableContinuousBuffer();
-            $this->encrypt->disablePadding();
-
-            $iv = pack('H*', $hash($keyBytes . $this->session_id . 'A' . $this->session_id));
-            while ($this->encrypt_block_size > strlen($iv)) {
-                $iv.= pack('H*', $hash($keyBytes . $this->session_id . $iv));
-            }
-            $this->encrypt->setIV(substr($iv, 0, $this->encrypt_block_size));
-
-            $key = pack('H*', $hash($keyBytes . $this->session_id . 'C' . $this->session_id));
-            while ($encryptKeyLength > strlen($key)) {
-                $key.= pack('H*', $hash($keyBytes . $this->session_id . $key));
-            }
-            $this->encrypt->setKey(substr($key, 0, $encryptKeyLength));
-        }
-
-        if ($this->decrypt) {
-            $this->decrypt->enableContinuousBuffer();
-            $this->decrypt->disablePadding();
-
-            $iv = pack('H*', $hash($keyBytes . $this->session_id . 'B' . $this->session_id));
-            while ($this->decrypt_block_size > strlen($iv)) {
-                $iv.= pack('H*', $hash($keyBytes . $this->session_id . $iv));
-            }
-            $this->decrypt->setIV(substr($iv, 0, $this->decrypt_block_size));
-
-            $key = pack('H*', $hash($keyBytes . $this->session_id . 'D' . $this->session_id));
-            while ($decryptKeyLength > strlen($key)) {
-                $key.= pack('H*', $hash($keyBytes . $this->session_id . $key));
-            }
-            $this->decrypt->setKey(substr($key, 0, $decryptKeyLength));
-        }
-
-        /* The "arcfour128" algorithm is the RC4 cipher, as described in
-           [SCHNEIER], using a 128-bit key.  The first 1536 bytes of keystream
-           generated by the cipher MUST be discarded, and the first byte of the
-           first encrypted packet MUST be encrypted using the 1537th byte of
-           keystream.
-
-           -- http://tools.ietf.org/html/rfc4345#section-4 */
-        if ($encrypt == 'arcfour128' || $encrypt == 'arcfour256') {
-            $this->encrypt->encrypt(str_repeat("\0", 1536));
-        }
-        if ($decrypt == 'arcfour128' || $decrypt == 'arcfour256') {
-            $this->decrypt->decrypt(str_repeat("\0", 1536));
-        }
-
-        for ($i = 0; $i < count($mac_algorithms) && !in_array($mac_algorithms[$i], $this->mac_algorithms_client_to_server); $i++);
-        if ($i == count($mac_algorithms)) {
-            user_error('No compatible client to server message authentication algorithms found', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        $createKeyLength = 0; // ie. $mac_algorithms[$i] == 'none'
-        switch ($mac_algorithms[$i]) {
-            case 'hmac-sha1':
-                $this->hmac_create = new Crypt_Hash('sha1');
-                $createKeyLength = 20;
-                break;
-            case 'hmac-sha1-96':
-                $this->hmac_create = new Crypt_Hash('sha1-96');
-                $createKeyLength = 20;
-                break;
-            case 'hmac-md5':
-                $this->hmac_create = new Crypt_Hash('md5');
-                $createKeyLength = 16;
-                break;
-            case 'hmac-md5-96':
-                $this->hmac_create = new Crypt_Hash('md5-96');
-                $createKeyLength = 16;
-        }
-
-        for ($i = 0; $i < count($mac_algorithms) && !in_array($mac_algorithms[$i], $this->mac_algorithms_server_to_client); $i++);
-        if ($i == count($mac_algorithms)) {
-            user_error('No compatible server to client message authentication algorithms found', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        $checkKeyLength = 0;
-        $this->hmac_size = 0;
-        switch ($mac_algorithms[$i]) {
-            case 'hmac-sha1':
-                $this->hmac_check = new Crypt_Hash('sha1');
-                $checkKeyLength = 20;
-                $this->hmac_size = 20;
-                break;
-            case 'hmac-sha1-96':
-                $this->hmac_check = new Crypt_Hash('sha1-96');
-                $checkKeyLength = 20;
-                $this->hmac_size = 12;
-                break;
-            case 'hmac-md5':
-                $this->hmac_check = new Crypt_Hash('md5');
-                $checkKeyLength = 16;
-                $this->hmac_size = 16;
-                break;
-            case 'hmac-md5-96':
-                $this->hmac_check = new Crypt_Hash('md5-96');
-                $checkKeyLength = 16;
-                $this->hmac_size = 12;
-        }
-
-        $key = pack('H*', $hash($keyBytes . $this->session_id . 'E' . $this->session_id));
-        while ($createKeyLength > strlen($key)) {
-            $key.= pack('H*', $hash($keyBytes . $this->session_id . $key));
-        }
-        $this->hmac_create->setKey(substr($key, 0, $createKeyLength));
-
-        $key = pack('H*', $hash($keyBytes . $this->session_id . 'F' . $this->session_id));
-        while ($checkKeyLength > strlen($key)) {
-            $key.= pack('H*', $hash($keyBytes . $this->session_id . $key));
-        }
-        $this->hmac_check->setKey(substr($key, 0, $checkKeyLength));
-
-        for ($i = 0; $i < count($compression_algorithms) && !in_array($compression_algorithms[$i], $this->compression_algorithms_server_to_client); $i++);
-        if ($i == count($compression_algorithms)) {
-            user_error('No compatible server to client compression algorithms found', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-        $this->decompress = $compression_algorithms[$i] == 'zlib';
-
-        for ($i = 0; $i < count($compression_algorithms) && !in_array($compression_algorithms[$i], $this->compression_algorithms_client_to_server); $i++);
-        if ($i == count($compression_algorithms)) {
-            user_error('No compatible client to server compression algorithms found', E_USER_NOTICE);
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-        $this->compress = $compression_algorithms[$i] == 'zlib';
-
-        return true;
-    }
-
-    /**
-     * Login
-     *
-     * @param String $username
-     * @param optional String $password
-     * @return Boolean
-     * @access public
-     * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-     *           by sending dummy SSH_MSG_IGNORE messages.
-     */
-    function login($username, $password = '')
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR)) {
-            return false;
-        }
-
-        $packet = pack('CNa*',
-            NET_SSH2_MSG_SERVICE_REQUEST, strlen('ssh-userauth'), 'ssh-userauth'
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        if ($type != NET_SSH2_MSG_SERVICE_ACCEPT) {
-            user_error('Expected SSH_MSG_SERVICE_ACCEPT', E_USER_NOTICE);
-            return false;
-        }
-
-        // although PHP5's get_class() preserves the case, PHP4's does not
-        if (is_object($password) && strtolower(get_class($password)) == 'crypt_rsa')  {
-            return $this->_privatekey_login($username, $password);
-        }
-
-        $utf8_password = utf8_encode($password);
-        $packet = pack('CNa*Na*Na*CNa*',
-            NET_SSH2_MSG_USERAUTH_REQUEST, strlen($username), $username, strlen('ssh-connection'), 'ssh-connection',
-            strlen('password'), 'password', 0, strlen($utf8_password), $utf8_password
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        // remove the username and password from the last logged packet
-        if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == NET_SSH2_LOG_COMPLEX) {
-            $packet = pack('CNa*Na*Na*CNa*',
-                NET_SSH2_MSG_USERAUTH_REQUEST, strlen('username'), 'username', strlen('ssh-connection'), 'ssh-connection',
-                strlen('password'), 'password', 0, strlen('password'), 'password'
-            );
-            $this->message_log[count($this->message_log) - 1] = $packet;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ: // in theory, the password can be changed
-                if (defined('NET_SSH2_LOGGING')) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ';
-                }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->errors[] = 'SSH_MSG_USERAUTH_PASSWD_CHANGEREQ: ' . utf8_decode($this->_string_shift($response, $length));
-                return $this->_disconnect(NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER);
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                // either the login is bad or the server employees multi-factor authentication
-                return false;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                $this->bitmap |= NET_SSH2_MASK_LOGIN;
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Login with an RSA private key
-     *
-     * @param String $username
-     * @param Crypt_RSA $password
-     * @return Boolean
-     * @access private
-     * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-     *           by sending dummy SSH_MSG_IGNORE messages.
-     */
-    function _privatekey_login($username, $privatekey)
-    {
-        // see http://tools.ietf.org/html/rfc4253#page-15
-        $publickey = $privatekey->getPublicKey(CRYPT_RSA_PUBLIC_FORMAT_RAW);
-        if ($publickey === false) {
-            return false;
-        }
-
-        $publickey = array(
-            'e' => $publickey['e']->toBytes(true),
-            'n' => $publickey['n']->toBytes(true)
-        );
-        $publickey = pack('Na*Na*Na*',
-            strlen('ssh-rsa'), 'ssh-rsa', strlen($publickey['e']), $publickey['e'], strlen($publickey['n']), $publickey['n']
-        );
-
-        $part1 = pack('CNa*Na*Na*',
-            NET_SSH2_MSG_USERAUTH_REQUEST, strlen($username), $username, strlen('ssh-connection'), 'ssh-connection',
-            strlen('publickey'), 'publickey'
-        );
-        $part2 = pack('Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publickey), $publickey);
-
-        $packet = $part1 . chr(0) . $part2;
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->errors[] = 'SSH_MSG_USERAUTH_FAILURE: ' . $this->_string_shift($response, $length);
-                return $this->_disconnect(NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER);
-            case NET_SSH2_MSG_USERAUTH_PK_OK:
-                // we'll just take it on faith that the public key blob and the public key algorithm name are as
-                // they should be
-                if (defined('NET_SSH2_LOGGING')) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = 'NET_SSH2_MSG_USERAUTH_PK_OK';
-                }
-        }
-
-        $packet = $part1 . chr(1) . $part2;
-        $privatekey->setSignatureMode(CRYPT_RSA_SIGNATURE_PKCS1);
-        $signature = $privatekey->sign(pack('Na*a*', strlen($this->session_id), $this->session_id, $packet));
-        $signature = pack('Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($signature), $signature);
-        $packet.= pack('Na*', strlen($signature), $signature);
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server', E_USER_NOTICE);
-            return false;
-        }
-
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                // either the login is bad or the server employees multi-factor authentication
-                return false;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                $this->bitmap |= NET_SSH2_MASK_LOGIN;
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Execute Command
-     *
-     * @param String $command
-     * @return String
-     * @access public
-     */
-    function exec($command)
-    {
-        if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            return false;
-        }
-
-        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
-        // be adjusted".  0x7FFFFFFF is, at 4GB, the max size.  technically, it should probably be decremented, but, 
-        // honestly, if you're transfering more than 4GB, you probably shouldn't be using phpseclib, anyway.
-        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
-        $this->window_size_client_to_server[NET_SSH2_CHANNEL_EXEC] = 0x7FFFFFFF;
-        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
-        // uses 0x4000, that's what will be used here, as well.
-        $packet_size = 0x4000;
-
-        $packet = pack('CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN, strlen('session'), 'session', NET_SSH2_CHANNEL_EXEC, $this->window_size_client_to_server[NET_SSH2_CHANNEL_EXEC], $packet_size);
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[NET_SSH2_CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $response = $this->_get_channel_packet(NET_SSH2_CHANNEL_EXEC);
-        if ($response === false) {
-            return false;
-        }
-
-        // sending a pty-req SSH_MSG_CHANNEL_REQUEST message is unnecessary and, in fact, in most cases, slows things
-        // down.  the one place where it might be desirable is if you're doing something like Net_SSH2::exec('ping localhost &').
-        // with a pty-req SSH_MSG_cHANNEL_REQUEST, exec() will return immediately and the ping process will then
-        // then immediately terminate.  without such a request exec() will loop indefinitely.  the ping process won't end but
-        // neither will your script.
-
-        // although, in theory, the size of SSH_MSG_CHANNEL_REQUEST could exceed the maximum packet size established by
-        // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the 
-        // "maximum size of an individual data packet". ie. SSH_MSG_CHANNEL_DATA.  RFC4254#section-5.2 corroborates.
-        $packet = pack('CNNa*CNa*',
-            NET_SSH2_MSG_CHANNEL_REQUEST, $this->server_channels[NET_SSH2_CHANNEL_EXEC], strlen('exec'), 'exec', 1, strlen($command), $command);
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[NET_SSH2_CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        $response = $this->_get_channel_packet(NET_SSH2_CHANNEL_EXEC);
-        if ($response === false) {
-            return false;
-        }
-
-        $this->channel_status[NET_SSH2_CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        $output = '';
-        while (true) {
-            $temp = $this->_get_channel_packet(NET_SSH2_CHANNEL_EXEC);
-            switch (true) {
-                case $temp === true:
-                    return $output;
-                case $temp === false:
-                    return false;
-                default:
-                    $output.= $temp;
-            }
-        }
-    }
-
-    /**
-     * Disconnect
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-    }
-
-    /**
-     * Destructor.
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * disconnect().
-     *
-     * @access public
-     */
-    function __destruct()
-    {
-        $this->disconnect();
-    }
-
-    /**
-     * Gets Binary Packets
-     *
-     * See '6. Binary Packet Protocol' of rfc4253 for more info.
-     *
-     * @see Net_SSH2::_send_binary_packet()
-     * @return String
-     * @access private
-     */
-    function _get_binary_packet()
-    {
-        if (feof($this->fsock)) {
-            user_error('Connection closed prematurely', E_USER_NOTICE);
-            return false;
-        }
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $raw = fread($this->fsock, $this->decrypt_block_size);
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        if ($this->decrypt !== false) {
-            $raw = $this->decrypt->decrypt($raw);
-        }
-
-        extract(unpack('Npacket_length/Cpadding_length', $this->_string_shift($raw, 5)));
-
-        $remaining_length = $packet_length + 4 - $this->decrypt_block_size;
-        $buffer = '';
-        while ($remaining_length > 0) {
-            $temp = fread($this->fsock, $remaining_length);
-            $buffer.= $temp;
-            $remaining_length-= strlen($temp);
-        }
-        if (!empty($buffer)) {
-            $raw.= $this->decrypt !== false ? $this->decrypt->decrypt($buffer) : $buffer;
-            $buffer = $temp = '';
-        }
-
-        $payload = $this->_string_shift($raw, $packet_length - $padding_length - 1);
-        $padding = $this->_string_shift($raw, $padding_length); // should leave $raw empty
-
-        if ($this->hmac_check !== false) {
-            $hmac = fread($this->fsock, $this->hmac_size);
-            if ($hmac != $this->hmac_check->hash(pack('NNCa*', $this->get_seq_no, $packet_length, $padding_length, $payload . $padding))) {
-                user_error('Invalid HMAC', E_USER_NOTICE);
-                return false;
-            }
-        }
-
-        //if ($this->decompress) {
-        //    $payload = gzinflate(substr($payload, 2));
-        //}
-
-        $this->get_seq_no++;
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $temp = isset($this->message_numbers[ord($payload[0])]) ? $this->message_numbers[ord($payload[0])] : 'UNKNOWN';
-            $this->message_number_log[] = '<- ' . $temp .
-                                          ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SSH2_LOGGING == NET_SSH2_LOG_COMPLEX) {
-                $this->message_log[] = substr($payload, 1);
-            }
-        }
-
-        return $this->_filter($payload);
-    }
-
-    /**
-     * Filter Binary Packets
-     *
-     * Because some binary packets need to be ignored...
-     *
-     * @see Net_SSH2::_get_binary_packet()
-     * @return String
-     * @access private
-     */
-    function _filter($payload)
-    {
-        switch (ord($payload[0])) {
-            case NET_SSH2_MSG_DISCONNECT:
-                $this->_string_shift($payload, 1);
-                extract(unpack('Nreason_code/Nlength', $this->_string_shift($payload, 8)));
-                $this->errors[] = 'SSH_MSG_DISCONNECT: ' . $this->disconnect_reasons[$reason_code] . "\r\n" . utf8_decode($this->_string_shift($payload, $length));
-                $this->bitmask = 0;
-                return false;
-            case NET_SSH2_MSG_IGNORE:
-                $payload = $this->_get_binary_packet();
-                break;
-            case NET_SSH2_MSG_DEBUG:
-                $this->_string_shift($payload, 2);
-                extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-                $this->errors[] = 'SSH_MSG_DEBUG: ' . utf8_decode($this->_string_shift($payload, $length));
-                $payload = $this->_get_binary_packet();
-                break;
-            case NET_SSH2_MSG_UNIMPLEMENTED:
-                return false;
-            case NET_SSH2_MSG_KEXINIT:
-                if ($this->session_id !== false) {
-                    if (!$this->_key_exchange($payload)) {
-                        $this->bitmask = 0;
-                        return false;
-                    }
-                    $payload = $this->_get_binary_packet();
-                }
-        }
-
-        // see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in
-        if (($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR) && !($this->bitmap & NET_SSH2_MASK_LOGIN) && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) {
-            $this->_string_shift($payload, 1);
-            extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-            $this->errors[] = 'SSH_MSG_USERAUTH_BANNER: ' . utf8_decode($this->_string_shift($payload, $length));
-            $payload = $this->_get_binary_packet();
-        }
-
-        // only called when we've already logged in
-        if (($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR) && ($this->bitmap & NET_SSH2_MASK_LOGIN)) {
-            switch (ord($payload[0])) {
-                case NET_SSH2_MSG_GLOBAL_REQUEST: // see http://tools.ietf.org/html/rfc4254#section-4
-                    $this->_string_shift($payload, 1);
-                    extract(unpack('Nlength', $this->_string_shift($payload)));
-                    $this->errors[] = 'SSH_MSG_GLOBAL_REQUEST: ' . utf8_decode($this->_string_shift($payload, $length));
-
-                    if (!$this->_send_binary_packet(pack('C', NET_SSH2_MSG_REQUEST_FAILURE))) {
-                        return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    }
-
-                    $payload = $this->_get_binary_packet();
-                    break;
-                case NET_SSH2_MSG_CHANNEL_OPEN: // see http://tools.ietf.org/html/rfc4254#section-5.1
-                    $this->_string_shift($payload, 1);
-                    extract(unpack('N', $this->_string_shift($payload, 4)));
-                    $this->errors[] = 'SSH_MSG_CHANNEL_OPEN: ' . utf8_decode($this->_string_shift($payload, $length));
-
-                    $this->_string_shift($payload, 4); // skip over client channel
-                    extract(unpack('Nserver_channel', $this->_string_shift($payload, 4)));
-
-                    $packet = pack('CN3a*Na*',
-                        NET_SSH2_MSG_REQUEST_FAILURE, $server_channel, NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED, 0, '', 0, '');
-
-                    if (!$this->_send_binary_packet($packet)) {
-                        return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    }
-
-                    $payload = $this->_get_binary_packet();
-                    break;
-                case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
-                    $payload = $this->_get_binary_packet();
-            }
-        }
-
-        return $payload;
-    }
-
-    /**
-     * Gets channel data
-     *
-     * Returns the data as a string if it's available and false if not.
-     *
-     * @param $client_channel
-     * @return Mixed
-     * @access private
-     */
-    function _get_channel_packet($client_channel)
-    {
-        if (!empty($this->channel_buffers[$client_channel])) {
-            return array_shift($this->channel_buffers[$client_channel]);
-        }
-
-        while (true) {
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                user_error('Connection closed by server', E_USER_NOTICE);
-                return false;
-            }
-
-            extract(unpack('Ctype/Nchannel', $this->_string_shift($response, 5)));
-
-            switch ($this->channel_status[$channel]) {
-                case NET_SSH2_MSG_CHANNEL_OPEN:
-                    switch ($type) {
-                        case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION:
-                            extract(unpack('Nserver_channel', $this->_string_shift($response, 4)));
-                            $this->server_channels[$client_channel] = $server_channel;
-                            $this->_string_shift($response, 4); // skip over (server) window size
-                            $temp = unpack('Npacket_size_client_to_server', $this->_string_shift($response, 4));
-                            $this->packet_size_client_to_server[$client_channel] = $temp['packet_size_client_to_server'];
-                            return true;
-                        //case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
-                        default:
-                            user_error('Unable to open channel', E_USER_NOTICE);
-                            return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    }
-                    break;
-                case NET_SSH2_MSG_CHANNEL_REQUEST:
-                    switch ($type) {
-                        case NET_SSH2_MSG_CHANNEL_SUCCESS:
-                            return true;
-                        //case NET_SSH2_MSG_CHANNEL_FAILURE:
-                        default:
-                            user_error('Unable to request pseudo-terminal', E_USER_NOTICE);
-                            return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    }
-
-            }
-
-            switch ($type) {
-                case NET_SSH2_MSG_CHANNEL_DATA:
-                    if ($client_channel == NET_SSH2_CHANNEL_EXEC) {
-                        // SCP requires null packets, such as this, be sent.  further, in the case of the ssh.com SSH server
-                        // this actually seems to make things twice as fast.  more to the point, the message right after 
-                        // SSH_MSG_CHANNEL_DATA (usually SSH_MSG_IGNORE) won't block for as long as it would have otherwise.
-                        // in OpenSSH it slows things down but only by a couple thousandths of a second.
-                        $this->_send_channel_packet($client_channel, chr(0));
-                    }
-                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                    $data = $this->_string_shift($response, $length);
-                    if ($client_channel == $channel) {
-                        return $data;
-                    }
-                    if (!isset($this->channel_buffers[$client_channel])) {
-                        $this->channel_buffers[$client_channel] = array();
-                    }
-                    $this->channel_buffers[$client_channel][] = $data;
-                    break;
-                case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
-                    if ($client_channel == NET_SSH2_CHANNEL_EXEC) {
-                        $this->_send_channel_packet($client_channel, chr(0));
-                    }
-                    // currently, there's only one possible value for $data_type_code: NET_SSH2_EXTENDED_DATA_STDERR
-                    extract(unpack('Ndata_type_code/Nlength', $this->_string_shift($response, 8)));
-                    $data = $this->_string_shift($response, $length);
-                    if ($client_channel == $channel) {
-                        return $data;
-                    }
-                    if (!isset($this->channel_buffers[$client_channel])) {
-                        $this->channel_buffers[$client_channel] = array();
-                    }
-                    $this->channel_buffers[$client_channel][] = $data;
-                    break;
-                case NET_SSH2_MSG_CHANNEL_REQUEST:
-                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                    $value = $this->_string_shift($response, $length);
-                    switch ($value) {
-                        case 'exit-signal':
-                            $this->_string_shift($response, 1);
-                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                            $this->errors[] = 'SSH_MSG_CHANNEL_REQUEST (exit-signal): ' . $this->_string_shift($response, $length);
-                            $this->_string_shift($response, 1);
-                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                            if ($length) {
-                                $this->errors[count($this->errors)].= "\r\n" . $this->_string_shift($response, $length);
-                            }
-                        //case 'exit-status':
-                        default:
-                            // "Some systems may not implement signals, in which case they SHOULD ignore this message."
-                            //  -- http://tools.ietf.org/html/rfc4254#section-6.9
-                            break;
-                    }
-                    break;
-                case NET_SSH2_MSG_CHANNEL_CLOSE:
-                    $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
-                    return true;
-                case NET_SSH2_MSG_CHANNEL_EOF:
-                    break;
-                default:
-                    user_error('Error reading channel data', E_USER_NOTICE);
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-            }
-        }
-    }
-
-    /**
-     * Sends Binary Packets
-     *
-     * See '6. Binary Packet Protocol' of rfc4253 for more info.
-     *
-     * @param String $data
-     * @see Net_SSH2::_get_binary_packet()
-     * @return Boolean
-     * @access private
-     */
-    function _send_binary_packet($data)
-    {
-        if (feof($this->fsock)) {
-            user_error('Connection closed prematurely', E_USER_NOTICE);
-            return false;
-        }
-
-        //if ($this->compress) {
-        //    // the -4 removes the checksum:
-        //    // http://php.net/function.gzcompress#57710
-        //    $data = substr(gzcompress($data), 0, -4);
-        //}
-
-        // 4 (packet length) + 1 (padding length) + 4 (minimal padding amount) == 9
-        $packet_length = strlen($data) + 9;
-        // round up to the nearest $this->encrypt_block_size
-        $packet_length+= (($this->encrypt_block_size - 1) * $packet_length) % $this->encrypt_block_size;
-        // subtracting strlen($data) is obvious - subtracting 5 is necessary because of packet_length and padding_length
-        $padding_length = $packet_length - strlen($data) - 5;
-
-        $padding = '';
-        for ($i = 0; $i < $padding_length; $i++) {
-            $padding.= chr(crypt_random(0, 255));
-        }
-
-        // we subtract 4 from packet_length because the packet_length field isn't supposed to include itself
-        $packet = pack('NCa*', $packet_length - 4, $padding_length, $data . $padding);
-
-        $hmac = $this->hmac_create !== false ? $this->hmac_create->hash(pack('Na*', $this->send_seq_no, $packet)) : '';
-        $this->send_seq_no++;
-
-        if ($this->encrypt !== false) {
-            $packet = $this->encrypt->encrypt($packet);
-        }
-
-        $packet.= $hmac;
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $result = strlen($packet) == fputs($this->fsock, $packet);
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $temp = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN';
-            $this->message_number_log[] = '-> ' . $temp .
-                                          ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SSH2_LOGGING == NET_SSH2_LOG_COMPLEX) {
-                $this->message_log[] = substr($data, 1);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Sends channel data
-     *
-     * Spans multiple SSH_MSG_CHANNEL_DATAs if appropriate
-     *
-     * @param Integer $client_channel
-     * @param String $data
-     * @return Boolean
-     * @access private
-     */
-    function _send_channel_packet($client_channel, $data)
-    {
-        while (strlen($data) > $this->packet_size_client_to_server[$client_channel]) {
-            // resize the window, if appropriate
-            $this->window_size_client_to_server[$client_channel]-= $this->packet_size_client_to_server[$client_channel];
-            if ($this->window_size_client_to_server[$client_channel] < 0) {
-                $packet = pack('CNN', NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST, $this->server_channels[$client_channel], $this->window_size);
-                if (!$this->_send_binary_packet($packet)) {
-                    return false;
-                }
-                $this->window_size_client_to_server[$client_channel]+= $this->window_size;
-            }
-
-            $packet = pack('CN2a*',
-                NET_SSH2_MSG_CHANNEL_DATA,
-                $this->server_channels[$client_channel],
-                $this->packet_size_client_to_server[$client_channel],
-                $this->_string_shift($data, $this->packet_size_client_to_server[$client_channel])
-            );
-
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-        }
-
-        // resize the window, if appropriate
-        $this->window_size_client_to_server[$client_channel]-= strlen($data);
-        if ($this->window_size_client_to_server[$client_channel] < 0) {
-            $packet = pack('CNN', NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST, $this->server_channels[$client_channel], $this->window_size);
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-            $this->window_size_client_to_server[$client_channel]+= $this->window_size;
-        }
-
-        return $this->_send_binary_packet(pack('CN2a*',
-            NET_SSH2_MSG_CHANNEL_DATA,
-            $this->server_channels[$client_channel],
-            strlen($data),
-            $data));
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param Integer $reason
-     * @return Boolean
-     * @access private
-     */
-    function _disconnect($reason)
-    {
-        if ($this->bitmap) {
-            $data = pack('CNNa*Na*', NET_SSH2_MSG_DISCONNECT, $reason, 0, '', 0, '');
-            $this->_send_binary_packet($data);
-            $this->bitmap = 0;
-            fclose($this->fsock);
-            return false;
-        }
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param String $string
-     * @param optional Integer $index
-     * @return String
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * Define Array
-     *
-     * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
-     * named constants from it, using the value as the name of the constant and the index as the value of the constant.
-     * If any of the constants that would be defined already exists, none of the constants will be defined.
-     *
-     * @param Array $array
-     * @access private
-     */
-    function _define_array()
-    {
-        $args = func_get_args();
-        foreach ($args as $arg) {
-            foreach ($arg as $key=>$value) {
-                if (!defined($value)) {
-                    define($value, $key);
-                } else {
-                    break 2;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a log of the packets that have been sent and received.
-     *
-     * Returns a string if NET_SSH2_LOGGING == NET_SSH2_LOG_COMPLEX, an array if NET_SSH2_LOGGING == NET_SSH2_LOG_SIMPLE and false if !defined('NET_SSH2_LOGGING')
-     *
-     * @access public
-     * @return String or Array
-     */
-    function getLog()
-    {
-        if (!defined('NET_SSH2_LOGGING')) {
-            return false;
-        }
-
-        switch (NET_SSH2_LOGGING) {
-            case NET_SSH2_LOG_SIMPLE:
-                return $this->message_number_log;
-                break;
-            case NET_SSH2_LOG_COMPLEX:
-                return $this->_format_log($this->message_log, $this->message_number_log);
-                break;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Formats a log for printing
-     *
-     * @param Array $message_log
-     * @param Array $message_number_log
-     * @access private
-     * @return String
-     */
-    function _format_log($message_log, $message_number_log)
-    {
-        static $boundary = ':', $long_width = 65, $short_width = 16;
-
-        $output = '';
-        for ($i = 0; $i < count($message_log); $i++) {
-            $output.= $message_number_log[$i] . "\r\n";
-            $current_log = $message_log[$i];
-            $j = 0;
-            do {
-                if (!empty($current_log)) {
-                    $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
-                }
-                $fragment = $this->_string_shift($current_log, $short_width);
-                $hex = substr(
-                           preg_replace(
-                               '#(.)#es',
-                               '"' . $boundary . '" . str_pad(dechex(ord(substr("\\1", -1))), 2, "0", STR_PAD_LEFT)',
-                               $fragment),
-                           strlen($boundary)
-                       );
-                // replace non ASCII printable characters with dots
-                // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
-                // also replace < with a . since < messes up the output on web browsers
-                $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output.= str_pad($hex, $long_width - $short_width, ' ') . $raw . "\r\n";
-                $j++;
-            } while (!empty($current_log));
-            $output.= "\r\n";
-        }
-
-        return $output;
-    }
-
-    /**
-     * Returns all errors
-     *
-     * @return String
-     * @access public
-     */
-    function getErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Returns the last error
-     *
-     * @return String
-     * @access public
-     */
-    function getLastError()
-    {
-        return $this->errors[count($this->errors) - 1];
-    }
-
-    /**
-     * Return the server identification.
-     *
-     * @return String
-     * @access public
-     */
-    function getServerIdentification()
-    {
-        return $this->server_identifier;
-    }
-
-    /**
-     * Return a list of the key exchange algorithms the server supports.
-     *
-     * @return Array
-     * @access public
-     */
-    function getKexAlgorithms()
-    {
-        return $this->kex_algorithms;
-    }
-
-    /**
-     * Return a list of the host key (public key) algorithms the server supports.
-     *
-     * @return Array
-     * @access public
-     */
-    function getServerHostKeyAlgorithms()
-    {
-        return $this->server_host_key_algorithms;
-    }
-
-    /**
-     * Return a list of the (symmetric key) encryption algorithms the server supports, when receiving stuff from the client.
-     *
-     * @return Array
-     * @access public
-     */
-    function getEncryptionAlgorithmsClient2Server()
-    {
-        return $this->encryption_algorithms_client_to_server;
-    }
-
-    /**
-     * Return a list of the (symmetric key) encryption algorithms the server supports, when sending stuff to the client.
-     *
-     * @return Array
-     * @access public
-     */
-    function getEncryptionAlgorithmsServer2Client()
-    {
-        return $this->encryption_algorithms_server_to_client;
-    }
-
-    /**
-     * Return a list of the MAC algorithms the server supports, when receiving stuff from the client.
-     *
-     * @return Array
-     * @access public
-     */
-    function getMACAlgorithmsClient2Server()
-    {
-        return $this->mac_algorithms_client_to_server;
-    }
-
-    /**
-     * Return a list of the MAC algorithms the server supports, when sending stuff to the client.
-     *
-     * @return Array
-     * @access public
-     */
-    function getMACAlgorithmsServer2Client()
-    {
-        return $this->mac_algorithms_server_to_client;
-    }
-
-    /**
-     * Return a list of the compression algorithms the server supports, when receiving stuff from the client.
-     *
-     * @return Array
-     * @access public
-     */
-    function getCompressionAlgorithmsClient2Server()
-    {
-        return $this->compression_algorithms_client_to_server;
-    }
-
-    /**
-     * Return a list of the compression algorithms the server supports, when sending stuff to the client.
-     *
-     * @return Array
-     * @access public
-     */
-    function getCompressionAlgorithmsServer2Client()
-    {
-        return $this->compression_algorithms_server_to_client;
-    }
-
-    /**
-     * Return a list of the languages the server supports, when sending stuff to the client.
-     *
-     * @return Array
-     * @access public
-     */
-    function getLanguagesServer2Client()
-    {
-        return $this->languages_server_to_client;
-    }
-
-    /**
-     * Return a list of the languages the server supports, when receiving stuff from the client.
-     *
-     * @return Array
-     * @access public
-     */
-    function getLanguagesClient2Server()
-    {
-        return $this->languages_client_to_server;
-    }
-
-    /**
-     * Returns the server public host key.
-     *
-     * Caching this the first time you connect to a server and checking the result on subsequent connections
-     * is recommended.  Returns false if the server signature is not signed correctly with the public host key.
-     *
-     * @return Mixed
-     * @access public
-     */
-    function getServerPublicHostKey()
-    {
-        $signature = $this->signature;
-        $server_public_host_key = $this->server_public_host_key;
-
-        extract(unpack('Nlength', $this->_string_shift($server_public_host_key, 4)));
-        $this->_string_shift($server_public_host_key, $length);
-
-        switch ($this->signature_format) {
-            case 'ssh-dss':
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $p = new Math_BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $q = new Math_BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $g = new Math_BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $y = new Math_BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                /* The value for 'dss_signature_blob' is encoded as a string containing
-                   r, followed by s (which are 160-bit integers, without lengths or
-                   padding, unsigned, and in network byte order). */
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                if ($temp['length'] != 40) {
-                    user_error('Invalid signature', E_USER_NOTICE);
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                }
-
-                $r = new Math_BigInteger($this->_string_shift($signature, 20), 256);
-                $s = new Math_BigInteger($this->_string_shift($signature, 20), 256);
-
-                if ($r->compare($q) >= 0 || $s->compare($q) >= 0) {
-                    user_error('Invalid signature', E_USER_NOTICE);
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                }
-
-                $w = $s->modInverse($q);
-
-                $u1 = $w->multiply(new Math_BigInteger(sha1($this->session_id), 16));
-                list(, $u1) = $u1->divide($q);
-
-                $u2 = $w->multiply($r);
-                list(, $u2) = $u2->divide($q);
-
-                $g = $g->modPow($u1, $p);
-                $y = $y->modPow($u2, $p);
-
-                $v = $g->multiply($y);
-                list(, $v) = $v->divide($p);
-                list(, $v) = $v->divide($q);
-
-                if (!$v->equals($r)) {
-                    user_error('Bad server signature', E_USER_NOTICE);
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                }
-
-                break;
-            case 'ssh-rsa':
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $e = new Math_BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $n = new Math_BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-                $nLength = $temp['length'];
-
-                /*
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                $signature = $this->_string_shift($signature, $temp['length']);
-
-                if (!class_exists('Crypt_RSA')) {
-                    require_once('Crypt/RSA.php');
-                }
-
-                $rsa = new Crypt_RSA();
-                $rsa->setSignatureMode(CRYPT_RSA_SIGNATURE_PKCS1);
-                $rsa->loadKey(array('e' => $e, 'n' => $n), CRYPT_RSA_PUBLIC_FORMAT_RAW);
-                if (!$rsa->verify($this->session_id, $signature)) {
-                    user_error('Bad server signature', E_USER_NOTICE);
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                }
-                */
-
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                $s = new Math_BigInteger($this->_string_shift($signature, $temp['length']), 256);
-
-                // validate an RSA signature per "8.2 RSASSA-PKCS1-v1_5", "5.2.2 RSAVP1", and "9.1 EMSA-PSS" in the
-                // following URL:
-                // ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
-
-                // also, see SSHRSA.c (rsa2_verifysig) in PuTTy's source.
-
-                if ($s->compare(new Math_BigInteger()) < 0 || $s->compare($n->subtract(new Math_BigInteger(1))) > 0) {
-                    user_error('Invalid signature', E_USER_NOTICE);
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                }
-
-                $s = $s->modPow($e, $n);
-                $s = $s->toBytes();
-
-                $h = pack('N4H*', 0x00302130, 0x0906052B, 0x0E03021A, 0x05000414, sha1($this->session_id));
-                $h = chr(0x01) . str_repeat(chr(0xFF), $nLength - 3 - strlen($h)) . $h;
-
-                if ($s != $h) {
-                    user_error('Bad server signature', E_USER_NOTICE);
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                }
-        }
-
-        return $this->server_public_host_key;
-    }
-}
\ No newline at end of file
diff --git a/library/phpsec/PHP/Compat/Function/array_fill.php b/library/phpsec/PHP/Compat/Function/array_fill.php
deleted file mode 100644
index e02bfa14d..000000000
--- a/library/phpsec/PHP/Compat/Function/array_fill.php
+++ /dev/null
@@ -1,43 +0,0 @@
-, Arpad Ray 
- * @link        http://php.net/function.array_fill
- * @author      Jim Wigginton 
- * @version     $Revision: 1.1 $
- * @since       PHP 4.2.0
- */
-function php_compat_array_fill($start_index, $num, $value)
-{
-    if ($num <= 0) {
-        user_error('array_fill(): Number of elements must be positive', E_USER_WARNING);
-
-        return false;
-    }
-
-    $temp = array();
-
-    $end_index = $start_index + $num;
-    for ($i = (int) $start_index; $i < $end_index; $i++) {
-        $temp[$i] = $value;
-    }
-
-    return $temp;
-}
-
-// Define
-if (!function_exists('array_fill')) {
-    function array_fill($start_index, $num, $value)
-    {
-        return php_compat_array_fill($start_index, $num, $value);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/library/phpsec/PHP/Compat/Function/bcpowmod.php b/library/phpsec/PHP/Compat/Function/bcpowmod.php
deleted file mode 100644
index 6ec1b1840..000000000
--- a/library/phpsec/PHP/Compat/Function/bcpowmod.php
+++ /dev/null
@@ -1,67 +0,0 @@
-, Arpad Ray 
- * @link        http://php.net/function.bcpowmod
- * @author      Sara Golemon 
- * @version     $Revision: 1.1 $
- * @since       PHP 5.0.0
- * @require     PHP 4.0.0 (user_error)
- */
-function php_compat_bcpowmod($x, $y, $modulus, $scale = 0)
-{
-    // Sanity check
-    if (!is_scalar($x)) {
-        user_error('bcpowmod() expects parameter 1 to be string, ' .
-            gettype($x) . ' given', E_USER_WARNING);
-        return false;
-    }
-
-    if (!is_scalar($y)) {
-        user_error('bcpowmod() expects parameter 2 to be string, ' .
-            gettype($y) . ' given', E_USER_WARNING);
-        return false;
-    }
-
-    if (!is_scalar($modulus)) {
-        user_error('bcpowmod() expects parameter 3 to be string, ' .
-            gettype($modulus) . ' given', E_USER_WARNING);
-        return false;
-    }
-
-    if (!is_scalar($scale)) {
-        user_error('bcpowmod() expects parameter 4 to be integer, ' .
-            gettype($scale) . ' given', E_USER_WARNING);
-        return false;
-    }
-
-    $t = '1';
-    while (bccomp($y, '0')) {
-        if (bccomp(bcmod($y, '2'), '0')) {
-            $t = bcmod(bcmul($t, $x), $modulus);
-            $y = bcsub($y, '1');
-        }
-
-        $x = bcmod(bcmul($x, $x), $modulus);
-        $y = bcdiv($y, '2');
-    }
-
-    return $t;    
-}
-
-
-// Define
-if (!function_exists('bcpowmod')) {
-    function bcpowmod($x, $y, $modulus, $scale = 0)
-    {
-        return php_compat_bcpowmod($x, $y, $modulus, $scale);
-    }
-}
-?>
\ No newline at end of file
diff --git a/library/phpsec/PHP/Compat/Function/str_split.php b/library/phpsec/PHP/Compat/Function/str_split.php
deleted file mode 100644
index 8e38bdb89..000000000
--- a/library/phpsec/PHP/Compat/Function/str_split.php
+++ /dev/null
@@ -1,59 +0,0 @@
-, Arpad Ray 
- * @link        http://php.net/function.str_split
- * @author      Aidan Lister 
- * @version     $Revision: 1.1 $
- * @since       PHP 5
- * @require     PHP 4.0.0 (user_error)
- */
-function php_compat_str_split($string, $split_length = 1)
-{
-    if (!is_scalar($split_length)) {
-        user_error('str_split() expects parameter 2 to be long, ' .
-            gettype($split_length) . ' given', E_USER_WARNING);
-        return false;
-    }
-
-    $split_length = (int) $split_length;
-    if ($split_length < 1) {
-        user_error('str_split() The length of each segment must be greater than zero', E_USER_WARNING);
-        return false;
-    }
-    
-    // Select split method
-    if ($split_length < 65536) {
-        // Faster, but only works for less than 2^16
-        preg_match_all('/.{1,' . $split_length . '}/s', $string, $matches);
-        return $matches[0];
-    } else {
-        // Required due to preg limitations
-        $arr = array();
-        $idx = 0;
-        $pos = 0;
-        $len = strlen($string);
-
-        while ($len > 0) {
-            $blk = ($len < $split_length) ? $len : $split_length;
-            $arr[$idx++] = substr($string, $pos, $blk);
-            $pos += $blk;
-            $len -= $blk;
-        }
-
-        return $arr;
-    }
-}
-
-
-// Define
-if (!function_exists('str_split')) {
-    function str_split($string, $split_length = 1)
-    {
-        return php_compat_str_split($string, $split_length);
-    }
-}
diff --git a/library/phpsec/crypt.html b/library/phpsec/crypt.html
deleted file mode 100644
index 6720cf789..000000000
--- a/library/phpsec/crypt.html
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-Chapter 3. Cryptography
    Chapter 3. Cryptography
    Prev   Next
    Chapter 3. Cryptography
    Table of Contents
    3.1. Introduction
    3.1.1. Dependencies
    3.1.2. setKey() and setIV()
    3.1.3. setMCrypt()
    3.1.4. encrypt() and decrypt()
    3.1.5. enableContinuousBuffer() and disableContinuousBuffer()
    3.1.6. enablePadding() and disablePadding()
    3.2. Crypt_DES
    3.2.1. The constructor
    3.3. Crypt_TripleDES
    3.3.1. The constructor
    3.4. Crypt_RC4
    3.4.1. The constructor
    3.5. Crypt_Rijndael & Crypt_AES
    3.5.1. The constructor
    3.5.2. AES vs. Rijndael
    3.5.3. setKeyLength()
    3.5.4. setBlockLength()
    3.5.5. Speed Comparisons
    3.1. Introduction
    
-                All of the cryptographic libraries included in phpseclib use mcrypt, if available, and an internal implementation 
-                if it's not.  The libraries all use a common interface although some functions, for some algorithms, carry with 
-                with them certain caveats.  Those that do not have caveats attached (or have relatively few attached) are 
-                described below.  If you don't know which one to use, try Crypt_TripleDES.
-            
    3.1.1. Dependencies
    
-                    The Crypt_* functions require, minimally, PHP 4.0.0.  Crypt_TripleDES additionally requires Crypt/DES.php.
-                
    3.1.2. setKey() and setIV()
    
-                    Sets the key and the initialization vector, respectively.  If neither are set, each assumed to be equal to 
-                    some amount of null bytes.  The initialization vector is only used in block ciphers and even then only 
-                    in CBC mode.  If the key or the initialization vector are larger then the block size, they're truncated.
-                    If they're smaller, they're padded with null bytes.
-                
    3.1.3. setMCrypt()
    
-                    See php.net's entry on mcrypt_module_open.
-                    The first parameter is equal to $algorithm_directory and the second, to $mode_directory.
-                
    3.1.4. encrypt() and decrypt()
    
-                    Self-explanatory.  Encrypts or decrypts messages.  See the examples in the subsequent sections.
-                
    3.1.5. enableContinuousBuffer() and disableContinuousBuffer()
    
-                    Say you have a 16-byte plaintext $plaintext and that you're using Crypt_DES.  Using the default behavior, the two following code snippets
-                    will yield different outputs:
-                
        echo $des->encrypt(substr($plaintext, 0, 8));
-    echo $des->encrypt(substr($plaintext, 8, 8));
        echo $des->encrypt($plaintext);
    
-                    The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-                    another, as demonstrated with the following:
-                
        $des->encrypt(substr($plaintext, 0, 8));
-    echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
        echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
    
-                    With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-                    outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-                    decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-
-                    Put another way, when the continuous buffer is enabled, the state of the Crypt_DES() object changes after each
-                    encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-                    continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-                    however, they are also less intuitive and more likely to cause you problems.
-                
    3.1.6. enablePadding() and disablePadding()
    
-                    Enables / disables PKCS padding on block ciphers.  Stream ciphers (Crypt_RC4 is the only stream
-                    cipher currently included) ignore this.
-                
    3.2. Crypt_DES
    
-                Implements DES (a block cipher).  Here's an example of how to use it:
-            
    <?php
-    include('Crypt/DES.php');
-
-    $des = new Crypt_DES();
-
-    $des->setKey('abcdefgh');
-
-    $size = 10 * 1024;
-    $plaintext = '';
-    for ($i = 0; $i < $size; $i++) {
-        $plaintext.= 'a';
-    }
-
-    echo $des->decrypt($des->encrypt($plaintext));
-?>
    3.2.1. The constructor
    
-                    The constructor takes one optional parameter - $mode.  $mode can be equal to CRYPT_DES_MODE_ECB
-                    or CRYPT_DES_MODE_CBC.  CRYPT_DES_MODE_CBC is generally considered more secure 
-                    and is what Crypt_DES uses by default.  If you don't know the difference between ECB or CBC, 
-                    just use the default settings.
-                
    3.3. Crypt_TripleDES
    
-                Implements TripleDES (a block cipher).  Here's an example of how to use it:
-            
    <?php
-    include('Crypt/TripleDES.php');
-
-    $des = new Crypt_TripleDES();
-
-    $des->setKey('abcdefghijklmnopqrstuvwx');
-
-    $size = 10 * 1024;
-    $plaintext = '';
-    for ($i = 0; $i < $size; $i++) {
-        $plaintext.= 'a';
-    }
-
-    echo $des->decrypt($des->encrypt($plaintext));
-?>
    3.3.1. The constructor
    
-                    The constructor takes one optional parameter - $mode.  $mode can be equal to CRYPT_DES_MODE_ECB,
-                    CRYPT_DES_MODE_CBC, CRYPT_DES_MODE_3CBC, or CRYPT_DES_MODE_CBC3.
-                    CRYPT_DES_MODE_CBC3 is an alias CRYPT_DES_MODE_CBC.  It's defined to distinguish
-                    it from CRYPT_DES_MODE_3CBC, which uses inner chaining to propogate the initialization vector.
-                    SSH-1 uses this and it is generally considered to be less secure then CRYPT_DES_MODE_CBC3, 
-                    which uses outer chaining (and is what SSH-2 uses).
-                
    3.4. Crypt_RC4
    
-                Implements RC4 (a stream cipher).  Here's an example of how to use it:
-            
    <?php
-    include('Crypt/RC4.php');
-
-    $rc4 = new Crypt_RC4();
-
-    $rc4->setKey('abcdefghijklmnopqrstuvwx');
-
-    $size = 10 * 1024;
-    $plaintext = '';
-    for ($i = 0; $i < $size; $i++) {
-        $plaintext.= 'a';
-    }
-
-    echo $rc4->decrypt($rc4->encrypt($plaintext));
-?>
    3.4.1. The constructor
    
-                    Not much to say about this constructor.  Since it's a stream cipher, you don't need to worry about which
-                    mode of operation to use.
-                
    3.5. Crypt_Rijndael & Crypt_AES
    
-                Implements Rijndael / AES.  Here's an example of how to use Crypt_AES:
-            
    <?php
-    include('Crypt/AES.php');
-
-    $aes = new Crypt_AES();
-
-    $aes->setKey('abcdefghijklmnop');
-
-    $size = 10 * 1024;
-    $plaintext = '';
-    for ($i = 0; $i < $size; $i++) {
-        $plaintext.= 'a';
-    }
-
-    echo $aes->decrypt($aes->encrypt($plaintext));
-?>
    3.5.1. The constructor
    
-                    Crypt_AES's constructor takes CRYPT_AES_MODE_ECB and CRYPT_AES_MODE_CBC as parameters.  Crypt_Rijndael, CRYPT_RIJNDAEL_MODE_ECB and CRYPT_RIJNDAEL_MODE_CBC.  In both cases, if no valid mode is defined, CBC will be used.
-                
    3.5.2. AES vs. Rijndael
    
-                    AES is a subset of Rijndael.  Both have variable key sizes, however, AES's block size is fixed at 128 bytes, whereas Rijndael's is variable.  Also, Rijndael supports, by means of an extension to the specification, two key sizes that AES does not - 160 bits and 224 bits.
-                
    3.5.3. setKeyLength()
    
-                    Valid key lengths for AES are 128 bits, 192 bits, and 256 bits.  If the key that is assigned is invalid and less than 256 bits, they key length is rounded up to the next closest valid size and the key will be null padded to that amount.  If the key length is greater than 256 bits, it will be truncated to 256 bits.
-                
    
-                    As an example, if the key is 136 bits, it will be null padded to 192 bits (or 160 bits if Rijndael is being used).
-                
    
-                    If setKeyLength() has been called, this behavior changes somewhat.  Say you've set the key length, via this function, to 256 bits.  Then, instead of an invalid key being null padded to 192 or 160 bits, it will be null padded to 256 bits.
-                
    3.5.4. setBlockLength()
    
-                    setBlockLength() operates in a manner similar to setKeyLength(), with one exception.  setBlockLength() only works on Rijndael.  Although Crypt_AES inherits setBlockLength() as a function, the function doesn't do anything in AES.
-                
    3.5.5. Speed Comparisons
    
-                    The following table compares the speed of five different pure-PHP implementations of AES (one of which is Crypt_Rijndael and one of which is Crypt_AES) when ran on 150KB of text on a 1.8GHz Pentium 4-M.  The numbers listed are averaged from five different trials and are measured in seconds.  phpseclib's two implementations are highlighted.  All implementations can be viewed by clicking on their names.
-                
    Table 3.1. AES Speed Comparisons
    movable-type.phpsphpaes.phpsphpclasses1.phpsphpclasses2.phpsphpseclib-aes.phpsphpseclib-rijndael.phps
    15.684415817239.953724813515.010015010862.5917131900793.57283110815.24388728142

    
-                    As can be seen, phpseclib's implementations are the fastest.  phpseclib-aes.phps is faster than phpseclib-rijndael.phps because phpseclib-rijndael.phps has to contend with multiple block sizes whereas phpseclib-aes.phps does not.
-                
    Prev   Next
    Chapter 2. Math Home Chapter 4. Networking
    
diff --git a/library/phpsec/docbook.css b/library/phpsec/docbook.css
deleted file mode 100644
index 4f67aa4cd..000000000
--- a/library/phpsec/docbook.css
+++ /dev/null
@@ -1,43 +0,0 @@
-body {
-  font-family: Georgia, "Times New Roman", Times, serif
-}
-
-div.author h3 {
-  display: none
-}
-
-a {
-  text-decoration: none;
-  color: #369
-}
-
-a:hover {
-  text-decoration: underline
-}
-
-.programlisting {
-  font-family: Monaco, "Andale Mono","Courier New", Courier, mono;
-  font-size: 10pt
-}
-
-.programlisting, .code {
-  background: #eee;
-  color: #181;
-  font-weight: bold
-}
-
-.red {
-  color: #e11
-}
-
-.highlight {
-  background: #ee1
-}
-
-thead {
-  background: #ccc
-}
-
-#crypt_aes_benchmarks_table.tbody {
-  font-weight: bold
-}
\ No newline at end of file
diff --git a/library/phpsec/index.html b/library/phpsec/index.html
deleted file mode 100644
index 6dda0f369..000000000
--- a/library/phpsec/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-PHP Secure Communications Library
    PHP Secure Communications Library
       Next
    PHP Secure Communications Library
    Jim TerraFrost Wigginton
    Copyright © 2007 - 2010 TerraFrost (Jim Wigginton)
    Abstract
    
-                The PHP Secure Communications Library contains LGPL-licensed pure-PHP implementations of arbitrary-precision integers, 
-                fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael, AES, SSH-1, SSH-2, and SFTP.  This book discusses how to use them.
    Table of Contents
    1. Introduction
    1.1. Who should use phpseclib
    1.2. Using phpseclib
    2. Math
    2.1. Math_BigInteger
    2.1.1. Dependencies
    2.1.2. The constructor
    2.1.3. toString(), toBytes(), toHex() and toBits()
    2.1.4. add(), subtract(), multiply() and divide()
    2.1.5. powMod() and modInverse()
    2.1.6. gcd() and extendedGCD()
    2.1.7. abs()
    2.1.8. equals() and compare()
    2.1.9. setPrecision()
    2.1.10. bitwise_and(), bitwise_or(), bitwise_xor() and bitwise_not()
    2.1.11. bitwise_rightShift() and bitwise_leftShift()
    2.1.12. bitwise_rightRotate() and bitwise_leftRotate()
    2.1.13. setRandomGenerator()
    2.1.14. isPrime()
    2.1.15. random() and randomPrime()
    3. Symmetric-key Cryptography
    3.1. Introduction
    3.1.1. Dependencies
    3.1.2. setKey() and setIV()
    3.1.3. encrypt() and decrypt()
    3.1.4. enableContinuousBuffer() and disableContinuousBuffer()
    3.1.5. enablePadding() and disablePadding()
    3.1.6. A word of caution about stream ciphers and CTR mode
    3.2. Crypt_DES
    3.2.1. The constructor
    3.3. Crypt_TripleDES
    3.3.1. The constructor
    3.4. Crypt_RC4
    3.4.1. The constructor
    3.5. Crypt_Rijndael & Crypt_AES
    3.5.1. The constructor
    3.5.2. AES vs. Rijndael
    3.5.3. setKeyLength()
    3.5.4. setBlockLength()
    3.5.5. Speed Comparisons
    4. Miscellaneous Cryptography
    4.1. Crypt_Hash
    4.1.1. Supported Algorithms and Dependencies
    4.1.2. Example
    4.2. Crypt_RSA
    4.2.1. Dependencies
    4.2.2. Examples
    4.2.3. createKey()
    4.2.4. setPrivateKeyFormat(), setPublicKeyFormat(), loadKey() and setPassword()
    4.2.5. setPublicKey() and getPublicKey()
    4.2.6. encrypt(), decrypt() and setEncryptionMode()
    4.2.7. sign(), verify(), and setSignatureMode()
    4.2.8. setHash(), setMGFHash() and setSaltLength()
    5. Networking
    5.1. Net_SSH
    5.1.1. Dependencies
    5.1.2. Net_SSH1 Examples
    5.1.3. Net_SSH2 Examples
    5.1.4. Host Key Verification
    5.1.5. interactiveRead() / interactiveWrite() vs. exec()
    5.1.6. SSH-1's exec() vs. SSH-2's exec()
    5.1.7. Successive calls to SSH-2's exec()
    5.1.8. Debugging SSH-2
    5.2. Net_SFTP
    5.2.1. Introduction
    5.2.2. Dependencies
    5.2.3. Net_SFTP Example
    5.2.4. put($remote_file, $data [, $mode])
    5.2.5. get($remote_file [, $local_file])
    5.2.6. pwd(), chdir(), mkdir() and rmdir()
    5.2.7. chmod() and size()
    5.2.8. nlist() and rawlist()
    5.2.9. delete() and rename()
    5.2.10. Debugging SFTP
    List of Tables
    3.1. AES Speed Comparisons
       Next
       Chapter 1. Introduction
    
diff --git a/library/phpsec/intro.html b/library/phpsec/intro.html
deleted file mode 100644
index 406b22fc5..000000000
--- a/library/phpsec/intro.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-Chapter 1. Introduction
    Chapter 1. Introduction
    Prev   Next
    Chapter 1. Introduction
    Table of Contents
    1.1. Who should use phpseclib
    1.2. Using phpseclib
    1.1. Who should use phpseclib
    
-                Although many of the features this library implements are implemented in PHP via optional extensions, what are 
-                you, as a developer, going to do when a user tries to run your software on a host which, coincidentally, doesn't 
-                happen to have that optional extension installed?  You could, flat-out, tell that user to look for another 
-                software package that does work on their server (or to get another host, or whatever), which is liable to leave 
-                a bad impression on the user, or you could use a library like this - a library that uses those optional 
-                extensions if they're available and falls back on an internal PHP implementation if they're not.
-            
    
-                Another advantage of using this library over optional PHP extensions is that you, as a developer, may find this 
-                libraries API easier to use then extensions API.
-            
    1.2. Using phpseclib
    
-                This library is written using the same conventions that libraries in the PHP Extension and Application Repository (PEAR) 
-                have been written in.  In particular, this library expects to be in your include_path:
-            
    <?php
-set_include_path(get_include_path() . PATH_SEPARATOR . 'phpseclib');
-
-include('Net/SSH2.php');
-?>
    Prev   Next
    PHP Secure Communications Library Home Chapter 2. Math
    
diff --git a/library/phpsec/math.html b/library/phpsec/math.html
deleted file mode 100644
index 4e5a14a54..000000000
--- a/library/phpsec/math.html
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-Chapter 2. Math
    Chapter 2. Math
    Prev   Next
    Chapter 2. Math
    Table of Contents
    2.1. Math_BigInteger
    2.1.1. Dependencies
    2.1.2. The constructor
    2.1.3. toString(), toBytes(), toHex() and toBits()
    2.1.4. add(), subtract(), multiply() and divide()
    2.1.5. powMod() and modInverse()
    2.1.6. gcd() and extendedGCD()
    2.1.7. abs()
    2.1.8. equals() and compare()
    2.1.9. setPrecision()
    2.1.10. bitwise_and(), bitwise_or(), bitwise_xor() and bitwise_not()
    2.1.11. bitwise_rightShift() and bitwise_leftShift()
    2.1.12. bitwise_rightRotate() and bitwise_leftRotate()
    2.1.13. setRandomGenerator()
    2.1.14. isPrime()
    2.1.15. random() and randomPrime()
    2.1. Math_BigInteger
    
-                Implements an arbitrary precision integer arithmetic library.  Uses gmp or bcmath, if available, and an 
-                internal implementation, otherwise.  Here's an example:
-            
    <?php
-    include('Math/BigInteger.php');
-
-    $a = new Math_BigInteger(2);
-    $b = new Math_BigInteger(3);
-
-    $c = $a->add($b);
-
-    echo $c->toString(); // outputs 5
-?>
    2.1.1. Dependencies
    
-                    If you're running PHP 5, Math_BigInteger's only dependancy is the PCRE extension (which is enabled by default).  Math_BigInteger also works on PHP 4 if PHP/Compat/Function/array_fill.php and PHP/Compat/Function/bcpowmod.php are included.
-                
    2.1.2. The constructor
    
-                    The constructor takes two parameters.  The first is the number and the second represents the base.  Both 
-                    are optional (if they're not provided, the Math_BigInteger object will assume a value of 0).
-                
    
-                    The supported bases are base-2, base-10 (default), base-16, and base-256.  To set $a, in the 
-                    above example, to 2, using base-2, we'd do new Math_BigInteger('10', 2).  To do it using 
-                    base-16, you could do new Math_BigInteger('2', 16) or new Math_BigInteger('0x2', 16).
-                    To set it to 2 using base-256, you'd do new Math_BigInteger(chr(2), 256).
-                
    
-                    If the base is negative (eg. -256), two's compliment will be used.  Thus, new Math_BigInteger(chr(0xFF), -256)
-                    is equal to -1, as is new Math_BigInteger('0xFFFFFFFF', -16) and new Math_BigInteger('11', -2).
-                    Basically, if the leading bit is 1, the number is assumed to be negative.
-                
    2.1.3. toString(), toBytes(), toHex() and toBits()
    
-                    toString() returns the base-10 form of a number.  toBytes() returns the base-256 
-                    form of a number, toHex() returns the base-16 form, and toBits() the base-2 form.
-                    toBytes(), toHex(), and toBits() also take an optional parameter which,
-                    if set, will return the two's compliment of a number.  So if, for example, $a is equal to -1,
-                    toBytes(true) will return chr(0xFF).
-                
    
-                    On PHP 5, toString() is called automatically when used in a string context via the
-                    __toString() magic method.
-                
    2.1.4. add(), subtract(), multiply() and divide()
    
-                    subtract() and multiply() operate similarly to add().  divide(), 
-                    however, does not.  Namely, it returns an array whose first element contains the quotient and whose 
-                    second element contains the "common residue".  If the remainder would be positive, the "common residue" 
-                    and the remainder are the same.  If the remainder would be negative, the "common residue" is equal to 
-                    the sum of the remainder and the divisor (basically, the "common residue" is the first positive modulo).
-                    Here's an example:
-                
    <?php
-    include('Math/BigInteger.php');
-
-    $a = new Math_BigInteger('10');
-    $b = new Math_BigInteger('20');
-
-    list($quotient, $remainder) = $a->divide($b);
-
-    echo $quotient->toString(); // outputs 0
-    echo "\r\n";
-    echo $remainder->toString(); // outputs 10
-?>
    2.1.5. powMod() and modInverse()
    
-                    Examples of each follow:
-                
    <?php
-    include('Math/BigInteger.php');
-
-    $a = new Math_BigInteger('10');
-    $b = new Math_BigInteger('20');
-    $c = new Math_BigInteger('30');
-
-    $c = $a->powMod($b, $c);
-
-    echo $c->toString(); // outputs 10
-?>
    <?php
-    include('Math/BigInteger.php');
-
-    $a = new Math_BigInteger(30);
-    $b = new Math_BigInteger(17);
-
-    $c = $a->modInverse($b);
-
-    echo $c->toString(); // outputs 4
-?>
    2.1.6. gcd() and extendedGCD()
    
-                    extendedGCD() returns an array containing three Math_BigInteger values indexed with x, y,
-                    and gcd.  x and y represent Bézout's identity.  gcd() returns a Math_BigInteger value
-                    equal to the gcd.  An example of each follows:
-                
    <?php
-include('Math/BigInteger.php');
-
-$a = new Math_BigInteger(693);
-$b = new Math_BigInteger(609);
-
-extract($a->extendedGCD($b));
-$c = $a->gcd($b);
-
-echo $gcd->toString() . "\r\n"; // outputs 21
-echo $c->toString() . "\r\n"; // outputs 21
-echo $a->toString() * $x->toString() + $b->toString() * $y->toString(); // outputs 21
-?>
    2.1.7. abs()
    
-                    $x->abs() returns the absolute value of $x.
-                
    2.1.8. equals() and compare()
    
-                    $x->equals($y) returns true or false depending on whether or not $x and
-                    $y are equal.
-                
    
-                    $x->compare($y) returns 1 if $x > $y, 0 if $x == $y, and -1 if $x < $y.  The reason for this
-                    is demonstrated thusly:
-                
    $x  > $y: $x->compare($y)  > 0
-$x  < $y: $x->compare($y)  < 0
-$x == $y: $x->compare($y) == 0
-$x >= $y: $x->compare($y) >= 0
-$x <= $y: $x->compare($y) <= 0
    
-                    As a consequence of this, !$x->compare($y) does not mean $x != $y but rather
-                    $x == $y.
-                
    2.1.9. setPrecision()
    
-                    Some bitwise operations give different results depending on the precision being used.  Examples include
-                    left shift, not, and rotates, as discussed for bitwise_not().
-                    This function lets you control the precision.
-                
    
-                    Whenever a new Math_BigInteger object is created it's precision is set to the same precision as the
-                    calling object.  In other words, if you do $b = $a->bitwise_not() then $b will
-                    have the same precision as $a.
-                
    2.1.10. bitwise_and(), bitwise_or(), bitwise_xor() and bitwise_not()
    
-                    bitwise_and(), bitwise_or() and bitwise_xor() operate similar to 
-                    add().  bitwise_not() is a bit more complicated.  To elaborate, if the
-                    precision (see setPrecision) is arbitrary,
-                    $x->bitwise_not() will always yield a smaller value since the most significant bit is
-                    assumed to have a value of one.  With fixed precision, however, the leading bit can be anything.
-                
    2.1.11. bitwise_rightShift() and bitwise_leftShift()
    
-                    $a->bitwise_rightShift($shift) shifts $a by $shift bits, effectively dividing by 2**$shift. 
-                    $a->bitwise_leftShift($shift) shifts $a by $shift bits, effectively multiplying by 2**$shift.
-                
    2.1.12. bitwise_rightRotate() and bitwise_leftRotate()
    
-                    $a->bitwise_rightRotate($shift) and $a->bitwise_leftRotate($shift) are
-                    demonstrated thusly:
-                
    <?php
-include('Math/BigInteger.php');
-
-$a = new Math_BigInteger('00111000', 2);
-$a->setPrecision(8);
-$b = $a->bitwise_leftRotate(2);
-echo $b->toBits(); // returns 11100000
-
-echo "\r\n";
-
-$a = new Math_BigInteger('00111000', 2);
-$b = $a->bitwise_leftRotate(2);
-echo $b->toBits(); // returns 100011
-?>
    
-                    Just as with bitwise_not(), these operations are
-                    precision dependant.
-                
    2.1.13. setRandomGenerator()
    
-                    Sets the random generator.  To set it to mt_rand() (which is what it is by default), call
-                    $x->setRandomGenerator('mt_rand').
-                
    2.1.14. isPrime()
    
-                    Returns true if a number is prime and false if it isn't.
-                
    2.1.15. random() and randomPrime()
    
-                    random($min, $max) generates a random number between $min and $max.
-                    randomPrime($min, $max) generates a random prime number between $min and $max.
-                    If no prime number exists between $min and $max false is returned.
-                
    
-                    randomPrime() has an optional third parameter, as well - $timeout.  Generating prime numbers
-                    is a particurarly expensive operation and although in certain environments even 512-bit primes can be
-                    generated in a less than a second it can take other environments upwards of around a minute if not more.
-                
    Prev   Next
    Chapter 1. Introduction Home Chapter 3. Symmetric-key Cryptography
    
diff --git a/library/phpsec/misc_crypt.html b/library/phpsec/misc_crypt.html
deleted file mode 100644
index 9751ddac8..000000000
--- a/library/phpsec/misc_crypt.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-Chapter 4. Miscellaneous Cryptography
    Chapter 4. Miscellaneous Cryptography
    Prev   Next
    Chapter 4. Miscellaneous Cryptography
    Table of Contents
    4.1. Crypt_Hash
    4.1.1. Supported Algorithms and Dependencies
    4.1.2. Example
    4.2. Crypt_RSA
    4.2.1. Dependencies
    4.2.2. Examples
    4.2.3. createKey()
    4.2.4. setPrivateKeyFormat(), setPublicKeyFormat(), loadKey() and setPassword()
    4.2.5. setPublicKey() and getPublicKey()
    4.2.6. encrypt(), decrypt() and setEncryptionMode()
    4.2.7. sign(), verify(), and setSignatureMode()
    4.2.8. setHash(), setMGFHash() and setSaltLength()
    4.1. Crypt_Hash
    4.1.1. Supported Algorithms and Dependencies
    The following algorithms are supported:
    md2, md5, md5-96, sha1, sha1-96, sha256, sha384, and sha512
    
-                    Crypt_Hash requires, minimally, PHP 4.3.0 (due to its use of
-                    sha1()).  If sha384 or sha512 are being used and
-                    you're not running PHP 5.1.2 or greater then Math/BigInteger.php is also required.
-                
    
-                    Crypt_Hash uses the hash extension if it's available (> 5.1.2), mhash if it's not, and it's own
-                    internal implementation if not even mhash is available.
-                
    4.1.2. Example
    <?php
-include('Crypt/Hash.php');
-
-$hash = new Crypt_Hash('sha1');
-//$hash->setKey('abcdefg');
-echo bin2hex($hash->hash('abcdefg'));
-?>
    If $hash->setKey() had been called $hash->hash() would have returned an HMAC.
    4.2. Crypt_RSA
    4.2.1. Dependencies
    
-                    If you're running PHP 5, Crypt_RSA requires Math/BigInteger.php and Crypt/Hash.php.  If you're running
-                    PHP 4, Crypt_RSA also requires PHP/Compat/Function/array_fill.php, PHP/Compat/Function/bcpowmod.php, and
-                    PHP/Compat/Function/str_split.php
-            
    4.2.2. Examples
    Here's an example of how to encrypt / decrypt with Crypt_RSA:
    <?php
-include('Crypt/RSA.php');
-
-$rsa = new Crypt_RSA();
-extract($rsa->createKey());
-
-$plaintext = 'terrafrost';
-
-$rsa->loadKey($privatekey);
-$ciphertext = $rsa->encrypt($plaintext);
-
-$rsa->loadKey($publickey);
-echo $rsa->decrypt($ciphertext);
-?>
    Here's an example of how to create / verify a signature with Crypt_RSA:
    <?php
-include('Crypt/RSA.php');
-
-$rsa = new Crypt_RSA();
-extract($rsa->createKey());
-
-$plaintext = 'terrafrost';
-
-$rsa->loadKey($privatekey);
-$signature = $rsa->sign($plaintext);
-
-$rsa->loadKey($publickey);
-echo $rsa->verify($plaintext, $signature) ? 'verified' : 'unverified';
->
    4.2.3. createKey()
    
-                    createKey() takes three parameters - $bits, $timeout,
-                    and $primes.  $timeout is present since creating a key has the potential to be
-                    fairly time consuming and will guarantee that createKey() does not run for more than
-                    $timeout seconds.  $primes lets provide pre-computed prime numbers to speed
-                    things up.
-                
    
-                    extract($rsa->createKey()) creates three variables - $publickey,
-                    $privatekey, and $partialkey.  If createKey hit the timeout then
-                    it'll return all the primes that it had managed to compute so that you might pass them back to
-                    createKey() on a subsequent call.
-                
    
-                    The exponent can be set by defining CRYPT_RSA_EXPONENT and multi-prime RSA can be utilized
-                    by adjusting CRYPT_RSA_SMALLEST_PRIME.  Note that these must be done before a Crypt_RSA()
-                    object is initialized.
-                
    
-                    Smaller values for CRYPT_RSA_SMALLEST_PRIME result in increased speed at the cost of security.
-                
    4.2.4. setPrivateKeyFormat(), setPublicKeyFormat(), loadKey() and setPassword()
    Crypt_RSA supports the following formats:
    CRYPT_RSA_PRIVATE_FORMAT_PKCS1:
    -----BEGIN RSA PRIVATE KEY-----
-MIICWgIBAAKBgHx5XHa3LjiugtNq2xkd0oFf2SdsJ04hQYLoeRR3bqAei3Gc+PSy
-AvynCIh/03JCvBsUHaCe8BwjwaTYrpq5QunGo/wvIzvx2d3G9dlrpOIFLiatZYOf
-h07+CkSfaRXhBUKkul/gU87WPhKEcbnPDJS10uD1HqLsHfSKLNitGOf7AgElAoGA
-ENIhQHmedlzFkjEI2eFveURNxw6dhxlANEjtxH7XmRjiaUyQWGsVKQ+nNQpa2Bbb
-JkD9FbSc/OI8wz/gPmwP9eJN29CriebhaV3ebM1L1gbb5r7Vf/D/6rxB0BG/h2lA
-jyZWEZrV/Gi9ZCaw/J+IUu1pAskKid84yHphvszywCUCQQDigrtr+cVkwkUsxOGd
-B378yQCroXmybAD7FQHwVslafuFfTHkaMQSU/ZZLVY1ioMs1VVzzq/vOu0RstZOY
-AfHFAkEAjK3mIWdG4JOM44/SrDkACNatsMtXKOi4K3SlXu9ie6ikXPD+GSZ+bWCX
-GstFaXr9cHRvZPF3qYtK+j2N9UXOvwJBALeoRO/DmSFDkgifoixLRF5CHDgiD6Vs
-U9J/vGIBLaNSHoSe3rtKVr3+CyhTNF3Oe0AABi1bA4UGioGn+yFNr0UCQBbQF3sJ
-1CRq9ECT3PlVWfOYbzFtFQ2NhaYul1uAw9yzkEZsROF73SZ+XbFRZTOzFFds08su
-E2eaDCiUXDWcnhECQQCRUQn2huHlssj8kt35NAVwiHCNfaeSQ5tiDcwfOywA4YXl
-Q+kpuWq5U3V8j/9/n7pE/DL0nXEG/3QpKHJEYV5T
------END RSA PRIVATE KEY-----
    CRYPT_RSA_PRIVATE_FORMAT_PKCS1 (with password):
    -----BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,0AE1DB47E71463BE
-
-pI2Kk5ceURbMYNo1xQqqA5rm2/QP4hgj/HuvrACtPSz/aesbG+h4lYXGpQ9os6Ha
-AyFW+iX2UWS6BRwJj1ztO20sKT6ckg7eINSfiSSAeOOiG5aHLxOYayO9aQ5UrrJX
-r0QmwRJRiHTW/82PLBNzfFHYskslNI9EWA5L/Gg4NAXDWwDooGvGkDq3ex7WkWLr
-k7DN2JoZuWsUZxwpgTDouRQMsygrsdSjwRDSgbnTn6luEBrL9fc5/oAWf0xoTk5h
-XMiOOHPBNPiZ1883ayq91HL/6895g8U9oIR1wQmdl0USViYYp5jI19ueowCyblzP
-xD3Bfpb6RPaZ/yqECOysPk6PDz257SGDMNk/QrQJ/eZkeniNXHJ8d+nJGuajZeBu
-6A/bglvKGNNNWe8UJMb5P2OAliD7y7F9wXrkV5FnQ/Q49tGxdBl7WXNuGp4x2d9s
-ZEnv3mOtrr1lM+2QE0Zg8mjqSem5b6Dp0LxOj5j45j5IbBrrd3MKu87jJVzp8yHy
-sBC6NMYYtO03qxV/j1kJR+MmAcCF1+4GGRWdFcoc0sXGVqmEOmK4QfYx3T0Vb6Hk
-oLdlh6ofZogezzJ8A1BvV382sTsJ90eqbgz3E+fDl8iR86+EV9bUujFE4IaBgZJP
-gxikVItdTcq1frNKTCSH/RPeRwk+oKWTpCYGgNA+bl641onW1DCLYcd14N6TDKmY
-77cOTf2ZDGOYNPycAF/FnNJJyLO3IYpU63aKBshB4dYeVrfH0FvG6g5Xt0geIkiD
-5W9El4ks7/3r97x443SagDRt6Mceo5TtzzFfAo7cZeA=
------END RSA PRIVATE KEY-----
    CRYPT_RSA_PUBLIC_FORMAT_PKCS1:
    -----BEGIN PUBLIC KEY-----
-MIGGAoGAfHlcdrcuOK6C02rbGR3SgV/ZJ2wnTiFBguh5FHduoB6LcZz49LIC/KcIiH/TckK8GxQd
-oJ7wHCPBpNiumrlC6caj/C8jO/HZ3cb12Wuk4gUuJq1lg5+HTv4KRJ9pFeEFQqS6X+BTztY+EoRx
-uc8MlLXS4PUeouwd9Ios2K0Y5/sCASU=
------END PUBLIC KEY-----
    CRYPT_RSA_PUBLIC_FORMAT_OPENSSH:
    ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIB8eVx2ty44roLTatsZHdKBX9knbCdOIUGC6HkUd26gHotx
-nPj0sgL8pwiIf9NyQrwbFB2gnvAcI8Gk2K6auULpxqP8LyM78dndxvXZa6TiBS4mrWWDn4dO/gpEn2kV
-4QVCpLpf4FPO1j4ShHG5zwyUtdLg9R6i7B30iizYrRjn+w== phpseclib-generated-key
    
-                    Passwords can be set via setPassword() and are only supported on private keys.
-                    CRYPT_RSA_PUBLIC_FORMAT_OPENSSH generates keys that are intended to go in $HOME/.ssh/authorized_keys
-                    for use with OpenSSH.  Another format - CRYPT_RSA_PUBLIC_FORMAT_RAW - is stored as an array with two
-                    indexes - one for the modulus and one for the exponent.  Indexes accepted by loadkey()
-                    are as follows:
-                
    
-                    e, exponent, publicExponent, modulus, modulo, n
-                
    
-                    loadKey() has two parameters - $key and the optional $type.
-                    The default type, if $type is not explicitely set, is CRYPT_RSA_PRIVATE_FORMAT_PKCS1.
-                    It should, at this point, be noted that Crypt_RSA treats public and private keys largelly identically.
-                    A key can be formatted as a CRYPT_RSA_PUBLIC_FORMAT_PKCS1 and still conform to the 
-                    CRYPT_RSA_PRIVATE_FORMAT_PKCS1 format and vice versa.  The only real difference between private keys and
-                    public keys is that private keys *can* contain their public key counterparts whereas public keys cannot.
-                    That said, this distinction is, for the most part, irrelevant and academic.  For a more thorough
-                    discussion of this see setPublicKey() and getPublicKey().
-                
    4.2.5. setPublicKey() and getPublicKey()
    
-                    As noted in setPrivateKeyFormat(), setPublicKeyFormat(), loadKey() and setPassword(),
-                    Crypt_RSA treats public and private keys largely identically.  The only real difference is that some
-                    private key formats contain the public key within them whereas no public key format does.  The reason
-                    you'd want to do this is for indexing purposes.  For example, in SSH-2, RSA authentication works by
-                    sending your public key along with a signature created by your private key.  The SSH-2 server then looks
-                    the public key up in an index of public keys to see if it's an allowed key and then verifies the signature.
-                    To that end, setPublicKey() defines the public key if it hasn't already been defined and
-                    getPublicKey() returns it.  getPublicKey() has an optional parameter - $type -
-                    that sets the format.
-                
    4.2.6. encrypt(), decrypt() and setEncryptionMode()
    
-                    Crypt_RSA supports two encryption modes - CRYPT_RSA_ENCRYPTION_OAEP and
-                    CRYPT_RSA_ENCRYPTION_PKCS1.  CRYPT_RSA_ENCRYPTION_OAEP uses
-                    Optimal Asymmetric Encryption Padding
-                    and provides more security than CRYPT_RSA_ENCRYPTION_PKCS1.
-                
    
-                    Both CRYPT_RSA_ENCRYPTION_OAEP and CRYPT_RSA_ENCRYPTION_PKCS1 impose limits
-                    on how large the plaintext can be.  If the plaintext exceeds these limits the plaintext will be split
-                    up such that each block falls within those limits.
-                
    4.2.7. sign(), verify(), and setSignatureMode()
    
-                    Crypt_RSA supports two signature modes - CRYPT_RSA_SIGNATURE_PSS and
-                    CRYPT_RSA_SIGNATURE_PKCS1.  The former is assumed to provide more security than the latter.
-                    See Examples for examples.
-                
    4.2.8. setHash(), setMGFHash() and setSaltLength()
    
-                   In all likelihood, calling these functions will be unnecessary as the default values should be sufficient.
-                   None-the-less a discussion of them follows.
-                
    
-                    setHash() is used with signature production / verification and (if the encryption mode is
-                    CRYPT_RSA_ENCRYPTION_OAEP) encryption and decryption.  If the specified hash isn't supported sha1 will
-                    be used.
-                
    
-                    setMGFHash() determines which hashing function should be used for the mask generation
-                    function as utilized in CRYPT_RSA_ENCRYPTION_OAEP and CRYPT_RSA_SIGNATURE_PSS.  PKCS#1 recommends
-                    but does not require that the MGFHash and the Hash be set to the same thing.
-                
    
-                    setSaltLength() is only utilized with CRYPT_RSA_SIGNATURE_PSS.  PKCS#1 recommends this
-                    value either be 0 (which is what it is by default) or the length of the output of the hash function as
-                    set via setHash()
-                
    Prev   Next
    Chapter 3. Symmetric-key Cryptography Home Chapter 5. Networking
    
diff --git a/library/phpsec/net.html b/library/phpsec/net.html
deleted file mode 100644
index 2752b826d..000000000
--- a/library/phpsec/net.html
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-Chapter 5. Networking
    Chapter 5. Networking
    Prev   
    Chapter 5. Networking
    Table of Contents
    5.1. Net_SSH
    5.1.1. Dependencies
    5.1.2. Net_SSH1 Examples
    5.1.3. Net_SSH2 Examples
    5.1.4. Host Key Verification
    5.1.5. interactiveRead() / interactiveWrite() vs. exec()
    5.1.6. SSH-1's exec() vs. SSH-2's exec()
    5.1.7. Successive calls to SSH-2's exec()
    5.1.8. Debugging SSH-2
    5.2. Net_SFTP
    5.2.1. Introduction
    5.2.2. Dependencies
    5.2.3. Net_SFTP Example
    5.2.4. put($remote_file, $data [, $mode])
    5.2.5. get($remote_file [, $local_file])
    5.2.6. pwd(), chdir(), mkdir() and rmdir()
    5.2.7. chmod() and size()
    5.2.8. nlist() and rawlist()
    5.2.9. delete() and rename()
    5.2.10. Debugging SFTP
    5.1. Net_SSH
    
-                The Net_SSH1 and Net_SSH2 libraries have, for the most part, an identical API.  Some functions, however, do behave differently.
-            
    5.1.1. Dependencies
    
-                    Net_SSH1/2 require, minimally, Math/BigInteger.php, Crypt/*.php, and PHP/Compat/Function/*.php.  Net_SSH1 requires PHP 4.0.0 unless you're using the interactive functions, which require PHP 4.3.0.  Net_SSH2 requires PHP 4.3.0 due to it's use of sha1().
-                
    5.1.2. Net_SSH1 Examples
    <?php
-    include('Net/SSH1.php');
-
-    $ssh = new Net_SSH1('www.domain.tld');
-    if (!$ssh->login('username', 'password')) {
-        exit('Login Failed');
-    }
-
-    while (true) {
-        echo $ssh->interactiveRead();
-
-        $read = array(STDIN);
-        $write = $except = NULL;
-        if (stream_select($read, $write, $except, 0)) {
-            $ssh->interactiveWrite(fread(STDIN, 1));
-        }
-    }
-?>
    <?php
-    include('Net/SSH1.php');
-
-    $ssh = new Net_SSH1('www.domain.tld');
-    if (!$ssh->login('username', 'password')) {
-        exit('Login Failed');
-    }
-
-    echo $ssh->exec('ls -la');
-?>
    5.1.3. Net_SSH2 Examples
    <?php
-    include('Net/SSH2.php');
-
-    $ssh = new Net_SSH2('www.domain.tld');
-    if (!$ssh->login('username', 'password')) {
-        exit('Login Failed');
-    }
-
-    echo $ssh->exec('pwd');
-    echo $ssh->exec('ls -la');
-?>
    <?php
-    include('Crypt/RSA.php');
-    include('Net/SSH2.php');
-
-    $key = new Crypt_RSA();
-    //$key->setPassword('whatever');
-    $key->loadKey(file_get_contents('privatekey'));
-
-    $ssh = new Net_SSH2('www.domain.tld');
-    if (!$ssh->login('username', $key)) {
-        exit('Login Failed');
-    }
-
-    echo $ssh->exec('pwd');
-    echo $ssh->exec('ls -la');
-?<
    5.1.4. Host Key Verification
    
-                    SSH protects itself against active eavesdroppers by providing a host key.  The first time you connect the host key is supposed to be cached in some manner.  On subsequent connections, the host key being used for this connection should be checked against the cached host key.  If they match, it's the same server.  If not, it's a different one.
-                
    
-                    In SSH-1, getHostKeyPublicModulus() and getHostKeyPublicExponent() will provide you with the host key.  In SSH-2, getServerPublicHostKey() gets you the key.
-                
    
-                    The Net_SSH1 and Net_SSH2 examples omit the key verification stage for brevity.  Also, depending on the context in which this library is used, it may even be unnecessary.  For example, if you're connecting to www.example.com:22 from www.example.com:80, eavesdroppers are not something you need to worry about.
-                
    5.1.5. interactiveRead() / interactiveWrite() vs. exec()
    
-                    Say you wanted to use SSH to get the contents of a directory.  If you used interactiveWrite('ls') to do this, and then interactiveRead() to get the output, you, in all likelihood, wouldn't get the whole output.  You'd have to call interactiveRead() multiple times - you'd have to call it as many times as it took for you to get the complete output, which, in turn, begs the question...  how do you know when you have the complete output?
-                    You could assume that whenever the prompt (eg. root@desktop:/root#) showed up, that that'd mean you had the complete output, but that's not fool proof.  And what about messages of the day?  The first interactiveRead() you do is liable to include a part of that rather than the directory listing.  So, not only do you have to make some sort of guestimate as to when the output ends - you often may have to guestimate as to when it begins.
-                
    
-                    To top it all off, you may also get ANSI escape codes interspersed amongst the output, which would need to be removed.
-                
    
-                    Using exec('ls') resolves all of these issues.  If you're implementing an interactive client, the interactive functions are the ones you'll want to use.  Otherwise, exec() is likely what you'll want to use.
-                
    
-                    interactiveRead() / interactiveWrite() are not implemented in Net_SSH2.  The SSH-2 protocol supports them, however, phpseclib does not.  The reasons are discussed in the SSH-1's exec() vs. SSH-2's exec() section.
-                
    5.1.6. SSH-1's exec() vs. SSH-2's exec()
    
-                    exec() works by creating a channel, issuing a command, and then subsequently destroying that channel.  Since SSH-1 only allows one channel, exec() can only be called once.  SSH-2, in contrast, allows an unlimited number of channels, and as such, you can perform as many exec()'s as you see fit.
-                
    
-                    As a consequence of this difference, Net_SSH2 does not implement interactiveRead() / interactiveWrite(), even though the SSH-2 specifications provide for those functions.  Simply put, in SSH-1, those functions are necessary to do multiple commands.  In SSH-2, they're not, and so they're not implemented.
-                
    5.1.7. Successive calls to SSH-2's exec()
    
-                    Successive calls to SSH-2's exec() may not work as expected.  Consider the following:
-                
    <?php
-    include('Net/SSH2.php');
-
-    $ssh = new Net_SSH2('www.domain.tld');
-    if (!$ssh->login('username', 'password')) {
-        exit('Login Failed');
-    }
-
-    echo $ssh->exec('pwd');
-    echo $ssh->exec('cd /');
-    echo $ssh->exec('pwd');
-?>
    
-                    If done on an interactive shell, the output you'd receive for the first pwd would (depending on how your system is setup) be different than the output of the second pwd.  The above code snippet, however, will yield two identical lines.  The reason for this is that any "state changes" you make to the one-time shell are gone once the exec() has been ran and the channel has been deleted.
-                    As such, if you want to support cd in your program, it'd be best to just handle that internally and rewrite all commands, before they're passed to exec() such that the relative paths are expanded to the absolute paths.
-                    Alternatively, one could always run a shell script, however, that may not always be an option.
-                
    5.1.8. Debugging SSH-2
    
-                    To log output, the NET_SSH2_LOGGING constant will need to be defined.  If you want full logs, you'll need to do define('NET_SSH2_LOGGING', NET_SSH2_LOG_COMPLEX).  $ssh->getLog() will then return a string containing the unencrypted packets in hex and ASCII.  If you want to just record the packet types that are being sent to and fro, you'll need to do define('NET_SSH2_LOGGING', NET_SSH2_LOG_SIMPLE).  $ssh->getLog() will then return an array.  Both log types include the amount of time it took to send the packet in question.  The former is useful for general diagnostics and the latter is more useful for profiling.  An example follows:
-                
    <?php
-    include('Net/SSH2.php');
-    define('NET_SSH2_LOGGING', NET_SSH2_LOG_COMPLEX);
-
-    $ssh = new Net_SSH2('www.domain.tld');
-    if (!$ssh->login('username', 'password')) {
-        exit('Login Failed');
-    }
-
-    echo $ssh->exec('pwd');
-    echo $ssh->getLog();
-?>
    
-                    Depending on the problem, it may be more effective to just look at the output of $ssh->getLastError() (which returns a string) and $ssh->getErrors() (which returns an array) than to sift through the logs.
-                
    5.2. Net_SFTP
    5.2.1. Introduction
    
-                    Net_SFTP currently only supports SFTPv3, which, according to wikipedia.org, "is the most widely used 
-                    version, implemented by the popular OpenSSH SFTP server".
-                
    5.2.2. Dependencies
    
-                    Net_SFTP requires, minimally, PHP 4.3.0 and Net/SSH2.php, Math/BigInteger.php, Crypt/*.php, and PHP/Compat/Function/*.php.
-                
    5.2.3. Net_SFTP Example
    <?php
-include('Net/SFTP.php');
-
-$sftp = new Net_SFTP('www.domain.tld');
-if (!$sftp->login('username', 'password')) {
-    exit('Login Failed');
-}
-
-echo $sftp->pwd() . "\r\n";
-$sftp->put('filename.ext', 'hello, world!');
-print_r($sftp->nlist());
-?>
    5.2.4. put($remote_file, $data [, $mode])
    
-                    By default, put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
-                    So, for example, if you set $data to 'filename.ext' and then do get(), you will get a file, twelve bytes
-                    long, containing 'filename.ext' as its contents.
-                
    
-                    Setting $mode to NET_SFTP_LOCAL_FILE will change the above behavior.  With NET_SFTP_LOCAL_FILE, $remote_file will 
-                    contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
-                    large $remote_file will be, as well.
-                
    
-                    Currently, only binary mode is supported.  As such, if the line endings need to be adjusted, you will need to take
-                    care of that, yourself.
-                
    5.2.5. get($remote_file [, $local_file])
    
-                    Returns a string containing the contents of $remote_file if $local_file is left undefined or a boolean false if
-                    the operation was unsuccessful.  If $local_file is defined, returns true or false depending on the success of the
-                    operation
-                
    5.2.6. pwd(), chdir(), mkdir() and rmdir()
    
-                    pwd() returns the current directory, chdir() changes directories, mkdir() creates direcotires, and rmdir() removes directories.
-                    In the event of failure, they all return false.  chdir(), mkdir(), and rmdir() return true on successful completion of the operation.
-                
    5.2.7. chmod() and size()
    
-                    chmod() sets the permissions on a file and returns the new file permissions on success or false on error.  Permissions are expected to be in octal so to set a file to 777 do $sftp->chmod(0777, $filename)
-                
    
-                    size() returns the size, in bytes, of an arbitrary file.
-                
    5.2.8. nlist() and rawlist()
    
-                    nlist($dir = '.') returns the contents of the current directory as a numerically indexed array and rawlist() returns an associate array where the filenames are the array keys and the array values are, themselves, arrays containing the file attributes.  The directory can be changed with the first parameter.
-                
    5.2.9. delete() and rename()
    
-                    The purpose of both functions should be easy enough to glean - delete() deletes files or directories and rename() renames them.  Both return true on success and false on failure.
-                
    5.2.10. Debugging SFTP
    
-                    Debbuging SFTP connections in phpseclib works in a manner similar to debugging SSH-2  Instead of the constant being NET_SSH2_LOGGING, however, it's NET_SFTP_LOGGING.  And instead of NET_SSH2_LOG_COMPLEX or NET_SSH2_LOG_SIMPLE it's NET_SFTP_LOG_COMPLEX or NET_SFTP_LOG_SIMPLE respectively.  And instead of calling $sftp->getLog() you call $sftp->getSFTPLog() or $sftp->getLastSFTPError() or whatever.
-                
    Prev   
    Chapter 4. Miscellaneous Cryptography Home 
    
diff --git a/library/phpsec/sym_crypt.html b/library/phpsec/sym_crypt.html
deleted file mode 100644
index 956506290..000000000
--- a/library/phpsec/sym_crypt.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-Chapter 3. Symmetric-key Cryptography
    Chapter 3. Symmetric-key Cryptography
    Prev   Next
    Chapter 3. Symmetric-key Cryptography
    Table of Contents
    3.1. Introduction
    3.1.1. Dependencies
    3.1.2. setKey() and setIV()
    3.1.3. encrypt() and decrypt()
    3.1.4. enableContinuousBuffer() and disableContinuousBuffer()
    3.1.5. enablePadding() and disablePadding()
    3.1.6. A word of caution about stream ciphers and CTR mode
    3.2. Crypt_DES
    3.2.1. The constructor
    3.3. Crypt_TripleDES
    3.3.1. The constructor
    3.4. Crypt_RC4
    3.4.1. The constructor
    3.5. Crypt_Rijndael & Crypt_AES
    3.5.1. The constructor
    3.5.2. AES vs. Rijndael
    3.5.3. setKeyLength()
    3.5.4. setBlockLength()
    3.5.5. Speed Comparisons
    3.1. Introduction
    
-                All of the cryptographic libraries included in phpseclib use mcrypt, if available, and an internal implementation 
-                if it's not.  The libraries all use a common interface although some functions, for some algorithms, carry with 
-                with them certain caveats.  Those that do not have caveats attached (or have relatively few attached) are 
-                described below.  If you don't know which one to use, try Crypt_TripleDES.
-            
    3.1.1. Dependencies
    
-                    The Crypt_* functions require, minimally, PHP 4.0.0.  Crypt_TripleDES additionally requires Crypt/DES.php.
-                
    3.1.2. setKey() and setIV()
    
-                    Sets the key and the initialization vector, respectively.  If neither are set, each assumed to be equal to 
-                    some amount of null bytes.  The initialization vector is only used in block ciphers and even then only 
-                    in CBC mode.  If the key or the initialization vector are larger then the block size, they're truncated.
-                    If they're smaller, they're padded with null bytes.
-                
    3.1.3. encrypt() and decrypt()
    
-                    Self-explanatory.  Encrypts or decrypts messages.  See the examples in the subsequent sections.
-                
    3.1.4. enableContinuousBuffer() and disableContinuousBuffer()
    
-                    If the continuous buffer is enabled and you're using a stream cipher or a block cipher mode other than ECB then encrypting the same string twice will yield different ciphertexts.
-                    The reason being that the IV doesn't reset after each encryption / decryption round when the continuous buffer is used.
-                    This provides better security but it may also make for less intuitive behavior.
-                    For this reason, the continuous buffer is disabled by default.
-                 
    3.1.5. enablePadding() and disablePadding()
    
-                    Enables / disables PKCS padding on block ciphers.  Stream ciphers (Crypt_RC4 is the only stream
-                    cipher currently included) ignore this.
-                
    3.1.6. A word of caution about stream ciphers and CTR mode
    
-                    Most stream ciphers (and block ciphers operating in a mode - like CTR - that turns them into stream ciphers) work by generating a stream of pseudorandom characters called a keystream and then XOR'ing that with the plaintext.
-                    This *effectively* makes them one-time pads which, in theory, can provide perfect secrecy.  The problem with one-time pads is that they're not as versatile as one might desire.
-                    Among other things, a keystream must never be reset, lest it be possible for an attacker to recover the keystream via a known-plaintext attack.  ie. $ciphertext ^ $plaintext = $key.  If $key is constant (because the keystream's being reset or something) than an attacker can recover any $plaintext, but if not - if it's dynamic - then the only key that an attacker could recover is their own.
-                
    3.2. Crypt_DES
    
-                Implements DES (a block cipher).  Here's an example of how to use it:
-            
    <?php
-    include('Crypt/DES.php');
-
-    $des = new Crypt_DES();
-
-    $des->setKey('abcdefgh');
-
-    $size = 10 * 1024;
-    $plaintext = '';
-    for ($i = 0; $i < $size; $i++) {
-        $plaintext.= 'a';
-    }
-
-    echo $des->decrypt($des->encrypt($plaintext));
-?>
    3.2.1. The constructor
    
-                    The constructor takes one optional parameter - $mode.  Valid values for $mode are as follows:
-                
    • CRYPT_DES_MODE_ECB
    • CRYPT_DES_MODE_CBC: The default value.
    • CRYPT_DES_MODE_CTR
    3.3. Crypt_TripleDES
    
-                Implements TripleDES (a block cipher).  Here's an example of how to use it:
-            
    <?php
-    include('Crypt/TripleDES.php');
-
-    $des = new Crypt_TripleDES();
-
-    $des->setKey('abcdefghijklmnopqrstuvwx');
-
-    $size = 10 * 1024;
-    $plaintext = '';
-    for ($i = 0; $i < $size; $i++) {
-        $plaintext.= 'a';
-    }
-
-    echo $des->decrypt($des->encrypt($plaintext));
-?>
    3.3.1. The constructor
    
-                    The constructor takes one optional parameter - $mode.  Valid values for $mode are as follows:
-                
    • CRYPT_DES_MODE_ECB
    • CRYPT_DES_MODE_CBC3: Employs outer chaining to propogate the initialization vector.  Used by SSH-2 and generally considered more secure than inner chaining.
    • CRYPT_DES_MODE_3CBC: Employs inner chaining to propogate the initialization vector.  Used by SSH-1.
    • CRYPT_DES_MODE_CBC: The default value.  An alias for CRYPT_DES_MODE_CBC3.
    • CRYPT_DES_MODE_CTR
    3.4. Crypt_RC4
    
-                Implements RC4 (a stream cipher).  Here's an example of how to use it:
-            
    <?php
-    include('Crypt/RC4.php');
-
-    $rc4 = new Crypt_RC4();
-
-    $rc4->setKey('abcdefghijklmnopqrstuvwx');
-
-    $size = 10 * 1024;
-    $plaintext = '';
-    for ($i = 0; $i < $size; $i++) {
-        $plaintext.= 'a';
-    }
-
-    echo $rc4->decrypt($rc4->encrypt($plaintext));
-?>
    3.4.1. The constructor
    
-                    Not much to say about this constructor.  Since it's a stream cipher, you don't need to worry about which
-                    mode of operation to use.
-                
    3.5. Crypt_Rijndael & Crypt_AES
    
-                Implements Rijndael / AES.  Here's an example of how to use Crypt_AES:
-            
    <?php
-    include('Crypt/AES.php');
-
-    $aes = new Crypt_AES();
-
-    $aes->setKey('abcdefghijklmnop');
-
-    $size = 10 * 1024;
-    $plaintext = '';
-    for ($i = 0; $i < $size; $i++) {
-        $plaintext.= 'a';
-    }
-
-    echo $aes->decrypt($aes->encrypt($plaintext));
-?>
    3.5.1. The constructor
    
-                    Crypt_AES's constructor's optional parameter can take the following values:
-                
    • CRYPT_AES_MODE_ECB
    • CRYPT_AES_MODE_CBC: The default value.
    • CRYPT_AES_MODE_CTR
    
-                    Crypt_Rijndael takes the following:
-                
    • CRYPT_RIJNDAEL_MODE_ECB
    • CRYPT_RIJNDAEL_MODE_CBC: The default value.
    • CRYPT_RIJNDAEL_MODE_CTR
    3.5.2. AES vs. Rijndael
    
-                    AES is a subset of Rijndael.  Both have variable key sizes, however, AES's block size is fixed at 128 bits, whereas Rijndael's is variable.  Also, Rijndael supports, by means of an extension to the specification, two key sizes that AES does not - 160 bits and 224 bits.
-                
    3.5.3. setKeyLength()
    
-                    Valid key lengths for AES are 128 bits, 192 bits, and 256 bits.  If the key that is assigned is invalid and less than 256 bits, they key length is rounded up to the next closest valid size and the key will be null padded to that amount.  If the key length is greater than 256 bits, it will be truncated to 256 bits.
-                
    
-                    As an example, if the key is 136 bits, it will be null padded to 192 bits (or 160 bits if Rijndael is being used).
-                
    
-                    If setKeyLength() has been called, this behavior changes somewhat.  Say you've set the key length, via this function, to 256 bits.  Then, instead of an invalid key being null padded to 192 or 160 bits, it will be null padded to 256 bits.
-                
    3.5.4. setBlockLength()
    
-                    setBlockLength() operates in a manner similar to setKeyLength(), with one exception.  setBlockLength() only works on Rijndael.  Although Crypt_AES inherits setBlockLength() as a function, the function doesn't do anything in AES.
-                
    3.5.5. Speed Comparisons
    
-                    The following table compares the speed of five different pure-PHP implementations of AES (one of which is Crypt_Rijndael and one of which is Crypt_AES) when ran on 150KB of text on a 1.8GHz Pentium 4-M.  The numbers listed are averaged from five different trials and are measured in seconds.  phpseclib's two implementations are highlighted.  All implementations can be viewed by clicking on their names.
-                
    Table 3.1. AES Speed Comparisons
    movable-type.phpsphpaes.phpsphpclasses1.phpsphpclasses2.phpsphpseclib-aes.phpsphpseclib-rijndael.phps
    15.684415817239.953724813515.010015010862.5917131900792.035815429687522.62501101493836

    
-                    As can be seen, phpseclib's implementations are the fastest.  phpseclib-aes.phps is faster than phpseclib-rijndael.phps because phpseclib-rijndael.phps has to contend with multiple block sizes whereas phpseclib-aes.phps does not.  Note that if mcrypt weren't explicitily disabled phpseclib would have been even faster.
-                
    Prev   Next
    Chapter 2. Math Home Chapter 4. Miscellaneous Cryptography
    
diff --git a/library/spam/README b/library/spam/README
deleted file mode 100644
index a0d67fca7..000000000
--- a/library/spam/README
+++ /dev/null
@@ -1,12 +0,0 @@
-B8 for Friendica
-
-B8 is an excellent bayesian spam implementation for PHP. However when evaluating it for use in Friendica there were a few shortcomings. B8's primary audience is guestbooks and blogs - single user situations. 
-
-Friendica is a multi-user distributed social environment. So the first thing we need to add to b8 is a concept of user ID. 
-
-Second we don't want to use a second stored set of DB login credentials so we're going to implemetn Friendica's MySQL driver and use our existing connection and credentials.
-
-The third requirement is that the B8 processing model is to load a set of word/data sets from the DB, perform processing (which may change the value of the data) and then store the results back to the DB. We're in a highly dynamic environment with lots of sometimes concurrent message processing. So the plan is to alter the storage architecture to read data in, do processing, and then apply a somewhat atomic change operation where the changes are performed in a single query using the current data in storage rather than something passed through outside processing and where the data may be outdated come time to store it.
-
-In accordance with the LGPL of the B8 package these changes are available in source form at http://github.com/friendica/friendica in the directory library/spam
-  
\ No newline at end of file
diff --git a/library/spam/b8/b8.php b/library/spam/b8/b8.php
deleted file mode 100644
index 28a3dd29f..000000000
--- a/library/spam/b8/b8.php
+++ /dev/null
@@ -1,503 +0,0 @@
-
-#
-#   b8 - A Bayesian spam filter written in PHP 5
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * Copyright (C) 2006-2010 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Tobias Leupold
- * @author Oliver Lillie (aka buggedcom) (original PHP 5 port)
- */
-
-class b8
-{
-
-	public $config = array(
-		'min_size'      => 3,
-		'max_size'      => 30,
-		'allow_numbers' => FALSE,
-		'lexer'         => 'default',
-		'degenerator'   => 'default',
-		'storage'       => 'dba',
-		'use_relevant'  => 15,
-		'min_dev'       => 0.2,
-		'rob_s'         => 0.3,
-		'rob_x'         => 0.5
-	);
-
-	private $_lexer      = NULL;
-	private $_database   = NULL;
-	private $_token_data = NULL;
-
-	const SPAM    = 'spam';
-	const HAM     = 'ham';
-	const LEARN   = 'learn';
-	const UNLEARN = 'unlearn';
-
-	const STARTUP_FAIL_DATABASE = 'STARTUP_FAIL_DATABASE';
-	const STARTUP_FAIL_LEXER    = 'STARTUP_FAIL_LEXER';
-	const TRAINER_CATEGORY_FAIL = 'TRAINER_CATEGORY_FAIL';
-
-	/**
-	 * Constructs b8
-	 *
-	 * @access public
-	 * @return void
-	 */
-
-	function __construct($config = array(), $database_config)
-	{
-
-		# Validate config data
-
-		if(count($config) > 0) {
-
-			foreach ($config as $name=>$value) {
-
-				switch($name) {
-
-					case 'min_dev':
-					case 'rob_s':
-					case 'rob_x':
-						$this->config[$name] = (float) $value;
-						break;
-
-					case 'min_size':
-					case 'max_size':
-					case 'use_relevant':
-						$this->config[$name] = (int) $value;
-						break;
-
-					case 'allow_numbers':
-						$this->config[$name] = (bool) $value;
-						break;
-
-					case 'lexer':
-						$value = (string) strtolower($value);
-						$this->config[$name] = is_file(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lexer' . DIRECTORY_SEPARATOR . "lexer_" . $value . '.php') === TRUE ? $value : 'default';
-						break;
-
-					case 'storage':
-						$this->config[$name] = (string) $value;
-						break;
-
-				}
-
-			}
-
-		}
-
-		# Setup the database backend
-
-		# Get the basic storage class used by all backends
-		if($this->load_class('b8_storage_base', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'storage_base.php') === FALSE)
-			return;
-
-		# Get the degenerator we need
-		if($this->load_class('b8_degenerator_' . $this->config['degenerator'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'degenerator' . DIRECTORY_SEPARATOR . 'degenerator_' . $this->config['degenerator'] . '.php') === FALSE)
-			return;
-
-		# Get the actual storage backend we need
-		if($this->load_class('b8_storage_' . $this->config['storage'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'storage_' . $this->config['storage'] . '.php') === FALSE)
-			return;
-
-		# Setup the backend
-		$class = 'b8_storage_' . $this->config['storage'];
-		$this->_database = new $class(
-			$database_config,
-			$this->config['degenerator'], date('ymd')
-		);
-
-		# Setup the lexer class
-
-		if($this->load_class('b8_lexer_' . $this->config['lexer'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lexer' . DIRECTORY_SEPARATOR . 'lexer_' . $this->config['lexer'] . '.php') === FALSE)
-			return;
-
-		$class = 'b8_lexer_' . $this->config['lexer'];
-		$this->_lexer = new $class(
-			array(
-				'min_size' => $this->config['min_size'],
-				'max_size' => $this->config['max_size'],
-				'allow_numbers' => $this->config['allow_numbers']
-			)
-		);
-
-	}
-
-	/**
-	 * Load a class file if a class has not been defined yet.
-	 *
-	 * @access public
-	 * @return boolean Returns TRUE if everything is okay, otherwise FALSE.
-	 */
-
-	public function load_class($class_name, $class_file)
-	{
-
-		if(class_exists($class_name, FALSE) === FALSE) {
-
-			$included = require_once $class_file;
-
-			if($included === FALSE or class_exists($class_name, FALSE) === FALSE)
-				return FALSE;
-
-		}
-
-		return TRUE;
-
-	}
-
-	/**
-	 * Validates the class has all it needs to work.
-	 *
-	 * @access public
-	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
-	 */
-
-	public function validate()
-	{
-
-		if($this->_database === NULL)
-			return self::STARTUP_FAIL_DATABASE;
-
-		# Connect the database backend if we aren't connected yet
-
-		elseif($this->_database->connected === FALSE) {
-
-			$connection = $this->_database->connect();
-
-			if($connection !== TRUE)
-				return $connection;
-
-		}
-
-		if($this->_lexer === NULL)
-			return self::STARTUP_FAIL_LEXER;
-
-		return TRUE;
-
-	}
-
-	/**
-	 * Classifies a text
-	 *
-	 * @access public
-	 * @package default
-	 * @param string $text
-	 * @return float The rating between 0 (ham) and 1 (spam)
-	 */
-
-	public function classify($uid,$text)
-	{
-
-		# Validate the startup
-
-		$started_up = $this->validate();
-
-		if($started_up !== TRUE)
-			return $started_up;
-
-		# Get the internal database variables, containing the number of ham and
-		# spam texts so the spam probability can be calculated in relation to them
-		$internals = $this->_database->get_internals($uid);
-
-		# Calculate the spamminess of all tokens
-
-		# Get all tokens we want to rate
-
-		$tokens = $this->_lexer->get_tokens($text);
-
-		# Check if the lexer failed
-		# (if so, $tokens will be a lexer error code, if not, $tokens will be an array)
-		if(!is_array($tokens))
-			return $tokens;
-
-		# Fetch all availible data for the token set from the database
-		$this->_token_data = $this->_database->get(array_keys($tokens),$uid);
-
-		# Calculate the spamminess and importance for each token (or a degenerated form of it)
-
-		$word_count = array();
-		$rating     = array();
-		$importance = array();
-
-		foreach($tokens as $word => $count) {
-
-			$word_count[$word] = $count;
-
-			# Although we only call this function only here ... let's do the
-			# calculation stuff in a function to make this a bit less confusing ;-)
-			$rating[$word] = $this->_get_probability($word, $internals['texts_ham'], $internals['texts_spam']);
-
-			$importance[$word] = abs(0.5 - $rating[$word]);
-
-		}
-
-		# Order by importance
-		arsort($importance);
-		reset($importance);
-
-		# Get the most interesting tokens (use all if we have less than the given number)
-
-		$relevant = array();
-
-		for($i = 0; $i < $this->config['use_relevant']; $i++) {
-
-			if($tmp = each($importance)) {
-
-				# Important tokens remain
-
-				# If the token's rating is relevant enough, use it
-
-				if(abs(0.5 - $rating[$tmp['key']]) > $this->config['min_dev']) {
-
-					# Tokens that appear more than once also count more than once
-
-					for($x = 0, $l = $word_count[$tmp['key']]; $x < $l; $x++)
-						array_push($relevant, $rating[$tmp['key']]);
-
-				}
-
-			}
-
-			else {
-				# We have less than words to use, so we already
-				# use what we have and can break here
-				break;
-			}
-
-		}
-
-		# Calculate the spamminess of the text (thanks to Mr. Robinson ;-)
-		# We set both hamminess and Spamminess to 1 for the first multiplying
-		$hamminess  = 1;
-		$spamminess = 1;
-
-		# Consider all relevant ratings
-		foreach($relevant as $value) {
-			$hamminess  *= (1.0 - $value);
-			$spamminess *= $value;
-		}
-
-		# If no token was good for calculation, we really don't know how
-		# to rate this text; so we assume a spam and ham probability of 0.5
-
-		if($hamminess === 1 and $spamminess === 1) {
-			$hamminess = 0.5;
-			$spamminess = 0.5;
-			$n = 1;
-		}
-		else {
-			# Get the number of relevant ratings
-			$n = count($relevant);
-		}
-
-		# Calculate the combined rating
-
-		# The actual hamminess and spamminess
-		$hamminess  = 1 - pow($hamminess,  (1 / $n));
-		$spamminess = 1 - pow($spamminess, (1 / $n));
-
-		# Calculate the combined indicator
-		$probability = ($hamminess - $spamminess) / ($hamminess + $spamminess);
-
-		# We want a value between 0 and 1, not between -1 and +1, so ...
-		$probability = (1 + $probability) / 2;
-
-		# Alea iacta est
-		return $probability;
-
-	}
-
-	/**
-	 * Calculate the spamminess of a single token also considering "degenerated" versions
-	 *
-	 * @access private
-	 * @param string $word
-	 * @param string $texts_ham
-	 * @param string $texts_spam
-	 * @return void
-	 */
-
-	private function _get_probability($word, $texts_ham, $texts_spam)
-	{
-
-		# Let's see what we have!
-
-		if(isset($this->_token_data['tokens'][$word]) === TRUE) {
-			# The token was in the database, so we can use it's data as-is
-			# and calculate the spamminess of this token directly
-			return $this->_calc_probability($this->_token_data['tokens'][$word], $texts_ham, $texts_spam);
-		}
-
-		# Damn. The token was not found, so do we have at least similar words?
-
-		if(isset($this->_token_data['degenerates'][$word]) === TRUE) {
-
-			# We found similar words, so calculate the spamminess for each one
-			# and choose the most important one for the further calculation
-
-			# The default rating is 0.5 simply saying nothing
-			$rating = 0.5;
-
-			foreach($this->_token_data['degenerates'][$word] as $degenerate => $count) {
-
-				# Calculate the rating of the current degenerated token
-				$rating_tmp = $this->_calc_probability($count, $texts_ham, $texts_spam);
-
-				# Is it more important than the rating of another degenerated version?
-				if(abs(0.5 - $rating_tmp) > abs(0.5 - $rating))
-					$rating = $rating_tmp;
-
-			}
-
-			return $rating;
-
-		}
-
-		else {
-			# The token is really unknown, so choose the default rating
-			# for completely unknown tokens. This strips down to the
-			# robX parameter so we can cheap out the freaky math ;-)
-			return $this->config['rob_x'];
-		}
-
-	}
-
-	/**
-	 * Do the actual spamminess calculation of a single token
-	 *
-	 * @access private
-	 * @param array $data
-	 * @param string $texts_ham
-	 * @param string $texts_spam
-	 * @return void
-	 */
-
-	private function _calc_probability($data, $texts_ham, $texts_spam)
-	{
-
-		# Calculate the basic probability by Mr. Graham
-
-		# But: consider the number of ham and spam texts saved instead of the
-		# number of entries where the token appeared to calculate a relative
-		# spamminess because we count tokens appearing multiple times not just
-		# once but as often as they appear in the learned texts
-
-		$rel_ham = $data['count_ham'];
-		$rel_spam = $data['count_spam'];
-
-		if($texts_ham > 0)
-			$rel_ham = $data['count_ham'] / $texts_ham;
-
-		if($texts_spam > 0)
-			$rel_spam = $data['count_spam'] / $texts_spam;
-
-		$rating = $rel_spam / ($rel_ham + $rel_spam);
-
-		# Calculate the better probability proposed by Mr. Robinson
-		$all = $data['count_ham'] + $data['count_spam'];
-		return (($this->config['rob_s'] * $this->config['rob_x']) + ($all * $rating)) / ($this->config['rob_s'] + $all);
-
-	}
-
-	/**
-	 * Check the validity of the category of a request
-	 *
-	 * @access private
-	 * @param string $category
-	 * @return void
-	 */
-
-	private function _check_category($category)
-	{
-		return $category === self::HAM or $category === self::SPAM;
-	}
-
-	/**
-	 * Learn a reference text
-	 *
-	 * @access public
-	 * @param string $text
-	 * @param const $category Either b8::SPAM or b8::HAM
-	 * @return void
-	 */
-
-	public function learn($text, $category, $uid)
-	{
-		return $this->_process_text($text, $category, self::LEARN, $uid);
-	}
-
-	/**
-	 * Unlearn a reference text
-	 *
-	 * @access public
-	 * @param string $text
-	 * @param const $category Either b8::SPAM or b8::HAM
-	 * @return void
-	 */
-
-	public function unlearn($text, $category, $uid)
-	{
-		return $this->_process_text($text, $category, self::UNLEARN, $uid);
-	}
-
-	/**
-	 * Does the actual interaction with the storage backend for learning or unlearning texts
-	 *
-	 * @access private
-	 * @param string $text
-	 * @param const $category Either b8::SPAM or b8::HAM
-	 * @param const $action Either b8::LEARN or b8::UNLEARN
-	 * @return void
-	 */
-
-	private function _process_text($text, $category, $action, $uid = 0)
-	{
-
-		# Validate the startup
-
-		$started_up = $this->validate();
-
-		if($started_up !== TRUE)
-			return $started_up;
-
-		# Look if the request is okay
-		if($this->_check_category($category) === FALSE)
-			return self::TRAINER_CATEGORY_FAIL;
-
-		# Get all tokens from $text
-
-		$tokens = $this->_lexer->get_tokens($text);
-
-		# Check if the lexer failed
-		# (if so, $tokens will be a lexer error code, if not, $tokens will be an array)
-		if(!is_array($tokens))
-			return $tokens;
-
-		# Pass the tokens and what to do with it to the storage backend
-		return $this->_database->process_text($tokens, $category, $action, $uid);
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/library/spam/b8/b8.php.ORIG b/library/spam/b8/b8.php.ORIG
deleted file mode 100644
index ea1e15ffa..000000000
--- a/library/spam/b8/b8.php.ORIG
+++ /dev/null
@@ -1,503 +0,0 @@
-
-#
-#   b8 - A Bayesian spam filter written in PHP 5
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * Copyright (C) 2006-2010 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Tobias Leupold
- * @author Oliver Lillie (aka buggedcom) (original PHP 5 port)
- */
-
-class b8
-{
-
-	public $config = array(
-		'min_size'      => 3,
-		'max_size'      => 30,
-		'allow_numbers' => FALSE,
-		'lexer'         => 'default',
-		'degenerator'   => 'default',
-		'storage'       => 'dba',
-		'use_relevant'  => 15,
-		'min_dev'       => 0.2,
-		'rob_s'         => 0.3,
-		'rob_x'         => 0.5
-	);
-
-	private $_lexer      = NULL;
-	private $_database   = NULL;
-	private $_token_data = NULL;
-
-	const SPAM    = 'spam';
-	const HAM     = 'ham';
-	const LEARN   = 'learn';
-	const UNLEARN = 'unlearn';
-
-	const STARTUP_FAIL_DATABASE = 'STARTUP_FAIL_DATABASE';
-	const STARTUP_FAIL_LEXER    = 'STARTUP_FAIL_LEXER';
-	const TRAINER_CATEGORY_FAIL = 'TRAINER_CATEGORY_FAIL';
-
-	/**
-	 * Constructs b8
-	 *
-	 * @access public
-	 * @return void
-	 */
-
-	function __construct($config = array(), $database_config)
-	{
-
-		# Validate config data
-
-		if(count($config) > 0) {
-
-			foreach ($config as $name=>$value) {
-
-				switch($name) {
-
-					case 'min_dev':
-					case 'rob_s':
-					case 'rob_x':
-						$this->config[$name] = (float) $value;
-						break;
-
-					case 'min_size':
-					case 'max_size':
-					case 'use_relevant':
-						$this->config[$name] = (int) $value;
-						break;
-
-					case 'allow_numbers':
-						$this->config[$name] = (bool) $value;
-						break;
-
-					case 'lexer':
-						$value = (string) strtolower($value);
-						$this->config[$name] = is_file(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lexer' . DIRECTORY_SEPARATOR . "lexer_" . $value . '.php') === TRUE ? $value : 'default';
-						break;
-
-					case 'storage':
-						$this->config[$name] = (string) $value;
-						break;
-
-				}
-
-			}
-
-		}
-
-		# Setup the database backend
-
-		# Get the basic storage class used by all backends
-		if($this->load_class('b8_storage_base', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'storage_base.php') === FALSE)
-			return;
-
-		# Get the degenerator we need
-		if($this->load_class('b8_degenerator_' . $this->config['degenerator'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'degenerator' . DIRECTORY_SEPARATOR . 'degenerator_' . $this->config['degenerator'] . '.php') === FALSE)
-			return;
-
-		# Get the actual storage backend we need
-		if($this->load_class('b8_storage_' . $this->config['storage'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'storage_' . $this->config['storage'] . '.php') === FALSE)
-			return;
-
-		# Setup the backend
-		$class = 'b8_storage_' . $this->config['storage'];
-		$this->_database = new $class(
-			$database_config,
-			$this->config['degenerator'], date('ymd')
-		);
-
-		# Setup the lexer class
-
-		if($this->load_class('b8_lexer_' . $this->config['lexer'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lexer' . DIRECTORY_SEPARATOR . 'lexer_' . $this->config['lexer'] . '.php') === FALSE)
-			return;
-
-		$class = 'b8_lexer_' . $this->config['lexer'];
-		$this->_lexer = new $class(
-			array(
-				'min_size' => $this->config['min_size'],
-				'max_size' => $this->config['max_size'],
-				'allow_numbers' => $this->config['allow_numbers']
-			)
-		);
-
-	}
-
-	/**
-	 * Load a class file if a class has not been defined yet.
-	 *
-	 * @access public
-	 * @return boolean Returns TRUE if everything is okay, otherwise FALSE.
-	 */
-
-	public function load_class($class_name, $class_file)
-	{
-
-		if(class_exists($class_name, FALSE) === FALSE) {
-
-			$included = require_once $class_file;
-
-			if($included === FALSE or class_exists($class_name, FALSE) === FALSE)
-				return FALSE;
-
-		}
-
-		return TRUE;
-
-	}
-
-	/**
-	 * Validates the class has all it needs to work.
-	 *
-	 * @access public
-	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
-	 */
-
-	public function validate()
-	{
-
-		if($this->_database === NULL)
-			return self::STARTUP_FAIL_DATABASE;
-
-		# Connect the database backend if we aren't connected yet
-
-		elseif($this->_database->connected === FALSE) {
-
-			$connection = $this->_database->connect();
-
-			if($connection !== TRUE)
-				return $connection;
-
-		}
-
-		if($this->_lexer === NULL)
-			return self::STARTUP_FAIL_LEXER;
-
-		return TRUE;
-
-	}
-
-	/**
-	 * Classifies a text
-	 *
-	 * @access public
-	 * @package default
-	 * @param string $text
-	 * @return float The rating between 0 (ham) and 1 (spam)
-	 */
-
-	public function classify($text)
-	{
-
-		# Validate the startup
-
-		$started_up = $this->validate();
-
-		if($started_up !== TRUE)
-			return $started_up;
-
-		# Get the internal database variables, containing the number of ham and
-		# spam texts so the spam probability can be calculated in relation to them
-		$internals = $this->_database->get_internals();
-
-		# Calculate the spamminess of all tokens
-
-		# Get all tokens we want to rate
-
-		$tokens = $this->_lexer->get_tokens($text);
-
-		# Check if the lexer failed
-		# (if so, $tokens will be a lexer error code, if not, $tokens will be an array)
-		if(!is_array($tokens))
-			return $tokens;
-
-		# Fetch all availible data for the token set from the database
-		$this->_token_data = $this->_database->get(array_keys($tokens));
-
-		# Calculate the spamminess and importance for each token (or a degenerated form of it)
-
-		$word_count = array();
-		$rating     = array();
-		$importance = array();
-
-		foreach($tokens as $word => $count) {
-
-			$word_count[$word] = $count;
-
-			# Although we only call this function only here ... let's do the
-			# calculation stuff in a function to make this a bit less confusing ;-)
-			$rating[$word] = $this->_get_probability($word, $internals['texts_ham'], $internals['texts_spam']);
-
-			$importance[$word] = abs(0.5 - $rating[$word]);
-
-		}
-
-		# Order by importance
-		arsort($importance);
-		reset($importance);
-
-		# Get the most interesting tokens (use all if we have less than the given number)
-
-		$relevant = array();
-
-		for($i = 0; $i < $this->config['use_relevant']; $i++) {
-
-			if($tmp = each($importance)) {
-
-				# Important tokens remain
-
-				# If the token's rating is relevant enough, use it
-
-				if(abs(0.5 - $rating[$tmp['key']]) > $this->config['min_dev']) {
-
-					# Tokens that appear more than once also count more than once
-
-					for($x = 0, $l = $word_count[$tmp['key']]; $x < $l; $x++)
-						array_push($relevant, $rating[$tmp['key']]);
-
-				}
-
-			}
-
-			else {
-				# We have less than words to use, so we already
-				# use what we have and can break here
-				break;
-			}
-
-		}
-
-		# Calculate the spamminess of the text (thanks to Mr. Robinson ;-)
-		# We set both hamminess and Spamminess to 1 for the first multiplying
-		$hamminess  = 1;
-		$spamminess = 1;
-
-		# Consider all relevant ratings
-		foreach($relevant as $value) {
-			$hamminess  *= (1.0 - $value);
-			$spamminess *= $value;
-		}
-
-		# If no token was good for calculation, we really don't know how
-		# to rate this text; so we assume a spam and ham probability of 0.5
-
-		if($hamminess === 1 and $spamminess === 1) {
-			$hamminess = 0.5;
-			$spamminess = 0.5;
-			$n = 1;
-		}
-		else {
-			# Get the number of relevant ratings
-			$n = count($relevant);
-		}
-
-		# Calculate the combined rating
-
-		# The actual hamminess and spamminess
-		$hamminess  = 1 - pow($hamminess,  (1 / $n));
-		$spamminess = 1 - pow($spamminess, (1 / $n));
-
-		# Calculate the combined indicator
-		$probability = ($hamminess - $spamminess) / ($hamminess + $spamminess);
-
-		# We want a value between 0 and 1, not between -1 and +1, so ...
-		$probability = (1 + $probability) / 2;
-
-		# Alea iacta est
-		return $probability;
-
-	}
-
-	/**
-	 * Calculate the spamminess of a single token also considering "degenerated" versions
-	 *
-	 * @access private
-	 * @param string $word
-	 * @param string $texts_ham
-	 * @param string $texts_spam
-	 * @return void
-	 */
-
-	private function _get_probability($word, $texts_ham, $texts_spam)
-	{
-
-		# Let's see what we have!
-
-		if(isset($this->_token_data['tokens'][$word]) === TRUE) {
-			# The token was in the database, so we can use it's data as-is
-			# and calculate the spamminess of this token directly
-			return $this->_calc_probability($this->_token_data['tokens'][$word], $texts_ham, $texts_spam);
-		}
-
-		# Damn. The token was not found, so do we have at least similar words?
-
-		if(isset($this->_token_data['degenerates'][$word]) === TRUE) {
-
-			# We found similar words, so calculate the spamminess for each one
-			# and choose the most important one for the further calculation
-
-			# The default rating is 0.5 simply saying nothing
-			$rating = 0.5;
-
-			foreach($this->_token_data['degenerates'][$word] as $degenerate => $count) {
-
-				# Calculate the rating of the current degenerated token
-				$rating_tmp = $this->_calc_probability($count, $texts_ham, $texts_spam);
-
-				# Is it more important than the rating of another degenerated version?
-				if(abs(0.5 - $rating_tmp) > abs(0.5 - $rating))
-					$rating = $rating_tmp;
-
-			}
-
-			return $rating;
-
-		}
-
-		else {
-			# The token is really unknown, so choose the default rating
-			# for completely unknown tokens. This strips down to the
-			# robX parameter so we can cheap out the freaky math ;-)
-			return $this->config['rob_x'];
-		}
-
-	}
-
-	/**
-	 * Do the actual spamminess calculation of a single token
-	 *
-	 * @access private
-	 * @param array $data
-	 * @param string $texts_ham
-	 * @param string $texts_spam
-	 * @return void
-	 */
-
-	private function _calc_probability($data, $texts_ham, $texts_spam)
-	{
-
-		# Calculate the basic probability by Mr. Graham
-
-		# But: consider the number of ham and spam texts saved instead of the
-		# number of entries where the token appeared to calculate a relative
-		# spamminess because we count tokens appearing multiple times not just
-		# once but as often as they appear in the learned texts
-
-		$rel_ham = $data['count_ham'];
-		$rel_spam = $data['count_spam'];
-
-		if($texts_ham > 0)
-			$rel_ham = $data['count_ham'] / $texts_ham;
-
-		if($texts_spam > 0)
-			$rel_spam = $data['count_spam'] / $texts_spam;
-
-		$rating = $rel_spam / ($rel_ham + $rel_spam);
-
-		# Calculate the better probability proposed by Mr. Robinson
-		$all = $data['count_ham'] + $data['count_spam'];
-		return (($this->config['rob_s'] * $this->config['rob_x']) + ($all * $rating)) / ($this->config['rob_s'] + $all);
-
-	}
-
-	/**
-	 * Check the validity of the category of a request
-	 *
-	 * @access private
-	 * @param string $category
-	 * @return void
-	 */
-
-	private function _check_category($category)
-	{
-		return $category === self::HAM or $category === self::SPAM;
-	}
-
-	/**
-	 * Learn a reference text
-	 *
-	 * @access public
-	 * @param string $text
-	 * @param const $category Either b8::SPAM or b8::HAM
-	 * @return void
-	 */
-
-	public function learn($text, $category)
-	{
-		return $this->_process_text($text, $category, self::LEARN);
-	}
-
-	/**
-	 * Unlearn a reference text
-	 *
-	 * @access public
-	 * @param string $text
-	 * @param const $category Either b8::SPAM or b8::HAM
-	 * @return void
-	 */
-
-	public function unlearn($text, $category)
-	{
-		return $this->_process_text($text, $category, self::UNLEARN);
-	}
-
-	/**
-	 * Does the actual interaction with the storage backend for learning or unlearning texts
-	 *
-	 * @access private
-	 * @param string $text
-	 * @param const $category Either b8::SPAM or b8::HAM
-	 * @param const $action Either b8::LEARN or b8::UNLEARN
-	 * @return void
-	 */
-
-	private function _process_text($text, $category, $action)
-	{
-
-		# Validate the startup
-
-		$started_up = $this->validate();
-
-		if($started_up !== TRUE)
-			return $started_up;
-
-		# Look if the request is okay
-		if($this->_check_category($category) === FALSE)
-			return self::TRAINER_CATEGORY_FAIL;
-
-		# Get all tokens from $text
-
-		$tokens = $this->_lexer->get_tokens($text);
-
-		# Check if the lexer failed
-		# (if so, $tokens will be a lexer error code, if not, $tokens will be an array)
-		if(!is_array($tokens))
-			return $tokens;
-
-		# Pass the tokens and what to do with it to the storage backend
-		return $this->_database->process_text($tokens, $category, $action);
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/library/spam/b8/degenerator/degenerator_default.php b/library/spam/b8/degenerator/degenerator_default.php
deleted file mode 100644
index 4ff6d882b..000000000
--- a/library/spam/b8/degenerator/degenerator_default.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * Copyright (C) 2006-2010 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Tobias Leupold
- */
-
-class b8_degenerator_default
-{
-
-	public $degenerates = array();
-
-	/**
-	 * Generates a list of "degenerated" words for a list of words.
-	 *
-	 * @access public
-	 * @param array $tokens
-	 * @return array An array containing an array of degenerated tokens for each token
-	 */
-
-	public function degenerate(array $words)
-	{
-
-		$degenerates = array();
-
-		foreach($words as $word)
-			$degenerates[$word] = $this->_degenerate_word($word);
-
-		return $degenerates;
-
-	}
-
-	/**
-	 * If the original word is not found in the database then
-	 * we build "degenerated" versions of the word to lookup.
-	 *
-	 * @access private
-	 * @param string $word
-	 * @return array An array of degenerated words
-	 */
-
-	protected function _degenerate_word($word)
-	{
-
-		# Check for any stored words so the process doesn't have to repeat
-		if(isset($this->degenerates[$word]) === TRUE)
-			return $this->degenerates[$word];
-
-		$degenerate = array();
-
-		# Add different version of upper and lower case and ucfirst
-		array_push($degenerate, strtolower($word));
-		array_push($degenerate, strtoupper($word));
-		array_push($degenerate, ucfirst($word));
-
-		# Degenerate all versions
-
-		foreach($degenerate as $alt_word) {
-
-			# Look for stuff like !!! and ???
-
-			if(preg_match('/[!?]$/', $alt_word) > 0) {
-
-				# Add versions with different !s and ?s
-
-				if(preg_match('/[!?]{2,}$/', $alt_word) > 0) {
-					$tmp = preg_replace('/([!?])+$/', '$1', $alt_word);
-					array_push($degenerate, $tmp);
-				}
-
-				$tmp = preg_replace('/([!?])+$/', '', $alt_word);
-				array_push($degenerate, $tmp);
-
-			}
-
-			# Look for ... at the end of the word
-
-			$alt_word_int = $alt_word;
-
-			while(preg_match('/[\.]$/', $alt_word_int) > 0) {
-				$alt_word_int = substr($alt_word_int, 0, strlen($alt_word_int) - 1);
-				array_push($degenerate, $alt_word_int);
-			}
-
-		}
-
-		# Some degenerates are the same as the original word. These don't have
-		# to be fetched, so we create a new array with only new tokens
-
-		$real_degenerate = array();
-
-		foreach($degenerate as $deg_word) {
-			if($word != $deg_word)
-				array_push($real_degenerate, $deg_word);
-		}
-
-		# Store the list of degenerates for the token
-		$this->degenerates[$word] = $real_degenerate;
-
-		return $real_degenerate;
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/library/spam/b8/lexer/lexer_default.php b/library/spam/b8/lexer/lexer_default.php
deleted file mode 100644
index 7b5ca22bf..000000000
--- a/library/spam/b8/lexer/lexer_default.php
+++ /dev/null
@@ -1,205 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * Copyright (C) 2006-2010 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Tobias Leupold
- * @author Oliver Lillie (aka buggedcom) (original PHP 5 port)
- */
-
-class b8_lexer_default
-{
-
-	const LEXER_TEXT_NOT_STRING = 'LEXER_TEXT_NOT_STRING';
-	const LEXER_TEXT_EMPTY      = 'LEXER_TEXT_EMPTY';
-
-	public $config = NULL;
-
-	# The regular expressions we use to split the text to tokens
-
-	public $regexp = array(
-		'ip'        => '/([A-Za-z0-9\_\-\.]+)/',
-		'raw_split' => '/[\s,\.\/"\:;\|<>\-_\[\]{}\+=\)\(\*\&\^%]+/',
-		'html'      => '/(<.+?>)/',
-		'tagname'   => '/(.+?)\s/',
-		'numbers'   => '/^[0-9]+$/'
-	);
-
-	/**
-	 * Constructs the lexer.
-	 *
-	 * @access public
-	 * @return void
-	 */
-
-	function __construct($config)
-	{
-		$this->config = $config;
-	}
-
-	/**
-	 * Generates the tokens required for the bayesian filter.
-	 *
-	 * @access public
-	 * @param string $text
-	 * @return array Returns the list of tokens
-	 */
-
-	public function get_tokens($text)
-	{
-
-		# Check that we actually have a string ...
-		if(is_string($text) === FALSE)
-			return self::LEXER_TEXT_NOT_STRING;
-
-		# ... and that it's not empty
-		if(empty($text) === TRUE)
-			return self::LEXER_TEXT_EMPTY;
-
-		# Re-convert the text to the original characters coded in UTF-8, as
-		# they have been coded in html entities during the post process
-		$text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
-
-		$tokens = array();
-
-		# Find URLs and IP addresses
-
-		preg_match_all($this->regexp['ip'], $text, $raw_tokens);
-
-		foreach($raw_tokens[1] as $word) {
-
-			# Check for a dot
-			if(strpos($word, '.') === FALSE)
-				continue;
-
-			# Check that the word is valid, min and max sizes, etc.
-			if($this->_is_valid($word) === FALSE)
-				continue;
-
-			if(isset($tokens[$word]) === FALSE)
-				$tokens[$word] = 1;
-			else
-				$tokens[$word] += 1;
-
-			# Delete the word from the text so it doesn't get re-added.
-			$text = str_replace($word, '', $text);
-
-			# Also process the parts of the URLs
-			$url_parts = preg_split($this->regexp['raw_split'], $word);
-
-			foreach($url_parts as $word) {
-
-				# Again validate the part
-
-				if($this->_is_valid($word) === FALSE)
-					continue;
-
-				if(isset($tokens[$word]) === FALSE)
-					$tokens[$word] = 1;
-				else
-					$tokens[$word] += 1;
-
-			}
-
-		}
-
-		# Split the remaining text
-
-		$raw_tokens = preg_split($this->regexp['raw_split'], $text);
-
-		foreach($raw_tokens as $word) {
-
-			# Again validate the part
-
-			if($this->_is_valid($word) === FALSE)
-				continue;
-
-			if(isset($tokens[$word]) === FALSE)
-				$tokens[$word] = 1;
-			else
-				$tokens[$word] += 1;
-
-		}
-
-		# Process the HTML
-
-		preg_match_all($this->regexp['html'], $text, $raw_tokens);
-
-		foreach($raw_tokens[1] as $word) {
-
-			# Again validate the part
-
-			if($this->_is_valid($word) === FALSE)
-				continue;
-
-			# If the tag has parameters, just use the tag itself
-
-			if(strpos($word, ' ') !== FALSE) {
-				preg_match($this->regexp['tagname'], $word, $tmp);
-				$word = "{$tmp[1]}...>";
-			}
-
-			if(isset($tokens[$word]) === FALSE)
-				$tokens[$word] = 1;
-			else
-				$tokens[$word] += 1;
-
-		}
-
-		# Return a list of all found tokens
-		return $tokens;
-
-	}
-
-	/**
-	 * Validates a token.
-	 *
-	 * @access private
-	 * @param string $token The token string.
-	 * @return boolean Returns TRUE if the token is valid, otherwise returns FALSE
-	 */
-
-	private function _is_valid($token)
-	{
-
-		# Validate the size of the token
-
-		$len = strlen($token);
-
-		if($len < $this->config['min_size'] or $len > $this->config['max_size'])
-			return FALSE;
-
-		# We may want to exclude pure numbers
-		if($this->config['allow_numbers'] === FALSE) {
-			if(preg_match($this->regexp['numbers'], $token) > 0)
-				return FALSE;
-		}
-
-		# Token is okay
-		return TRUE;
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/library/spam/b8/storage/storage_base.php b/library/spam/b8/storage/storage_base.php
deleted file mode 100644
index 6b181ee96..000000000
--- a/library/spam/b8/storage/storage_base.php
+++ /dev/null
@@ -1,396 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * Functions used by all storage backends
- * Copyright (C) 2010 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Tobias Leupold
- */
-
-abstract class b8_storage_base
-{
-
-	public $connected            = FALSE;
-
-	protected $_degenerator      = NULL;
-
-	const INTERNALS_TEXTS_HAM    = 'bayes*texts.ham';
-	const INTERNALS_TEXTS_SPAM   = 'bayes*texts.spam';
-	const INTERNALS_DBVERSION    = 'bayes*dbversion';
-
-	const BACKEND_NOT_CONNECTED  = 'BACKEND_NOT_CONNECTED';
-	const DATABASE_WRONG_VERSION = 'DATABASE_WRONG_VERSION';
-	const DATABASE_NOT_B8        = 'DATABASE_NOT_B8';
-
-	/**
-	 * Validates the class has all it needs to work.
-	 *
-	 * @access protected
-	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
-	 */
-
-	protected function validate()
-	{
-
-		# We set up the degenerator here, as we would have to duplicate code if it
-		# was done in the constructor of the respective storage backend.
-		$class = 'b8_degenerator_' . $this->b8_config['degenerator'];
-		$this->_degenerator = new $class();
-
-		if($this->connected !== TRUE)
-			return self::BACKEND_NOT_CONNECTED;
-
-		return TRUE;
-
-	}
-
-	/**
-	 * Checks if a b8 database is used and if it's version is okay
-	 *
-	 * @access protected
-	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
-	 */
-
-	protected function check_database($uid)
-	{
-
-		$internals = $this->get_internals($uid);
-
-		if(isset($internals['dbversion'])) {
-			if($internals['dbversion'] == "2") {
-				return TRUE;
-			}
-			else {
-				$this->connected = FALSE;
-				return self::DATABASE_WRONG_VERSION;
-			}
-		}
-		else {
-			$this->connected = FALSE;
-			return self::DATABASE_NOT_B8;
-		}
-
-	}
-
-	/**
-	 * Parses the "count" data of a token.
-	 *
-	 * @access private
-	 * @param string $data
-	 * @return array Returns an array of the parsed data: array(count_ham, count_spam, lastseen).
-	 */
-
-	private function _parse_count($data)
-	{
-
-		list($count_ham, $count_spam, $lastseen) = explode(' ', $data);
-
-		$count_ham  = (int) $count_ham;
-		$count_spam = (int) $count_spam;
-
-		return array(
-			'count_ham'  => $count_ham,
-			'count_spam' => $count_spam
-		);
-
-	}
-
-	/**
-	 * Get the database's internal variables.
-	 *
-	 * @access public
-	 * @return array Returns an array of all internals.
-	 */
-
-	public function get_internals($uid)
-	{
-
-		$internals = $this->_get_query(
-			array(
-				self::INTERNALS_TEXTS_HAM,
-				self::INTERNALS_TEXTS_SPAM,
-				self::INTERNALS_DBVERSION
-			),
-			$uid
-		);
-
-		return array(
-			'texts_ham'  => (int) $internals[self::INTERNALS_TEXTS_HAM],
-			'texts_spam' => (int) $internals[self::INTERNALS_TEXTS_SPAM],
-			'dbversion'  => (int) $internals[self::INTERNALS_DBVERSION]
-		);
-
-	}
-
-	/**
-	 * Get all data about a list of tags from the database.
-	 *
-	 * @access public
-	 * @param array $tokens
-	 * @return mixed Returns FALSE on failure, otherwise returns array of returned data in the format array('tokens' => array(token => count), 'degenerates' => array(token => array(degenerate => count))).
-	 */
-
-	public function get($tokens, $uid)
-	{
-
-		# Validate the startup
-
-		$started_up = $this->validate();
-
-		if($started_up !== TRUE)
-			return $started_up;
-
-		# First we see what we have in the database.
-		$token_data = $this->_get_query($tokens, $uid);
-
-		# Check if we have to degenerate some tokens
-
-		$missing_tokens = array();
-
-		foreach($tokens as $token) {
-			if(!isset($token_data[$token]))
-				$missing_tokens[] = $token;
-		}
-
-		if(count($missing_tokens) > 0) {
-
-			# We have to degenerate some tokens
-			$degenerates_list = array();
-
-			# Generate a list of degenerated tokens for the missing tokens ...
-			$degenerates = $this->_degenerator->degenerate($missing_tokens);
-
-			# ... and look them up
-
-			foreach($degenerates as $token => $token_degenerates)
-				$degenerates_list = array_merge($degenerates_list, $token_degenerates);
-
-			$token_data = array_merge($token_data, $this->_get_query($degenerates_list));
-
-		}
-
-		# Here, we have all availible data in $token_data.
-
-		$return_data_tokens = array();
-		$return_data_degenerates = array();
-
-		foreach($tokens as $token) {
-
-			if(isset($token_data[$token]) === TRUE) {
-
-				# The token was found in the database
-
-				# Add the data ...
-				$return_data_tokens[$token] = $this->_parse_count($token_data[$token]);
-
-				# ... and update it's lastseen parameter
-				$this->_update($token, "{$return_data_tokens[$token]['count_ham']} {$return_data_tokens[$token]['count_spam']} " . $this->b8_config['today'], $uid );
-
-			}
-
-			else {
-
-				# The token was not found, so we look if we
-				# can return data for degenerated tokens
-
-				# Check all degenerated forms of the token
-
-				foreach($this->_degenerator->degenerates[$token] as $degenerate) {
-
-					if(isset($token_data[$degenerate]) === TRUE) {
-
-						# A degeneration of the token way found in the database
-
-						# Add the data ...
-						$return_data_degenerates[$token][$degenerate] = $this->_parse_count($token_data[$degenerate]);
-
-						# ... and update it's lastseen parameter
-						$this->_update($degenerate, "{$return_data_degenerates[$token][$degenerate]['count_ham']} {$return_data_degenerates[$token][$degenerate]['count_spam']} " . $this->b8_config['today'], $uid);
-
-					}
-
-				}
-
-			}
-
-		}
-
-		# Now, all token data directly found in the database is in $return_data_tokens
-		# and all data for degenerated versions is in $return_data_degenerates
-
-		# First, we commit the changes to the lastseen parameters
-		$this->_commit();
-
-		# Then, we return what we have
-		return array(
-			'tokens'      => $return_data_tokens,
-			'degenerates' => $return_data_degenerates
-		);
-
-	}
-
-	/**
-	 * Stores or deletes a list of tokens from the given category.
-	 *
-	 * @access public
-	 * @param array $tokens
-	 * @param const $category Either b8::HAM or b8::SPAM
-	 * @param const $action Either b8::LEARN or b8::UNLEARN
-	 * @return void
-	 */
-
-	public function process_text($tokens, $category, $action, $uid)
-	{
-
-		# Validate the startup
-
-		$started_up = $this->validate();
-
-		if($started_up !== TRUE)
-			return $started_up;
-
-		# No matter what we do, we first have to check what data we have.
-
-		# First get the internals, including the ham texts and spam texts counter
-		$internals = $this->get_internals($uid);
-
-		# Then, fetch all data for all tokens we have (and update their lastseen parameters)
-		$token_data = $this->_get_query(array_keys($tokens), $uid);
-
-		# Process all tokens to learn/unlearn
-
-		foreach($tokens as $token => $count) {
-
-			if(isset($token_data[$token])) {
-
-				# We already have this token, so update it's data
-
-				# Get the existing data
-				list($count_ham, $count_spam, $lastseen) = explode(' ', $token_data[$token]);
-				$count_ham  = (int) $count_ham;
-				$count_spam = (int) $count_spam;
-
-				# Increase or decrease the right counter
-
-				if($action === b8::LEARN) {
-					if($category === b8::HAM)
-						$count_ham += $count;
-					elseif($category === b8::SPAM)
-						$count_spam += $count;
-				}
-
-				elseif($action == b8::UNLEARN) {
-					if($category === b8::HAM)
-						$count_ham -= $count;
-					elseif($category === b8::SPAM)
-						$count_spam -= $count;
-				}
-
-				# We don't want to have negative values
-
-				if($count_ham < 0)
-					$count_ham = 0;
-
-				if($count_spam < 0)
-					$count_spam = 0;
-
-				# Now let's see if we have to update or delete the token
-				if($count_ham !== 0 or $count_spam !== 0)
-					$this->_update($token, "$count_ham $count_spam " . $this->b8_config['today'], $uid);
-				else
-					$this->_del($token, $uid);
-
-			}
-
-			else {
-
-				# We don't have the token. If we unlearn a text, we can't delete it
-				# as we don't have it anyway, so just do something if we learn a text
-
-				if($action === b8::LEARN) {
-
-					if($category === b8::HAM)
-						$data = '1 0 ';
-					elseif($category === b8::SPAM)
-						$data = '0 1 ';
-
-					$data .= $this->b8_config['today'];
-
-					$this->_put($token, $data, $uid);
-
-				}
-
-			}
-
-		}
-
-		# Now, all token have been processed, so let's update the right text
-
-		if($action === b8::LEARN) {
-
-			if($category === b8::HAM) {
-				$internals['texts_ham']++;
-				$this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham'], $uid);
-			}
-
-			elseif($category === b8::SPAM) {
-				$internals['texts_spam']++;
-				$this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam'], $uid);
-			}
-
-		}
-
-		elseif($action == b8::UNLEARN) {
-
-			if($category === b8::HAM) {
-
-				$internals['texts_ham']--;
-
-				if($internals['texts_ham'] < 0)
-					$internals['texts_ham'] = 0;
-
-				$this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham'], $uid);
-
-			}
-
-			elseif($category === b8::SPAM) {
-
-				$internals['texts_spam']--;
-
-				if($internals['texts_spam'] < 0)
-					$internals['texts_spam'] = 0;
-
-				$this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam'], $uid);
-
-			}
-
-		}
-
-		# We're done and can commit all changes to the database now
-		$this->_commit($uid);
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/library/spam/b8/storage/storage_base.php.ORIG b/library/spam/b8/storage/storage_base.php.ORIG
deleted file mode 100644
index 01f5a69d7..000000000
--- a/library/spam/b8/storage/storage_base.php.ORIG
+++ /dev/null
@@ -1,395 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * Functions used by all storage backends
- * Copyright (C) 2010 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Tobias Leupold
- */
-
-abstract class b8_storage_base
-{
-
-	public $connected            = FALSE;
-
-	protected $_degenerator      = NULL;
-
-	const INTERNALS_TEXTS_HAM    = 'bayes*texts.ham';
-	const INTERNALS_TEXTS_SPAM   = 'bayes*texts.spam';
-	const INTERNALS_DBVERSION    = 'bayes*dbversion';
-
-	const BACKEND_NOT_CONNECTED  = 'BACKEND_NOT_CONNECTED';
-	const DATABASE_WRONG_VERSION = 'DATABASE_WRONG_VERSION';
-	const DATABASE_NOT_B8        = 'DATABASE_NOT_B8';
-
-	/**
-	 * Validates the class has all it needs to work.
-	 *
-	 * @access protected
-	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
-	 */
-
-	protected function validate()
-	{
-
-		# We set up the degenerator here, as we would have to duplicate code if it
-		# was done in the constructor of the respective storage backend.
-		$class = 'b8_degenerator_' . $this->b8_config['degenerator'];
-		$this->_degenerator = new $class();
-
-		if($this->connected !== TRUE)
-			return self::BACKEND_NOT_CONNECTED;
-
-		return TRUE;
-
-	}
-
-	/**
-	 * Checks if a b8 database is used and if it's version is okay
-	 *
-	 * @access protected
-	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
-	 */
-
-	protected function check_database()
-	{
-
-		$internals = $this->get_internals();
-
-		if(isset($internals['dbversion'])) {
-			if($internals['dbversion'] == "2") {
-				return TRUE;
-			}
-			else {
-				$this->connected = FALSE;
-				return self::DATABASE_WRONG_VERSION;
-			}
-		}
-		else {
-			$this->connected = FALSE;
-			return self::DATABASE_NOT_B8;
-		}
-
-	}
-
-	/**
-	 * Parses the "count" data of a token.
-	 *
-	 * @access private
-	 * @param string $data
-	 * @return array Returns an array of the parsed data: array(count_ham, count_spam, lastseen).
-	 */
-
-	private function _parse_count($data)
-	{
-
-		list($count_ham, $count_spam, $lastseen) = explode(' ', $data);
-
-		$count_ham  = (int) $count_ham;
-		$count_spam = (int) $count_spam;
-
-		return array(
-			'count_ham'  => $count_ham,
-			'count_spam' => $count_spam
-		);
-
-	}
-
-	/**
-	 * Get the database's internal variables.
-	 *
-	 * @access public
-	 * @return array Returns an array of all internals.
-	 */
-
-	public function get_internals()
-	{
-
-		$internals = $this->_get_query(
-			array(
-				self::INTERNALS_TEXTS_HAM,
-				self::INTERNALS_TEXTS_SPAM,
-				self::INTERNALS_DBVERSION
-			)
-		);
-
-		return array(
-			'texts_ham'  => (int) $internals[self::INTERNALS_TEXTS_HAM],
-			'texts_spam' => (int) $internals[self::INTERNALS_TEXTS_SPAM],
-			'dbversion'  => (int) $internals[self::INTERNALS_DBVERSION]
-		);
-
-	}
-
-	/**
-	 * Get all data about a list of tags from the database.
-	 *
-	 * @access public
-	 * @param array $tokens
-	 * @return mixed Returns FALSE on failure, otherwise returns array of returned data in the format array('tokens' => array(token => count), 'degenerates' => array(token => array(degenerate => count))).
-	 */
-
-	public function get($tokens)
-	{
-
-		# Validate the startup
-
-		$started_up = $this->validate();
-
-		if($started_up !== TRUE)
-			return $started_up;
-
-		# First we see what we have in the database.
-		$token_data = $this->_get_query($tokens);
-
-		# Check if we have to degenerate some tokens
-
-		$missing_tokens = array();
-
-		foreach($tokens as $token) {
-			if(!isset($token_data[$token]))
-				$missing_tokens[] = $token;
-		}
-
-		if(count($missing_tokens) > 0) {
-
-			# We have to degenerate some tokens
-			$degenerates_list = array();
-
-			# Generate a list of degenerated tokens for the missing tokens ...
-			$degenerates = $this->_degenerator->degenerate($missing_tokens);
-
-			# ... and look them up
-
-			foreach($degenerates as $token => $token_degenerates)
-				$degenerates_list = array_merge($degenerates_list, $token_degenerates);
-
-			$token_data = array_merge($token_data, $this->_get_query($degenerates_list));
-
-		}
-
-		# Here, we have all availible data in $token_data.
-
-		$return_data_tokens = array();
-		$return_data_degenerates = array();
-
-		foreach($tokens as $token) {
-
-			if(isset($token_data[$token]) === TRUE) {
-
-				# The token was found in the database
-
-				# Add the data ...
-				$return_data_tokens[$token] = $this->_parse_count($token_data[$token]);
-
-				# ... and update it's lastseen parameter
-				$this->_update($token, "{$return_data_tokens[$token]['count_ham']} {$return_data_tokens[$token]['count_spam']} " . $this->b8_config['today']);
-
-			}
-
-			else {
-
-				# The token was not found, so we look if we
-				# can return data for degenerated tokens
-
-				# Check all degenerated forms of the token
-
-				foreach($this->_degenerator->degenerates[$token] as $degenerate) {
-
-					if(isset($token_data[$degenerate]) === TRUE) {
-
-						# A degeneration of the token way found in the database
-
-						# Add the data ...
-						$return_data_degenerates[$token][$degenerate] = $this->_parse_count($token_data[$degenerate]);
-
-						# ... and update it's lastseen parameter
-						$this->_update($degenerate, "{$return_data_degenerates[$token][$degenerate]['count_ham']} {$return_data_degenerates[$token][$degenerate]['count_spam']} " . $this->b8_config['today']);
-
-					}
-
-				}
-
-			}
-
-		}
-
-		# Now, all token data directly found in the database is in $return_data_tokens
-		# and all data for degenerated versions is in $return_data_degenerates
-
-		# First, we commit the changes to the lastseen parameters
-		$this->_commit();
-
-		# Then, we return what we have
-		return array(
-			'tokens'      => $return_data_tokens,
-			'degenerates' => $return_data_degenerates
-		);
-
-	}
-
-	/**
-	 * Stores or deletes a list of tokens from the given category.
-	 *
-	 * @access public
-	 * @param array $tokens
-	 * @param const $category Either b8::HAM or b8::SPAM
-	 * @param const $action Either b8::LEARN or b8::UNLEARN
-	 * @return void
-	 */
-
-	public function process_text($tokens, $category, $action)
-	{
-
-		# Validate the startup
-
-		$started_up = $this->validate();
-
-		if($started_up !== TRUE)
-			return $started_up;
-
-		# No matter what we do, we first have to check what data we have.
-
-		# First get the internals, including the ham texts and spam texts counter
-		$internals = $this->get_internals();
-
-		# Then, fetch all data for all tokens we have (and update their lastseen parameters)
-		$token_data = $this->_get_query(array_keys($tokens));
-
-		# Process all tokens to learn/unlearn
-
-		foreach($tokens as $token => $count) {
-
-			if(isset($token_data[$token])) {
-
-				# We already have this token, so update it's data
-
-				# Get the existing data
-				list($count_ham, $count_spam, $lastseen) = explode(' ', $token_data[$token]);
-				$count_ham  = (int) $count_ham;
-				$count_spam = (int) $count_spam;
-
-				# Increase or decrease the right counter
-
-				if($action === b8::LEARN) {
-					if($category === b8::HAM)
-						$count_ham += $count;
-					elseif($category === b8::SPAM)
-						$count_spam += $count;
-				}
-
-				elseif($action == b8::UNLEARN) {
-					if($category === b8::HAM)
-						$count_ham -= $count;
-					elseif($category === b8::SPAM)
-						$count_spam -= $count;
-				}
-
-				# We don't want to have negative values
-
-				if($count_ham < 0)
-					$count_ham = 0;
-
-				if($count_spam < 0)
-					$count_spam = 0;
-
-				# Now let's see if we have to update or delete the token
-				if($count_ham !== 0 or $count_spam !== 0)
-					$this->_update($token, "$count_ham $count_spam " . $this->b8_config['today']);
-				else
-					$this->_del($token);
-
-			}
-
-			else {
-
-				# We don't have the token. If we unlearn a text, we can't delete it
-				# as we don't have it anyway, so just do something if we learn a text
-
-				if($action === b8::LEARN) {
-
-					if($category === b8::HAM)
-						$data = '1 0 ';
-					elseif($category === b8::SPAM)
-						$data = '0 1 ';
-
-					$data .= $this->b8_config['today'];
-
-					$this->_put($token, $data);
-
-				}
-
-			}
-
-		}
-
-		# Now, all token have been processed, so let's update the right text
-
-		if($action === b8::LEARN) {
-
-			if($category === b8::HAM) {
-				$internals['texts_ham']++;
-				$this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham']);
-			}
-
-			elseif($category === b8::SPAM) {
-				$internals['texts_spam']++;
-				$this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam']);
-			}
-
-		}
-
-		elseif($action == b8::UNLEARN) {
-
-			if($category === b8::HAM) {
-
-				$internals['texts_ham']--;
-
-				if($internals['texts_ham'] < 0)
-					$internals['texts_ham'] = 0;
-
-				$this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham']);
-
-			}
-
-			elseif($category === b8::SPAM) {
-
-				$internals['texts_spam']--;
-
-				if($internals['texts_spam'] < 0)
-					$internals['texts_spam'] = 0;
-
-				$this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam']);
-
-			}
-
-		}
-
-		# We're done and can commit all changes to the database now
-		$this->_commit();
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/library/spam/b8/storage/storage_dba.php b/library/spam/b8/storage/storage_dba.php
deleted file mode 100644
index 04618b23e..000000000
--- a/library/spam/b8/storage/storage_dba.php
+++ /dev/null
@@ -1,198 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * The DBA (Berkeley DB) abstraction layer for communicating with the database.
- * Copyright (C) 2006-2010 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Tobias Leupold
- */
-
-class b8_storage_dba extends b8_storage_base
-{
-
-	public $config = array(
-		'database'    => 'wordlist.db',
-		'handler'     => 'db4',
-	);
-
-	public $b8_config = array(
-		'degenerator' => NULL,
-		'today'       => NULL
-	);
-
-	private $_db          = NULL;
-
-	const DATABASE_CONNECTION_FAIL = 'DATABASE_CONNECTION_FAIL';
-
-	/**
-	 * Constructs the database layer.
-	 *
-	 * @access public
-	 * @param string $config
-	 */
-
-	function __construct($config, $degenerator, $today)
-	{
-
-		# Pass some variables of the main b8 config to this class
-		$this->b8_config['degenerator'] = $degenerator;
-		$this->b8_config['today']       = $today;
-
-		# Validate the config items
-		if(count($config) > 0) {
-			foreach ($config as $name => $value) {
-				$this->config[$name] = (string) $value;
-			}
-		}
-
-	}
-
-	/**
-	 * Closes the database connection.
-	 *
-	 * @access public
-	 * @return void
-	 */
-
-	function __destruct()
-	{
-		if($this->_db !== NULL) {
-			dba_close($this->_db);
-			$this->connected = FALSE;
-		}
-	}
-
-	/**
-	 * Connect to the database and do some checks.
-	 *
-	 * @access public
-	 * @return mixed Returns TRUE on a successful database connection, otherwise returns a constant from b8.
-	 */
-
-	public function connect()
-	{
-
-		# Have we already connected?
-		if($this->_db !== NULL)
-			return TRUE;
-
-		# Open the database connection
-		$this->_db = dba_open(dirname(__FILE__) . DIRECTORY_SEPARATOR . ".." . DIRECTORY_SEPARATOR . $this->config['database'], "w", $this->config['handler']);
-
-		if($this->_db === FALSE) {
-			$this->connected = FALSE;
-			$this->_db = NULL;
-			return self::DATABASE_CONNECTION_FAIL;
-		}
-
-		# Everything is okay and connected
-
-		$this->connected = TRUE;
-
-		# Let's see if this is a b8 database and the version is okay
-		return $this->check_database();
-
-	}
-
-	/**
-	 * Does the actual interaction with the database when fetching data.
-	 *
-	 * @access protected
-	 * @param array $tokens
-	 * @return mixed Returns an array of the returned data in the format array(token => data) or an empty array if there was no data.
-	 */
-
-	protected function _get_query($tokens)
-	{
-
-		$data = array();
-
-		foreach ($tokens as $token) {
-
-			$count = dba_fetch($token, $this->_db);
-
-			if($count !== FALSE)
-				$data[$token] = $count;
-
-		}
-
-		return $data;
-
-	}
-
-	/**
-	 * Store a token to the database.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @param string $count
-	 * @return bool TRUE on success or FALSE on failure
-	 */
-
-	protected function _put($token, $count) {
-		return dba_insert($token, $count, $this->_db);
-	}
-
-	/**
-	 * Update an existing token.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @param string $count
-	 * @return bool TRUE on success or FALSE on failure
-	 */
-
-	protected function _update($token, $count)
-	{
-		return dba_replace($token, $count, $this->_db);
-	}
-
-	/**
-	 * Remove a token from the database.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @return bool TRUE on success or FALSE on failure
-	 */
-
-	protected function _del($token)
-	{
-		return dba_delete($token, $this->_db);
-	}
-
-	/**
-	 * Does nothing :-D
-	 *
-	 * @access protected
-	 * @return void
-	 */
-
-	protected function _commit()
-	{
-		# We just need this function because the (My)SQL backend(s) need it.
-		return;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/library/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php
deleted file mode 100644
index e01e652ae..000000000
--- a/library/spam/b8/storage/storage_frndc.php
+++ /dev/null
@@ -1,313 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * The MySQL abstraction layer for communicating with the database.
- * Copyright (C) 2009 Oliver Lillie (aka buggedcom)
- * Copyright (C) 2010-2011 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Oliver Lillie (aka buggedcom) (original PHP 5 port and optimizations)
- * @author Tobias Leupold
- */
-
-class b8_storage_frndc extends b8_storage_base
-{
-
-	public $config = array(
-		'database'        => 'b8_wordlist',
-		'table_name'      => 'b8_wordlist',
-		'host'            => 'localhost',
-		'user'            => FALSE,
-		'pass'            => FALSE,
-		'connection'      => NULL
-	);
-
-	public $b8_config = array(
-		'degenerator'     => NULL,
-		'today'           => NULL
-	);
-
-	private $_connection                   = NULL;
-	private $_deletes                      = array();
-	private $_puts                         = array();
-	private $_updates                      = array();
-	private $uid                           = 0;
-
-	const DATABASE_CONNECTION_FAIL         = 'DATABASE_CONNECTION_FAIL';
-	const DATABASE_CONNECTION_ERROR        = 'DATABASE_CONNECTION_ERROR';
-	const DATABASE_CONNECTION_BAD_RESOURCE = 'DATABASE_CONNECTION_BAD_RESOURCE';
-	const DATABASE_SELECT_ERROR            = 'DATABASE_SELECT_ERROR';
-	const DATABASE_TABLE_ACCESS_FAIL       = 'DATABASE_TABLE_ACCESS_FAIL';
-	const DATABASE_WRONG_VERSION           = 'DATABASE_WRONG_VERSION';
-
-	/**
-	 * Constructs the database layer.
-	 *
-	 * @access public
-	 * @param string $config
-	 */
-
-	function __construct($config, $degenerator, $today)
-	{
-
-		# Pass some variables of the main b8 config to this class
-		$this->b8_config['degenerator'] = $degenerator;
-		$this->b8_config['today']       = $today;
-
-		# Validate the config items
-
-		if(count($config) > 0) {
-
-			foreach ($config as $name => $value) {
-
-				switch($name) {
-
-					case 'table_name':
-					case 'host':
-					case 'user':
-					case 'pass':
-					case 'database':
-						$this->config[$name] = (string) $value;
-						break;
-
-					case 'connection':
-
-						if($value !== NULL) {
-
-							if(is_resource($value) === TRUE) {
-								$resource_type = get_resource_type($value);
-								$this->config['connection'] = $resource_type !== 'mysql link' && $resource_type !== 'mysql link persistent' ? FALSE : $value;
-							}
-
-							else
-								$this->config['connection'] = FALSE;
-
-						}
-
-						break;
-
-				}
-
-			}
-
-		}
-
-	}
-
-	/**
-	 * Closes the database connection.
-	 *
-	 * @access public
-	 * @return void
-	 */
-
-	function __destruct()
-	{
-
-		if ($this->_connection === NULL) {
-			return;
-		}
-
-		// Commit any changes before closing
-		$this->_commit();
-
-		// Just close the connection if no link-resource was passed and b8 created it's own connection
-		if ($this->config['connection'] === NULL) {
-			mysql_close($this->_connection);
-		}
-
-		$this->connected = FALSE;
-
-	}
-
-	/**
-	 * Connect to the database and do some checks.
-	 *
-	 * @access public
-	 * @return mixed Returns TRUE on a successful database connection, otherwise returns a constant from b8.
-	 */
-
-	public function connect()
-	{
-
-		$this->connected = TRUE;
-		return TRUE;
-
-	}
-
-	/**
-	 * Does the actual interaction with the database when fetching data.
-	 *
-	 * @access protected
-	 * @param array $tokens
-	 * @return mixed Returns an array of the returned data in the format array(token => data) or an empty array if there was no data.
-	 */
-
-	protected function _get_query($tokens, $uid)
-	{
-
-		// Construct the query ...
-		if (count($tokens) > 0) {
-
-			$where = array();
-
-			foreach ($tokens as $token) {
-				$token = dbesc($token);
-				array_push($where, $token);
-			}
-
-			$where = 'term IN ("' . implode('", "', $where) . '")';
-		} else {
-			$token = dbesc($token);
-			$where = 'term = "' . $token . '"';
-		}
-
-		// ... and fetch the data
-
-		$result = q('SELECT * FROM `spam` WHERE ' . $where . ' AND `uid` = ' . $uid );
-
-
-		$returned_tokens = array();
-		if (dbm::is_result($result)) {
-			foreach ($result as $rr) {
-				$returned_tokens[] = $rr['term'];
-			}
-		}
-		$to_create = array();
-
-		if (count($tokens) > 0) {
-			foreach($tokens as $token)
-				if(! in_array($token,$returned_tokens))
-					$to_create[] = str_tolower($token); 
-		}
-		if (count($to_create)) {
-			$sql = '';
-			foreach ($to_create as $term) {
-				if (strlen($sql)) {
-					$sql .= ',';
-				}
-				$sql .= sprintf("(`term`,`datetime`,`uid`) VALUES('%s','%s',%d)",
-					dbesc(str_tolower($term)),
-					dbesc(datetime_convert()),
-					intval($uid)
-				);
-			}
-			q("INSERT INTO `spam` " . $sql);
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * Store a token to the database.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @param string $count
-	 * @return void
-	 */
-	protected function _put($token, $count, $uid) {
-		$token = dbesc($token);
-		$count = dbesc($count);
-		$uid = dbesc($uid);
-		array_push($this->_puts, '("' . $token . '", "' . $count . '", "' . $uid .'")');
-	}
-
-	/**
-	 * Update an existing token.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @param string $count
-	 * @return void
-	 */
-	protected function _update($token, $count, $uid)
-	{
-		$token = dbesc($token);
-		$count = dbesc($count);
-		$uid = dbesc($uid);
-		array_push($this->_puts, '("' . $token . '", "' . $count . '", "' . $uid .'")');
-	}
-
-	/**
-	 * Remove a token from the database.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @return void
-	 */
-	protected function _del($token, $uid)
-	{
-		$token = dbesc($token);
-		$uid = dbesc($uid);
-		$this->uid = $uid;
-		array_push($this->_deletes, $token);
-	}
-
-	/**
-	 * Commits any modification queries.
-	 *
-	 * @access protected
-	 * @return void
-	 */
-	protected function _commit($uid)
-	{
-
-		if(count($this->_deletes) > 0) {
-
-			$result = q('
-				DELETE FROM ' . $this->config['table_name'] . '
-				WHERE token IN ("' . implode('", "', $this->_deletes) . '") AND uid = ' . $this->uid);
-
-			$this->_deletes = array();
-
-		}
-
-		if(count($this->_puts) > 0) {
-
-			$result = q('
-				INSERT INTO ' . $this->config['table_name'] . '(token, count, uid)
-				VALUES ' . implode(', ', $this->_puts));
-
-			$this->_puts = array();
-
-		}
-
-		if(count($this->_updates) > 0) {
-
-			// this still needs work
-			$result = q("select * from " . $this->config['table_name'] . ' where token = ');
-
-			
-			$result = q('
-				INSERT INTO ' . $this->config['table_name'] . '(token, count, uid)
-				VALUES ' . implode(', ', $this->_updates) . ', ' . $uid . '
-				ON DUPLICATE KEY UPDATE ' . $this->config['table_name'] . '.count = VALUES(count);', $this->_connection);
-
-			$this->_updates = array();
-
-		}
-
-	}
-
-}
diff --git a/library/spam/b8/storage/storage_mysql.php b/library/spam/b8/storage/storage_mysql.php
deleted file mode 100644
index 022536350..000000000
--- a/library/spam/b8/storage/storage_mysql.php
+++ /dev/null
@@ -1,351 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-/**
- * The MySQL abstraction layer for communicating with the database.
- * Copyright (C) 2009 Oliver Lillie (aka buggedcom)
- * Copyright (C) 2010-2011 Tobias Leupold 
- *
- * @license LGPL
- * @access public
- * @package b8
- * @author Oliver Lillie (aka buggedcom) (original PHP 5 port and optimizations)
- * @author Tobias Leupold
- */
-
-class b8_storage_mysql extends b8_storage_base
-{
-
-	public $config = array(
-		'database'        => 'b8_wordlist',
-		'table_name'      => 'b8_wordlist',
-		'host'            => 'localhost',
-		'user'            => FALSE,
-		'pass'            => FALSE,
-		'connection'      => NULL
-	);
-
-	public $b8_config = array(
-		'degenerator'     => NULL,
-		'today'           => NULL
-	);
-
-	private $_connection                   = NULL;
-	private $_deletes                      = array();
-	private $_puts                         = array();
-	private $_updates                      = array();
-
-	const DATABASE_CONNECTION_FAIL         = 'DATABASE_CONNECTION_FAIL';
-	const DATABASE_CONNECTION_ERROR        = 'DATABASE_CONNECTION_ERROR';
-	const DATABASE_CONNECTION_BAD_RESOURCE = 'DATABASE_CONNECTION_BAD_RESOURCE';
-	const DATABASE_SELECT_ERROR            = 'DATABASE_SELECT_ERROR';
-	const DATABASE_TABLE_ACCESS_FAIL       = 'DATABASE_TABLE_ACCESS_FAIL';
-	const DATABASE_WRONG_VERSION           = 'DATABASE_WRONG_VERSION';
-
-	/**
-	 * Constructs the database layer.
-	 *
-	 * @access public
-	 * @param string $config
-	 */
-
-	function __construct($config, $degenerator, $today)
-	{
-
-		# Pass some variables of the main b8 config to this class
-		$this->b8_config['degenerator'] = $degenerator;
-		$this->b8_config['today']       = $today;
-
-		# Validate the config items
-
-		if(count($config) > 0) {
-
-			foreach ($config as $name => $value) {
-
-				switch($name) {
-
-					case 'table_name':
-					case 'host':
-					case 'user':
-					case 'pass':
-					case 'database':
-						$this->config[$name] = (string) $value;
-						break;
-
-					case 'connection':
-
-						if($value !== NULL) {
-
-							if(is_resource($value) === TRUE) {
-								$resource_type = get_resource_type($value);
-								$this->config['connection'] = $resource_type !== 'mysql link' && $resource_type !== 'mysql link persistent' ? FALSE : $value;
-							}
-
-							else
-								$this->config['connection'] = FALSE;
-
-						}
-
-						break;
-
-				}
-
-			}
-
-		}
-
-	}
-
-	/**
-	 * Closes the database connection.
-	 *
-	 * @access public
-	 * @return void
-	 */
-
-	function __destruct()
-	{
-
-		if($this->_connection === NULL)
-			return;
-
-		# Commit any changes before closing
-		$this->_commit();
-
-		# Just close the connection if no link-resource was passed and b8 created it's own connection
-		if($this->config['connection'] === NULL)
-			mysql_close($this->_connection);
-
-		$this->connected = FALSE;
-
-	}
-
-	/**
-	 * Connect to the database and do some checks.
-	 *
-	 * @access public
-	 * @return mixed Returns TRUE on a successful database connection, otherwise returns a constant from b8.
-	 */
-
-	public function connect()
-	{
-
-		# Are we already connected?
-		if($this->connected === TRUE)
-			return TRUE;
-
-		# Are we using an existing passed resource?
-		if($this->config['connection'] === FALSE) {
-			# ... yes we are, but the connection is not a resource, so return an error
-			$this->connected = FALSE;
-			return self::DATABASE_CONNECTION_BAD_RESOURCE;
-		}
-
-		elseif($this->config['connection'] === NULL) {
-
-			# ... no we aren't so we have to connect.
-
-			if($this->_connection = mysql_connect($this->config['host'], $this->config['user'], $this->config['pass'])) {
-				if(mysql_select_db($this->config['database'], $this->_connection) === FALSE) {
-					$this->connected = FALSE;
-					return self::DATABASE_SELECT_ERROR . ": " . mysql_error();
-				}
-			}
-			else {
-				$this->connected = FALSE;
-				return self::DATABASE_CONNECTION_ERROR;
-			}
-
-		}
-
-		else {
-			# ... yes we are
-			$this->_connection = $this->config['connection'];
-		}
-
-		# Just in case ...
-		if($this->_connection === NULL) {
-			$this->connected = FALSE;
-			return self::DATABASE_CONNECTION_FAIL;
-		}
-
-		# Check to see if the wordlist table exists
-		if(mysql_query('DESCRIBE ' . $this->config['table_name'], $this->_connection) === FALSE) {
-			$this->connected = FALSE;
-			return self::DATABASE_TABLE_ACCESS_FAIL . ": " . mysql_error();
-		}
-
-		# Everything is okay and connected
-		$this->connected = TRUE;
-
-		# Let's see if this is a b8 database and the version is okay
-		return $this->check_database();
-
-	}
-
-	/**
-	 * Does the actual interaction with the database when fetching data.
-	 *
-	 * @access protected
-	 * @param array $tokens
-	 * @return mixed Returns an array of the returned data in the format array(token => data) or an empty array if there was no data.
-	 */
-
-	protected function _get_query($tokens)
-	{
-
-		# Construct the query ...
-
-		if(count($tokens) > 0) {
-
-			$where = array();
-
-			foreach ($tokens as $token) {
-				$token = mysql_real_escape_string($token, $this->_connection);
-				array_push($where, $token);
-			}
-
-			$where = 'token IN ("' . implode('", "', $where) . '")';
-		}
-
-		else {
-			$token = mysql_real_escape_string($token, $this->_connection);
-			$where = 'token = "' . $token . '"';
-		}
-
-		# ... and fetch the data
-
-		$result = mysql_query('
-			SELECT token, count
-			FROM ' . $this->config['table_name'] . '
-			WHERE ' . $where . ';
-		', $this->_connection);
-
-		$data = array();
-
-		while ($row = mysql_fetch_array($result, MYSQL_ASSOC))
-			$data[$row['token']] = $row['count'];
-
-		mysql_free_result($result);
-
-		return $data;
-
-	}
-
-	/**
-	 * Store a token to the database.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @param string $count
-	 * @return void
-	 */
-
-	protected function _put($token, $count) {
-		$token = mysql_real_escape_string($token, $this->_connection);
-		$count = mysql_real_escape_string($count, $this->_connection);;
-		array_push($this->_puts, '("' . $token . '", "' . $count . '")');
-	}
-
-	/**
-	 * Update an existing token.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @param string $count
-	 * @return void
-	 */
-
-	protected function _update($token, $count)
-	{
-		$token = mysql_real_escape_string($token, $this->_connection);
-		$count = mysql_real_escape_string($count, $this->_connection);
-		array_push($this->_updates, '("' . $token . '", "' . $count . '")');
-	}
-
-	/**
-	 * Remove a token from the database.
-	 *
-	 * @access protected
-	 * @param string $token
-	 * @return void
-	 */
-
-	protected function _del($token)
-	{
-		$token = mysql_real_escape_string($token, $this->_connection);
-		array_push($this->_deletes, $token);
-	}
-
-	/**
-	 * Commits any modification queries.
-	 *
-	 * @access protected
-	 * @return void
-	 */
-
-	protected function _commit()
-	{
-
-		if(count($this->_deletes) > 0) {
-
-			$result = mysql_query('
-				DELETE FROM ' . $this->config['table_name'] . '
-				WHERE token IN ("' . implode('", "', $this->_deletes) . '");
-			', $this->_connection);
-
-			if(is_resource($result) === TRUE)
-				mysql_free_result($result);
-
-			$this->_deletes = array();
-
-		}
-
-		if(count($this->_puts) > 0) {
-
-			$result = mysql_query('
-				INSERT INTO ' . $this->config['table_name'] . '(token, count)
-				VALUES ' . implode(', ', $this->_puts) . ';', $this->_connection);
-
-			if(is_resource($result) === TRUE)
-				mysql_free_result($result);
-
-			$this->_puts = array();
-
-		}
-
-		if(count($this->_updates) > 0) {
-
-			$result = mysql_query('
-				INSERT INTO ' . $this->config['table_name'] . '(token, count)
-				VALUES ' . implode(', ', $this->_updates) . '
-				ON DUPLICATE KEY UPDATE ' . $this->config['table_name'] . '.count = VALUES(count);', $this->_connection);
-
-			if(is_resource($result) === TRUE)
-				mysql_free_result($result);
-
-			$this->_updates = array();
-
-		}
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/library/spam/doc/COPYING b/library/spam/doc/COPYING
deleted file mode 100644
index 8add30ad5..000000000
--- a/library/spam/doc/COPYING
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  , 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/library/spam/doc/ChangeLog b/library/spam/doc/ChangeLog
deleted file mode 100644
index 78a4fc77f..000000000
--- a/library/spam/doc/ChangeLog
+++ /dev/null
@@ -1,179 +0,0 @@
-2010-12-30 Tobias Leupold 
-
-	* Release: Version 0.5.1
-
-	* Bigger changes:
-		- Fixed some issues with the scope of variables leading to problems when multiple instances of b8 are created. Thanks to Mike Creuzer for the bug report :-)
-		- Centralized the loading of class definition files in the b8 constructor and created a function to handle the inclusion.
-
-	* b8.php: Return a lexer error code instead of a rating if the lexer failed. The lexer never returned FALSE but b8 checked only for this value to validate the lexer didn't fail. Thanks to Matt Friedman for the bug report :-)
-
-	* lexer/lexer_default.php: A bit of code cleanup: less useless nesting.
-
-	* doc/readme.*: Updated the documentation, added a FAQ.
-
-2010-06-27 Tobias Leupold 
-
-	* Release: Version 0.5-r1
-
-	* doc/readme.*: Updated the documentation; forgot the newly introduced b8::HAM and b8::SPAM variables. Added some additional information about the storage model.
-
-2010-06-02 Tobias Leupold 
-
-	* Release: Version 0.5
-
-	* 100.000 Changes (new major release!), at a glance:
-		- No PHP 4 compatibility anymore. Much cleaner code base with less hacks.
-		- Completely reworked storage model. The SQL performance increased dramatically, the Berkeley DB performance remains as fast as it always has been.
-		- Better lexer which can also handle non-latin1 texts in a nice way, so that e. g. Cyrillic or Chinese texts can be classified more performant.
-		- No config files anymore, multiple instances of b8 can be now created in the same script with different configuration, databases and no problems.
-		- No spooky administration interface anymore that needs an SQL database, even if Berkeley DB is used (anybody who actually used this?! I never did ;-).
-		- No "install" scripts and routines and a less end-user compatible documentation. Anybody integrating b8 in his homepage won't be an end-user, will he?
-
-2009-02-03 Oliver Lillie (aka buggedcom)
-
-	* Revision: 221 (the original PHP 5 port)
-
-	* Rewrote Tobias' original class for optimisation and PHP 5 functionality.
-
-	* Improved database mysql query useage by over ~820%
-
-	* Class is faster, ~20%.
-
-	* Slight increase in memory usage, but it's small and given the advantages of the speed increase and query reduction it's worth it.
-
-	* Removed install code from mysql class and added a sql file. Anyone who wants to use this is generally going to be more advanced anyway and see the sql to install.
-
-2009-02-03 Tobias Leupold 
-
-	* Release: Version 0.4.4 -- changed the license type from GPL to LGPL
-
-2008-06-27 Tobias Leupold 
-
-	* Release: Version 0.4.3 -- no bugs found ... so let's make a release with only small changes ;-)
-
-	* b8.php: Removed debugging messages that were commented out anyway
-
-	* storage/storage_mysql.php: Made it possible to pass both a MySQL-link resource and a table name to b8. This makes b8 useable in the Redaxo CMS (and probably others)
-
-	* doc/readme.htm: Updated documentation accordingly
-
-2008-02-17 Tobias Leupold 
-
-	* Release: Version 0.4.2
-
-	* interface/backup.php: the bayes*dbversion tag is now written to a database emptied by drop(), so that it will be useable without an error message even if no backup is recovered afterwards.
-
-	* doc/readme.htm: added a security note to the configuration section (htaccess should be used to avoid everybody to be able to see the configuration)
-
-2007-09-17 Tobias Leupold 
-
-	* Release: Version 0.4.1
-
-	* storage/storage_mysql.php: fixed b8 crashing when getting passed a persistent MySQL resource link. Thanks to Paul Chapman for the bug report :-)
-
-2007-06-08 Tobias Leupold 
-
-	* Release: Version 0.4
-
-	* Let's go the whole hog. b8's class is now "b8" and no more "bayes", and all internal variables have now according names.
-
-	* Reworked the whole (surprisingly crappy) implementation of b8. No more global() calls, everything happens inside the classes now. Made that whole stuff really object oriented (as good as possible with PHP's poor OOP model ;-).
-
-	* No more PHP code in the configuration files.
-
-	* Created an extra lexer class. This is now also configurable.
-
-	* Storage classes now can create their own databases when this is requested by the configuration.
-
-	* MySQL calls are no random shots anymore: either, a MySQL-link resource is passed to b8 on startup which will be used for the queries, or the class sets up it's own link. Same for SQLite.
-
-	* The interface now uses a separate storage backend capable of SQL. In this way, we _really_ can query the database for e. g. an ordered list of tokens. After doing what we wanted with this work database, the b8 database can be synced with it.
-
-	* Added a lot of verbose error handling.
-
-	* Fixed a dumb error: all tokens from a text were used for the spamminess calculation, because two for() loops both used $i as their counter. D'oh!!! Now, the filter's performance is way better.
-
-	* Catched on the way how that whole math stuff works a little more ;-) Now, the calculation of the single probabilities proposed by Mr. Robinson does a little more the stuff it was intended to do, because ...
-
-	* Made some calculation constants parameters: the number of tokens to use, the default rating for unknown tokens and Gary Robinson's s constant.
-
-	* Introduced an optional minimum deviation that a token's rating must have to be considered in the spamminess calculation.
-
-	* The default extreme ratings for tokens only in ham or spam are now optional. One can also choose to calculate all ratings by Mr. Robinson's method.
-
-	* Noticed that text primary keys are not case sensitive by default in MySQL, which has a noticeable impact on the filter's performance. Informed the MySQL users about that.
-
-	* The whole code sucks much less ;-) b8 should be way more user friendly now.
-
-	* Re-wrote the whole documentation.
-
-	* Fixed the ChangeLog :-)
-
-2007-02-08 Tobias Leupold 
-
-	* Release: Version 0.3.3 again ;-)
-
-	* bayes-php is now b8. See http://www.nasauber.de/blog/text.php?text=58 for details :-) Thanks to Tobias Lang (http://langt.net/) for this cool new name!
-
-2007-01-05 Tobias Leupold 
-
-	* Release: Version 0.3.3
-
-	* Renamed the internal BerkeleyDB handle from "$db" to the less general name "$bayes_php_db" due to an collision with phpwcms's (http://www.phpwcms.de/) global $db variable and potentially other php programs.
-
-	* Commented out Laurent Goussard's SQLite storage class by default, as it's try { } catch { } calls break PHP 4
-
-2006-09-03 Tobias Leupold 
-
-	* Release: Version 0.3.2
-
-	* Laurent Goussard (loranger@free.fr) contributed an SQLite storage class(which needs PHP 5).
-
-	* I finally added my eMail address to the sources ;-)
-
-2006-07-24 Tobias Leupold 
-
-	* Release: Version 0.3.1
-
-	* Fixed a problem in the unlearn() function: If a text was unlearned that wasn't learned before (accidentaly), it could happen that the count parameter for this text was smaller than 0, breaking the spamminess calulation
-
-2006-07-02 Tobias Leupold 
-
-	* Release: Version 0.3
-
-	* Improved the get_tokens() function; the filter should now be a lot more performant, especially with short texts
-
-	* Added the "lastseen" parameter for each token to make the database maintainable (outdated tokens can be deleted)
-
-	* Added a real database maintainance interface
-
-2006-06-12 Tobias Leupold 
-
-	* Release: Version 0.2.1
-
-	* Fixed a problem in get_tokens() (if it was called more than once, tokens were counted more often than they appeared in the text)
-
-	* Slightly enhanced the default index.php interface: after learning a text as Ham or Spam, the rating before and after it is displayed to inform the user about it
-
-2006-05-21 Tobias Leupold 
-
-	* Release: Version 0.2
-
-	* Comments now in English (to pretend international success of bayes-php ;-)
-
-	* Recommendations of Paul Graham's article "Better Bayesian Filtering" ( http://www.paulgraham.com/better.html ) are now considered: Tokens that only appear in Ham or Spam and not in the other category are rated with 0.9998 or 0.0002 if they were less than 10 times in Ham or Spam and with 0.9999 or 0.0001 if they appeared more that 10 times. This should allow the filter to differentiate spam texts more sharp from ham texts. Also, token "degeneration" as described in the article is performed for unknown tokens to estimate their spamminess.
-
-	* The database connect is now swapped in a separate configuration file, so only this file has to be preserved if bayes-php is updated and only this file has to be changed to configure the script.
-
-2006-03-29 Tobias Leupold 
-
-	* Release: Version 0.1.1
-
-	* get_tokens() beachtet jetzt auch HTML-Tags und Wörter mit Akzenten und Apostrophen
-
-	* Verschiedene Kleinigkeiten "sauber" gemacht :-)
-
-2006-03-05 Tobias Leupold 
-
-	* Added 2007-06-08: Initial release (Version 0.1)
diff --git a/library/spam/doc/readme.htm b/library/spam/doc/readme.htm
deleted file mode 100644
index 727d5ae5f..000000000
--- a/library/spam/doc/readme.htm
+++ /dev/null
@@ -1,707 +0,0 @@
-
-
-
-
-
-
-b8: readme
-
-
-
-
-
-
    
-
    b8: readme
    
-
---
-
-
-
-
-
-
-
-
-
-
    


    Author:Tobias Leupold
    Homepage:http://nasauber.de/
    Contact:tobias.leupold@web.de
    Date:2010-12-23
    
-
-
    
-
    1   Description of b8
    
-
    
-
    1.1   What is b8?
    
-
    b8 is a spam filter implemented in PHP. It is intended to keep your weblog or guestbook spam-free. The filter can be used anywhere in your PHP code and tells you whether a text is spam or not, using statistical text analysis. See How does it work? for details about this. To be able to do this, b8 first has to learn some spam and some ham example texts to decide what's good and what's not. If it makes mistakes classifying unknown texts, they can be corrected and b8 learns from the corrections, getting better with each learned text.
    
-
    At the moment of this writing, b8 has classified 14411 guestbook entries and weblog comments on my homepage since december 2006. 131 were ham. 39 spam texts (0.27 %) have been rated as ham (false negatives), with not even one false positive (ham message classified as spam). This results in a sensitivity of 99.73 % (the probability that a spam text will actually be rated as spam) and a specifity of 100 % (the probability that a ham text will actually be rated as ham) for me. I hope, you'll get the same good results :-)
    
-
    Basically, b8 is a statistical ("Bayesian"[1]) spam filter like Bogofilter or SpamBayes, but it is not intended to classify e-mails. When I started to write b8, I didn't find a good PHP spam filter (or any spam filter that wasn't just some example code how one could implement a Bayesian spam filter in PHP) that was intended to filter weblog or guestbook entries. That's why I had to write my own ;-) 
    
-Caused by it's purpose, the way b8 works is slightly different from most of the Bayesian email spam filters out there. See What's different? if you're interested in the details.
    
-
-
-
-
-
-
    [1]A mathematician told me that the math in b8 actually does not use Bayes' theorem but some derived algorithms that are just related to it. So … let's simply believe that and stop claiming b8 was a Bayesian spam filter ;-)
    
-
    
-
    
-
    1.2   How does it work?
    
-
    b8  basically uses the math and technique described in Paul Graham's article "A Plan For Spam" [2] to distinguish ham and spam. The improvements proposed in Graham's article "Better Bayesian Filtering" [3] and Gary Robinson's article "Spam Detection" [4] have also been considered. See also the article "A Statistical Approach to the Spam Problem" [5].
    
-
    b8 cuts the text to classify to pieces, extracting stuff like e-mail addresses, links and HTML tags. For each such token, it calculates a single probability for a text containing it being spam, based on what the filter has learned so far. When the token was not seen before, b8 tries to find similar ones using the "degeneration" described in [3] and uses the most relevant value found. If really nothing is found, b8 assumes a default rating for this token for the further calculations. 
    
-Then, b8 takes the most relevant values (which have a rating far from 0.5, which would mean we don't know what it is) and calculates the probability that the whole text is spam by the inverse chi-square function described in [4].
-There are some parameters that can be set which influence the filter's behaviour (see below).
    
-
    In short words: you give b8 a text and it returns a value between 0 and 1, saying it's ham when it's near 0 and saying it's spam when it's near 1.
    
-
    
-
    
-
    1.3   What do I need for it?
    
-
    Not much! You just need PHP 5 on the server where b8 will be used (b8 version 0.5 finally dropped PHP 4 compatibility – thankfully ;-) and a proper storage possibility for the wordlists. I strongly recommend using Berkeley DB. See below how you can check if you can use it and why you should use it. If the server's PHP wasn't compiled with Berkeley DB support, a MySQL table can be used alternatively.
    
-
    
-
    
-
    1.4   What's different?
    
-
    b8 is designed to classify weblog or guestbook entries, not e-mails. For this reason, it uses a slightly different technique than most of the other statistical spam filters out there use.
    
-
    My experience was that spam entries on my weblog or guestbook were often quite short, sometimes just something like "123abc" as text and a link to a suspect homepage. Some spam bots don't even made a difference between e. g. the "name" and "text" fields and posted their text as email address, for example. Considering this, b8 just takes one string to classify, making no difference between "headers" and "text". 
    
-The other thing is that most statistical spam filters count one token one time, no matter how often it appears in the text (as Graham describes it in [2]). b8 does count how often a token was seen and learns or considers this. Additionally, the number of learned ham and spam texts are saved and used as the calculation base for the single probabilities. Why this? Because a text containing one link (no matter where it points to, just indicated by a "http://" or a "www.") might not be spam, but a text containing 20 links might be.
    
-
    This means that b8 might be good for classifying weblog or guestbook entries (I really think it is ;-) – but very likely, it will work quite poor when being used for something else (like classifying e-mails). But as said above, for this task, there are a lot of very good filters out there to choose from.
    
-
    
-
    
-
    
-
    2   Update from prior versions
    
-
    If this is a new b8 installation, read on at the Installation section!
    
-
    
-
    2.1   Update from bayes-php version 0.2.1 or earlier
    
-
    Please first follow the database update instructions of the bayes-php-0.3 release if you update from a version prior to bayes-php-0.3 and then read the following paragraph about updating from a version <0.3.3.
    
-
    
-
    
-
    2.2   Update from bayes-php version 0.3 or later
    
-
    
-
    You use Berkeley DB?
    
-
    Everything's fine, you can simply continue using your database.
    
-
    You use MySQL?
    
-
    The CREATE statement of b8's wordlist has changed. The best is probably to create a dump via your favorite administration tool or script, create the new table and re-insert all data. The layout is still the same: there's one "token" column and one "data" column. Having done that, you can keep using your data.
    
-
    You use SQLite?
    
-
    Sorry, at the moment, there's no SQLite backend for b8. But we're working on it :-)
    
-
    
-
    The configuration model of b8 has changed.  Please read through the Configuration section and update your configuration accordingly.
    
-
    b8's lexer has been partially re-written. It should now be able to handle all kind of non-latin-1 input, like cyrillic, chinese or japanese texts. Caused by this fact, much more tokens will be recognized when classifying such texts. Therefore, you could get different results in b8's ratings, even if the same database is used and although the math is still the same.
    
-
    b8 0.5 introduced two constants that can be used in the learn() and unlearn() functions: b8::HAM and b8::SPAM. The literal values "ham" and "spam" can still be used anyway.
    
-
    
-
    
-
    
-
    3   Installation
    
-
    Installing b8 on your server is quite easy. You just have to provide the needed files. To do this, you could just upload the whole b8 subdirectory to the base directory of your homepage. It contains the filter itself and all needed backend classes. The other directories (doc, example and install) are not used by b8.
    
-
    That's it ;-)
    
-
    
-
    
-
    4   Configuration
    
-
    The configuration is passed as arrays when instantiating a new b8 object. Two arrays can be passed to b8, one containing b8's base configuration and some settings for the lexer (which should be common for all lexer classes, in case some other lexer than the default one will be written one day) and one for the storage backend. 
    
-You can have a look at example/index.php to see how this can be done. Using b8 in your scripts also shows example code showing how b8 can be included in a PHP script.
    
-
    Not all values have to be set. When some values are missing, the default ones will be used. If you do use the default settings, you don't have to pass them to b8.
    
-
    
-
    4.1   b8's base configuration
    
-
    All these values can be set in the "config_b8" array (the first parameter) passed to b8. The name of the array doesn't matter (of course), it just has to be the first argument.
    
-
    These are some basic settings telling b8 which backend classes to use:
    
-
    
-
    
-
    storage
    
-
    This defines which storage backend will be used to save b8's wordlist. Currently, two backends are available: Berkeley DB (dba) and MySQL (mysql). At the moment, b8 does not support SQLite (as the previous version did), but it will be (hopefully) re-added in one of the next releases. The default is dba (string).
    
-
    
-
    Berkeley DB
    
-
    This is the preferred storage backend. It was the original backend for the filter and remains the most performant. b8's storage model is optimized for this database, as it is really fast and fits perfectly to what the filter needs to do the job. All content is saved in a single file, you don't need special user rights or a database server. 
    
-If you don't know whether your server's PHP can use a Berkeley DB, simply run the script install/setup_berkeleydb.php. If it shows a Berkeley DB handler, please use this backend.
    
-
    MySQL
    
-
    As some webspace hosters don't allow using a Berkeley DB (but please be sure to check if you can use it!), but most do provide a MySQL server, using a MySQL table for the wordlist is provided as an alternative storage method. As said above, b8 was always intended to use a Berkeley DB. It doesn't use or need SQL to query the database. So, very likely, this will work less performant, produce a lot of unnecessary overhead and waste computing power. But it will do fine anyway!
    
-
    
-
    See Configuration of the storage backend for the settings of the chosen backend.
    
-
    
-
    degenerator
    
-
    The degenerator class to be used. See How does it work? and [3] if you're interested in what "degeneration" is. Defaults to default (string). At the moment, only one degenerator exists, so you probably don't want to change this unless you have written your own degenerator.
    
-
    lexer
    
-
    The lexer class to be used. Defaults to default (string). At the moment, only one lexer exists, so you probably don't want to change this unless you have written your own lexer.
    
-
    The behaviour of the lexer can be additionally configured with the following variables:
    
-
    
-
    
-
    min_size
    
-
    The minimal length for a token to be considered when calculating the rating of a text. Defaults to 3 (integer).
    
-
    max_size
    
-
    The maximal length for a token to be considered when calculating the rating of a text. Defaults to 30 (integer).
    
-
    allow_numbers
    
-
    Should pure numbers also be considered? Defaults to FALSE (boolean).
    
-
    
-
    
-
    
-
    
-
    
-
    The following settings influence the mathematical internals of b8. If you want to experiment, feel free to play around with them; but be warned: wrong settings of these values will result in poor performance or could even "short-circuit" the filter. 
    
-Leave these values as they are unless you know what you are doing!
    
-
    The "Statistical discussion about b8" [6] shows why the default values are the default ones.
    
-
    
-
    
-
    use_relevant
    
-
    This tells b8 how many tokens should be used when calculating the spamminess of a text. The default setting is 15 (integer). This seems to be a quite reasonable value. When using to many tokens, the filter will fail on texts filled with useless stuff or with passages from a newspaper, etc. not being very spammish. 
    
-The tokens counted multiple times (see above) are added in addition to this value. They don't replace other ratings.
    
-
    min_dev
    
-
    This defines a minimum deviation from 0.5 that a token's rating must have to be considered when calculating the spamminess. Tokens with a rating closer to 0.5 than this value will simply be skipped. 
    
-If you don't want to use this feature, set this to 0. Defaults to 0.2 (float). Read [6] before increasing this.
    
-
    rob_x
    
-
    This is Gary Robinson's x constant (cf. [4]). A completely unknown token will be rated with the value of rob_x. The default 0.5 (float) seems to be quite reasonable, as we can't say if a token that also can't be rated by degeneration is good or bad. 
    
-If you receive much more spam than ham or vice versa, you could change this setting accordingly.
    
-
    rob_s
    
-
    This is Gary Robinson's s constant. This is essentially the probability that the rob_x value is correct for a completely unknown token. It will also shift the probability of rarely seen tokens towards this value. The default is 0.3 (float) 
    
-See [4] for a closer description of the s constant and read [6] for specific information about this constant in b8's algorithms.
    
-
    
-
    
-
    
-
    
-
    4.2   Configuration of the storage backend
    
-
    All the following values can be set in the "config_database" array (the second parameter) passed to b8. The name of the array doesn't matter (of course), it just has to be the second argument.
    
-
    
-
    4.2.1   Settings for the Berkeley DB (DBA) backend
    
-
    
-
    database
    
-
    The filename of the database file, relative to the location of b8.php. Defaults to wordlist.db (string).
    
-
    handler
    
-
    The DBA handler to use (cf. the PHP documentation and Setting up a new Berkeley DB). Defaults to db4 (string).
    
-
    
-
    
-
    
-
    4.2.2   Settings for the MySQL backend
    
-
    
-
    database
    
-
    The database containing b8's wordlist table. Defaults to b8_wordlist (string).
    
-
    table_name
    
-
    The table containing b8's wordlist. Defaults to b8_wordlist (string).
    
-
    host
    
-
    The host of the MySQL server. Defaults to localhost (string).
    
-
    user
    
-
    The user name used to open the database connection. Defaults to FALSE (boolean).
    
-
    pass
    
-
    The password required to open the database connection. Defaults to FALSE (boolean).
    
-
    connection
    
-
    An existing MySQL link-resource that can be used by b8. Defaults to NULL (NULL).
    
-
    
-
    
-
    
-
    
-
    
-
    5   Using b8
    
-
    Now, that everything is configured, you can start to use b8. A sample script that shows what can be done with the filter exists in example/index.php. The best thing for testing how all this works is to use this script before using b8 in your own scripts.
    
-
    Before you can start, you have to setup a database so that b8 can store a wordlist.
    
-
    
-
    5.1   Setting up a new database
    
-
    
-
    5.1.1   Setting up a new Berkeley DB
    
-
    I wrote a script to setup a new Berkeley DB for b8. It is located in install/setup_berkeleydb.php. Just run this script on your server and be sure that the directory containing it has the proper access rights set so that the server's HTTP server user or PHP user can create a new file in it (probably 0777). The script is quite self-explaining, just run it.
    
-
    Of course, you can also create a Berkeley DB by hand. In this case, you just have to insert three keys:
    
-
    -bayes*dbversion  => 2
-bayes*texts.ham  => 0
-bayes*texts.spam => 0
-
    
-
    Be sure to set the right DBA handler in the storage backend configuration if it's not db4.
    
-
    
-
    
-
    5.1.2   Setting up a new MySQL table
    
-
    The SQL file install/setup_mysql.sql contains both the create statement for the wordlist table of b8 and the INSERT statements for adding the necessary internal variables.
    
-
    Simply change the table name according to your needs (or leave it as it is ;-) and run the SQL to setup a b8 wordlist MySQL table.
    
-
    
-
    
-
    
-
    5.2   Using b8 in your scripts
    
-
    Just have a look at the example script located in example/index.php to see how you can include b8 in your scripts. Essentially, this strips down to:
    
-
    -# Include the b8 code
-require "{$_SERVER['DOCUMENT_ROOT']}/b8/b8.php";
-
-# Do some configuration
-
-$config_b8 = array(
-        'some_key' => 'some_value',
-        'foo' => 'bar'
-);
-
-$config_database = array(
-        'some_key' => 'some_value',
-        'foo' => 'bar'
-);
-
-# Create a new b8 instance
-$b8 = new b8($config_b8, $config_database);
-
    
-
    b8 provides three functions in an object oriented way (called e. g. via $b8->classify($text)):
    
-
    
-
    learn($text, $category)
    
-
    This saves the reference text $text (string) in the category $category (b8 constant). 
    
-b8 0.5 introduced two constants that can be used as $category: b8::HAM and b8::SPAM. To be downward compatible with older versions of b8, the literal values "ham" and "spam" (case-sensitive strings) can still be used here.
    
-
    unlearn($text, $category)
    
-
    This function just exists to delete a text from a category in which is has been stored accidentally before. It deletes the reference text $text (string) from the category $category (either the constants b8::HAM or b8::SPAM or the literal case-sensitive strings "ham" or "spam" – cf. above). 
    
-Don't delete a spam text from ham after saving it in spam or vice versa, as long you don't have stored it accidentally in the wrong category before! This will not improve performance, quite the opposite: it will actually break the filter after a time, as the counter for saved ham or spam texts will reach 0, although you have ham or spam tokens stored: the filter will try to remove texts from the ham or spam data which have never been stored there, decrease the counter for tokens which are found just skip the non-existing words.
    
-
    classify($text)
    
-
    This function takes the text $text (string), calculates it's probability for being spam it and returns a value between 0 and 1 (float). 
    
-A value close to 0 says the text is more likely ham and a value close to 1 says the text is more likely spam. What to do with this value is your business ;-) See also Tips on operation below.
    
-
    
-
    
-
    
-
    
-
    6   Tips on operation
    
-
    Before b8 can decide whether a text is spam or ham, you have to tell it what you consider as spam or ham. At least one learned spam or one learned ham text is needed to calculate anything. To get good ratings, you need both learned ham and learned spam texts, the more the better. 
    
-What's considered as "ham" or "spam" can be very different, depending on the operation site. On my homepage, practically each and every text posted in English or using cyrillic letters is spam. On an English or Russian homepage, this will be not the case. So I think it's not really meaningful to provide some "spam data" to start. Just train b8 with "your" spam and ham.
    
-
    For the practical use, I advise to give the filter all data availible. E. g. name, email address, homepage, IP address und of course the text itself should be stored in a variable (e. g. separated with an \n or just a space or tab after each block) and then be classified. The learning should also be done with all data availible. 
    
-Saving the IP address is probably only meaningful for spam entries, because spammers often use the same IP address multiple times. In principle, you can leave out the IP of ham entries.
    
-
    You can use b8 e. g. in a guestbook script and let it classify the text before saving it. Everyone has to decide which rating is necessary to classify a text as "spam", but a rating of >= 0.8 seems to be reasonable for me. If one expects the spam to be in another language that the ham entries or the spams are very short normally, one could also think about a limit of 0.7. 
    
-The email filters out there mostly use > 0.9 or even > 0.99; but keep in mind that they have way more data to analyze in most of the cases. A guestbook entry may be quite short, especially when it's spam.
    
-
    In my opinion, a autolearn function is very handy. I save spam messages with a rating higher than 0.7 but less than 0.9 automatically as spam. I don't do this with ham messages in an automated way to prevent the filter from saving a false negative as ham and then classifying and learning all the spam as ham when I'm on holidays ;-)
    
-
    
-
    
-
    7   Closing
    
-
    So … that's it. Thanks for using b8! If you find a bug or have an idea how to make b8 better, let me know. I'm also always looking forward to get e-mails from people using b8 on their homepages :-)
    
-
    
-
    
-
    8   References
    
-
-
-
-
-
-
    [2](1, 2) Paul Graham, A Plan For Spam (http://paulgraham.com/spam.html)
    
-
-
-
-
-
-
    [3](1, 2, 3) Paul Graham, Better Bayesian Filtering (http://paulgraham.com/better.html)
    
-
-
-
-
-
-
    [4](1, 2, 3, 4) Gary Robinson, Spam Detection (http://radio.weblogs.com/0101454/stories/2002/09/16/spamDetection.html)
    
-
-
-
-
-
-
    [5]A Statistical Approach to the Spam Problem (http://linuxjournal.com/article/6467)
    
-
-
-
-
-
-
    [6](1, 2, 3) Tobias Leupold, Statistical discussion about b8 (http://nasauber.de/opensource/b8/discussion/)
    
-
    
-
    
-
    9   Appendix
    
-
    
-
    9.1   FAQ
    
-
    
-
    9.1.1   What about more than two categories?
    
-
    I wrote b8 with the KISS principle in mind. For the "end-user", we have a class with almost no setup to do that can do three things: classify a text, learn a text and un-learn a text. Normally, there's no need to un-learn a text, so essentially, there are only two functions we need. 
    
-This simplicity is only possible because b8 only knows two categories (normally "Ham" and "Spam" or some other category pair) and tells you, in one float number between 0 and 1, if a given texts rather fits in the first or the second category. If we would support multiple categories, more work would have to be done and things would become more complicated. One would have to setup the categories, have another database layout (perhaps making it mandatory to have SQL) and one float number would not be sufficient to describe b8's output, so more code would be needed – even outside of b8.
    
-
    All the code, the database layout and particularly the math is intended to do exactly one thing: distinguish between two categories. I think it would be a lot of work to change b8 so that it would support more than two categories. Probably, this is possible to do, but don't ask me in which way we would have to change the math to get multiple-category support – I'm a dentist, not a mathematician ;-) 
    
-Apart from this I do believe that most people using b8 don't want or need multiple categories. They just want to know if a text is spam or not, don't they? I do, at least ;-)
    
-
    But let's think about the multiple-category thing. How would we calculate a rating for more than two categories? If we had a third one, let's call it "Treet", how would we calculate a rating? We could calculate three different ratings. One for "Ham", one for "Spam" and one for "Treet" and choose the highest one to tell the user what category fits best for the text. This could be done by using a small wrapper script using three instances of b8 as-is and three different databases, each containing texts being "Ham", "Spam", "Treet" and the respective counterparts. 
    
-But here's the problem: if we have "Ham" and "Spam", "Spam" is the counterpart of "Ham". But what's the counterpart of "Spam" if we have more than one additional category? Where do the "Non-Ham", "Non-Spam" and "Non-Treet" texts come from?
    
-
    Another approach, a direct calculation of more than two probabilities (the "Ham" probability is simply 1 minus the "Spam" probability, so we actually get two probabilities with the return value of b8) out of one database would require big changes in b8's structure and math.
    
-
    There's a project called PHPNaiveBayesianFilter which supports multiple categories by default. The author calls his software "Version 1.0", but I think this is the very first release, not a stable or mature one. The most recent change of that release dates back to 2003 according to the "changed" date of the files inside the zip archive, so probably, this project is dead or has never been alive and under active development at all. 
    
-Actually, I played around with that code but the results weren't really good, so I decided to write my own spam filter from scratch back in early 2006 ;-)
    
-
    All in all, there seems to be no easy way to implement multiple (meaning more than two) categories using b8's current code base and probably, b8 will never support more than two categories. Perhaps, a fork or a complete re-write would  be better than implementing such a feature. Anyway, I don't close my mind to multiple categories in b8. Feel free to tell me how multiple categories could be implementented in b8 or how a multiple-category version using the same code base (sharing a common abstract class?) could be written.
    
-
    
-
    
-
    9.1.2   What about a list with words to ignore?
    
-
    Some people suggested to introduce a list with words that b8 will simply ignore. Like "and", "or", "the", and so on. I don't think this is very meaningful.
    
-
    First, it would just work for the particular language that has been stored in the list. Speaking of my homepage, most of my spam is English, almost all my ham is German. So I would have to maintain a list with the probably less interesting words for at least two languages. Additionally, I get spam in Chinese, Japanese and Cyrillic writing or something else I can't read as well. What word should be ignored in those texts?  
    
-Second, why should we ever exclude words? Who tells us those words are actually meaningless? If a word appears both in ham and spam, it's rating will be near 0.5 and so, it won't be used for the final calculation if a appropriate minimum deviation was set. So b8 will exclude it anyway without any blacklist. And think of this: if we excluded a word of which we only think it doesn't mean anything but it actually does appear more often in ham or spam, the results will get even worse.
    
-
    So why should we care about things we do not have to care about? ;-)
    
-
    
-
    
-
    9.1.3   Why is it called "b8"?
    
-
    The initial name for the filter was (damn creative!) "bayes-php". There were two main reasons for searching another name: 1. "bayes-php" sucks. 2. the PHP License says the PHP guys do not like when the name of a script written in PHP contains the word "PHP". Read the License FAQ for a reasonable argumentation about this.
    
-
    Luckily, Tobias Lang proposed the new name "b8". And these are the reasons why I chose this name:
    
-
      
-
    • "bayes-php" is a "b" followed by 8 letters.
      • 
-
    • "b8" is short and handy. Additionally, there was no program with the name "b8" or "bate"
      • 
-
    • The English verb "to bate" means "to decrease" – and that's what b8 does: it decreases the number of spam entries in your weblog or guestbook!
      • 
-
    • "b8" just sounds way cooler than "bayes-php" ;-)
      • 
-
    
-
    
-
    
-
    
-
    9.2   About the database
    
-
    
-
    9.2.1   The database layout
    
-
    The database layout is quite simple. It's just key:value for everything stored. There are three "internal" variables stored as normal tokens (but all containing a * which is always used as a split character by the lexer, so we can't get collisions):
    
-
    
-
    bayes*dbversion
    
-
    This indicates the database's "version". The first versions of b8 did not set this. Version "2" indicates that we have a database created by a b8 version already storing the "lastseen" parameter.
    
-
    bayes*texts.ham
    
-
    The number of ham texts learned.
    
-
    bayes*texts.spam
    
-
    The number of spam texts learned.
    
-
    
-
    Each "normal" token is stored with it's literal name as the key and it's data as the value. The data consists of the count of the token in all ham and spam texts and the date when the token was used the last time, all in one string and separated by spaces. So we have the following scheme:
    
-
    -"token" => "count_ham count_spam lastseen"
-
    
-
    
-
    
-
    9.2.2   The "lastseen" parameter
    
-
    Somebody looking at the code might be wondering why b8 stores this "lastseen" parameter. This value is not used for any calculation at the moment. Initially, it was intended to keep the database maintainable in a way that "old" data could be removed. When e. g. a token only appeared once in ham or spam and has not been seen for a year, one could simply delete it from the database. 
    
-I actually never used this feature (does anybody?). So probably, some changes will be done to this one day. Perhaps, I find a way to include this data in the spamminess calculation in a meaningful way, or at least for some statistics. One could also make this optional to keep the calculation effort small if this is needed.
    
-
    Feel free to send me any suggestions about this!
    
-
    
-
    
-
    
-
    
-
-
diff --git a/library/spam/doc/readme.rst b/library/spam/doc/readme.rst
deleted file mode 100644
index 451b28326..000000000
--- a/library/spam/doc/readme.rst
+++ /dev/null
@@ -1,371 +0,0 @@
-==========
-b8: readme
-==========
-
-:Author: Tobias Leupold
-:Homepage: http://nasauber.de/
-:Contact: tobias.leupold@web.de
-:Date: |date|
-
-.. contents:: Table of Contents
-
-Description of b8
-=================
-
-What is b8?
------------
-
-b8 is a spam filter implemented in `PHP `__. It is intended to keep your weblog or guestbook spam-free. The filter can be used anywhere in your PHP code and tells you whether a text is spam or not, using statistical text analysis. See `How does it work?`_ for details about this. To be able to do this, b8 first has to learn some spam and some ham example texts to decide what's good and what's not. If it makes mistakes classifying unknown texts, they can be corrected and b8 learns from the corrections, getting better with each learned text.
-
-At the moment of this writing, b8 has classified 14411 guestbook entries and weblog comments on my homepage since december 2006. 131 were ham. 39 spam texts (0.27 %) have been rated as ham (false negatives), with not even one false positive (ham message classified as spam). This results in a sensitivity of 99.73 % (the probability that a spam text will actually be rated as spam) and a specifity of 100 % (the probability that a ham text will actually be rated as ham) for me. I hope, you'll get the same good results :-)
-
-Basically, b8 is a statistical ("Bayesian"[#]_) spam filter like `Bogofilter `__ or `SpamBayes `__, but it is not intended to classify e-mails. When I started to write b8, I didn't find a good PHP spam filter (or any spam filter that wasn't just some example code how one *could* implement a Bayesian spam filter in PHP) that was intended to filter weblog or guestbook entries. That's why I had to write my own ;-) |br|
-Caused by it's purpose, the way b8 works is slightly different from most of the Bayesian email spam filters out there. See `What's different?`_ if you're interested in the details.
-
-.. [#] A mathematician told me that the math in b8 actually does not use Bayes' theorem but some derived algorithms that are just related to it. So … let's simply believe that and stop claiming b8 was a *Bayesian* spam filter ;-)
-
-How does it work?
------------------
-
-b8  basically uses the math and technique described in Paul Graham's article "A Plan For Spam" [#planforspam]_ to distinguish ham and spam. The improvements proposed in Graham's article "Better Bayesian Filtering" [#betterbayesian]_ and Gary Robinson's article "Spam Detection" [#spamdetection]_ have also been considered. See also the article "A Statistical Approach to the Spam Problem" [#statisticalapproach]_.
-
-b8 cuts the text to classify to pieces, extracting stuff like e-mail addresses, links and HTML tags. For each such token, it calculates a single probability for a text containing it being spam, based on what the filter has learned so far. When the token was not seen before, b8 tries to find similar ones using the "degeneration" described in [#betterbayesian]_ and uses the most relevant value found. If really nothing is found, b8 assumes a default rating for this token for the further calculations. |br|
-Then, b8 takes the most relevant values (which have a rating far from 0.5, which would mean we don't know what it is) and calculates the probability that the whole text is spam by the inverse chi-square function described in [#spamdetection]_.
-There are some parameters that can be set which influence the filter's behaviour (see below).
-
-In short words: you give b8 a text and it returns a value between 0 and 1, saying it's ham when it's near 0 and saying it's spam when it's near 1.
-
-What do I need for it?
-----------------------
-
-Not much! You just need PHP 5 on the server where b8 will be used (b8 version 0.5 finally dropped PHP 4 compatibility – thankfully ;-) and a proper storage possibility for the wordlists. I strongly recommend using `Berkeley DB `_. See below how you can check if you can use it and why you should use it. If the server's PHP wasn't compiled with Berkeley DB support, a `MySQL `_ table can be used alternatively.
-
-What's different?
------------------
-
-b8 is designed to classify weblog or guestbook entries, not e-mails. For this reason, it uses a slightly different technique than most of the other statistical spam filters out there use.
-
-My experience was that spam entries on my weblog or guestbook were often quite short, sometimes just something like "123abc" as text and a link to a suspect homepage. Some spam bots don't even made a difference between e. g. the "name" and "text" fields and posted their text as email address, for example. Considering this, b8 just takes one string to classify, making no difference between "headers" and "text". |br|
-The other thing is that most statistical spam filters count one token one time, no matter how often it appears in the text (as Graham describes it in [#planforspam]_). b8 does count how often a token was seen and learns or considers this. Additionally, the number of learned ham and spam texts are saved and used as the calculation base for the single probabilities. Why this? Because a text containing one link (no matter where it points to, just indicated by a "\h\t\t\p\:\/\/" or a "www.") might not be spam, but a text containing 20 links might be.
-
-This means that b8 might be good for classifying weblog or guestbook entries (I really think it is ;-) – but very likely, it will work quite poor when being used for something else (like classifying e-mails). But as said above, for this task, there are a lot of very good filters out there to choose from.
-
-Update from prior versions
-==========================
-
-If this is a new b8 installation, read on at the `Installation`_ section!
-
-Update from bayes-php version 0.2.1 or earlier
-----------------------------------------------
-
-Please first follow the database update instructions of the bayes-php-0.3 release if you update from a version prior to bayes-php-0.3 and then read the following paragraph about updating from a version <0.3.3.
-
-Update from bayes-php version 0.3 or later
-------------------------------------------
-
-**You use Berkeley DB?**
-	Everything's fine, you can simply continue using your database.
-
-**You use MySQL?**
-	The ``CREATE`` statement of b8's wordlist has changed. The best is probably to create a dump via your favorite administration tool or script, create the new table and re-insert all data. The layout is still the same: there's one "token" column and one "data" column. Having done that, you can keep using your data.
-
-**You use SQLite?**
-	Sorry, at the moment, there's no SQLite backend for b8. But we're working on it :-)
-
-The configuration model of b8 has changed.  Please read through the `Configuration`_ section and update your configuration accordingly.
-
-b8's lexer has been partially re-written. It should now be able to handle all kind of non-latin-1 input, like cyrillic, chinese or japanese texts. Caused by this fact, much more tokens will be recognized when classifying such texts. Therefore, you could get different results in b8's ratings, even if the same database is used and although the math is still the same.
-
-b8 0.5 introduced two constants that can be used in the ``learn()`` and ``unlearn()`` functions: ``b8::HAM`` and ``b8::SPAM``. The literal values "ham" and "spam" can still be used anyway.
-
-Installation
-============
-
-Installing b8 on your server is quite easy. You just have to provide the needed files. To do this, you could just upload the whole ``b8`` subdirectory to the base directory of your homepage. It contains the filter itself and all needed backend classes. The other directories (``doc``, ``example`` and ``install``) are not used by b8.
-
-That's it ;-)
-
-Configuration
-=============
-
-The configuration is passed as arrays when instantiating a new b8 object. Two arrays can be passed to b8, one containing b8's base configuration and some settings for the lexer (which should be common for all lexer classes, in case some other lexer than the default one will be written one day) and one for the storage backend. |br|
-You can have a look at ``example/index.php`` to see how this can be done. `Using b8 in your scripts`_ also shows example code showing how b8 can be included in a PHP script.
-
-Not all values have to be set. When some values are missing, the default ones will be used. If you do use the default settings, you don't have to pass them to b8.
-
-b8's base configuration
------------------------
-
-All these values can be set in the "config_b8" array (the first parameter) passed to b8. The name of the array doesn't matter (of course), it just has to be the first argument.
-
-These are some basic settings telling b8 which backend classes to use:
-
-	**storage**
-		This defines which storage backend will be used to save b8's wordlist. Currently, two backends are available: `Berkeley DB `_ (``dba``) and `MySQL `_ (``mysql``). At the moment, b8 does not support `SQLite `_ (as the previous version did), but it will be (hopefully) re-added in one of the next releases. The default is ``dba`` (string).
-
-		*Berkeley DB*
-			This is the preferred storage backend. It was the original backend for the filter and remains the most performant. b8's storage model is optimized for this database, as it is really fast and fits perfectly to what the filter needs to do the job. All content is saved in a single file, you don't need special user rights or a database server. |br|
-			If you don't know whether your server's PHP can use a Berkeley DB, simply run the script ``install/setup_berkeleydb.php``. If it shows a Berkeley DB handler, please use this backend.
-
-		*MySQL*
-			As some webspace hosters don't allow using a Berkeley DB (but please be sure to check if you can use it!), but most do provide a MySQL server, using a MySQL table for the wordlist is provided as an alternative storage method. As said above, b8 was always intended to use a Berkeley DB. It doesn't use or need SQL to query the database. So, very likely, this will work less performant, produce a lot of unnecessary overhead and waste computing power. But it will do fine anyway!
-
-		See `Configuration of the storage backend`_ for the settings of the chosen backend.
-
-	**degenerator**
-		The degenerator class to be used. See `How does it work?`_ and [#betterbayesian]_ if you're interested in what "degeneration" is. Defaults to ``default`` (string). At the moment, only one degenerator exists, so you probably don't want to change this unless you have written your own degenerator.
-
-	**lexer**
-		The lexer class to be used. Defaults to ``default`` (string). At the moment, only one lexer exists, so you probably don't want to change this unless you have written your own lexer.
-
-		The behaviour of the lexer can be additionally configured with the following variables:
-
-			**min_size**
-				The minimal length for a token to be considered when calculating the rating of a text. Defaults to ``3`` (integer).
-
-			**max_size**
-				The maximal length for a token to be considered when calculating the rating of a text. Defaults to ``30`` (integer).
-
-			**allow_numbers**
-				Should pure numbers also be considered? Defaults to ``FALSE`` (boolean).
-
-The following settings influence the mathematical internals of b8. If you want to experiment, feel free to play around with them; but be warned: wrong settings of these values will result in poor performance or could even "short-circuit" the filter. |br|
-Leave these values as they are unless you know what you are doing!
-
-The "Statistical discussion about b8" [#b8statistic]_ shows why the default values are the default ones.
-
-	**use_relevant**
-		This tells b8 how many tokens should be used when calculating the spamminess of a text. The default setting is ``15`` (integer). This seems to be a quite reasonable value. When using to many tokens, the filter will fail on texts filled with useless stuff or with passages from a newspaper, etc. not being very spammish. |br|
-		The tokens counted multiple times (see above) are added in addition to this value. They don't replace other ratings.
-
-	**min_dev**
-		This defines a minimum deviation from 0.5 that a token's rating must have to be considered when calculating the spamminess. Tokens with a rating closer to 0.5 than this value will simply be skipped. |br|
-		If you don't want to use this feature, set this to ``0``. Defaults to ``0.2`` (float). Read [#b8statistic]_ before increasing this.
-
-	**rob_x**
-		This is Gary Robinson's *x* constant (cf. [#spamdetection]_). A completely unknown token will be rated with the value of ``rob_x``. The default ``0.5`` (float) seems to be quite reasonable, as we can't say if a token that also can't be rated by degeneration is good or bad. |br|
-		If you receive much more spam than ham or vice versa, you could change this setting accordingly.
-
-	**rob_s**
-		This is Gary Robinson's *s* constant. This is essentially the probability that the *rob_x* value is correct for a completely unknown token. It will also shift the probability of rarely seen tokens towards this value. The default is ``0.3`` (float) |br|
-		See [#spamdetection]_ for a closer description of the *s* constant and read [#b8statistic]_ for specific information about this constant in b8's algorithms.
-
-Configuration of the storage backend
-------------------------------------
-
-All the following values can be set in the "config_database" array (the second parameter) passed to b8. The name of the array doesn't matter (of course), it just has to be the second argument.
-
-Settings for the Berkeley DB (DBA) backend
-``````````````````````````````````````````
-**database**
-	The filename of the database file, relative to the location of ``b8.php``. Defaults to ``wordlist.db`` (string).
-
-**handler**
-	The DBA handler to use (cf. `the PHP documentation `_ and `Setting up a new Berkeley DB`_). Defaults to ``db4`` (string).
-
-Settings for the MySQL backend
-``````````````````````````````
-
-**database**
-	The database containing b8's wordlist table. Defaults to ``b8_wordlist`` (string).
-
-**table_name**
-	The table containing b8's wordlist. Defaults to ``b8_wordlist`` (string).
-
-**host**
-	The host of the MySQL server. Defaults to ``localhost`` (string).
-
-**user**
-	The user name used to open the database connection. Defaults to ``FALSE`` (boolean).
-
-**pass**
-	The password required to open the database connection. Defaults to ``FALSE`` (boolean).
-
-**connection**
-	An existing MySQL link-resource that can be used by b8. Defaults to ``NULL`` (NULL).
-
-Using b8
-========
-
-Now, that everything is configured, you can start to use b8. A sample script that shows what can be done with the filter exists in ``example/index.php``. The best thing for testing how all this works is to use this script before using b8 in your own scripts.
-
-Before you can start, you have to setup a database so that b8 can store a wordlist.
-
-Setting up a new database
--------------------------
-
-Setting up a new Berkeley DB
-````````````````````````````
-
-I wrote a script to setup a new Berkeley DB for b8. It is located in ``install/setup_berkeleydb.php``. Just run this script on your server and be sure that the directory containing it has the proper access rights set so that the server's HTTP server user or PHP user can create a new file in it (probably ``0777``). The script is quite self-explaining, just run it.
-
-Of course, you can also create a Berkeley DB by hand. In this case, you just have to insert three keys:
-
-::
-
-	bayes*dbversion  => 2
-	bayes*texts.ham  => 0
-	bayes*texts.spam => 0
-
-Be sure to set the right DBA handler in the storage backend configuration if it's not ``db4``.
-
-Setting up a new MySQL table
-````````````````````````````
-
-The SQL file ``install/setup_mysql.sql`` contains both the create statement for the wordlist table of b8 and the ``INSERT`` statements for adding the necessary internal variables.
-
-Simply change the table name according to your needs (or leave it as it is ;-) and run the SQL to setup a b8 wordlist MySQL table.
-
-Using b8 in your scripts
-------------------------
-
-Just have a look at the example script located in ``example/index.php`` to see how you can include b8 in your scripts. Essentially, this strips down to:
-
-::
-
-	# Include the b8 code
-	require "{$_SERVER['DOCUMENT_ROOT']}/b8/b8.php";
-
-	# Do some configuration
-
-	$config_b8 = array(
-		'some_key' => 'some_value',
-		'foo' => 'bar'
-	);
-
-	$config_database = array(
-		'some_key' => 'some_value',
-		'foo' => 'bar'
-	);
-
-	# Create a new b8 instance
-	$b8 = new b8($config_b8, $config_database);
-
-b8 provides three functions in an object oriented way (called e. g. via ``$b8->classify($text)``):
-
-**learn($text, $category)**
-	This saves the reference text ``$text`` (string) in the category ``$category`` (b8 constant). |br|
-	b8 0.5 introduced two constants that can be used as ``$category``: ``b8::HAM`` and ``b8::SPAM``. To be downward compatible with older versions of b8, the literal values "ham" and "spam" (case-sensitive strings) can still be used here.
-
-**unlearn($text, $category)**
-	This function just exists to delete a text from a category in which is has been stored accidentally before. It deletes the reference text ``$text`` (string) from the category ``$category`` (either the constants ``b8::HAM`` or ``b8::SPAM`` or the literal case-sensitive strings "ham" or "spam" – cf. above). |br|
-	**Don't delete a spam text from ham after saving it in spam or vice versa, as long you don't have stored it accidentally in the wrong category before!** This will not improve performance, quite the opposite: it will actually break the filter after a time, as the counter for saved ham or spam texts will reach 0, although you have ham or spam tokens stored: the filter will try to remove texts from the ham or spam data which have never been stored there, decrease the counter for tokens which are found just skip the non-existing words.
-
-**classify($text)**
-	This function takes the text ``$text`` (string), calculates it's probability for being spam it and returns a value between 0 and 1 (float). |br|
-	A value close to 0 says the text is more likely ham and a value close to 1 says the text is more likely spam. What to do with this value is *your* business ;-) See also `Tips on operation`_ below.
-
-Tips on operation
-=================
-
-Before b8 can decide whether a text is spam or ham, you have to tell it what you consider as spam or ham. At least one learned spam or one learned ham text is needed to calculate anything. To get good ratings, you need both learned ham and learned spam texts, the more the better. |br|
-What's considered as "ham" or "spam" can be very different, depending on the operation site. On my homepage, practically each and every text posted in English or using cyrillic letters is spam. On an English or Russian homepage, this will be not the case. So I think it's not really meaningful to provide some "spam data" to start. Just train b8 with "your" spam and ham.
-
-For the practical use, I advise to give the filter all data availible. E. g. name, email address, homepage, IP address und of course the text itself should be stored in a variable (e. g. separated with an ``\n`` or just a space or tab after each block) and then be classified. The learning should also be done with all data availible. |br|
-Saving the IP address is probably only meaningful for spam entries, because spammers often use the same IP address multiple times. In principle, you can leave out the IP of ham entries.
-
-You can use b8 e. g. in a guestbook script and let it classify the text before saving it. Everyone has to decide which rating is necessary to classify a text as "spam", but a rating of >= 0.8 seems to be reasonable for me. If one expects the spam to be in another language that the ham entries or the spams are very short normally, one could also think about a limit of 0.7. |br|
-The email filters out there mostly use > 0.9 or even > 0.99; but keep in mind that they have way more data to analyze in most of the cases. A guestbook entry may be quite short, especially when it's spam.
-
-In my opinion, a autolearn function is very handy. I save spam messages with a rating higher than 0.7 but less than 0.9 automatically as spam. I don't do this with ham messages in an automated way to prevent the filter from saving a false negative as ham and then classifying and learning all the spam as ham when I'm on holidays ;-)
-
-Closing
-=======
-
-So … that's it. Thanks for using b8! If you find a bug or have an idea how to make b8 better, let me know. I'm also always looking forward to get e-mails from people using b8 on their homepages :-)
-
-References
-==========
-
-.. [#planforspam] Paul Graham, *A Plan For Spam* (http://paulgraham.com/spam.html)
-.. [#betterbayesian] Paul Graham, *Better Bayesian Filtering* (http://paulgraham.com/better.html)
-.. [#spamdetection] Gary Robinson, *Spam Detection* (http://radio.weblogs.com/0101454/stories/2002/09/16/spamDetection.html)
-.. [#statisticalapproach] *A Statistical Approach to the Spam Problem* (http://linuxjournal.com/article/6467)
-.. [#b8statistic] Tobias Leupold, *Statistical discussion about b8* (http://nasauber.de/opensource/b8/discussion/)
-
-Appendix
-========
-
-FAQ
----
-
-What about more than two categories?
-````````````````````````````````````
-
-I wrote b8 with the `KISS principle `__ in mind. For the "end-user", we have a class with almost no setup to do that can do three things: classify a text, learn a text and un-learn a text. Normally, there's no need to un-learn a text, so essentially, there are only two functions we need. |br|
-This simplicity is only possible because b8 only knows two categories (normally "Ham" and "Spam" or some other category pair) and tells you, in one float number between 0 and 1, if a given texts rather fits in the first or the second category. If we would support multiple categories, more work would have to be done and things would become more complicated. One would have to setup the categories, have another database layout (perhaps making it mandatory to have SQL) and one float number would not be sufficient to describe b8's output, so more code would be needed – even outside of b8.
-
-All the code, the database layout and particularly the math is intended to do exactly one thing: distinguish between two categories. I think it would be a lot of work to change b8 so that it would support more than two categories. Probably, this is possible to do, but don't ask me in which way we would have to change the math to get multiple-category support – I'm a dentist, not a mathematician ;-) |br|
-Apart from this I do believe that most people using b8 don't want or need multiple categories. They just want to know if a text is spam or not, don't they? I do, at least ;-)
-
-But let's think about the multiple-category thing. How would we calculate a rating for more than two categories? If we had a third one, let's call it "`Treet `__", how would we calculate a rating? We could calculate three different ratings. One for "Ham", one for "Spam" and one for "Treet" and choose the highest one to tell the user what category fits best for the text. This could be done by using a small wrapper script using three instances of b8 as-is and three different databases, each containing texts being "Ham", "Spam", "Treet" and the respective counterparts. |br|
-But here's the problem: if we have "Ham" and "Spam", "Spam" is the counterpart of "Ham". But what's the counterpart of "Spam" if we have more than one additional category? Where do the "Non-Ham", "Non-Spam" and "Non-Treet" texts come from?
-
-Another approach, a direct calculation of more than two probabilities (the "Ham" probability is simply 1 minus the "Spam" probability, so we actually get two probabilities with the return value of b8) out of one database would require big changes in b8's structure and math.
-
-There's a project called `PHPNaiveBayesianFilter `__ which supports multiple categories by default. The author calls his software "Version 1.0", but I think this is the very first release, not a stable or mature one. The most recent change of that release dates back to 2003 according to the "changed" date of the files inside the zip archive, so probably, this project is dead or has never been alive and under active development at all. |br|
-Actually, I played around with that code but the results weren't really good, so I decided to write my own spam filter from scratch back in early 2006 ;-)
-
-All in all, there seems to be no easy way to implement multiple (meaning more than two) categories using b8's current code base and probably, b8 will never support more than two categories. Perhaps, a fork or a complete re-write would  be better than implementing such a feature. Anyway, I don't close my mind to multiple categories in b8. Feel free to tell me how multiple categories could be implementented in b8 or how a multiple-category version using the same code base (sharing a common abstract class?) could be written.
-
-What about a list with words to ignore?
-```````````````````````````````````````
-
-Some people suggested to introduce a list with words that b8 will simply ignore. Like "and", "or", "the", and so on. I don't think this is very meaningful.
-
-First, it would just work for the particular language that has been stored in the list. Speaking of my homepage, most of my spam is English, almost all my ham is German. So I would have to maintain a list with the probably less interesting words for at least two languages. Additionally, I get spam in Chinese, Japanese and Cyrillic writing or something else I can't read as well. What word should be ignored in those texts?  |br|
-Second, why should we ever exclude words? Who tells us those words are *actually* meaningless? If a word appears both in ham and spam, it's rating will be near 0.5 and so, it won't be used for the final calculation if a appropriate minimum deviation was set. So b8 will exclude it anyway without any blacklist. And think of this: if we excluded a word of which we only *think* it doesn't mean anything but it actually does appear more often in ham or spam, the results will get even worse.
-
-So why should we care about things we do not have to care about? ;-)
-
-
-Why is it called "b8"?
-``````````````````````
-
-The initial name for the filter was (damn creative!) "bayes-php". There were two main reasons for searching another name: 1. "bayes-php" sucks. 2. the `PHP License `_ says the PHP guys do not like when the name of a script written in PHP contains the word "PHP". Read the `License FAQ `_ for a reasonable argumentation about this.
-
-Luckily, `Tobias Lang `_ proposed the new name "b8". And these are the reasons why I chose this name:
-
-- "bayes-php" is a "b" followed by 8 letters.
-- "b8" is short and handy. Additionally, there was no program with the name "b8" or "bate"
-- The English verb "to bate" means "to decrease" – and that's what b8 does: it decreases the number of spam entries in your weblog or guestbook!
-- "b8" just sounds way cooler than "bayes-php" ;-)
-
-About the database
-------------------
-
-The database layout
-```````````````````
-
-The database layout is quite simple. It's just key:value for everything stored. There are three "internal" variables stored as normal tokens (but all containing a ``*`` which is always used as a split character by the lexer, so we can't get collisions):
-
-**bayes*dbversion**
-	This indicates the database's "version". The first versions of b8 did not set this. Version "2" indicates that we have a database created by a b8 version already storing `the "lastseen" parameter`_.
-
-**bayes*texts.ham**
-	The number of ham texts learned.
-
-**bayes*texts.spam**
-	The number of spam texts learned.
-
-Each "normal" token is stored with it's literal name as the key and it's data as the value. The data consists of the count of the token in all ham and spam texts and the date when the token was used the last time, all in one string and separated by spaces. So we have the following scheme:
-
-::
-
-	"token" => "count_ham count_spam lastseen"
-
-The "lastseen" parameter
-````````````````````````
-
-Somebody looking at the code might be wondering why b8 stores this "lastseen" parameter. This value is not used for any calculation at the moment. Initially, it was intended to keep the database maintainable in a way that "old" data could be removed. When e. g. a token only appeared once in ham or spam and has not been seen for a year, one could simply delete it from the database. |br|
-I actually never used this feature (does anybody?). So probably, some changes will be done to this one day. Perhaps, I find a way to include this data in the spamminess calculation in a meaningful way, or at least for some statistics. One could also make this optional to keep the calculation effort small if this is needed.
-
-Feel free to send me any suggestions about this!
-
-.. |br| raw:: html
-
-   
    
-
-.. section-numbering::
-
-.. |date| date::
diff --git a/library/spam/example/index.php b/library/spam/example/index.php
deleted file mode 100644
index 6d3c14260..000000000
--- a/library/spam/example/index.php
+++ /dev/null
@@ -1,241 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-
-### This is an example script demonstrating how b8 can be used. ###
-
-#/*
-
-# Use this code block if you want to use Berkeley DB.
-
-# The database filename is interpreted relative to the b8.php script location.
-
-$config_b8 = array(
-	'storage' => 'dba'
-);
-
-$config_database = array(
-	'database' => 'wordlist.db',
-	'handler'  => 'db4'
-);
-
-#*/
-
-/*
-
-# Use this code block if you want to use MySQL.
-
-# An existing link resource can be passed to b8 by setting
-# $config_database['connection'] to this link resource.
-# Be sure to set your database access data otherwise!
-
-$config_b8 = array(
-	'storage' => 'mysql'
-);
-
-$config_database = array(
-	'database'   => 'test',
-	'table_name' => 'b8_wordlist',
-	'host'       => 'localhost',
-	'user'       => '',
-	'pass'       => ''
-);
-
-*/
-
-# To be able to calculate the time the classification took
-
-$time_start = NULL;
-
-function microtimeFloat()
-{
-	list($usec, $sec) = explode(" ", microtime());
-	return ((float) $usec + (float) $sec);
-}
-
-# Output a nicely colored rating
-
-function formatRating($rating)
-{
-
-	if($rating === FALSE)
-		return "could not calculate spaminess";
-
-	$red   = floor(255 * $rating);
-	$green = floor(255 * (1 - $rating));
-
-	return "" . sprintf("%5f", $rating) . "";
-
-}
-
-echo <<
-
-
-
-
-
-
-
-example b8 interface
-
-
-
-
-
-
-
-
-
-
-
    
-
-
    example b8 interface
    
-
-
-END;
-
-$postedText = "";
-
-if(isset($_POST['action']) and $_POST['text'] ==  "")
-	echo "
    Please type in a text!
    \n\n";
-
-elseif(isset($_POST['action']) and $_POST['text'] !=  "") {
-
-	$time_start = microtimeFloat();
-
-	# Include the b8 code
-	require dirname(__FILE__) . "/../b8/b8.php";
-
-	# Create a new b8 instance
-	$b8 = new b8($config_b8, $config_database);
-
-	# Check if everything worked smoothly
-
-	$started_up = $b8->validate();
-
-	if($started_up !== TRUE) {
-		echo "example: Could not initialize b8. error code: $started_up";
-		exit;
-	}
-
-	$text = stripslashes($_POST['text']);
-	$postedText = htmlentities($text, ENT_QUOTES, 'UTF-8');
-
-	switch($_POST['action']) {
-
-		case "Classify":
-			echo "
    Spaminess: " . formatRating($b8->classify($text)) . "
    \n";
-			break;
-
-		case "Save as Spam":
-
-			$ratingBefore = $b8->classify($text);
-			$b8->learn($text, b8::SPAM);
-			$ratingAfter = $b8->classify($text);
-
-			echo "
    Saved the text as Spam
    \n\n";
-
-			echo "
    \n";
-			echo "\n";
-			echo "\n";
-			echo "
    Classification before learning:" . formatRating($ratingBefore) . "
    Classification after learning:"  . formatRating($ratingAfter)  . "
    \n\n";
-
-			break;
-
-		case "Save as Ham":
-
-			$ratingBefore = $b8->classify($text);
-			$b8->learn($text, b8::HAM);
-			$ratingAfter = $b8->classify($text);
-
-			echo "
    Saved the text as Ham
    \n\n";
-
-			echo "
    \n";
-			echo "\n";
-			echo "\n";
-			echo "
    Classification before learning:" . formatRating($ratingBefore) . "
    Classification after learning:"  . formatRating($ratingAfter)  . "
    \n\n";
-
-			break;
-
-		case "Delete from Spam":
-			$b8->unlearn($text, b8::SPAM);
-			echo "
    Deleted the text from Spam
    \n\n";
-			break;
-
-		case "Delete from Ham":
-			$b8->unlearn($text, b8::HAM);
-			echo "
    Deleted the text from Ham
    \n\n";
-			break;
-
-	}
-
-	$mem_used      = round(memory_get_usage() / 1048576, 5);
-	$peak_mem_used = round(memory_get_peak_usage() / 1048576, 5);
-	$time_taken    = round(microtimeFloat() - $time_start, 5);
-
-}
-
-echo <<
-
    
-
    
-
-
    
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    
-
    
-
-
-
-END;
-
-if($time_start !== NULL) {
-
-echo <<
-
-
-
-
-
    Memory used:     $mem_used MB
    Peak memory used:$peak_mem_used MB
    Time taken:      $time_taken sec
    
-
-
-END;
-
-}
-
-?>
-
-
-
-
diff --git a/library/spam/install/setup_berkeleydb.php b/library/spam/install/setup_berkeleydb.php
deleted file mode 100644
index 81e1d5afa..000000000
--- a/library/spam/install/setup_berkeleydb.php
+++ /dev/null
@@ -1,240 +0,0 @@
-
-#
-#   This file is part of the b8 package
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation in version 2.1 of the License.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-echo <<
-
-
-
-
-
-
-
-b8 Berkeley DB setup
-
-
-
-
-
-
-
-
-
-
-
    
-
-
    b8 Berkeley DB setup
    
-
-
-END;
-
-$failed = FALSE;
-
-if(isset($_POST['handler'])) {
-
-	$dbfile = $_POST['dbfile'];
-	$dbfile_directory = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']);
-
-	echo "
    Creating database
    \n\n";
-
-	echo "
    \n";
-
-	echo "Checking database file name … ";
-
-	if($dbfile == "") {
-		echo "Please provide the name of the database file!
    \n";
-		$failed = TRUE;
-	}
-	else
-		echo "$dbfile
    \n";
-
-	if(!$failed) {
-
-		echo "Touching/Creating " . htmlentities($dbfile) . " … ";
-
-		if(touch($dbfile) === FALSE) {
-			echo "Failed to touch the database file. Please check the given filename and/or fix the permissions of $dbfile_directory.
    \n";
-			$failed = TRUE;
-		}
-		else
-			echo "done
    \n";
-
-	}
-
-	if(!$failed) {
-
-		echo "Setting file permissions to 0666 &hellip ";
-
-		if(chmod($dbfile, 0666) === FALSE) {
-			echo "Failed to change the permissions of $dbfile_directory/$dbfile. Please adjust them manually.
    \n";
-			$failed = TRUE;
-		}
-		else
-			echo "done
    \n";
-
-	}
-
-	if(!$failed) {
-
-		echo "Checking if the given file is empty &hellip ";
-
-		if(filesize($dbfile) > 0) {
-			echo "$dbfile_directory/$dbfile is not empty. Can't create a new database. Please delete/empty this file or give another filename.
    \n";
-			$failed = TRUE;
-		}
-		else
-			echo "it is
    \n";
-
-	}
-
-	if(!$failed) {
-
-		echo "Connecting to $dbfile … ";
-
-		$db = dba_open($dbfile, "c", $_POST['handler']);
-
-		if($db === FALSE) {
-			echo "Could not connect to the database!
    \n";
-			$failed = TRUE;
-		}
-		else
-			echo "done
    \n";
-
-	}
-
-	if(!$failed) {
-
-		echo "Storing necessary internal variables &hellip ";
-
-		$internals = array(
-			"bayes*dbversion" => "2",
-			"bayes*texts.ham" => "0",
-			"bayes*texts.spam" => "0"
-		);
-
-		foreach($internals as $key => $value) {
-			if(dba_insert($key, $value, $db) === FALSE) {
-				echo "Failed to insert data!
    \n";
-				$failed = TRUE;
-				break;
-			}
-		}
-
-		if(!$failed)
-			echo "done
    \n";
-
-	}
-
-	if(!$failed) {
-
-		echo "Trying to read data from the database &hellip ";
-
-		$dbversion = dba_fetch("bayes*dbversion", $db);
-
-		if($dbversion != "2") {
-			echo "Failed to read data!
    \n";
-			$failed = TRUE;
-		}
-		else
-			echo "success
    \n";
-	}
-
-	if(!$failed) {
-
-		dba_close($db);
-
-		echo "
    \n\n";
-		echo "
    Successfully created a new b8 database!
    \n\n";
-		echo "\n";
-		echo "\n";
-		echo "\n";
-		echo "
    Filename:$dbfile_directory/$dbfile
    DBA handler:{$_POST['handler']}
    \n\n";
-		echo "
    Move this file to it's destination directory (default: the base directory of b8) to use it with b8. Be sure to use the right DBA handler in b8's configuration.";
-
-	}
-
-	echo "
    \n\n";
-
-}
-
-if($failed === TRUE or !isset($_POST['handler'])) {
-
-echo <<
-
-
    DBA Handler
    
-
-
    
-The following table shows all available DBA handlers. Please choose the "Berkeley DB" one.
-
    
-
-
-
-
-END;
-
-foreach(dba_handlers(TRUE) as $name => $version) {
-
-	$checked = "";
-
-	if(!isset($_POST['handler'])) {
-		if(strpos($version, "Berkeley") !== FALSE )
-			$checked = " checked=\"checked\"";
-	}
-	else {
-		if($_POST['handler'] == $name)
-			$checked = " checked=\"checked\"";
-	}
-
-	echo "\n";
-
-}
-
-echo <<
-
-
    Database file
    
-
-
    
-Please the name of the desired database file. It will be created in the directory where this script is located.
-
    
-
-
    
-
-
    
-
-
    
-
-
    
-
-
-
-
-END;
-
-}
-
-?>
-
-
-
-
-
-
diff --git a/library/spam/install/setup_mysql.sql b/library/spam/install/setup_mysql.sql
deleted file mode 100644
index ac43274e9..000000000
--- a/library/spam/install/setup_mysql.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-
---   Copyright (C) 2010 Tobias Leupold 
---
---   This file is part of the b8 package
---
---   This program is free software; you can redistribute it and/or modify it
---   under the terms of the GNU Lesser General Public License as published by
---   the Free Software Foundation in version 2.1 of the License.
---
---   This program is distributed in the hope that it will be useful, but
---   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
---   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
---   License for more details.
---
---   You should have received a copy of the GNU Lesser General Public License
---   along with this program; if not, write to the Free Software Foundation,
---   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-CREATE TABLE `b8_wordlist` (
-  `token` varchar(255) character set utf8 collate utf8_bin NOT NULL,
-  `count` varchar(255) default NULL,
-  PRIMARY KEY  (`token`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `b8_wordlist` VALUES ('bayes*dbversion', '2');
-INSERT INTO `b8_wordlist` VALUES ('bayes*texts.ham', '0');
-INSERT INTO `b8_wordlist` VALUES ('bayes*texts.spam', '0');
diff --git a/mod/admin.php b/mod/admin.php
index b1bc8de5f..cf0714ef9 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -629,7 +629,6 @@ function admin_page_site_post(App $a) {
 	$no_multi_reg		=	((x($_POST,'no_multi_reg'))		? True						: False);
 	$no_openid		=	!((x($_POST,'no_openid'))		? True						: False);
 	$no_regfullname		=	!((x($_POST,'no_regfullname'))		? True						: False);
-	$no_utf			=	!((x($_POST,'no_utf'))			? True						: False);
 	$community_page_style	=	((x($_POST,'community_page_style'))	? intval(trim($_POST['community_page_style']))	: 0);
 	$max_author_posts_community_page	=	((x($_POST,'max_author_posts_community_page'))	? intval(trim($_POST['max_author_posts_community_page']))	: 0);
 
@@ -666,7 +665,6 @@ function admin_page_site_post(App $a) {
 	$proxy_disabled		=	((x($_POST,'proxy_disabled'))		? True						: False);
 	$only_tag_search	=	((x($_POST,'only_tag_search'))		? True						: False);
 	$rino			=	((x($_POST,'rino'))			? intval($_POST['rino'])			: 0);
-	$embedly		=	((x($_POST,'embedly'))			? notags(trim($_POST['embedly']))		: '');
 	$worker_queues		=	((x($_POST,'worker_queues'))		? intval($_POST['worker_queues'])		: 4);
 	$worker_dont_fork	=	((x($_POST,'worker_dont_fork'))		? True						: False);
 	$worker_fastlane	=	((x($_POST,'worker_fastlane'))		? True						: False);
@@ -763,66 +761,57 @@ function admin_page_site_post(App $a) {
 		} else {
 			set_config('system','singleuser', $singleuser);
 		}
-	set_config('system','maximagesize', $maximagesize);
-	set_config('system','max_image_length', $maximagelength);
-	set_config('system','jpeg_quality', $jpegimagequality);
+	set_config('system', 'maximagesize', $maximagesize);
+	set_config('system', 'max_image_length', $maximagelength);
+	set_config('system', 'jpeg_quality', $jpegimagequality);
 
-	set_config('config','register_policy', $register_policy);
-	set_config('system','max_daily_registrations', $daily_registrations);
-	set_config('system','account_abandon_days', $abandon_days);
-	set_config('config','register_text', $register_text);
-	set_config('system','allowed_sites', $allowed_sites);
-	set_config('system','allowed_email', $allowed_email);
-	set_config('system','block_public', $block_public);
-	set_config('system','publish_all', $force_publish);
-	set_config('system','directory', $global_directory);
-	set_config('system','thread_allow', $thread_allow);
-	set_config('system','newuser_private', $newuser_private);
-	set_config('system','enotify_no_content', $enotify_no_content);
-	set_config('system','disable_embedded', $disable_embedded);
-	set_config('system','allow_users_remote_self', $allow_users_remote_self);
+	set_config('config', 'register_policy', $register_policy);
+	set_config('system', 'max_daily_registrations', $daily_registrations);
+	set_config('system', 'account_abandon_days', $abandon_days);
+	set_config('config', 'register_text', $register_text);
+	set_config('system', 'allowed_sites', $allowed_sites);
+	set_config('system', 'allowed_email', $allowed_email);
+	set_config('system', 'block_public', $block_public);
+	set_config('system', 'publish_all', $force_publish);
+	set_config('system', 'directory', $global_directory);
+	set_config('system', 'thread_allow', $thread_allow);
+	set_config('system', 'newuser_private', $newuser_private);
+	set_config('system', 'enotify_no_content', $enotify_no_content);
+	set_config('system', 'disable_embedded', $disable_embedded);
+	set_config('system', 'allow_users_remote_self', $allow_users_remote_self);
 
-	set_config('system','block_extended_register', $no_multi_reg);
-	set_config('system','no_openid', $no_openid);
-	set_config('system','no_regfullname', $no_regfullname);
-	set_config('system','community_page_style', $community_page_style);
-	set_config('system','max_author_posts_community_page', $max_author_posts_community_page);
-	set_config('system','no_utf', $no_utf);
-	set_config('system','verifyssl', $verifyssl);
-	set_config('system','proxyuser', $proxyuser);
-	set_config('system','proxy', $proxy);
-	set_config('system','curl_timeout', $timeout);
-	set_config('system','dfrn_only', $dfrn_only);
-	set_config('system','ostatus_disabled', $ostatus_disabled);
-	set_config('system','ostatus_poll_interval', $ostatus_poll_interval);
-	set_config('system','ostatus_full_threads', $ostatus_full_threads);
-	set_config('system','diaspora_enabled', $diaspora_enabled);
+	set_config('system', 'block_extended_register', $no_multi_reg);
+	set_config('system', 'no_openid', $no_openid);
+	set_config('system', 'no_regfullname', $no_regfullname);
+	set_config('system', 'community_page_style', $community_page_style);
+	set_config('system', 'max_author_posts_community_page', $max_author_posts_community_page);
+	set_config('system', 'verifyssl', $verifyssl);
+	set_config('system', 'proxyuser', $proxyuser);
+	set_config('system', 'proxy', $proxy);
+	set_config('system', 'curl_timeout', $timeout);
+	set_config('system', 'dfrn_only', $dfrn_only);
+	set_config('system', 'ostatus_disabled', $ostatus_disabled);
+	set_config('system', 'ostatus_poll_interval', $ostatus_poll_interval);
+	set_config('system', 'ostatus_full_threads', $ostatus_full_threads);
+	set_config('system', 'diaspora_enabled', $diaspora_enabled);
 
-	set_config('config','private_addons', $private_addons);
-
-	set_config('system','force_ssl', $force_ssl);
-	set_config('system','hide_help', $hide_help);
-	set_config('system','use_fulltext_engine', $use_fulltext_engine);
-	set_config('system','itemcache', $itemcache);
-	set_config('system','itemcache_duration', $itemcache_duration);
-	set_config('system','max_comments', $max_comments);
-	set_config('system','temppath', $temppath);
-	set_config('system','basepath', $basepath);
-	set_config('system','proxy_disabled', $proxy_disabled);
-	set_config('system','only_tag_search', $only_tag_search);
-	set_config('system','worker_queues', $worker_queues);
-	set_config('system','worker_dont_fork', $worker_dont_fork);
-	set_config('system','worker_fastlane', $worker_fastlane);
-	set_config('system','frontend_worker', $worker_frontend);
-
-	if (($rino == 2) and !function_exists('mcrypt_create_iv')) {
-		notice(t("RINO2 needs mcrypt php extension to work."));
-	} else {
-		set_config('system','rino_encrypt', $rino);
-	}
-
-	set_config('system','embedly', $embedly);
+	set_config('config', 'private_addons', $private_addons);
 
+	set_config('system', 'force_ssl', $force_ssl);
+	set_config('system', 'hide_help', $hide_help);
+	set_config('system', 'use_fulltext_engine', $use_fulltext_engine);
+	set_config('system', 'itemcache', $itemcache);
+	set_config('system', 'itemcache_duration', $itemcache_duration);
+	set_config('system', 'max_comments', $max_comments);
+	set_config('system', 'temppath', $temppath);
+	set_config('system', 'basepath', $basepath);
+	set_config('system', 'proxy_disabled', $proxy_disabled);
+	set_config('system', 'only_tag_search', $only_tag_search);
+	set_config('system', 'worker_queues', $worker_queues);
+	set_config('system', 'worker_dont_fork', $worker_dont_fork);
+	set_config('system', 'worker_fastlane', $worker_fastlane);
+	set_config('system', 'frontend_worker', $worker_frontend);
+	set_config('system', 'rino_encrypt', $rino);
 
 	info(t('Site settings updated.').EOL);
 	goaway('admin/site');
@@ -1012,7 +1001,6 @@ function admin_page_site(App $a) {
 		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
 		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
 		'$no_regfullname'	=> array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
-		'$no_utf'		=> array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")),
 		'$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
 		'$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
 		'$ostatus_disabled' 	=> array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
@@ -1053,7 +1041,6 @@ function admin_page_site(App $a) {
 		'$relocate_url'		=> array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
 
 		'$rino' 		=> array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
-		'$embedly' 		=> array('embedly', t("Embedly API key"), get_config('system','embedly'), t("Embedly is used to fetch additional data for web pages. This is an optional parameter.")),
 
 		'$worker_queues' 	=> array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
 		'$worker_dont_fork'	=> array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")),
diff --git a/mod/babel.php b/mod/babel.php
index e8ea11c94..f71863bde 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -1,78 +1,73 @@
 ', $s);
+	return str_replace("\n", '
    ', $s);
 }
 
 function babel_content(App $a) {
-
 	$o .= '
    Babel Diagnostic
    ';
 
 	$o .= '
    ';
-	$o .= t('Source (bbcode) text:') . EOL . '' . EOL;
+	$o .= t('Source (bbcode) text:') . EOL;
+	$o .= '' . EOL;
 	$o .= '';
 
 	$o .= '

    ';
 
 	$o .= '
    ';
-	$o .= t('Source (Diaspora) text to convert to BBcode:') . EOL . '' . EOL;
+	$o .= t('Source (Diaspora) text to convert to BBcode:') . EOL;
+	$o .= '' . EOL;
 	$o .= '';
 
 	$o .= '

    ';
 
-	if(x($_REQUEST,'text')) {
-
+	if (x($_REQUEST, 'text')) {
 		$text = trim($_REQUEST['text']);
-		$o .= "
    " . t("Source input: ") . "
    " . EOL. EOL;
+		$o .= '
    ' . t('Source input: ') . '
    ' . EOL. EOL;
 		$o .= visible_lf($text) . EOL. EOL;
 
 		$html = bbcode($text);
-		$o .= "
    " . t("bb2html (raw HTML): ") . "
    " . EOL. EOL;
+		$o .= '
    ' . t('bb2html (raw HTML): ') . '
    ' . EOL. EOL;
 		$o .= htmlspecialchars($html). EOL. EOL;
 
 		//$html = bbcode($text);
-		$o .= "
    " . t("bb2html: ") . "
    " . EOL. EOL;
+		$o .= '
    ' . t('bb2html: ') . '
    ' . EOL. EOL;
 		$o .= $html. EOL. EOL;
 
 		$bbcode = html2bbcode($html);
-		$o .= "
    " . t("bb2html2bb: ") . "
    " . EOL. EOL;
+		$o .= '
    ' . t('bb2html2bb: ') . '
    ' . EOL. EOL;
 		$o .= visible_lf($bbcode) . EOL. EOL;
 
 		$diaspora = bb2diaspora($text);
-		$o .= "
    " . t("bb2md: ") . "
    " . EOL. EOL;
+		$o .= '
    ' . t('bb2md: ') . '
    ' . EOL. EOL;
 		$o .= visible_lf($diaspora) . EOL. EOL;
 
 		$html = Markdown($diaspora);
-		$o .= "
    " . t("bb2md2html: ") . "
    " . EOL. EOL;
+		$o .= '
    ' . t('bb2md2html: ') . '
    ' . EOL. EOL;
 		$o .= $html. EOL. EOL;
 
 		$bbcode = diaspora2bb($diaspora);
-		$o .= "
    " . t("bb2dia2bb: ") . "
    " . EOL. EOL;
+		$o .= '
    ' . t('bb2dia2bb: ') . '
    ' . EOL. EOL;
 		$o .= visible_lf($bbcode) . EOL. EOL;
 
 		$bbcode = html2bbcode($html);
-		$o .= "
    " . t("bb2md2html2bb: ") . "
    " . EOL. EOL;
+		$o .= '
    ' . t('bb2md2html2bb: ') . '
    ' . EOL. EOL;
 		$o .= visible_lf($bbcode) . EOL. EOL;
-
-
-
 	}
 
-	if(x($_REQUEST,'d2bbtext')) {
-
+	if (x($_REQUEST, 'd2bbtext')) {
 		$d2bbtext = trim($_REQUEST['d2bbtext']);
-		$o .= "
    " . t("Source input (Diaspora format): ") . "
    " . EOL. EOL;
-		$o .= visible_lf($d2bbtext) . EOL. EOL;
-
+		$o .= '
    ' . t('Source input (Diaspora format): ') . '
    ' . EOL. EOL;
+		$o .= '
    ' . $d2bbtext . '
    ' . EOL. EOL;
 
 		$bb = diaspora2bb($d2bbtext);
-		$o .= "
    " . t("diaspora2bb: ") . "
    " . EOL. EOL;
-		$o .= visible_lf($bb) . EOL. EOL;
+		$o .= '
    ' . t('diaspora2bb: ') . '
    ' . EOL. EOL;
+		$o .= '
    ' . $bb . '
    ' . EOL. EOL;
 	}
 
 	return $o;
diff --git a/mod/community.php b/mod/community.php
index 174330401..45326e291 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -1,12 +1,12 @@
 ' . t('Community') . '';
-	if(! $update) {
+	if (! $update) {
 		nav_set_selected('community');
 	}
 
-	if(x($a->data,'search'))
+	if (x($a->data,'search')) {
 		$search = notags(trim($a->data['search']));
-	else
+	} else {
 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
-
+	}
 
 	// Here is the way permissions work in this module...
 	// Only public posts can be shown
@@ -55,7 +51,7 @@ function community_content(App $a, $update = 0) {
 		return $o;
 	}
 
-	$maxpostperauthor = get_config('system','max_author_posts_community_page');
+	$maxpostperauthor = Config::get('system','max_author_posts_community_page');
 
 	if ($maxpostperauthor != 0) {
 		$count = 1;
@@ -65,23 +61,24 @@ function community_content(App $a, $update = 0) {
 
 		do {
 			foreach ($r AS $row=>$item) {
-				if ($previousauthor == $item["author-link"])
+				if ($previousauthor == $item["author-link"]) {
 					++$numposts;
-				else
+				} else {
 					$numposts = 0;
-
+				}
 				$previousauthor = $item["author-link"];
 
-				if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage']))
+				if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) {
 					$s[] = $item;
+				}
 			}
-			if ((sizeof($s) < $a->pager['itemspage']))
+			if ((sizeof($s) < $a->pager['itemspage'])) {
 				$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
-
+			}
 		} while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0));
-	} else
+	} else {
 		$s = $r;
-
+	}
 	// we behave the same in message lists as the search module
 
 	$o .= conversation($a, $s, 'community', $update);
@@ -92,9 +89,9 @@ function community_content(App $a, $update = 0) {
 }
 
 function community_getitems($start, $itemspage) {
-	if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
+	if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) {
 		return(community_getpublicitems($start, $itemspage));
-
+	}
 	$r = qu("SELECT %s
 		FROM `thread`
 		INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index e2ce80627..7a3882a5b 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -185,10 +185,10 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 			 *
 			 */
 
-			$src_aes_key = random_string();
+			$src_aes_key = openssl_random_pseudo_bytes(64);
 
 			$result = '';
-			openssl_private_encrypt($dfrn_id,$result,$user[0]['prvkey']);
+			openssl_private_encrypt($dfrn_id, $result, $user[0]['prvkey']);
 
 			$params['dfrn_id'] = bin2hex($result);
 			$params['public_key'] = $public_key;
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index d34c959f1..8df462e58 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -142,8 +142,6 @@ function dfrn_notify_post(App $a) {
 
 	$rino = get_config('system','rino_encrypt');
 	$rino = intval($rino);
-	// use RINO1 if mcrypt isn't installed and RINO2 was selected
-	if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
 
 	logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
@@ -184,7 +182,7 @@ function dfrn_notify_post(App $a) {
 			case 1:
 				// we got a key. old code send only the key, without RINO version.
 				// we assume RINO 1 if key and no RINO version
-				$data = aes_decrypt(hex2bin($data),$final_key);
+				$data = dfrn::aes_decrypt(hex2bin($data),$final_key);
 				break;
 			case 2:
 				try {
@@ -315,8 +313,6 @@ function dfrn_notify_content(App $a) {
 
 		$rino = get_config('system','rino_encrypt');
 		$rino = intval($rino);
-		// use RINO1 if mcrypt isn't installed and RINO2 was selected
-		if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
 
 		logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 1b19ad92c..c5844d13d 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -73,9 +73,9 @@ function dirfind_content(App $a, $prefix = "") {
 			$j->results[] = $objresult;
 
 			// Add the contact to the global contacts if it isn't already in our system
-			if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0))
-				poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"],
-					"", "", "", "", "", datetime_convert(), 0);
+			if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0)) {
+				update_gcontact($user_data);
+			}
 		} elseif ($local) {
 
 			if ($community)
diff --git a/mod/install.php b/mod/install.php
index fa952a79b..ce229244c 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -78,14 +78,7 @@ function install_post(App $a) {
 			$timezone = notags(trim($_POST['timezone']));
 			$language = notags(trim($_POST['language']));
 			$adminmail = notags(trim($_POST['adminmail']));
-			// In step 4 of the installer, we passed the  check for mcrypt
-			// already, so we can activate RINO, make RINO2 the default
-			// and only fall back if the mcrypt_create_iv function is
-			// not available on the system.
 			$rino = 2;
-			if (! function_exists('mcrypt_create_iv')) {
-				$rino = 1;
-			}
 
 			// connect to db
 			$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
@@ -422,7 +415,6 @@ function check_funcs(&$checks) {
 	check_add($ck_funcs, t('OpenSSL PHP module'), true, true, "");
 	check_add($ck_funcs, t('mysqli PHP module'), true, true, "");
 	check_add($ck_funcs, t('mb_string PHP module'), true, true, "");
-	check_add($ck_funcs, t('mcrypt PHP module'), true, true, "");
 	check_add($ck_funcs, t('XML PHP module'), true, true, "");
 	check_add($ck_funcs, t('iconv module'), true, true, "");
 
@@ -454,10 +446,6 @@ function check_funcs(&$checks) {
 		$ck_funcs[4]['status']= false;
 		$ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.');
 	}
-	if (! function_exists('mcrypt_create_iv')){
-		$ck_funcs[5]['status']= false;
-		$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
-	}
 	if (! function_exists('iconv_strlen')){
 		$ck_funcs[7]['status']= false;
 		$ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.');
@@ -465,18 +453,6 @@ function check_funcs(&$checks) {
 
 	$checks = array_merge($checks, $ck_funcs);
 
-	// check for 'mcrypt_create_iv()', needed for RINO2
-	if ($ck_funcs[5]['status']) {
-		if (function_exists('mcrypt_create_iv')) {
-			$__status = true;
-			$__help = t("If you are using php_cli, please make sure that mcrypt module is enabled in its config file");
-		} else {
-			$__status = false;
-			$__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.');
-		}
-		check_add($checks, t('mcrypt_create_iv() function'), $__status, false, $__help);
-	}
-
 	// check for XML DOM Documents being able to be generated
 	try {
 		$xml = new DOMDocument();
diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 6f2049475..7f010cee4 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -5,15 +5,13 @@
  * Documentation: http://nodeinfo.diaspora.software/schema.html
 */
 
-require_once("include/plugin.php");
+use \Friendica\Core\Config;
+
+require_once 'include/plugin.php';
 
 function nodeinfo_wellknown(App $a) {
-	if (!get_config("system", "nodeinfo")) {
-		http_status_exit(404);
-		killme();
-	}
-	$nodeinfo = array("links" => array(array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
-					"href" => App::get_baseurl()."/nodeinfo/1.0")));
+	$nodeinfo = array('links' => array(array('rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
+					'href' => App::get_baseurl().'/nodeinfo/1.0')));
 
 	header('Content-type: application/json; charset=utf-8');
 	echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
@@ -21,124 +19,127 @@ function nodeinfo_wellknown(App $a) {
 }
 
 function nodeinfo_init(App $a) {
-	if (!get_config("system", "nodeinfo")) {
+	if (!Config::get('system', 'nodeinfo')) {
 		http_status_exit(404);
 		killme();
 	}
 
-	if (($a->argc != 2) OR ($a->argv[1] != "1.0")) {
+	if (($a->argc != 2) OR ($a->argv[1] != '1.0')) {
 		http_status_exit(404);
 		killme();
 	}
 
-	$smtp = (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"));
+	$smtp = (function_exists('imap_open') AND !Config::get('system', 'imap_disabled') AND !Config::get('system', 'dfrn_only'));
 
 	$nodeinfo = array();
-	$nodeinfo["version"] = "1.0";
-	$nodeinfo["software"] = array("name" => "friendica", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
+	$nodeinfo['version'] = '1.0';
+	$nodeinfo['software'] = array('name' => 'friendica', 'version' => FRIENDICA_VERSION.'-'.DB_UPDATE_VERSION);
 
-	$nodeinfo["protocols"] = array();
-	$nodeinfo["protocols"]["inbound"] = array();
-	$nodeinfo["protocols"]["outbound"] = array();
+	$nodeinfo['protocols'] = array();
+	$nodeinfo['protocols']['inbound'] = array();
+	$nodeinfo['protocols']['outbound'] = array();
 
-	if (get_config("system","diaspora_enabled")) {
-		$nodeinfo["protocols"]["inbound"][] = "diaspora";
-		$nodeinfo["protocols"]["outbound"][] = "diaspora";
+	if (Config::get('system', 'diaspora_enabled')) {
+		$nodeinfo['protocols']['inbound'][] = 'diaspora';
+		$nodeinfo['protocols']['outbound'][] = 'diaspora';
 	}
 
-	$nodeinfo["protocols"]["inbound"][] = "friendica";
-	$nodeinfo["protocols"]["outbound"][] = "friendica";
+	$nodeinfo['protocols']['inbound'][] = 'friendica';
+	$nodeinfo['protocols']['outbound'][] = 'friendica';
 
-	if (!get_config("system","ostatus_disabled")) {
-		$nodeinfo["protocols"]["inbound"][] = "gnusocial";
-		$nodeinfo["protocols"]["outbound"][] = "gnusocial";
+	if (!Config::get('system', 'ostatus_disabled')) {
+		$nodeinfo['protocols']['inbound'][] = 'gnusocial';
+		$nodeinfo['protocols']['outbound'][] = 'gnusocial';
 	}
 
-	$nodeinfo["services"] = array();
-	$nodeinfo["services"]["inbound"] = array();
-	$nodeinfo["services"]["outbound"] = array();
+	$nodeinfo['services'] = array();
+	$nodeinfo['services']['inbound'] = array();
+	$nodeinfo['services']['outbound'] = array();
 
-	$nodeinfo["openRegistrations"] = ($a->config['register_policy'] != 0);
+	$nodeinfo['usage'] = array();
 
-	$nodeinfo["usage"] = array();
-	$nodeinfo["usage"]["users"] = array("total" => (int)get_config("nodeinfo","total_users"),
-				"activeHalfyear" => (int)get_config("nodeinfo","active_users_halfyear"),
-				"activeMonth" => (int)get_config("nodeinfo","active_users_monthly"));
-	$nodeinfo["usage"]["localPosts"] = (int)get_config("nodeinfo","local_posts");
-	$nodeinfo["usage"]["localComments"] = (int)get_config("nodeinfo","local_comments");
+	$nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0);
 
-	$nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]);
+	$nodeinfo['metadata'] = array('nodeName' => $a->config['sitename']);
 
-	if (plugin_enabled("appnet"))
-		$nodeinfo["services"]["inbound"][] = "appnet";
+	if (Config::get('system', 'nodeinfo')) {
 
-	if (plugin_enabled("appnet") OR plugin_enabled("buffer"))
-		$nodeinfo["services"]["outbound"][] = "appnet";
+		$nodeinfo['usage']['users'] = array('total' => (int)Config::get('nodeinfo', 'total_users'),
+					'activeHalfyear' => (int)Config::get('nodeinfo', 'active_users_halfyear'),
+					'activeMonth' => (int)Config::get('nodeinfo', 'active_users_monthly'));
+		$nodeinfo['usage']['localPosts'] = (int)Config::get('nodeinfo', 'local_posts');
+		$nodeinfo['usage']['localComments'] = (int)Config::get('nodeinfo', 'local_comments');
 
-	if (plugin_enabled("blogger"))
-		$nodeinfo["services"]["outbound"][] = "blogger";
+		if (plugin_enabled('appnet')) {
+			$nodeinfo['services']['inbound'][] = 'appnet';
+		}
+		if (plugin_enabled('appnet') OR plugin_enabled('buffer')) {
+			$nodeinfo['services']['outbound'][] = 'appnet';
+		}
+		if (plugin_enabled('blogger')) {
+			$nodeinfo['services']['outbound'][] = 'blogger';
+		}
+		if (plugin_enabled('dwpost')) {
+			$nodeinfo['services']['outbound'][] = 'dreamwidth';
+		}
+		if (plugin_enabled('fbpost') OR plugin_enabled('buffer')) {
+			$nodeinfo['services']['outbound'][] = 'facebook';
+		}
+		if (plugin_enabled('statusnet')) {
+			$nodeinfo['services']['inbound'][] = 'gnusocial';
+			$nodeinfo['services']['outbound'][] = 'gnusocial';
+		}
 
-	if (plugin_enabled("dwpost"))
-		$nodeinfo["services"]["outbound"][] = "dreamwidth";
+		if (plugin_enabled('gpluspost') OR plugin_enabled('buffer')) {
+			$nodeinfo['services']['outbound'][] = 'google';
+		}
+		if (plugin_enabled('ijpost')) {
+			$nodeinfo['services']['outbound'][] = 'insanejournal';
+		}
+		if (plugin_enabled('libertree')) {
+			$nodeinfo['services']['outbound'][] = 'libertree';
+		}
+		if (plugin_enabled('buffer')) {
+			$nodeinfo['services']['outbound'][] = 'linkedin';
+		}
+		if (plugin_enabled('ljpost')) {
+			$nodeinfo['services']['outbound'][] = 'livejournal';
+		}
+		if (plugin_enabled('buffer')) {
+			$nodeinfo['services']['outbound'][] = 'pinterest';
+		}
+		if (plugin_enabled('posterous')) {
+			$nodeinfo['services']['outbound'][] = 'posterous';
+		}
+		if (plugin_enabled('pumpio')) {
+			$nodeinfo['services']['inbound'][] = 'pumpio';
+			$nodeinfo['services']['outbound'][] = 'pumpio';
+		}
 
-	if (plugin_enabled("fbpost") OR plugin_enabled("buffer"))
-		$nodeinfo["services"]["outbound"][] = "facebook";
+		if ($smtp) {
+			$nodeinfo['services']['outbound'][] = 'smtp';
+		}
+		if (plugin_enabled('tumblr')) {
+			$nodeinfo['services']['outbound'][] = 'tumblr';
+		}
+		if (plugin_enabled('twitter') OR plugin_enabled('buffer')) {
+			$nodeinfo['services']['outbound'][] = 'twitter';
+		}
+		if (plugin_enabled('wppost')) {
+			$nodeinfo['services']['outbound'][] = 'wordpress';
+		}
+		$nodeinfo['metadata']['protocols'] = $nodeinfo['protocols'];
+		$nodeinfo['metadata']['protocols']['outbound'][] = 'atom1.0';
+		$nodeinfo['metadata']['protocols']['inbound'][] = 'atom1.0';
+		$nodeinfo['metadata']['protocols']['inbound'][] = 'rss2.0';
 
-	if (plugin_enabled("statusnet")) {
-		$nodeinfo["services"]["inbound"][] = "gnusocial";
-		$nodeinfo["services"]["outbound"][] = "gnusocial";
+		$nodeinfo['metadata']['services'] = $nodeinfo['services'];
+
+		if (plugin_enabled('twitter')) {
+			$nodeinfo['metadata']['services']['inbound'][] = 'twitter';
+		}
 	}
 
-	if (plugin_enabled("gpluspost") OR plugin_enabled("buffer"))
-		$nodeinfo["services"]["outbound"][] = "google";
-
-	if (plugin_enabled("ijpost"))
-		$nodeinfo["services"]["outbound"][] = "insanejournal";
-
-	if (plugin_enabled("libertree"))
-		$nodeinfo["services"]["outbound"][] = "libertree";
-
-	if (plugin_enabled("buffer"))
-		$nodeinfo["services"]["outbound"][] = "linkedin";
-
-	if (plugin_enabled("ljpost"))
-		$nodeinfo["services"]["outbound"][] = "livejournal";
-
-	if (plugin_enabled("buffer"))
-		$nodeinfo["services"]["outbound"][] = "pinterest";
-
-	if (plugin_enabled("posterous"))
-		$nodeinfo["services"]["outbound"][] = "posterous";
-
-	if (plugin_enabled("pumpio")) {
-		$nodeinfo["services"]["inbound"][] = "pumpio";
-		$nodeinfo["services"]["outbound"][] = "pumpio";
-	}
-
-	// redmatrix
-
-	if ($smtp)
-		$nodeinfo["services"]["outbound"][] = "smtp";
-
-	if (plugin_enabled("tumblr"))
-		$nodeinfo["services"]["outbound"][] = "tumblr";
-
-	if (plugin_enabled("twitter") OR plugin_enabled("buffer"))
-		$nodeinfo["services"]["outbound"][] = "twitter";
-
-	if (plugin_enabled("wppost"))
-		$nodeinfo["services"]["outbound"][] = "wordpress";
-
-	$nodeinfo["metadata"]["protocols"] = $nodeinfo["protocols"];
-	$nodeinfo["metadata"]["protocols"]["outbound"][] = "atom1.0";
-	$nodeinfo["metadata"]["protocols"]["inbound"][] = "atom1.0";
-	$nodeinfo["metadata"]["protocols"]["inbound"][] = "rss2.0";
-
-	$nodeinfo["metadata"]["services"] = $nodeinfo["services"];
-
-	if (plugin_enabled("twitter"))
-		$nodeinfo["metadata"]["services"]["inbound"][] = "twitter";
-
 	header('Content-type: application/json; charset=utf-8');
 	echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
 	exit;
@@ -150,40 +151,40 @@ function nodeinfo_cron() {
 
 	$a = get_app();
 
-	// If the plugin "statistics_json" is enabled then disable it and actrivate nodeinfo.
-	if (plugin_enabled("statistics_json")) {
-		set_config("system", "nodeinfo", true);
+	// If the plugin 'statistics_json' is enabled then disable it and actrivate nodeinfo.
+	if (plugin_enabled('statistics_json')) {
+		Config::set('system', 'nodeinfo', true);
 
-		$plugin = "statistics_json";
-		$plugins = get_config("system","addon");
+		$plugin = 'statistics_json';
+		$plugins = Config::get('system', 'addon');
 		$plugins_arr = array();
 
-		if($plugins) {
-			$plugins_arr = explode(",",str_replace(" ", "",$plugins));
+		if ($plugins) {
+			$plugins_arr = explode(',',str_replace(' ', '',$plugins));
 
 			$idx = array_search($plugin, $plugins_arr);
-			if ($idx !== false){
+			if ($idx !== false) {
 				unset($plugins_arr[$idx]);
 				uninstall_plugin($plugin);
-				set_config("system","addon", implode(", ",$plugins_arr));
+				Config::set('system', 'addon', implode(', ',$plugins_arr));
 			}
 		}
 	}
 
-	if (!get_config("system", "nodeinfo"))
+	if (!Config::get('system', 'nodeinfo')) {
 		return;
+	}
+	$last = Config::get('nodeinfo', 'last_calucation');
 
-	$last = get_config('nodeinfo','last_calucation');
-
-	if($last) {
+	if ($last) {
 		// Calculate every 24 hours
 		$next = $last + (24 * 60 * 60);
-		if($next > time()) {
-			logger("calculation intervall not reached");
+		if ($next > time()) {
+			logger('calculation intervall not reached');
 			return;
 		}
 	}
-        logger("cron_start");
+        logger('cron_start');
 
 	$users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
 			FROM `user`
@@ -202,31 +203,31 @@ function nodeinfo_cron() {
 
 			foreach ($users AS $user) {
 				if ((strtotime($user['login_date']) > $halfyear) OR
-					(strtotime($user['last-item']) > $halfyear))
+					(strtotime($user['last-item']) > $halfyear)) {
 					++$active_users_halfyear;
-
+				}
 				if ((strtotime($user['login_date']) > $month) OR
-					(strtotime($user['last-item']) > $month))
+					(strtotime($user['last-item']) > $month)) {
 					++$active_users_monthly;
-
+				}
 			}
-			set_config('nodeinfo','total_users', $total_users);
-		        logger("total_users: ".$total_users, LOGGER_DEBUG);
+			Config::set('nodeinfo', 'total_users', $total_users);
+		        logger('total_users: '.$total_users, LOGGER_DEBUG);
 
-			set_config('nodeinfo','active_users_halfyear', $active_users_halfyear);
-			set_config('nodeinfo','active_users_monthly', $active_users_monthly);
+			Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear);
+			Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly);
 	}
 
 	$posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0");
 
-	if (!is_array($posts))
+	if (!is_array($posts)) {
 		$local_posts = -1;
-	else
-		$local_posts = $posts[0]["local_posts"];
+	} else {
+		$local_posts = $posts[0]['local_posts'];
+	}
+	Config::set('nodeinfo', 'local_posts', $local_posts);
 
-	set_config('nodeinfo','local_posts', $local_posts);
-
-        logger("local_posts: ".$local_posts, LOGGER_DEBUG);
+        logger('local_posts: '.$local_posts, LOGGER_DEBUG);
 
 	$posts = qu("SELECT COUNT(*) FROM `contact`
 			INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `item`.`uid` = `contact`.`uid` AND
@@ -234,21 +235,21 @@ function nodeinfo_cron() {
 			WHERE `contact`.`self`",
 			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
 
-	if (!is_array($posts))
+	if (!is_array($posts)) {
 		$local_comments = -1;
-	else
-		$local_comments = $posts[0]["local_comments"];
-
-	set_config('nodeinfo','local_comments', $local_comments);
+	} else {
+		$local_comments = $posts[0]['local_comments'];
+	}
+	Config::set('nodeinfo', 'local_comments', $local_comments);
 
 	// Now trying to register
-	$url = "http://the-federation.info/register/".$a->get_hostname();
+	$url = 'http://the-federation.info/register/'.$a->get_hostname();
         logger('registering url: '.$url, LOGGER_DEBUG);
 	$ret = fetch_url($url);
         logger('registering answer: '.$ret, LOGGER_DEBUG);
 
-        logger("cron_end");
-	set_config('nodeinfo','last_calucation', time());
+        logger('cron_end');
+	Config::set('nodeinfo', 'last_calucation', time());
 }
 
 ?>
diff --git a/include/Core/Config.php b/src/Core/Config.php
similarity index 100%
rename from include/Core/Config.php
rename to src/Core/Config.php
diff --git a/include/Core/PConfig.php b/src/Core/PConfig.php
similarity index 100%
rename from include/Core/PConfig.php
rename to src/Core/PConfig.php
diff --git a/include/ParseUrl.php b/src/ParseUrl.php
similarity index 100%
rename from include/ParseUrl.php
rename to src/ParseUrl.php
diff --git a/util/composer.phar b/util/composer.phar
new file mode 100755
index 000000000..357793176
Binary files /dev/null and b/util/composer.phar differ
diff --git a/vendor/autoload.php b/vendor/autoload.php
new file mode 100644
index 000000000..c40d3df89
--- /dev/null
+++ b/vendor/autoload.php
@@ -0,0 +1,7 @@
+
  *     Jordi Boggiano 
  *
- * For the full copyright and license information, please view the LICENSE.composer
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Composer\Autoload;
 
 /**
- * ClassLoader implements a PSR-0 class loader
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
  *
  *     $loader = new \Composer\Autoload\ClassLoader();
  *
@@ -39,6 +37,8 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier 
  * @author Jordi Boggiano 
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
@@ -53,8 +53,9 @@ class ClassLoader
 
     private $useIncludePath = false;
     private $classMap = array();
-
     private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
 
     public function getPrefixes()
     {
@@ -147,7 +148,7 @@ class ClassLoader
      * appending or prepending to the ones previously set for this namespace.
      *
      * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-0 base directories
+     * @param array|string $paths   The PSR-4 base directories
      * @param bool         $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
@@ -271,6 +272,26 @@ class ClassLoader
         return $this->classMapAuthoritative;
     }
 
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
     /**
      * Registers this instance as an autoloader.
      *
@@ -313,29 +334,34 @@ class ClassLoader
      */
     public function findFile($class)
     {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
         // class map lookup
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
             return false;
         }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION')) {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if ($file === null) {
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
             // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
+            $this->missingClasses[$class] = true;
         }
 
         return $file;
@@ -348,10 +374,14 @@ class ClassLoader
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath.'\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        $length = $this->prefixLengthsPsr4[$first][$search];
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -361,7 +391,7 @@ class ClassLoader
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -380,7 +410,7 @@ class ClassLoader
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -390,7 +420,7 @@ class ClassLoader
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                 return $file;
             }
         }
@@ -399,6 +429,8 @@ class ClassLoader
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
+
+        return false;
     }
 }
 
diff --git a/include/autoloader/LICENSE.composer b/vendor/composer/LICENSE
similarity index 73%
rename from include/autoloader/LICENSE.composer
rename to vendor/composer/LICENSE
index b365b1f5a..f27399a04 100644
--- a/include/autoloader/LICENSE.composer
+++ b/vendor/composer/LICENSE
@@ -1,19 +1,21 @@
-Copyright (c) 2015 Nils Adermann, Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the Software), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, andor sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
new file mode 100644
index 000000000..bc30e0f92
--- /dev/null
+++ b/vendor/composer/autoload_classmap.php
@@ -0,0 +1,243 @@
+ $vendorDir . '/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php',
+    'Friendica\\Core\\Config' => $baseDir . '/src/Core/Config.php',
+    'Friendica\\Core\\PConfig' => $baseDir . '/src/Core/PConfig.php',
+    'Friendica\\ParseUrl' => $baseDir . '/src/ParseUrl.php',
+    'HTMLPurifier' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.php',
+    'HTMLPurifier_Arborize' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php',
+    'HTMLPurifier_AttrCollections' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php',
+    'HTMLPurifier_AttrDef' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php',
+    'HTMLPurifier_AttrDef_CSS' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php',
+    'HTMLPurifier_AttrDef_CSS_AlphaValue' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php',
+    'HTMLPurifier_AttrDef_CSS_Background' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php',
+    'HTMLPurifier_AttrDef_CSS_BackgroundPosition' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php',
+    'HTMLPurifier_AttrDef_CSS_Border' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php',
+    'HTMLPurifier_AttrDef_CSS_Color' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php',
+    'HTMLPurifier_AttrDef_CSS_Composite' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php',
+    'HTMLPurifier_AttrDef_CSS_DenyElementDecorator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php',
+    'HTMLPurifier_AttrDef_CSS_Filter' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php',
+    'HTMLPurifier_AttrDef_CSS_Font' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php',
+    'HTMLPurifier_AttrDef_CSS_FontFamily' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php',
+    'HTMLPurifier_AttrDef_CSS_Ident' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php',
+    'HTMLPurifier_AttrDef_CSS_ImportantDecorator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php',
+    'HTMLPurifier_AttrDef_CSS_Length' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php',
+    'HTMLPurifier_AttrDef_CSS_ListStyle' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php',
+    'HTMLPurifier_AttrDef_CSS_Multiple' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php',
+    'HTMLPurifier_AttrDef_CSS_Number' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php',
+    'HTMLPurifier_AttrDef_CSS_Percentage' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php',
+    'HTMLPurifier_AttrDef_CSS_TextDecoration' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php',
+    'HTMLPurifier_AttrDef_CSS_URI' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php',
+    'HTMLPurifier_AttrDef_Clone' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php',
+    'HTMLPurifier_AttrDef_Enum' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php',
+    'HTMLPurifier_AttrDef_HTML_Bool' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php',
+    'HTMLPurifier_AttrDef_HTML_Class' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php',
+    'HTMLPurifier_AttrDef_HTML_Color' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php',
+    'HTMLPurifier_AttrDef_HTML_FrameTarget' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php',
+    'HTMLPurifier_AttrDef_HTML_ID' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php',
+    'HTMLPurifier_AttrDef_HTML_Length' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php',
+    'HTMLPurifier_AttrDef_HTML_LinkTypes' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php',
+    'HTMLPurifier_AttrDef_HTML_MultiLength' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php',
+    'HTMLPurifier_AttrDef_HTML_Nmtokens' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php',
+    'HTMLPurifier_AttrDef_HTML_Pixels' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php',
+    'HTMLPurifier_AttrDef_Integer' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php',
+    'HTMLPurifier_AttrDef_Lang' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php',
+    'HTMLPurifier_AttrDef_Switch' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php',
+    'HTMLPurifier_AttrDef_Text' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php',
+    'HTMLPurifier_AttrDef_URI' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php',
+    'HTMLPurifier_AttrDef_URI_Email' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php',
+    'HTMLPurifier_AttrDef_URI_Email_SimpleCheck' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php',
+    'HTMLPurifier_AttrDef_URI_Host' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php',
+    'HTMLPurifier_AttrDef_URI_IPv4' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php',
+    'HTMLPurifier_AttrDef_URI_IPv6' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php',
+    'HTMLPurifier_AttrTransform' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php',
+    'HTMLPurifier_AttrTransform_Background' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php',
+    'HTMLPurifier_AttrTransform_BdoDir' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php',
+    'HTMLPurifier_AttrTransform_BgColor' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php',
+    'HTMLPurifier_AttrTransform_BoolToCSS' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php',
+    'HTMLPurifier_AttrTransform_Border' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php',
+    'HTMLPurifier_AttrTransform_EnumToCSS' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php',
+    'HTMLPurifier_AttrTransform_ImgRequired' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php',
+    'HTMLPurifier_AttrTransform_ImgSpace' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php',
+    'HTMLPurifier_AttrTransform_Input' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php',
+    'HTMLPurifier_AttrTransform_Lang' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php',
+    'HTMLPurifier_AttrTransform_Length' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php',
+    'HTMLPurifier_AttrTransform_Name' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php',
+    'HTMLPurifier_AttrTransform_NameSync' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php',
+    'HTMLPurifier_AttrTransform_Nofollow' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php',
+    'HTMLPurifier_AttrTransform_SafeEmbed' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php',
+    'HTMLPurifier_AttrTransform_SafeObject' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php',
+    'HTMLPurifier_AttrTransform_SafeParam' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php',
+    'HTMLPurifier_AttrTransform_ScriptRequired' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php',
+    'HTMLPurifier_AttrTransform_TargetBlank' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php',
+    'HTMLPurifier_AttrTransform_Textarea' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php',
+    'HTMLPurifier_AttrTypes' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php',
+    'HTMLPurifier_AttrValidator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php',
+    'HTMLPurifier_Bootstrap' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php',
+    'HTMLPurifier_CSSDefinition' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php',
+    'HTMLPurifier_ChildDef' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php',
+    'HTMLPurifier_ChildDef_Chameleon' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php',
+    'HTMLPurifier_ChildDef_Custom' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php',
+    'HTMLPurifier_ChildDef_Empty' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php',
+    'HTMLPurifier_ChildDef_List' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php',
+    'HTMLPurifier_ChildDef_Optional' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php',
+    'HTMLPurifier_ChildDef_Required' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php',
+    'HTMLPurifier_ChildDef_StrictBlockquote' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php',
+    'HTMLPurifier_ChildDef_Table' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php',
+    'HTMLPurifier_Config' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Config.php',
+    'HTMLPurifier_ConfigSchema' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php',
+    'HTMLPurifier_ConfigSchema_Builder_ConfigSchema' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php',
+    'HTMLPurifier_ConfigSchema_Builder_Xml' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php',
+    'HTMLPurifier_ConfigSchema_Exception' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php',
+    'HTMLPurifier_ConfigSchema_Interchange' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php',
+    'HTMLPurifier_ConfigSchema_InterchangeBuilder' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php',
+    'HTMLPurifier_ConfigSchema_Interchange_Directive' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php',
+    'HTMLPurifier_ConfigSchema_Interchange_Id' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php',
+    'HTMLPurifier_ConfigSchema_Validator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php',
+    'HTMLPurifier_ConfigSchema_ValidatorAtom' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php',
+    'HTMLPurifier_ContentSets' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php',
+    'HTMLPurifier_Context' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Context.php',
+    'HTMLPurifier_Definition' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php',
+    'HTMLPurifier_DefinitionCache' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php',
+    'HTMLPurifier_DefinitionCacheFactory' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php',
+    'HTMLPurifier_DefinitionCache_Decorator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php',
+    'HTMLPurifier_DefinitionCache_Decorator_Cleanup' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php',
+    'HTMLPurifier_DefinitionCache_Decorator_Memory' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php',
+    'HTMLPurifier_DefinitionCache_Null' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php',
+    'HTMLPurifier_DefinitionCache_Serializer' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php',
+    'HTMLPurifier_Doctype' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php',
+    'HTMLPurifier_DoctypeRegistry' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php',
+    'HTMLPurifier_ElementDef' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php',
+    'HTMLPurifier_Encoder' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php',
+    'HTMLPurifier_EntityLookup' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php',
+    'HTMLPurifier_EntityParser' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php',
+    'HTMLPurifier_ErrorCollector' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php',
+    'HTMLPurifier_ErrorStruct' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php',
+    'HTMLPurifier_Exception' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php',
+    'HTMLPurifier_Filter' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php',
+    'HTMLPurifier_Filter_ExtractStyleBlocks' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php',
+    'HTMLPurifier_Filter_YouTube' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php',
+    'HTMLPurifier_Generator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php',
+    'HTMLPurifier_HTMLDefinition' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php',
+    'HTMLPurifier_HTMLModule' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php',
+    'HTMLPurifier_HTMLModuleManager' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php',
+    'HTMLPurifier_HTMLModule_Bdo' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php',
+    'HTMLPurifier_HTMLModule_CommonAttributes' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php',
+    'HTMLPurifier_HTMLModule_Edit' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php',
+    'HTMLPurifier_HTMLModule_Forms' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php',
+    'HTMLPurifier_HTMLModule_Hypertext' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php',
+    'HTMLPurifier_HTMLModule_Iframe' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php',
+    'HTMLPurifier_HTMLModule_Image' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php',
+    'HTMLPurifier_HTMLModule_Legacy' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php',
+    'HTMLPurifier_HTMLModule_List' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php',
+    'HTMLPurifier_HTMLModule_Name' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php',
+    'HTMLPurifier_HTMLModule_Nofollow' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php',
+    'HTMLPurifier_HTMLModule_NonXMLCommonAttributes' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php',
+    'HTMLPurifier_HTMLModule_Object' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php',
+    'HTMLPurifier_HTMLModule_Presentation' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php',
+    'HTMLPurifier_HTMLModule_Proprietary' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php',
+    'HTMLPurifier_HTMLModule_Ruby' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php',
+    'HTMLPurifier_HTMLModule_SafeEmbed' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php',
+    'HTMLPurifier_HTMLModule_SafeObject' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php',
+    'HTMLPurifier_HTMLModule_SafeScripting' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php',
+    'HTMLPurifier_HTMLModule_Scripting' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php',
+    'HTMLPurifier_HTMLModule_StyleAttribute' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php',
+    'HTMLPurifier_HTMLModule_Tables' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php',
+    'HTMLPurifier_HTMLModule_Target' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php',
+    'HTMLPurifier_HTMLModule_TargetBlank' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php',
+    'HTMLPurifier_HTMLModule_Text' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php',
+    'HTMLPurifier_HTMLModule_Tidy' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php',
+    'HTMLPurifier_HTMLModule_Tidy_Name' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php',
+    'HTMLPurifier_HTMLModule_Tidy_Proprietary' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php',
+    'HTMLPurifier_HTMLModule_Tidy_Strict' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php',
+    'HTMLPurifier_HTMLModule_Tidy_Transitional' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php',
+    'HTMLPurifier_HTMLModule_Tidy_XHTML' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php',
+    'HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php',
+    'HTMLPurifier_HTMLModule_XMLCommonAttributes' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php',
+    'HTMLPurifier_IDAccumulator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php',
+    'HTMLPurifier_Injector' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php',
+    'HTMLPurifier_Injector_AutoParagraph' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php',
+    'HTMLPurifier_Injector_DisplayLinkURI' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php',
+    'HTMLPurifier_Injector_Linkify' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php',
+    'HTMLPurifier_Injector_PurifierLinkify' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php',
+    'HTMLPurifier_Injector_RemoveEmpty' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php',
+    'HTMLPurifier_Injector_RemoveSpansWithoutAttributes' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php',
+    'HTMLPurifier_Injector_SafeObject' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php',
+    'HTMLPurifier_Language' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Language.php',
+    'HTMLPurifier_LanguageFactory' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php',
+    'HTMLPurifier_Language_en_x_test' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php',
+    'HTMLPurifier_Length' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Length.php',
+    'HTMLPurifier_Lexer' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php',
+    'HTMLPurifier_Lexer_DOMLex' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php',
+    'HTMLPurifier_Lexer_DirectLex' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php',
+    'HTMLPurifier_Lexer_PH5P' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php',
+    'HTMLPurifier_Node' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Node.php',
+    'HTMLPurifier_Node_Comment' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php',
+    'HTMLPurifier_Node_Element' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php',
+    'HTMLPurifier_Node_Text' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php',
+    'HTMLPurifier_PercentEncoder' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php',
+    'HTMLPurifier_Printer' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php',
+    'HTMLPurifier_Printer_CSSDefinition' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php',
+    'HTMLPurifier_Printer_ConfigForm' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php',
+    'HTMLPurifier_Printer_ConfigForm_NullDecorator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php',
+    'HTMLPurifier_Printer_ConfigForm_bool' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php',
+    'HTMLPurifier_Printer_ConfigForm_default' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php',
+    'HTMLPurifier_Printer_HTMLDefinition' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php',
+    'HTMLPurifier_PropertyList' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php',
+    'HTMLPurifier_PropertyListIterator' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php',
+    'HTMLPurifier_Queue' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php',
+    'HTMLPurifier_Strategy' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php',
+    'HTMLPurifier_Strategy_Composite' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php',
+    'HTMLPurifier_Strategy_Core' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php',
+    'HTMLPurifier_Strategy_FixNesting' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php',
+    'HTMLPurifier_Strategy_MakeWellFormed' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php',
+    'HTMLPurifier_Strategy_RemoveForeignElements' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php',
+    'HTMLPurifier_Strategy_ValidateAttributes' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php',
+    'HTMLPurifier_StringHash' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php',
+    'HTMLPurifier_StringHashParser' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php',
+    'HTMLPurifier_TagTransform' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php',
+    'HTMLPurifier_TagTransform_Font' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php',
+    'HTMLPurifier_TagTransform_Simple' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php',
+    'HTMLPurifier_Token' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Token.php',
+    'HTMLPurifier_TokenFactory' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php',
+    'HTMLPurifier_Token_Comment' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php',
+    'HTMLPurifier_Token_Empty' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php',
+    'HTMLPurifier_Token_End' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php',
+    'HTMLPurifier_Token_Start' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php',
+    'HTMLPurifier_Token_Tag' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php',
+    'HTMLPurifier_Token_Text' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php',
+    'HTMLPurifier_URI' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URI.php',
+    'HTMLPurifier_URIDefinition' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php',
+    'HTMLPurifier_URIFilter' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php',
+    'HTMLPurifier_URIFilter_DisableExternal' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php',
+    'HTMLPurifier_URIFilter_DisableExternalResources' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php',
+    'HTMLPurifier_URIFilter_DisableResources' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php',
+    'HTMLPurifier_URIFilter_HostBlacklist' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php',
+    'HTMLPurifier_URIFilter_MakeAbsolute' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php',
+    'HTMLPurifier_URIFilter_Munge' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php',
+    'HTMLPurifier_URIFilter_SafeIframe' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php',
+    'HTMLPurifier_URIParser' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php',
+    'HTMLPurifier_URIScheme' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php',
+    'HTMLPurifier_URISchemeRegistry' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php',
+    'HTMLPurifier_URIScheme_data' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php',
+    'HTMLPurifier_URIScheme_file' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php',
+    'HTMLPurifier_URIScheme_ftp' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php',
+    'HTMLPurifier_URIScheme_http' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php',
+    'HTMLPurifier_URIScheme_https' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php',
+    'HTMLPurifier_URIScheme_mailto' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php',
+    'HTMLPurifier_URIScheme_news' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php',
+    'HTMLPurifier_URIScheme_nntp' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php',
+    'HTMLPurifier_UnitConverter' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php',
+    'HTMLPurifier_VarParser' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php',
+    'HTMLPurifier_VarParserException' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php',
+    'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php',
+    'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php',
+    'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php',
+    'Mobile_Detect' => $vendorDir . '/mobiledetect/mobiledetectlib/Mobile_Detect.php',
+);
diff --git a/include/autoloader/autoload_files.php b/vendor/composer/autoload_files.php
similarity index 77%
rename from include/autoloader/autoload_files.php
rename to vendor/composer/autoload_files.php
index 859135cc4..c25686b15 100644
--- a/include/autoloader/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -2,7 +2,7 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(dirname(__FILE__)))."/library";
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/include/autoloader/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
similarity index 59%
rename from include/autoloader/autoload_namespaces.php
rename to vendor/composer/autoload_namespaces.php
index 315a34931..f5eff86f1 100644
--- a/include/autoloader/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -2,9 +2,10 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(dirname(__FILE__)))."/library";
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
     'HTMLPurifier' => array($vendorDir . '/ezyang/htmlpurifier/library'),
+    'Detection' => array($vendorDir . '/mobiledetect/mobiledetectlib/namespaced'),
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
new file mode 100644
index 000000000..a8d577d5e
--- /dev/null
+++ b/vendor/composer/autoload_psr4.php
@@ -0,0 +1,10 @@
+ array($baseDir . '/src'),
+);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
new file mode 100644
index 000000000..48923cf47
--- /dev/null
+++ b/vendor/composer/autoload_real.php
@@ -0,0 +1,70 @@
+= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitFriendica::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
+
+        $loader->register(true);
+
+        if ($useStaticLoader) {
+            $includeFiles = Composer\Autoload\ComposerStaticInitFriendica::$files;
+        } else {
+            $includeFiles = require __DIR__ . '/autoload_files.php';
+        }
+        foreach ($includeFiles as $fileIdentifier => $file) {
+            composerRequireFriendica($fileIdentifier, $file);
+        }
+
+        return $loader;
+    }
+}
+
+function composerRequireFriendica($fileIdentifier, $file)
+{
+    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+        require $file;
+
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+    }
+}
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
new file mode 100644
index 000000000..f1f3423d8
--- /dev/null
+++ b/vendor/composer/autoload_static.php
@@ -0,0 +1,291 @@
+ __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
+    );
+
+    public static $prefixLengthsPsr4 = array (
+        'F' => 
+        array (
+            'Friendica\\' => 10,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'Friendica\\' => 
+        array (
+            0 => __DIR__ . '/../..' . '/src',
+        ),
+    );
+
+    public static $prefixesPsr0 = array (
+        'H' => 
+        array (
+            'HTMLPurifier' => 
+            array (
+                0 => __DIR__ . '/..' . '/ezyang/htmlpurifier/library',
+            ),
+        ),
+        'D' => 
+        array (
+            'Detection' => 
+            array (
+                0 => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/namespaced',
+            ),
+        ),
+    );
+
+    public static $classMap = array (
+        'Detection\\MobileDetect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php',
+        'Friendica\\Core\\Config' => __DIR__ . '/../..' . '/src/Core/Config.php',
+        'Friendica\\Core\\PConfig' => __DIR__ . '/../..' . '/src/Core/PConfig.php',
+        'Friendica\\ParseUrl' => __DIR__ . '/../..' . '/src/ParseUrl.php',
+        'HTMLPurifier' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.php',
+        'HTMLPurifier_Arborize' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php',
+        'HTMLPurifier_AttrCollections' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php',
+        'HTMLPurifier_AttrDef' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php',
+        'HTMLPurifier_AttrDef_CSS' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php',
+        'HTMLPurifier_AttrDef_CSS_AlphaValue' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php',
+        'HTMLPurifier_AttrDef_CSS_Background' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php',
+        'HTMLPurifier_AttrDef_CSS_BackgroundPosition' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php',
+        'HTMLPurifier_AttrDef_CSS_Border' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php',
+        'HTMLPurifier_AttrDef_CSS_Color' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php',
+        'HTMLPurifier_AttrDef_CSS_Composite' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php',
+        'HTMLPurifier_AttrDef_CSS_DenyElementDecorator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php',
+        'HTMLPurifier_AttrDef_CSS_Filter' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php',
+        'HTMLPurifier_AttrDef_CSS_Font' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php',
+        'HTMLPurifier_AttrDef_CSS_FontFamily' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php',
+        'HTMLPurifier_AttrDef_CSS_Ident' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php',
+        'HTMLPurifier_AttrDef_CSS_ImportantDecorator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php',
+        'HTMLPurifier_AttrDef_CSS_Length' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php',
+        'HTMLPurifier_AttrDef_CSS_ListStyle' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php',
+        'HTMLPurifier_AttrDef_CSS_Multiple' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php',
+        'HTMLPurifier_AttrDef_CSS_Number' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php',
+        'HTMLPurifier_AttrDef_CSS_Percentage' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php',
+        'HTMLPurifier_AttrDef_CSS_TextDecoration' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php',
+        'HTMLPurifier_AttrDef_CSS_URI' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php',
+        'HTMLPurifier_AttrDef_Clone' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php',
+        'HTMLPurifier_AttrDef_Enum' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php',
+        'HTMLPurifier_AttrDef_HTML_Bool' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php',
+        'HTMLPurifier_AttrDef_HTML_Class' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php',
+        'HTMLPurifier_AttrDef_HTML_Color' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php',
+        'HTMLPurifier_AttrDef_HTML_FrameTarget' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php',
+        'HTMLPurifier_AttrDef_HTML_ID' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php',
+        'HTMLPurifier_AttrDef_HTML_Length' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php',
+        'HTMLPurifier_AttrDef_HTML_LinkTypes' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php',
+        'HTMLPurifier_AttrDef_HTML_MultiLength' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php',
+        'HTMLPurifier_AttrDef_HTML_Nmtokens' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php',
+        'HTMLPurifier_AttrDef_HTML_Pixels' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php',
+        'HTMLPurifier_AttrDef_Integer' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php',
+        'HTMLPurifier_AttrDef_Lang' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php',
+        'HTMLPurifier_AttrDef_Switch' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php',
+        'HTMLPurifier_AttrDef_Text' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php',
+        'HTMLPurifier_AttrDef_URI' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php',
+        'HTMLPurifier_AttrDef_URI_Email' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php',
+        'HTMLPurifier_AttrDef_URI_Email_SimpleCheck' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php',
+        'HTMLPurifier_AttrDef_URI_Host' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php',
+        'HTMLPurifier_AttrDef_URI_IPv4' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php',
+        'HTMLPurifier_AttrDef_URI_IPv6' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php',
+        'HTMLPurifier_AttrTransform' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php',
+        'HTMLPurifier_AttrTransform_Background' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php',
+        'HTMLPurifier_AttrTransform_BdoDir' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php',
+        'HTMLPurifier_AttrTransform_BgColor' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php',
+        'HTMLPurifier_AttrTransform_BoolToCSS' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php',
+        'HTMLPurifier_AttrTransform_Border' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php',
+        'HTMLPurifier_AttrTransform_EnumToCSS' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php',
+        'HTMLPurifier_AttrTransform_ImgRequired' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php',
+        'HTMLPurifier_AttrTransform_ImgSpace' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php',
+        'HTMLPurifier_AttrTransform_Input' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php',
+        'HTMLPurifier_AttrTransform_Lang' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php',
+        'HTMLPurifier_AttrTransform_Length' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php',
+        'HTMLPurifier_AttrTransform_Name' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php',
+        'HTMLPurifier_AttrTransform_NameSync' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php',
+        'HTMLPurifier_AttrTransform_Nofollow' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php',
+        'HTMLPurifier_AttrTransform_SafeEmbed' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php',
+        'HTMLPurifier_AttrTransform_SafeObject' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php',
+        'HTMLPurifier_AttrTransform_SafeParam' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php',
+        'HTMLPurifier_AttrTransform_ScriptRequired' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php',
+        'HTMLPurifier_AttrTransform_TargetBlank' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php',
+        'HTMLPurifier_AttrTransform_Textarea' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php',
+        'HTMLPurifier_AttrTypes' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php',
+        'HTMLPurifier_AttrValidator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php',
+        'HTMLPurifier_Bootstrap' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php',
+        'HTMLPurifier_CSSDefinition' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php',
+        'HTMLPurifier_ChildDef' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php',
+        'HTMLPurifier_ChildDef_Chameleon' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php',
+        'HTMLPurifier_ChildDef_Custom' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php',
+        'HTMLPurifier_ChildDef_Empty' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php',
+        'HTMLPurifier_ChildDef_List' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php',
+        'HTMLPurifier_ChildDef_Optional' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php',
+        'HTMLPurifier_ChildDef_Required' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php',
+        'HTMLPurifier_ChildDef_StrictBlockquote' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php',
+        'HTMLPurifier_ChildDef_Table' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php',
+        'HTMLPurifier_Config' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Config.php',
+        'HTMLPurifier_ConfigSchema' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php',
+        'HTMLPurifier_ConfigSchema_Builder_ConfigSchema' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php',
+        'HTMLPurifier_ConfigSchema_Builder_Xml' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php',
+        'HTMLPurifier_ConfigSchema_Exception' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php',
+        'HTMLPurifier_ConfigSchema_Interchange' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php',
+        'HTMLPurifier_ConfigSchema_InterchangeBuilder' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php',
+        'HTMLPurifier_ConfigSchema_Interchange_Directive' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php',
+        'HTMLPurifier_ConfigSchema_Interchange_Id' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php',
+        'HTMLPurifier_ConfigSchema_Validator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php',
+        'HTMLPurifier_ConfigSchema_ValidatorAtom' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php',
+        'HTMLPurifier_ContentSets' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php',
+        'HTMLPurifier_Context' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Context.php',
+        'HTMLPurifier_Definition' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php',
+        'HTMLPurifier_DefinitionCache' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php',
+        'HTMLPurifier_DefinitionCacheFactory' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php',
+        'HTMLPurifier_DefinitionCache_Decorator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php',
+        'HTMLPurifier_DefinitionCache_Decorator_Cleanup' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php',
+        'HTMLPurifier_DefinitionCache_Decorator_Memory' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php',
+        'HTMLPurifier_DefinitionCache_Null' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php',
+        'HTMLPurifier_DefinitionCache_Serializer' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php',
+        'HTMLPurifier_Doctype' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php',
+        'HTMLPurifier_DoctypeRegistry' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php',
+        'HTMLPurifier_ElementDef' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php',
+        'HTMLPurifier_Encoder' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php',
+        'HTMLPurifier_EntityLookup' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php',
+        'HTMLPurifier_EntityParser' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php',
+        'HTMLPurifier_ErrorCollector' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php',
+        'HTMLPurifier_ErrorStruct' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php',
+        'HTMLPurifier_Exception' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php',
+        'HTMLPurifier_Filter' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php',
+        'HTMLPurifier_Filter_ExtractStyleBlocks' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php',
+        'HTMLPurifier_Filter_YouTube' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php',
+        'HTMLPurifier_Generator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php',
+        'HTMLPurifier_HTMLDefinition' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php',
+        'HTMLPurifier_HTMLModule' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php',
+        'HTMLPurifier_HTMLModuleManager' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php',
+        'HTMLPurifier_HTMLModule_Bdo' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php',
+        'HTMLPurifier_HTMLModule_CommonAttributes' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php',
+        'HTMLPurifier_HTMLModule_Edit' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php',
+        'HTMLPurifier_HTMLModule_Forms' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php',
+        'HTMLPurifier_HTMLModule_Hypertext' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php',
+        'HTMLPurifier_HTMLModule_Iframe' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php',
+        'HTMLPurifier_HTMLModule_Image' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php',
+        'HTMLPurifier_HTMLModule_Legacy' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php',
+        'HTMLPurifier_HTMLModule_List' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php',
+        'HTMLPurifier_HTMLModule_Name' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php',
+        'HTMLPurifier_HTMLModule_Nofollow' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php',
+        'HTMLPurifier_HTMLModule_NonXMLCommonAttributes' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php',
+        'HTMLPurifier_HTMLModule_Object' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php',
+        'HTMLPurifier_HTMLModule_Presentation' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php',
+        'HTMLPurifier_HTMLModule_Proprietary' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php',
+        'HTMLPurifier_HTMLModule_Ruby' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php',
+        'HTMLPurifier_HTMLModule_SafeEmbed' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php',
+        'HTMLPurifier_HTMLModule_SafeObject' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php',
+        'HTMLPurifier_HTMLModule_SafeScripting' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php',
+        'HTMLPurifier_HTMLModule_Scripting' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php',
+        'HTMLPurifier_HTMLModule_StyleAttribute' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php',
+        'HTMLPurifier_HTMLModule_Tables' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php',
+        'HTMLPurifier_HTMLModule_Target' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php',
+        'HTMLPurifier_HTMLModule_TargetBlank' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php',
+        'HTMLPurifier_HTMLModule_Text' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php',
+        'HTMLPurifier_HTMLModule_Tidy' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php',
+        'HTMLPurifier_HTMLModule_Tidy_Name' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php',
+        'HTMLPurifier_HTMLModule_Tidy_Proprietary' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php',
+        'HTMLPurifier_HTMLModule_Tidy_Strict' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php',
+        'HTMLPurifier_HTMLModule_Tidy_Transitional' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php',
+        'HTMLPurifier_HTMLModule_Tidy_XHTML' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php',
+        'HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php',
+        'HTMLPurifier_HTMLModule_XMLCommonAttributes' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php',
+        'HTMLPurifier_IDAccumulator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php',
+        'HTMLPurifier_Injector' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php',
+        'HTMLPurifier_Injector_AutoParagraph' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php',
+        'HTMLPurifier_Injector_DisplayLinkURI' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php',
+        'HTMLPurifier_Injector_Linkify' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php',
+        'HTMLPurifier_Injector_PurifierLinkify' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php',
+        'HTMLPurifier_Injector_RemoveEmpty' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php',
+        'HTMLPurifier_Injector_RemoveSpansWithoutAttributes' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php',
+        'HTMLPurifier_Injector_SafeObject' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php',
+        'HTMLPurifier_Language' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Language.php',
+        'HTMLPurifier_LanguageFactory' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php',
+        'HTMLPurifier_Language_en_x_test' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php',
+        'HTMLPurifier_Length' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Length.php',
+        'HTMLPurifier_Lexer' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php',
+        'HTMLPurifier_Lexer_DOMLex' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php',
+        'HTMLPurifier_Lexer_DirectLex' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php',
+        'HTMLPurifier_Lexer_PH5P' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php',
+        'HTMLPurifier_Node' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Node.php',
+        'HTMLPurifier_Node_Comment' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php',
+        'HTMLPurifier_Node_Element' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php',
+        'HTMLPurifier_Node_Text' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php',
+        'HTMLPurifier_PercentEncoder' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php',
+        'HTMLPurifier_Printer' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php',
+        'HTMLPurifier_Printer_CSSDefinition' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php',
+        'HTMLPurifier_Printer_ConfigForm' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php',
+        'HTMLPurifier_Printer_ConfigForm_NullDecorator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php',
+        'HTMLPurifier_Printer_ConfigForm_bool' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php',
+        'HTMLPurifier_Printer_ConfigForm_default' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php',
+        'HTMLPurifier_Printer_HTMLDefinition' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php',
+        'HTMLPurifier_PropertyList' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php',
+        'HTMLPurifier_PropertyListIterator' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php',
+        'HTMLPurifier_Queue' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php',
+        'HTMLPurifier_Strategy' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php',
+        'HTMLPurifier_Strategy_Composite' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php',
+        'HTMLPurifier_Strategy_Core' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php',
+        'HTMLPurifier_Strategy_FixNesting' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php',
+        'HTMLPurifier_Strategy_MakeWellFormed' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php',
+        'HTMLPurifier_Strategy_RemoveForeignElements' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php',
+        'HTMLPurifier_Strategy_ValidateAttributes' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php',
+        'HTMLPurifier_StringHash' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php',
+        'HTMLPurifier_StringHashParser' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php',
+        'HTMLPurifier_TagTransform' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php',
+        'HTMLPurifier_TagTransform_Font' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php',
+        'HTMLPurifier_TagTransform_Simple' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php',
+        'HTMLPurifier_Token' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Token.php',
+        'HTMLPurifier_TokenFactory' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php',
+        'HTMLPurifier_Token_Comment' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php',
+        'HTMLPurifier_Token_Empty' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php',
+        'HTMLPurifier_Token_End' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php',
+        'HTMLPurifier_Token_Start' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php',
+        'HTMLPurifier_Token_Tag' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php',
+        'HTMLPurifier_Token_Text' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php',
+        'HTMLPurifier_URI' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URI.php',
+        'HTMLPurifier_URIDefinition' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php',
+        'HTMLPurifier_URIFilter' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php',
+        'HTMLPurifier_URIFilter_DisableExternal' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php',
+        'HTMLPurifier_URIFilter_DisableExternalResources' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php',
+        'HTMLPurifier_URIFilter_DisableResources' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php',
+        'HTMLPurifier_URIFilter_HostBlacklist' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php',
+        'HTMLPurifier_URIFilter_MakeAbsolute' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php',
+        'HTMLPurifier_URIFilter_Munge' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php',
+        'HTMLPurifier_URIFilter_SafeIframe' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php',
+        'HTMLPurifier_URIParser' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php',
+        'HTMLPurifier_URIScheme' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php',
+        'HTMLPurifier_URISchemeRegistry' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php',
+        'HTMLPurifier_URIScheme_data' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php',
+        'HTMLPurifier_URIScheme_file' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php',
+        'HTMLPurifier_URIScheme_ftp' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php',
+        'HTMLPurifier_URIScheme_http' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php',
+        'HTMLPurifier_URIScheme_https' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php',
+        'HTMLPurifier_URIScheme_mailto' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php',
+        'HTMLPurifier_URIScheme_news' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php',
+        'HTMLPurifier_URIScheme_nntp' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php',
+        'HTMLPurifier_UnitConverter' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php',
+        'HTMLPurifier_VarParser' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php',
+        'HTMLPurifier_VarParserException' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php',
+        'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php',
+        'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php',
+        'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php',
+        'Mobile_Detect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/Mobile_Detect.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInitFriendica::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitFriendica::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitFriendica::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitFriendica::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
new file mode 100644
index 000000000..ebd4ea0a1
--- /dev/null
+++ b/vendor/composer/installed.json
@@ -0,0 +1,102 @@
+[
+    {
+        "name": "ezyang/htmlpurifier",
+        "version": "v4.7.0",
+        "version_normalized": "4.7.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/ezyang/htmlpurifier.git",
+            "reference": "ae1828d955112356f7677c465f94f7deb7d27a40"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40",
+            "reference": "ae1828d955112356f7677c465f94f7deb7d27a40",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2"
+        },
+        "time": "2015-08-05T01:03:42+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "HTMLPurifier": "library/"
+            },
+            "files": [
+                "library/HTMLPurifier.composer.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "LGPL"
+        ],
+        "authors": [
+            {
+                "name": "Edward Z. Yang",
+                "email": "admin@htmlpurifier.org",
+                "homepage": "http://ezyang.com"
+            }
+        ],
+        "description": "Standards compliant HTML filter written in PHP",
+        "homepage": "http://htmlpurifier.org/",
+        "keywords": [
+            "html"
+        ]
+    },
+    {
+        "name": "mobiledetect/mobiledetectlib",
+        "version": "2.8.25",
+        "version_normalized": "2.8.25.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/serbanghita/Mobile-Detect.git",
+            "reference": "f0896b5c7274d1450023b0b376240be902c3251c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/f0896b5c7274d1450023b0b376240be902c3251c",
+            "reference": "f0896b5c7274d1450023b0b376240be902c3251c",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.0.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "*"
+        },
+        "time": "2017-03-29T13:59:30+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "Mobile_Detect.php"
+            ],
+            "psr-0": {
+                "Detection": "namespaced/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Serban Ghita",
+                "email": "serbanghita@gmail.com",
+                "homepage": "http://mobiledetect.net",
+                "role": "Developer"
+            }
+        ],
+        "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.",
+        "homepage": "https://github.com/serbanghita/Mobile-Detect",
+        "keywords": [
+            "detect mobile devices",
+            "mobile",
+            "mobile detect",
+            "mobile detector",
+            "php mobile detect"
+        ]
+    }
+]
diff --git a/library/ezyang/htmlpurifier/CREDITS b/vendor/ezyang/htmlpurifier/CREDITS
similarity index 100%
rename from library/ezyang/htmlpurifier/CREDITS
rename to vendor/ezyang/htmlpurifier/CREDITS
diff --git a/library/ezyang/htmlpurifier/INSTALL b/vendor/ezyang/htmlpurifier/INSTALL
similarity index 100%
rename from library/ezyang/htmlpurifier/INSTALL
rename to vendor/ezyang/htmlpurifier/INSTALL
diff --git a/library/ezyang/htmlpurifier/INSTALL.fr.utf8 b/vendor/ezyang/htmlpurifier/INSTALL.fr.utf8
similarity index 100%
rename from library/ezyang/htmlpurifier/INSTALL.fr.utf8
rename to vendor/ezyang/htmlpurifier/INSTALL.fr.utf8
diff --git a/library/ezyang/htmlpurifier/LICENSE b/vendor/ezyang/htmlpurifier/LICENSE
similarity index 100%
rename from library/ezyang/htmlpurifier/LICENSE
rename to vendor/ezyang/htmlpurifier/LICENSE
diff --git a/library/ezyang/htmlpurifier/NEWS b/vendor/ezyang/htmlpurifier/NEWS
similarity index 100%
rename from library/ezyang/htmlpurifier/NEWS
rename to vendor/ezyang/htmlpurifier/NEWS
diff --git a/library/ezyang/htmlpurifier/README b/vendor/ezyang/htmlpurifier/README
similarity index 100%
rename from library/ezyang/htmlpurifier/README
rename to vendor/ezyang/htmlpurifier/README
diff --git a/library/ezyang/htmlpurifier/TODO b/vendor/ezyang/htmlpurifier/TODO
similarity index 100%
rename from library/ezyang/htmlpurifier/TODO
rename to vendor/ezyang/htmlpurifier/TODO
diff --git a/library/ezyang/htmlpurifier/VERSION b/vendor/ezyang/htmlpurifier/VERSION
similarity index 100%
rename from library/ezyang/htmlpurifier/VERSION
rename to vendor/ezyang/htmlpurifier/VERSION
diff --git a/library/ezyang/htmlpurifier/WHATSNEW b/vendor/ezyang/htmlpurifier/WHATSNEW
similarity index 100%
rename from library/ezyang/htmlpurifier/WHATSNEW
rename to vendor/ezyang/htmlpurifier/WHATSNEW
diff --git a/library/ezyang/htmlpurifier/WYSIWYG b/vendor/ezyang/htmlpurifier/WYSIWYG
similarity index 100%
rename from library/ezyang/htmlpurifier/WYSIWYG
rename to vendor/ezyang/htmlpurifier/WYSIWYG
diff --git a/library/ezyang/htmlpurifier/composer.json b/vendor/ezyang/htmlpurifier/composer.json
similarity index 100%
rename from library/ezyang/htmlpurifier/composer.json
rename to vendor/ezyang/htmlpurifier/composer.json
diff --git a/library/ezyang/htmlpurifier/extras/ConfigDoc/HTMLXSLTProcessor.php b/vendor/ezyang/htmlpurifier/extras/ConfigDoc/HTMLXSLTProcessor.php
similarity index 100%
rename from library/ezyang/htmlpurifier/extras/ConfigDoc/HTMLXSLTProcessor.php
rename to vendor/ezyang/htmlpurifier/extras/ConfigDoc/HTMLXSLTProcessor.php
diff --git a/library/ezyang/htmlpurifier/extras/FSTools.php b/vendor/ezyang/htmlpurifier/extras/FSTools.php
similarity index 100%
rename from library/ezyang/htmlpurifier/extras/FSTools.php
rename to vendor/ezyang/htmlpurifier/extras/FSTools.php
diff --git a/library/ezyang/htmlpurifier/extras/FSTools/File.php b/vendor/ezyang/htmlpurifier/extras/FSTools/File.php
similarity index 100%
rename from library/ezyang/htmlpurifier/extras/FSTools/File.php
rename to vendor/ezyang/htmlpurifier/extras/FSTools/File.php
diff --git a/library/ezyang/htmlpurifier/extras/HTMLPurifierExtras.auto.php b/vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.auto.php
similarity index 100%
rename from library/ezyang/htmlpurifier/extras/HTMLPurifierExtras.auto.php
rename to vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.auto.php
diff --git a/library/ezyang/htmlpurifier/extras/HTMLPurifierExtras.autoload.php b/vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.autoload.php
similarity index 100%
rename from library/ezyang/htmlpurifier/extras/HTMLPurifierExtras.autoload.php
rename to vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.autoload.php
diff --git a/library/ezyang/htmlpurifier/extras/HTMLPurifierExtras.php b/vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.php
similarity index 100%
rename from library/ezyang/htmlpurifier/extras/HTMLPurifierExtras.php
rename to vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.php
diff --git a/library/ezyang/htmlpurifier/extras/README b/vendor/ezyang/htmlpurifier/extras/README
similarity index 100%
rename from library/ezyang/htmlpurifier/extras/README
rename to vendor/ezyang/htmlpurifier/extras/README
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.auto.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.auto.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.composer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.composer.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.composer.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.composer.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.func.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.func.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.func.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.func.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.includes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.kses.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.kses.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.kses.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.kses.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.path.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.path.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.path.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.path.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Config.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Context.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Context.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Context.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Context.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Language.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Language.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Length.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Node.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Node.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Token.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Token.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URI.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URI.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URI.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URI.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php
diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php
similarity index 100%
rename from library/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php
rename to vendor/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php
diff --git a/library/ezyang/htmlpurifier/package.php b/vendor/ezyang/htmlpurifier/package.php
similarity index 100%
rename from library/ezyang/htmlpurifier/package.php
rename to vendor/ezyang/htmlpurifier/package.php
diff --git a/library/ezyang/htmlpurifier/phpdoc.ini b/vendor/ezyang/htmlpurifier/phpdoc.ini
similarity index 100%
rename from library/ezyang/htmlpurifier/phpdoc.ini
rename to vendor/ezyang/htmlpurifier/phpdoc.ini
diff --git a/library/ezyang/htmlpurifier/plugins/modx.txt b/vendor/ezyang/htmlpurifier/plugins/modx.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/modx.txt
rename to vendor/ezyang/htmlpurifier/plugins/modx.txt
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/.gitignore b/vendor/ezyang/htmlpurifier/plugins/phorum/.gitignore
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/.gitignore
rename to vendor/ezyang/htmlpurifier/plugins/phorum/.gitignore
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/Changelog b/vendor/ezyang/htmlpurifier/plugins/phorum/Changelog
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/Changelog
rename to vendor/ezyang/htmlpurifier/plugins/phorum/Changelog
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/INSTALL b/vendor/ezyang/htmlpurifier/plugins/phorum/INSTALL
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/INSTALL
rename to vendor/ezyang/htmlpurifier/plugins/phorum/INSTALL
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/README b/vendor/ezyang/htmlpurifier/plugins/phorum/README
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/README
rename to vendor/ezyang/htmlpurifier/plugins/phorum/README
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/config.default.php b/vendor/ezyang/htmlpurifier/plugins/phorum/config.default.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/config.default.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/config.default.php
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/htmlpurifier.php b/vendor/ezyang/htmlpurifier/plugins/phorum/htmlpurifier.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/htmlpurifier.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/htmlpurifier.php
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/info.txt b/vendor/ezyang/htmlpurifier/plugins/phorum/info.txt
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/info.txt
rename to vendor/ezyang/htmlpurifier/plugins/phorum/info.txt
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/init-config.php b/vendor/ezyang/htmlpurifier/plugins/phorum/init-config.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/init-config.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/init-config.php
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/migrate.bbcode.php b/vendor/ezyang/htmlpurifier/plugins/phorum/migrate.bbcode.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/migrate.bbcode.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/migrate.bbcode.php
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/settings.php b/vendor/ezyang/htmlpurifier/plugins/phorum/settings.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/settings.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/settings.php
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/settings/form.php b/vendor/ezyang/htmlpurifier/plugins/phorum/settings/form.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/settings/form.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/settings/form.php
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs-form.php b/vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs-form.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs-form.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs-form.php
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php b/vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php
diff --git a/library/ezyang/htmlpurifier/plugins/phorum/settings/save.php b/vendor/ezyang/htmlpurifier/plugins/phorum/settings/save.php
similarity index 100%
rename from library/ezyang/htmlpurifier/plugins/phorum/settings/save.php
rename to vendor/ezyang/htmlpurifier/plugins/phorum/settings/save.php
diff --git a/library/ezyang/htmlpurifier/release1-update.php b/vendor/ezyang/htmlpurifier/release1-update.php
similarity index 100%
rename from library/ezyang/htmlpurifier/release1-update.php
rename to vendor/ezyang/htmlpurifier/release1-update.php
diff --git a/library/ezyang/htmlpurifier/release2-tag.php b/vendor/ezyang/htmlpurifier/release2-tag.php
similarity index 100%
rename from library/ezyang/htmlpurifier/release2-tag.php
rename to vendor/ezyang/htmlpurifier/release2-tag.php
diff --git a/library/ezyang/htmlpurifier/test-settings.sample.php b/vendor/ezyang/htmlpurifier/test-settings.sample.php
similarity index 100%
rename from library/ezyang/htmlpurifier/test-settings.sample.php
rename to vendor/ezyang/htmlpurifier/test-settings.sample.php
diff --git a/library/Mobile_Detect/LICENSE.txt b/vendor/mobiledetect/mobiledetectlib/LICENSE.txt
similarity index 96%
rename from library/Mobile_Detect/LICENSE.txt
rename to vendor/mobiledetect/mobiledetectlib/LICENSE.txt
index 101abf8be..90e632a78 100644
--- a/library/Mobile_Detect/LICENSE.txt
+++ b/vendor/mobiledetect/mobiledetectlib/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) <2011-2014>  
+Copyright (c) <2011-2015> Serban Ghita, Nick Ilyin and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json
new file mode 100644
index 000000000..dc5420f30
--- /dev/null
+++ b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json
@@ -0,0 +1 @@
+{"version":"2.8.25","headerMatch":{"HTTP_ACCEPT":{"matches":["application\/x-obml2d","application\/vnd.rim.html","text\/vnd.wap.wml","application\/vnd.wap.xhtml+xml"]},"HTTP_X_WAP_PROFILE":null,"HTTP_X_WAP_CLIENTID":null,"HTTP_WAP_CONNECTION":null,"HTTP_PROFILE":null,"HTTP_X_OPERAMINI_PHONE_UA":null,"HTTP_X_NOKIA_GATEWAY_ID":null,"HTTP_X_ORANGE_ID":null,"HTTP_X_VODAFONE_3GPDPCONTEXT":null,"HTTP_X_HUAWEI_USERID":null,"HTTP_UA_OS":null,"HTTP_X_MOBILE_GATEWAY":null,"HTTP_X_ATT_DEVICEID":null,"HTTP_UA_CPU":{"matches":["ARM"]}},"uaHttpHeaders":["HTTP_USER_AGENT","HTTP_X_OPERAMINI_PHONE_UA","HTTP_X_DEVICE_USER_AGENT","HTTP_X_ORIGINAL_USER_AGENT","HTTP_X_SKYFIRE_PHONE","HTTP_X_BOLT_PHONE_UA","HTTP_DEVICE_STOCK_UA","HTTP_X_UCBROWSER_DEVICE_UA"],"uaMatch":{"phones":{"iPhone":"\\biPhone\\b|\\biPod\\b","BlackBerry":"BlackBerry|\\bBB10\\b|rim[0-9]+","HTC":"HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m","Nexus":"Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6","Dell":"Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b","Motorola":"Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b","Samsung":"\\bSamsung\\b|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C","LG":"\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)","Sony":"SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533","Asus":"Asus.*Galaxy|PadFone.*Mobile","NokiaLumia":"Lumia [0-9]{3,4}","Micromax":"Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b","Palm":"PalmSource|Palm","Vertu":"Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature","Pantech":"PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790","Fly":"IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250","Wiko":"KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM","iMobile":"i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)","SimValley":"\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b","Wolfgang":"AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q","Alcatel":"Alcatel","Nintendo":"Nintendo 3DS","Amoi":"Amoi","INQ":"INQ","GenericPhone":"Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"},"tablets":{"iPad":"iPad|iPad.*Mobile","NexusTablet":"Android.*Nexus[\\s]+(7|9|10)","SamsungTablet":"SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587","Kindle":"Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\\b|Android.*Silk\/[0-9.]+ like Chrome\/[0-9.]+ (?!Mobile)","SurfaceTablet":"Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)","HPTablet":"HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10","AsusTablet":"^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K011 | K017 | K01E |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA|P01Z","BlackBerryTablet":"PlayBook|RIM Tablet","HTCtablet":"HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410","MotorolaTablet":"xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617","NookTablet":"Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2","AcerTablet":"Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20\\b|\\bA3-A30","ToshibaTablet":"Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO","LGTablet":"\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b","FujitsuTablet":"Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b","PrestigioTablet":"PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002","LenovoTablet":"Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)","DellTablet":"Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7","YarvikTablet":"Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b","MedionTablet":"Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB","ArnovaTablet":"97G4|AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2","IntensoTablet":"INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004","IRUTablet":"M702pro","MegafonTablet":"MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b","EbodaTablet":"E-Boda (Supreme|Impresspeed|Izzycomm|Essential)","AllViewTablet":"Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)","ArchosTablet":"\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|c|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b","AinolTablet":"NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark","NokiaLumiaTablet":"Lumia 2520","SonyTablet":"Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31","PhilipsTablet":"\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b","CubeTablet":"Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT","CobyTablet":"MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010","MIDTablet":"M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10","MSITablet":"MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b","SMiTTablet":"Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)","RockChipTablet":"Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A","FlyTablet":"IQ310|Fly Vision","bqTablet":"Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris [E|M]10)|Maxwell.*Lite|Maxwell.*Plus","HuaweiTablet":"MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim","NecTablet":"\\bN-06D|\\bN-08D","PantechTablet":"Pantech.*P4100","BronchoTablet":"Broncho.*(N701|N708|N802|a710)","VersusTablet":"TOUCHPAD.*[78910]|\\bTOUCHTAB\\b","ZyncTablet":"z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900","PositivoTablet":"TB07STA|TB10STA|TB07FTA|TB10FTA","NabiTablet":"Android.*\\bNabi","KoboTablet":"Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build","DanewTablet":"DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b","TexetTablet":"NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE","PlaystationTablet":"Playstation.*(Portable|Vita)","TrekstorTablet":"ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab","PyleAudioTablet":"\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b","AdvanTablet":"Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ","DanyTechTablet":"Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1","GalapadTablet":"Android.*\\bG1\\b","MicromaxTablet":"Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b","KarbonnTablet":"Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b","AllFineTablet":"Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide","PROSCANTablet":"\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b","YONESTablet":"BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026","ChangJiaTablet":"TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503","GUTablet":"TX-A1301|TX-M9002|Q702|kf026","PointOfViewTablet":"TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10","OvermaxTablet":"OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)","HCLTablet":"HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync","DPSTablet":"DPS Dream 9|DPS Dual 7","VistureTablet":"V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10","CrestaTablet":"CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989","MediatekTablet":"\\bMT8125|MT8389|MT8135|MT8377\\b","ConcordeTablet":"Concorde([ ]+)?Tab|ConCorde ReadMan","GoCleverTablet":"GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042","ModecomTablet":"FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003","VoninoTablet":"\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b","ECSTablet":"V07OT2|TM105A|S10OT1|TR10CS1","StorexTablet":"eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab","VodafoneTablet":"SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497","EssentielBTablet":"Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2","RossMoorTablet":"RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711","iMobileTablet":"i-mobile i-note","TolinoTablet":"tolino tab [0-9.]+|tolino shine","AudioSonicTablet":"\\bC-22Q|T7-QC|T-17B|T-17P\\b","AMPETablet":"Android.* A78 ","SkkTablet":"Android.* (SKYPAD|PHOENIX|CYCLOPS)","TecnoTablet":"TECNO P9","JXDTablet":"Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b","iJoyTablet":"Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)","FX2Tablet":"FX2 PAD7|FX2 PAD10","XoroTablet":"KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151","ViewsonicTablet":"ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a","OdysTablet":"LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10","CaptivaTablet":"CAPTIVA PAD","IconbitTablet":"NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S","TeclastTablet":"T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi","OndaTablet":"\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+","JaytechTablet":"TPC-PA762","BlaupunktTablet":"Endeavour 800NG|Endeavour 1010","DigmaTablet":"\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b","EvolioTablet":"ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b","LavaTablet":"QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b","AocTablet":"MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712","MpmanTablet":"MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010","CelkonTablet":"CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b","WolderTablet":"miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b","MiTablet":"\\bMI PAD\\b|\\bHM NOTE 1W\\b","NibiruTablet":"Nibiru M1|Nibiru Jupiter One","NexoTablet":"NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI","LeaderTablet":"TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100","UbislateTablet":"UbiSlate[\\s]?7C","PocketBookTablet":"Pocketbook","KocasoTablet":"\\b(TB-1207)\\b","HisenseTablet":"\\b(F5281|E2371)\\b","Hudl":"Hudl HT7S3|Hudl 2","TelstraTablet":"T-Hub2","GenericTablet":"Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bTP750\\b"},"browsers":{"Chrome":"\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?","Dolfin":"\\bDolfin\\b","Opera":"Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+","Skyfire":"Skyfire","Edge":"Mobile Safari\/[.0-9]* Edge","IE":"IEMobile|MSIEMobile","Firefox":"fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile|FxiOS","Bolt":"bolt","TeaShark":"teashark","Blazer":"Blazer","Safari":"Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari","UCBrowser":"UC.*Browser|UCWEB","baiduboxapp":"baiduboxapp","baidubrowser":"baidubrowser","DiigoBrowser":"DiigoBrowser","Puffin":"Puffin","Mercury":"\\bMercury\\b","ObigoBrowser":"Obigo","NetFront":"NF-Browser","GenericBrowser":"NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger","PaleMoon":"Android.*PaleMoon|Mobile.*PaleMoon"},"os":{"AndroidOS":"Android","BlackBerryOS":"blackberry|\\bBB10\\b|rim tablet os","PalmOS":"PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino","SymbianOS":"Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b","WindowsMobileOS":"Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;","WindowsPhoneOS":"Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;","iOS":"\\biPhone.*Mobile|\\biPod|\\biPad","MeeGoOS":"MeeGo","MaemoOS":"Maemo","JavaOS":"J2ME\/|\\bMIDP\\b|\\bCLDC\\b","webOS":"webOS|hpwOS","badaOS":"\\bBada\\b","BREWOS":"BREW"},"utilities":{"Bot":"Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom","MobileBot":"Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2","DesktopMode":"WPDesktop","TV":"SonyDTV|HbbTV","WebKit":"(webkit)[ \/]([\\w.]+)","Console":"\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b","Watch":"SM-V700"}}}
\ No newline at end of file
diff --git a/library/Mobile_Detect/Mobile_Detect.php b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php
similarity index 75%
rename from library/Mobile_Detect/Mobile_Detect.php
rename to vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php
index 3a82c2969..4e44ff367 100644
--- a/library/Mobile_Detect/Mobile_Detect.php
+++ b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php
@@ -22,7 +22,7 @@
  *              README:       https://github.com/serbanghita/Mobile-Detect/blob/master/README.md
  *              HOWTO:        https://github.com/serbanghita/Mobile-Detect/wiki/Code-examples
  *
- * @version     2.8.11
+ * @version     2.8.25
  */
 
 class Mobile_Detect
@@ -66,7 +66,7 @@ class Mobile_Detect
     /**
      * Stores the version number of the current release.
      */
-    const VERSION                   = '2.8.11';
+    const VERSION                   = '2.8.25';
 
     /**
      * A type for the version() method indicating a string return value.
@@ -78,6 +78,12 @@ class Mobile_Detect
      */
     const VERSION_TYPE_FLOAT        = 'float';
 
+    /**
+     * A cache for resolved matches
+     * @var array
+     */
+    protected $cache = array();
+
     /**
      * The User-Agent HTTP header is stored in here.
      * @var string
@@ -90,6 +96,12 @@ class Mobile_Detect
      */
     protected $httpHeaders = array();
 
+    /**
+     * CloudFront headers. E.g. CloudFront-Is-Desktop-Viewer, CloudFront-Is-Mobile-Viewer & CloudFront-Is-Tablet-Viewer.
+     * @var array
+     */
+    protected $cloudfrontHeaders = array();
+
     /**
      * The matching Regex.
      * This is good for debug.
@@ -161,11 +173,12 @@ class Mobile_Detect
         'Nexus'         => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6',
         // @todo: Is 'Dell Streak' a tablet or a phone? ;)
         'Dell'          => 'Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\b001DL\b|\b101DL\b|\bGS01\b',
-        'Motorola'      => 'Motorola|DROIDX|DROID BIONIC|\bDroid\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925',
-        'Samsung'       => 'Samsung|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750',
-        'LG'            => '\bLG\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802)',
+        'Motorola'      => 'Motorola|DROIDX|DROID BIONIC|\bDroid\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\bMoto E\b',
+        'Samsung'       => '\bSamsung\b|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C',
+        'LG'            => '\bLG\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)',
         'Sony'          => 'SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533',
         'Asus'          => 'Asus.*Galaxy|PadFone.*Mobile',
+        'NokiaLumia'    => 'Lumia [0-9]{3,4}',
         // http://www.micromaxinfo.com/mobiles/smartphones
         // Added because the codes might conflict with Acer Tablets.
         'Micromax'      => 'Micromax.*\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\b',
@@ -177,7 +190,9 @@ class Mobile_Detect
         'Pantech'       => 'PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790',
         // http://www.fly-phone.com/devices/smartphones/ ; Included only smartphones.
         'Fly'           => 'IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250',
-       'iMobile'        => 'i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)',
+        // http://fr.wikomobile.com
+        'Wiko'          => 'KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM',
+        'iMobile'        => 'i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)',
         // Added simvalley mobile just for fun. They have some interesting devices.
         // http://www.simvalley.fr/telephonie---gps-_22_telephonie-mobile_telephones_.html
         'SimValley'     => '\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\b',
@@ -200,11 +215,14 @@ class Mobile_Detect
      * @var array
      */
     protected static $tabletDevices = array(
-        'iPad'              => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic.
-        'NexusTablet'       => 'Android.*Nexus[\s]+(7|9|10)|^.*Android.*Nexus(?:(?!Mobile).)*$',
-        'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-I9205|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T707A|SM-T807A|SM-T237P|SM-T807P|SM-P607T|SM-T217T|SM-T337T', // SCH-P709|SCH-P729|SM-T2558 - Samsung Mega - treat them like a regular phone.
+        // @todo: check for mobile friendly emails topic.
+        'iPad'              => 'iPad|iPad.*Mobile',
+        // Removed |^.*Android.*Nexus(?!(?:Mobile).)*$
+        // @see #442
+        'NexusTablet'       => 'Android.*Nexus[\s]+(7|9|10)',
+        'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587', // SCH-P709|SCH-P729|SM-T2558|GT-I9205 - Samsung Mega - treat them like a regular phone.
         // http://docs.aws.amazon.com/silk/latest/developerguide/user-agent.html
-        'Kindle'            => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI)\b',
+        'Kindle'            => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\b|Android.*Silk/[0-9.]+ like Chrome/[0-9.]+ (?!Mobile)',
         // Only the Surface tablets with Windows RT are considered mobile.
         // http://msdn.microsoft.com/en-us/library/ie/hh920767(v=vs.85).aspx
         'SurfaceTablet'     => 'Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)',
@@ -212,7 +230,7 @@ class Mobile_Detect
         'HPTablet'          => 'HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10',
         // Watch out for PadFone, see #132.
         // http://www.asus.com/de/Tablets_Mobile/Memo_Pad_Products/
-        'AsusTablet'        => '^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\bK00F\b|\bK00C\b|\bK00E\b|\bK00L\b|TX201LA|ME176C|ME102A|\bM80TA\b|ME372CL|ME560CG|ME372CG',
+        'AsusTablet'        => '^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\bK00F\b|\bK00C\b|\bK00E\b|\bK00L\b|TX201LA|ME176C|ME102A|\bM80TA\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K011 | K017 | K01E |ME572C|ME103K|ME170C|ME171C|\bME70C\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA|P01Z',
         'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
         'HTCtablet'         => 'HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410',
         'MotorolaTablet'    => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
@@ -222,7 +240,7 @@ class Mobile_Detect
         // http://us.acer.com/ac/en/US/content/group/tablets
         // http://www.acer.de/ac/de/DE/content/models/tablets/
         // Can conflict with Micromax and Motorola phones codes.
-        'AcerTablet'        => 'Android.*; \b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\b|W3-810|\bA3-A10\b',
+        'AcerTablet'        => 'Android.*; \b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\b|W3-810|\bA3-A10\b|\bA3-A11\b|\bA3-A20\b|\bA3-A30',
         // http://eu.computers.toshiba-europe.com/innovation/family/Tablets/1098744/banner_id/tablet_footerlink/
         // http://us.toshiba.com/tablets/tablet-finder
         // http://www.toshiba.co.jp/regza/tablet/
@@ -232,15 +250,15 @@ class Mobile_Detect
         'LGTablet'          => '\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\b',
         'FujitsuTablet'     => 'Android.*\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\b',
         // Prestigio Tablets http://www.prestigio.com/support
-        'PrestigioTablet'   => 'PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD',
+        'PrestigioTablet'   => 'PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002',
         // http://support.lenovo.com/en_GB/downloads/default.page?#
-        'LenovoTablet'      => 'Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)',
+        'LenovoTablet'      => 'Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)',
         // http://www.dell.com/support/home/us/en/04/Products/tab_mob/tablets
         'DellTablet'        => 'Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7',
         // http://www.yarvik.com/en/matrix/tablets/
         'YarvikTablet'      => 'Android.*\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\b',
         'MedionTablet'      => 'Android.*\bOYO\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB',
-        'ArnovaTablet'      => 'AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2',
+        'ArnovaTablet'      => '97G4|AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2',
         // http://www.intenso.de/kategorie_en.php?kategorie=33
         // @todo: http://www.nbhkdz.com/read/b8e64202f92a2df129126bff.html - investigate
         'IntensoTablet'     => 'INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004',
@@ -252,13 +270,15 @@ class Mobile_Detect
         // http://www.allview.ro/produse/droseries/lista-tablete-pc/
         'AllViewTablet'           => 'Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)',
         // http://wiki.archosfans.com/index.php?title=Main_Page
-        'ArchosTablet'      => '\b(101G9|80G9|A101IT)\b|Qilive 97R|Archos5|\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\b',
+        // @note Rewrite the regex format after we add more UAs.
+        'ArchosTablet'      => '\b(101G9|80G9|A101IT)\b|Qilive 97R|Archos5|\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|c|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\b',
         // http://www.ainol.com/plugin.php?identifier=ainol&module=product
         'AinolTablet'       => 'NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark',
+        'NokiaLumiaTablet'  => 'Lumia 2520',
         // @todo: inspect http://esupport.sony.com/US/p/select-system.pl?DIRECTOR=DRIVER
         // Readers http://www.atsuhiro-me.net/ebook/sony-reader/sony-reader-web-browser
         // http://www.sony.jp/support/tablet/
-        'SonyTablet'        => 'Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551',
+        'SonyTablet'        => 'Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31',
         // http://www.support.philips.com/support/catalog/worldproducts.jsp?userLanguage=en&userCountry=cn&categoryid=3G_LTE_TABLET_SU_CN_CARE&title=3G%20tablets%20/%20LTE%20range&_dyncharset=UTF-8
         'PhilipsTablet'     => '\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\b',
         // db + http://www.cube-tablet.com/buy-products.html
@@ -266,7 +286,7 @@ class Mobile_Detect
         // http://www.cobyusa.com/?p=pcat&pcat_id=3001
         'CobyTablet'        => 'MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010',
         // http://www.match.net.cn/products.asp
-        'MIDTablet'         => 'M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733',
+        'MIDTablet'         => 'M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10',
         // http://www.msi.com/support
         // @todo Research the Windows Tablets.
         'MSITablet' => 'MSI \b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\b',
@@ -282,7 +302,7 @@ class Mobile_Detect
         // http://www.fly-phone.com/devices/tablets/ ; http://www.fly-phone.com/service/
         'FlyTablet'         => 'IQ310|Fly Vision',
         // http://www.bqreaders.com/gb/tablets-prices-sale.html
-        'bqTablet'          => 'bq.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant)|Maxwell.*Lite|Maxwell.*Plus',
+        'bqTablet'          => 'Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris [E|M]10)|Maxwell.*Lite|Maxwell.*Plus',
         // http://www.huaweidevice.com/worldwide/productFamily.do?method=index&directoryId=5011&treeId=3290
         // http://www.huaweidevice.com/worldwide/downloadCenter.do?method=index&directoryId=3372&treeId=0&tb=1&type=software (including legacy tablets)
         'HuaweiTablet'      => 'MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim',
@@ -366,7 +386,7 @@ class Mobile_Detect
         // @note: no need to add all the tablet codes since they are guided by the first regex.
         'StorexTablet'  => 'eZee[_\']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab',
         // Generic Vodafone tablets.
-        'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7',
+        'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497',
         // French tablets - Essentiel B http://www.boulanger.fr/tablette_tactile_e-book/tablette_tactile_essentiel_b/cl_68908.htm?multiChoiceToDelete=brand&mc_brand=essentielb
         // Aka: http://www.essentielb.fr/
         'EssentielBTablet' => 'Smart[ \']?TAB[ ]+?[0-9]+|Family[ \']?TAB2',
@@ -387,7 +407,7 @@ class Mobile_Detect
         // Tecno Mobile (only tablet) - http://www.tecno-mobile.com/index.php/product?filterby=smart&list_order=all&page=1
         'TecnoTablet' => 'TECNO P9',
         // JXD (consoles & tablets) - http://jxd.hk/products.asp?selectclassid=009008&clsid=3
-        'JXDTablet' => 'Android.*\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\b',
+        'JXDTablet' => 'Android.* \b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\b',
         // i-Joy tablets - http://www.i-joy.es/en/cat/products/tablets/
         'iJoyTablet' => 'Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)',
         // http://www.intracon.eu/tablet
@@ -405,6 +425,8 @@ class Mobile_Detect
         'IconbitTablet' => 'NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S',
         // http://www.teclast.com/topic.php?channelID=70&topicID=140&pid=63
         'TeclastTablet' => 'T98 4G|\bP80\b|\bX90HD\b|X98 Air|X98 Air 3G|\bX89\b|P80 3G|\bX80h\b|P98 Air|\bX89HD\b|P98 3G|\bP90HD\b|P89 3G|X98 3G|\bP70h\b|P79HD 3G|G18d 3G|\bP79HD\b|\bP89s\b|\bA88\b|\bP10HD\b|\bP19HD\b|G18 3G|\bP78HD\b|\bA78\b|\bP75\b|G17s 3G|G17h 3G|\bP85t\b|\bP90\b|\bP11\b|\bP98t\b|\bP98HD\b|\bG18d\b|\bP85s\b|\bP11HD\b|\bP88s\b|\bA80HD\b|\bA80se\b|\bA10h\b|\bP89\b|\bP78s\b|\bG18\b|\bP85\b|\bA70h\b|\bA70\b|\bG17\b|\bP18\b|\bA80s\b|\bA11s\b|\bP88HD\b|\bA80h\b|\bP76s\b|\bP76h\b|\bP98\b|\bA10HD\b|\bP78\b|\bP88\b|\bA11\b|\bA10t\b|\bP76a\b|\bP76t\b|\bP76e\b|\bP85HD\b|\bP85a\b|\bP86\b|\bP75HD\b|\bP76v\b|\bA12\b|\bP75a\b|\bA15\b|\bP76Ti\b|\bP81HD\b|\bA10\b|\bT760VE\b|\bT720HD\b|\bP76\b|\bP73\b|\bP71\b|\bP72\b|\bT720SE\b|\bC520Ti\b|\bT760\b|\bT720VE\b|T720-3GE|T720-WiFi',
+        // Onda - http://www.onda-tablet.com/buy-android-onda.html?dir=desc&limit=all&order=price
+        'OndaTablet' => '\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\b[\s]+',
         'JaytechTablet'     => 'TPC-PA762',
         'BlaupunktTablet'   => 'Endeavour 800NG|Endeavour 1010',
         // http://www.digma.ru/support/download/
@@ -415,24 +437,37 @@ class Mobile_Detect
         // @todo: Research some more
         'EvolioTablet' => 'ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\bEvotab\b|\bNeura\b',
         // @todo http://www.lavamobiles.com/tablets-data-cards
-        'LavaTablet' => 'QPAD E704|\bIvoryS\b|E-TAB IVORY',
+        'LavaTablet' => 'QPAD E704|\bIvoryS\b|E-TAB IVORY|\bE-TAB\b',
+        // http://www.breezetablet.com/
+        'AocTablet' => 'MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712',
+        // http://www.mpmaneurope.com/en/products/internet-tablets-14/android-tablets-14/
+        'MpmanTablet' => 'MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\bMPG7\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010',
         // https://www.celkonmobiles.com/?_a=categoryphones&sid=2
         'CelkonTablet' => 'CT695|CT888|CT[\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\bCT-1\b',
+        // http://www.wolderelectronics.com/productos/manuales-y-guias-rapidas/categoria-2-miTab
+        'WolderTablet' => 'miTab \b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\b',
         // http://www.mi.com/en
         'MiTablet' => '\bMI PAD\b|\bHM NOTE 1W\b',
         // http://www.nbru.cn/index.html
         'NibiruTablet' => 'Nibiru M1|Nibiru Jupiter One',
         // http://navroad.com/products/produkty/tablety/
         'NexoTablet' => 'NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI',
+        // http://leader-online.com/new_site/product-category/tablets/
+        // http://www.leader-online.net.au/List/Tablet
+        'LeaderTablet' => 'TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100',
         // http://www.datawind.com/ubislate/
         'UbislateTablet' => 'UbiSlate[\s]?7C',
         // http://www.pocketbook-int.com/ru/support
         'PocketBookTablet' => 'Pocketbook',
+        // http://www.kocaso.com/product_tablet.html
+        'KocasoTablet' => '\b(TB-1207)\b',
+        // http://global.hisense.com/product/asia/tablet/Sero7/201412/t20141215_91832.htm
+        'HisenseTablet' => '\b(F5281|E2371)\b',
         // http://www.tesco.com/direct/hudl/
-        'Hudl'              => 'Hudl HT7S3',
+        'Hudl'              => 'Hudl HT7S3|Hudl 2',
         // http://www.telstra.com.au/home-phone/thub-2/
         'TelstraTablet'     => 'T-Hub2',
-        'GenericTablet'     => 'Android.*\b97D\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b|rk30sdk|\bEVOTAB\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\bM6pro\b|CT1020W|arc 10HD|\bJolla\b'
+        'GenericTablet'     => 'Android.*\b97D\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b|rk30sdk|\bEVOTAB\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\bM6pro\b|CT1020W|arc 10HD|\bTP750\b'
     );
 
     /**
@@ -451,7 +486,8 @@ class Mobile_Detect
         // http://wifeng.cn/?r=blog&a=view&id=106
         // http://nicksnettravels.builttoroam.com/post/2011/01/10/Bogus-Windows-Phone-7-User-Agent-String.aspx
         // http://msdn.microsoft.com/library/ms537503.aspx
-        'WindowsPhoneOS'   => 'Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;',
+        // https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx
+        'WindowsPhoneOS'   => 'Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;',
         'iOS'               => '\biPhone.*Mobile|\biPod|\biPad',
         // http://en.wikipedia.org/wiki/MeeGo
         // @todo: research MeeGo in UAs
@@ -468,16 +504,23 @@ class Mobile_Detect
     /**
      * List of mobile User Agents.
      *
+     * IMPORTANT: This is a list of only mobile browsers.
+     * Mobile Detect 2.x supports only mobile browsers,
+     * it was never designed to detect all browsers.
+     * The change will come in 2017 in the 3.x release for PHP7.
+     *
      * @var array
      */
     protected static $browsers = array(
+        //'Vivaldi'         => 'Vivaldi',
         // @reference: https://developers.google.com/chrome/mobile/docs/user-agent
         'Chrome'          => '\bCrMo\b|CriOS|Android.*Chrome/[.0-9]* (Mobile)?',
         'Dolfin'          => '\bDolfin\b',
         'Opera'           => 'Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR/[0-9.]+|Coast/[0-9.]+',
         'Skyfire'         => 'Skyfire',
+        'Edge'             => 'Mobile Safari/[.0-9]* Edge',
         'IE'              => 'IEMobile|MSIEMobile', // |Trident/[.0-9]+
-        'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile',
+        'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile|FxiOS',
         'Bolt'            => 'bolt',
         'TeaShark'        => 'teashark',
         'Blazer'          => 'Blazer',
@@ -485,7 +528,7 @@ class Mobile_Detect
         'Safari'          => 'Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari',
         // http://en.wikipedia.org/wiki/Midori_(web_browser)
         //'Midori'          => 'midori',
-        'Tizen'           => 'Tizen',
+        //'Tizen'           => 'Tizen',
         'UCBrowser'       => 'UC.*Browser|UCWEB',
         'baiduboxapp'     => 'baiduboxapp',
         'baidubrowser'    => 'baidubrowser',
@@ -502,6 +545,8 @@ class Mobile_Detect
         // @reference: http://en.wikipedia.org/wiki/Minimo
         // http://en.wikipedia.org/wiki/Vision_Mobile_Browser
         'GenericBrowser'  => 'NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger',
+        // @reference: https://en.wikipedia.org/wiki/Pale_Moon_(web_browser)
+        'PaleMoon'        => 'Android.*PaleMoon|Mobile.*PaleMoon',
     );
 
     /**
@@ -513,11 +558,12 @@ class Mobile_Detect
         // Experimental. When a mobile device wants to switch to 'Desktop Mode'.
         // http://scottcate.com/technology/windows-phone-8-ie10-desktop-or-mobile/
         // https://github.com/serbanghita/Mobile-Detect/issues/57#issuecomment-15024011
+        // https://developers.facebook.com/docs/sharing/best-practices
+        'Bot'         => 'Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom',
+        'MobileBot'   => 'Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker/M1A1-R2D2',
         'DesktopMode' => 'WPDesktop',
         'TV'          => 'SonyDTV|HbbTV', // experimental
         'WebKit'      => '(webkit)[ /]([\w.]+)',
-        'Bot'         => 'Googlebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|facebookexternalhit',
-        'MobileBot'   => 'Googlebot-Mobile|YahooSeeker/M1A1-R2D2',
         // @todo: Include JXD consoles.
         'Console'     => '\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\b',
         'Watch'       => 'SM-V700',
@@ -568,11 +614,13 @@ class Mobile_Detect
         'Chrome'        => array('Chrome/[VER]', 'CriOS/[VER]', 'CrMo/[VER]'),
         'Coast'         => array('Coast/[VER]'),
         'Dolfin'        => 'Dolfin/[VER]',
-        // @reference: https://developer.mozilla.org/en-US/docs/User_Agent_Strings_Reference
-        'Firefox'       => 'Firefox/[VER]',
+        // @reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent/Firefox
+        'Firefox'       => array('Firefox/[VER]', 'FxiOS/[VER]'), 
         'Fennec'        => 'Fennec/[VER]',
-        // @reference: http://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx
-        'IE'      => array('IEMobile/[VER];', 'IEMobile [VER]', 'MSIE [VER];'),
+        // http://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx
+        // https://msdn.microsoft.com/en-us/library/ie/hh869301(v=vs.85).aspx
+        'Edge' => 'Edge/[VER]',
+        'IE'      => array('IEMobile/[VER];', 'IEMobile [VER]', 'MSIE [VER];', 'Trident/[0-9.]+;.*rv:[VER]'),
         // http://en.wikipedia.org/wiki/NetFront
         'NetFront'      => 'NetFront/[VER]',
         'NokiaBrowser'  => 'NokiaBrowser/[VER]',
@@ -584,6 +632,7 @@ class Mobile_Detect
         'MicroMessenger' => 'MicroMessenger/[VER]',
         'baiduboxapp'   => 'baiduboxapp/[VER]',
         'baidubrowser'  => 'baidubrowser/[VER]',
+        'SamsungBrowser' => 'SamsungBrowser/[VER]',
         'Iron'          => 'Iron/[VER]',
         // @note: Safari 7534.48.3 is actually Version 5.1.
         // @note: On BlackBerry the Version is overwriten by the OS.
@@ -591,14 +640,16 @@ class Mobile_Detect
         'Skyfire'       => 'Skyfire/[VER]',
         'Tizen'         => 'Tizen/[VER]',
         'Webkit'        => 'webkit[ /][VER]',
+        'PaleMoon'         => 'PaleMoon/[VER]',
 
         // Engine
         'Gecko'         => 'Gecko/[VER]',
         'Trident'       => 'Trident/[VER]',
         'Presto'        => 'Presto/[VER]',
+        'Goanna'           => 'Goanna/[VER]',
 
         // OS
-        'iOS'              => ' \bOS\b [VER] ',
+        'iOS'              => ' \bi?OS\b [VER][ ;]{1}',
         'Android'          => 'Android [VER]',
         'BlackBerry'       => array('BlackBerry[\w]+/[VER]', 'BlackBerry.*Version/[VER]', 'Version/[VER]'),
         'BREW'             => 'BREW [VER]',
@@ -647,25 +698,28 @@ class Mobile_Detect
      * Set the HTTP Headers. Must be PHP-flavored. This method will reset existing headers.
      *
      * @param array $httpHeaders The headers to set. If null, then using PHP's _SERVER to extract
-     *                           the headers. The default null is left for backwards compatibilty.
+     *                           the headers. The default null is left for backwards compatibility.
      */
     public function setHttpHeaders($httpHeaders = null)
     {
-        //use global _SERVER if $httpHeaders aren't defined
+        // use global _SERVER if $httpHeaders aren't defined
         if (!is_array($httpHeaders) || !count($httpHeaders)) {
             $httpHeaders = $_SERVER;
         }
 
-        //clear existing headers
+        // clear existing headers
         $this->httpHeaders = array();
 
-        //Only save HTTP headers. In PHP land, that means only _SERVER vars that
-        //start with HTTP_.
+        // Only save HTTP headers. In PHP land, that means only _SERVER vars that
+        // start with HTTP_.
         foreach ($httpHeaders as $key => $value) {
-            if (substr($key,0,5) == 'HTTP_') {
+            if (substr($key, 0, 5) === 'HTTP_') {
                 $this->httpHeaders[$key] = $value;
             }
         }
+
+        // In case we're dealing with CloudFront, we need to know.
+        $this->setCfHeaders($httpHeaders);
     }
 
     /**
@@ -690,13 +744,13 @@ class Mobile_Detect
      */
     public function getHttpHeader($header)
     {
-        //are we using PHP-flavored headers?
+        // are we using PHP-flavored headers?
         if (strpos($header, '_') === false) {
             $header = str_replace('-', '_', $header);
             $header = strtoupper($header);
         }
 
-        //test the alternate, too
+        // test the alternate, too
         $altHeader = 'HTTP_' . $header;
 
         //Test both the regular and the HTTP_ prefix
@@ -725,6 +779,47 @@ class Mobile_Detect
         return self::$uaHttpHeaders;
     }
 
+
+    /**
+     * Set CloudFront headers
+     * http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/header-caching.html#header-caching-web-device
+     *
+     * @param array $cfHeaders List of HTTP headers
+     *
+     * @return  boolean If there were CloudFront headers to be set
+     */
+    public function setCfHeaders($cfHeaders = null) {
+        // use global _SERVER if $cfHeaders aren't defined
+        if (!is_array($cfHeaders) || !count($cfHeaders)) {
+            $cfHeaders = $_SERVER;
+        }
+
+        // clear existing headers
+        $this->cloudfrontHeaders = array();
+
+        // Only save CLOUDFRONT headers. In PHP land, that means only _SERVER vars that
+        // start with cloudfront-.
+        $response = false;
+        foreach ($cfHeaders as $key => $value) {
+            if (substr(strtolower($key), 0, 16) === 'http_cloudfront_') {
+                $this->cloudfrontHeaders[strtoupper($key)] = $value;
+                $response = true;
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * Retrieves the cloudfront headers.
+     *
+     * @return array
+     */
+    public function getCfHeaders()
+    {
+        return $this->cloudfrontHeaders;
+    }
+
     /**
      * Set the User-Agent to be used.
      *
@@ -734,19 +829,28 @@ class Mobile_Detect
      */
     public function setUserAgent($userAgent = null)
     {
-        if (!empty($userAgent)) {
+        // Invalidate cache due to #375
+        $this->cache = array();
+
+        if (false === empty($userAgent)) {
             return $this->userAgent = $userAgent;
         } else {
             $this->userAgent = null;
             foreach ($this->getUaHttpHeaders() as $altHeader) {
-                if (!empty($this->httpHeaders[$altHeader])) { // @todo: should use getHttpHeader(), but it would be slow. (Serban)
+                if (false === empty($this->httpHeaders[$altHeader])) { // @todo: should use getHttpHeader(), but it would be slow. (Serban)
                     $this->userAgent .= $this->httpHeaders[$altHeader] . " ";
                 }
             }
 
-            return $this->userAgent = (!empty($this->userAgent) ? trim($this->userAgent) : null);
-
+            if (!empty($this->userAgent)) {
+                return $this->userAgent = trim($this->userAgent);
+            }
         }
+
+        if (count($this->getCfHeaders()) > 0) {
+            return $this->userAgent = 'Amazon CloudFront';
+        }
+        return $this->userAgent = null;
     }
 
     /**
@@ -774,7 +878,7 @@ class Mobile_Detect
             $type = self::DETECTION_TYPE_MOBILE;
         }
 
-        if ($type != self::DETECTION_TYPE_MOBILE && $type != self::DETECTION_TYPE_EXTENDED) {
+        if ($type !== self::DETECTION_TYPE_MOBILE && $type !== self::DETECTION_TYPE_EXTENDED) {
             return;
         }
 
@@ -930,10 +1034,10 @@ class Mobile_Detect
     {
 
         foreach ($this->getMobileHeaders() as $mobileHeader => $matchType) {
-            if ( isset($this->httpHeaders[$mobileHeader]) ) {
-                if ( is_array($matchType['matches']) ) {
+            if (isset($this->httpHeaders[$mobileHeader])) {
+                if (is_array($matchType['matches'])) {
                     foreach ($matchType['matches'] as $_match) {
-                        if ( strpos($this->httpHeaders[$mobileHeader], $_match) !== false ) {
+                        if (strpos($this->httpHeaders[$mobileHeader], $_match) !== false) {
                             return true;
                         }
                     }
@@ -960,8 +1064,8 @@ class Mobile_Detect
      */
     public function __call($name, $arguments)
     {
-        //make sure the name starts with 'is', otherwise
-        if (substr($name, 0, 2) != 'is') {
+        // make sure the name starts with 'is', otherwise
+        if (substr($name, 0, 2) !== 'is') {
             throw new BadMethodCallException("No such method exists: $name");
         }
 
@@ -975,7 +1079,7 @@ class Mobile_Detect
     /**
      * Find a detection rule that matches the current User-agent.
      *
-     * @param null $userAgent deprecated
+     * @param  null    $userAgent deprecated
      * @return boolean
      */
     protected function matchDetectionRulesAgainstUA($userAgent = null)
@@ -985,6 +1089,7 @@ class Mobile_Detect
             if (empty($_regex)) {
                 continue;
             }
+
             if ($this->match($_regex, $userAgent)) {
                 return true;
             }
@@ -995,37 +1100,39 @@ class Mobile_Detect
 
     /**
      * Search for a certain key in the rules array.
-     * If the key is found the try to match the corresponding
-     * regex agains the User-Agent.
+     * If the key is found then try to match the corresponding
+     * regex against the User-Agent.
      *
      * @param string $key
-     * @param null $userAgent deprecated
-     * @return mixed
+     *
+     * @return boolean
      */
-    protected function matchUAAgainstKey($key, $userAgent = null)
+    protected function matchUAAgainstKey($key)
     {
         // Make the keys lowercase so we can match: isIphone(), isiPhone(), isiphone(), etc.
         $key = strtolower($key);
+        if (false === isset($this->cache[$key])) {
 
-        //change the keys to lower case
-        $_rules = array_change_key_case($this->getRules());
+            // change the keys to lower case
+            $_rules = array_change_key_case($this->getRules());
 
-        if (array_key_exists($key, $_rules)) {
-            if (empty($_rules[$key])) {
-                return null;
+            if (false === empty($_rules[$key])) {
+                $this->cache[$key] = $this->match($_rules[$key]);
             }
 
-            return $this->match($_rules[$key], $userAgent);
+            if (false === isset($this->cache[$key])) {
+                $this->cache[$key] = false;
+            }
         }
 
-        return false;
+        return $this->cache[$key];
     }
 
     /**
      * Check if the device is mobile.
      * Returns true if any type of mobile device detected, including special ones
-     * @param null $userAgent deprecated
-     * @param null $httpHeaders deprecated
+     * @param  null $userAgent   deprecated
+     * @param  null $httpHeaders deprecated
      * @return bool
      */
     public function isMobile($userAgent = null, $httpHeaders = null)
@@ -1039,6 +1146,14 @@ class Mobile_Detect
             $this->setUserAgent($userAgent);
         }
 
+        // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
+        if ($this->getUserAgent() === 'Amazon CloudFront') {
+            $cfHeaders = $this->getCfHeaders();
+            if(array_key_exists('HTTP_CLOUDFRONT_IS_MOBILE_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_MOBILE_VIEWER'] === 'true') {
+                return true;
+            }
+        }
+
         $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
 
         if ($this->checkHttpHeadersForMobile()) {
@@ -1059,6 +1174,14 @@ class Mobile_Detect
      */
     public function isTablet($userAgent = null, $httpHeaders = null)
     {
+        // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
+        if ($this->getUserAgent() === 'Amazon CloudFront') {
+            $cfHeaders = $this->getCfHeaders();
+            if(array_key_exists('HTTP_CLOUDFRONT_IS_TABLET_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_TABLET_VIEWER'] === 'true') {
+                return true;
+            }
+        }
+
         $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
 
         foreach (self::$tabletDevices as $_regex) {
@@ -1075,9 +1198,9 @@ class Mobile_Detect
      * userAgent.
      * @todo: The httpHeaders part is not yet used.
      *
-     * @param string $key
-     * @param string        $userAgent   deprecated
-     * @param string        $httpHeaders deprecated
+     * @param  string        $key
+     * @param  string        $userAgent   deprecated
+     * @param  string        $httpHeaders deprecated
      * @return bool|int|null
      */
     public function is($key, $userAgent = null, $httpHeaders = null)
@@ -1113,9 +1236,7 @@ class Mobile_Detect
      */
     public function match($regex, $userAgent = null)
     {
-        // Escape the special character which is the delimiter.
-        $regex = str_replace('/', '\/', $regex);
-        $match = (bool) preg_match('/'.$regex.'/is', (!empty($userAgent) ? $userAgent : $this->userAgent), $matches);
+        $match = (bool) preg_match(sprintf('#%s#is', $regex), (false === empty($userAgent) ? $userAgent : $this->userAgent), $matches);
         // If positive match is found, store the results for debug.
         if ($match) {
             $this->matchingRegex = $regex;
@@ -1175,15 +1296,15 @@ class Mobile_Detect
             return false;
         }
 
-        //set the $type to the default if we don't recognize the type
-        if ($type != self::VERSION_TYPE_STRING && $type != self::VERSION_TYPE_FLOAT) {
+        // set the $type to the default if we don't recognize the type
+        if ($type !== self::VERSION_TYPE_STRING && $type !== self::VERSION_TYPE_FLOAT) {
             $type = self::VERSION_TYPE_STRING;
         }
 
         $properties = self::getProperties();
 
         // Check if the property exists in the properties array.
-        if (array_key_exists($propertyName, $properties)) {
+        if (true === isset($properties[$propertyName])) {
 
             // Prepare the pattern to be matched.
             // Make sure we always deal with an array (string is converted).
@@ -1193,14 +1314,11 @@ class Mobile_Detect
 
                 $propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString);
 
-                // Escape the special character which is the delimiter.
-                $propertyPattern = str_replace('/', '\/', $propertyPattern);
-
                 // Identify and extract the version.
-                preg_match('/'.$propertyPattern.'/is', $this->userAgent, $match);
+                preg_match(sprintf('#%s#is', $propertyPattern), $this->userAgent, $match);
 
-                if (!empty($match[1])) {
-                    $version = ( $type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1] );
+                if (false === empty($match[1])) {
+                    $version = ($type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1]);
 
                     return $version;
                 }
@@ -1223,9 +1341,9 @@ class Mobile_Detect
 
         if (
             // Apple iOS 4-7.0 – Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3 / 5.1 / 6.1), iPad 3 (5.1 / 6.0), iPad Mini (6.1), iPad Retina (7.0), iPhone 3GS (4.3), iPhone 4 (4.3 / 5.1), iPhone 4S (5.1 / 6.0), iPhone 5 (6.0), and iPhone 5S (7.0)
-            $this->isIOS() && $this->version('iPad', self::VERSION_TYPE_FLOAT)>=4.3 ||
-            $this->isIOS() && $this->version('iPhone', self::VERSION_TYPE_FLOAT)>=4.3 ||
-            $this->isIOS() && $this->version('iPod', self::VERSION_TYPE_FLOAT)>=4.3 ||
+            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) >= 4.3 ||
+            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) >= 4.3 ||
+            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) >= 4.3 ||
 
             // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
             // Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
@@ -1234,29 +1352,29 @@ class Mobile_Detect
             ( $this->version('Android', self::VERSION_TYPE_FLOAT)>2.1 && $this->is('Webkit') ) ||
 
             // Windows Phone 7.5-8 - Tested on the HTC Surround (7.5), HTC Trophy (7.5), LG-E900 (7.5), Nokia 800 (7.8), HTC Mazaa (7.8), Nokia Lumia 520 (8), Nokia Lumia 920 (8), HTC 8x (8)
-            $this->version('Windows Phone OS', self::VERSION_TYPE_FLOAT)>=7.5 ||
+            $this->version('Windows Phone OS', self::VERSION_TYPE_FLOAT) >= 7.5 ||
 
             // Tested on the Torch 9800 (6) and Style 9670 (6), BlackBerry® Torch 9810 (7), BlackBerry Z10 (10)
-            $this->is('BlackBerry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)>=6.0 ||
+            $this->is('BlackBerry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 6.0 ||
             // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
             $this->match('Playbook.*Tablet') ||
 
             // Palm WebOS (1.4-3.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0), HP TouchPad (3.0)
-            ( $this->version('webOS', self::VERSION_TYPE_FLOAT)>=1.4 && $this->match('Palm|Pre|Pixi') ) ||
+            ( $this->version('webOS', self::VERSION_TYPE_FLOAT) >= 1.4 && $this->match('Palm|Pre|Pixi') ) ||
             // Palm WebOS 3.0  - Tested on HP TouchPad
             $this->match('hp.*TouchPad') ||
 
             // Firefox Mobile 18 - Tested on Android 2.3 and 4.1 devices
-            ( $this->is('Firefox') && $this->version('Firefox', self::VERSION_TYPE_FLOAT)>=18 ) ||
+            ( $this->is('Firefox') && $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 18 ) ||
 
             // Chrome for Android - Tested on Android 4.0, 4.1 device
-            ( $this->is('Chrome') && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT)>=4.0 ) ||
+            ( $this->is('Chrome') && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 4.0 ) ||
 
             // Skyfire 4.1 - Tested on Android 2.3 device
-            ( $this->is('Skyfire') && $this->version('Skyfire', self::VERSION_TYPE_FLOAT)>=4.1 && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT)>=2.3 ) ||
+            ( $this->is('Skyfire') && $this->version('Skyfire', self::VERSION_TYPE_FLOAT) >= 4.1 && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) ||
 
             // Opera Mobile 11.5-12: Tested on Android 2.3
-            ( $this->is('Opera') && $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT)>=11.5 && $this->is('AndroidOS') ) ||
+            ( $this->is('Opera') && $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11.5 && $this->is('AndroidOS') ) ||
 
             // Meego 1.2 - Tested on Nokia 950 and N9
             $this->is('MeeGoOS') ||
@@ -1266,76 +1384,76 @@ class Mobile_Detect
 
             // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
             // @todo: more tests here!
-            $this->is('Dolfin') && $this->version('Bada', self::VERSION_TYPE_FLOAT)>=2.0 ||
+            $this->is('Dolfin') && $this->version('Bada', self::VERSION_TYPE_FLOAT) >= 2.0 ||
 
             // UC Browser - Tested on Android 2.3 device
-            ( ($this->is('UC Browser') || $this->is('Dolfin')) && $this->version('Android', self::VERSION_TYPE_FLOAT)>=2.3 ) ||
+            ( ($this->is('UC Browser') || $this->is('Dolfin')) && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) ||
 
             // Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
             ( $this->match('Kindle Fire') ||
-            $this->is('Kindle') && $this->version('Kindle', self::VERSION_TYPE_FLOAT)>=3.0 ) ||
+            $this->is('Kindle') && $this->version('Kindle', self::VERSION_TYPE_FLOAT) >= 3.0 ) ||
 
             // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
             $this->is('AndroidOS') && $this->is('NookTablet') ||
 
             // Chrome Desktop 16-24 - Tested on OS X 10.7 and Windows 7
-            $this->version('Chrome', self::VERSION_TYPE_FLOAT)>=16 && !$isMobile ||
+            $this->version('Chrome', self::VERSION_TYPE_FLOAT) >= 16 && !$isMobile ||
 
             // Safari Desktop 5-6 - Tested on OS X 10.7 and Windows 7
-            $this->version('Safari', self::VERSION_TYPE_FLOAT)>=5.0 && !$isMobile ||
+            $this->version('Safari', self::VERSION_TYPE_FLOAT) >= 5.0 && !$isMobile ||
 
             // Firefox Desktop 10-18 - Tested on OS X 10.7 and Windows 7
-            $this->version('Firefox', self::VERSION_TYPE_FLOAT)>=10.0 && !$isMobile ||
+            $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 10.0 && !$isMobile ||
 
             // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
-            $this->version('IE', self::VERSION_TYPE_FLOAT)>=7.0 && !$isMobile ||
+            $this->version('IE', self::VERSION_TYPE_FLOAT) >= 7.0 && !$isMobile ||
 
             // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
-            $this->version('Opera', self::VERSION_TYPE_FLOAT)>=10 && !$isMobile
+            $this->version('Opera', self::VERSION_TYPE_FLOAT) >= 10 && !$isMobile
         ){
             return self::MOBILE_GRADE_A;
         }
 
         if (
-            $this->isIOS() && $this->version('iPad', self::VERSION_TYPE_FLOAT)<4.3 ||
-            $this->isIOS() && $this->version('iPhone', self::VERSION_TYPE_FLOAT)<4.3 ||
-            $this->isIOS() && $this->version('iPod', self::VERSION_TYPE_FLOAT)<4.3 ||
+            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT)<4.3 ||
+            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT)<4.3 ||
+            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT)<4.3 ||
 
             // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
-            $this->is('Blackberry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)>=5 && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<6 ||
+            $this->is('Blackberry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 5 && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<6 ||
 
             //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
-            ($this->version('Opera Mini', self::VERSION_TYPE_FLOAT)>=5.0 && $this->version('Opera Mini', self::VERSION_TYPE_FLOAT)<=7.0 &&
-            ($this->version('Android', self::VERSION_TYPE_FLOAT)>=2.3 || $this->is('iOS')) ) ||
+            ($this->version('Opera Mini', self::VERSION_TYPE_FLOAT) >= 5.0 && $this->version('Opera Mini', self::VERSION_TYPE_FLOAT) <= 7.0 &&
+            ($this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 || $this->is('iOS')) ) ||
 
             // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
             $this->match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
 
             // @todo: report this (tested on Nokia N71)
-            $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT)>=11 && $this->is('SymbianOS')
+            $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11 && $this->is('SymbianOS')
         ){
             return self::MOBILE_GRADE_B;
         }
 
         if (
             // Blackberry 4.x - Tested on the Curve 8330
-            $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<=5.0 ||
+            $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) <= 5.0 ||
             // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
-            $this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT)<=5.2 ||
+            $this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT) <= 5.2 ||
 
             // Tested on original iPhone (3.1), iPhone 3 (3.2)
-            $this->isIOS() && $this->version('iPad', self::VERSION_TYPE_FLOAT)<=3.2 ||
-            $this->isIOS() && $this->version('iPhone', self::VERSION_TYPE_FLOAT)<=3.2 ||
-            $this->isIOS() && $this->version('iPod', self::VERSION_TYPE_FLOAT)<=3.2 ||
+            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) <= 3.2 ||
+            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) <= 3.2 ||
+            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) <= 3.2 ||
 
             // Internet Explorer 7 and older - Tested on Windows XP
-            $this->version('IE', self::VERSION_TYPE_FLOAT)<=7.0 && !$isMobile
+            $this->version('IE', self::VERSION_TYPE_FLOAT) <= 7.0 && !$isMobile
         ){
             return self::MOBILE_GRADE_C;
         }
 
-        //All older smartphone platforms and featurephones - Any device that doesn't support media queries
-        //will receive the basic, C grade experience.
+        // All older smartphone platforms and featurephones - Any device that doesn't support media queries
+        // will receive the basic, C grade experience.
         return self::MOBILE_GRADE_C;
     }
 }
diff --git a/vendor/mobiledetect/mobiledetectlib/README.md b/vendor/mobiledetect/mobiledetectlib/README.md
new file mode 100644
index 000000000..2bbcf05fc
--- /dev/null
+++ b/vendor/mobiledetect/mobiledetectlib/README.md
@@ -0,0 +1,283 @@
+![Mobile Detect](http://demo.mobiledetect.net/logo-github.png)
+
+> Motto: "Every business should have a mobile detection script to detect mobile readers."
+
+[![Build Status](https://travis-ci.org/serbanghita/Mobile-Detect.svg?branch=devel)](https://travis-ci.org/serbanghita/Mobile-Detect) 
+[![Latest Stable Version](https://poser.pugx.org/mobiledetect/mobiledetectlib/v/stable.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib) 
+[![Total Downloads](https://poser.pugx.org/mobiledetect/mobiledetectlib/downloads.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib) 
+[![Daily Downloads](https://poser.pugx.org/mobiledetect/mobiledetectlib/d/daily.png)](https://packagist.org/packages/mobiledetect/mobiledetectlib) 
+[![License](https://poser.pugx.org/mobiledetect/mobiledetectlib/license.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib)
+
+*Mobile_Detect is a lightweight PHP class for detecting mobile devices (including tablets).
+It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.*
+
+We're committed to make Mobile_Detect the best open-source mobile detection resource and this is why before 
+each release we're running [unit tests](./tests), we also research and update the detection rules on **daily** 
+and **weekly** basis.
+
+Your website's _content strategy_ is important! You need a complete toolkit to deliver an experience that is _optimized_, _fast_ and _relevant_ to your users. Mobile_Detect class is a [server-side detection](http://www.w3.org/TR/mwabp/#bp-devcap-detection) tool that can help you with your RWD strategy, it is not a replacement for CSS3 media queries or other forms of client-side feature detection.
+
+##### Announcements
+
+For `2.x` branch we are no longer taking optimizations pull requests, but only new regexes and User-Agents for our tests.
+On `2.x` releases we are focusing on **new tablets only**. All the pull requests about TVs, bots or optimizations will be closed and analyzed after `3.0.0-beta` is released.
+
+Still working on `3.0.0` branch to provide you with device detection!
+We're really excited on this one!
+We would like to speed this up, but life and family gets in the way ;)
+
+Special thanks to **JetBrains** for providing licenses for **PHPStorm**. In case you never heard or tried PHPStorm, you're
+clearly missing out! [Check PHPStorm](https://www.jetbrains.com/phpstorm/) out!
+
+##### Download and demo
+
+|Download|Docs|Examples|
+|-------------|-------------|-------------|
+|[Go to releases](../../tags)|[Become a contributor](../../wiki/Become-a-contributor)|[Code examples](../../wiki/Code-examples)
+|[Mobile_Detect.php](./Mobile_Detect.php)|[History](../../wiki/History)|[:iphone: Live demo!](http://is.gd/mobiletest)
+|[Composer package](https://packagist.org/packages/mobiledetect/mobiledetectlib)|
+
+#### Continuous updates
+
+You can use [composer](https://getcomposer.org/doc/00-intro.md) in your release and update process to make sure you have the latest Mobile_Detect version.
+
+```
+composer require mobiledetect/mobiledetectlib
+```
+
+```json
+{
+    "require": {
+        "mobiledetect/mobiledetectlib": "^2.8"
+    }
+}
+```
+
+##### Help
+
+|Pledgie|Paypal|
+|-------|------|
+|[Donate :+1:](https://pledgie.com/campaigns/21856)|[Donate :beer:](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mobiledetectlib%40gmail%2ecom&lc=US&item_name=Mobile%20Detect¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)|
+
+
+I'm currently paying for hosting and spend a lot of my family time to maintain the project and planning the future releases.
+I would highly appreciate any money donations that will keep the research going.
+
+Special thanks to the community :+1: for donations, [BrowserStack](https://www.browserstack.com/) - for providing access to their great platform, [Zend](http://www.zend.com/) - for donating licenses, [Dragos Gavrila](https://twitter.com/grafician) who contributed with the logo.
+
+##### 3rd party modules / [Submit new](../../issues/new?title=New%203rd%20party%20module&body=Name, Link and Description of the module.)
+
+:point_right: Keep `Mobile_Detect.php` class in a separate `module` and do NOT include it in your script core because of the high frequency of updates.
+:point_right: When including the class into you `web application` or `module` always use `include_once '../path/to/Mobile_Detect.php` to prevent conflicts.
+
+**JavaScript**
+
+* mobile-detect.js - A [JavaScript port](https://github.com/hgoebl/mobile-detect.js) of Mobile-Detect class. Made by [Heinrich Goebl](https://github.com/hgoebl).
+
+**Varnish Cache**
+
+* [Varnish Mobile Detect](https://github.com/willemk/varnish-mobiletranslate) - Drop-in varnish solution to mobile user 
+detection based on the Mobile-Detect library. Made by [willemk](https://github.com/willemk).
+* [mobiledetect2vcl](https://github.com/carlosabalde/mobiledetect2vcl) - Python script to transform the Mobile 
+Detect JSON database into an UA-based mobile detection VCL subroutine easily integrable in any Varnish Cache 
+configuration. Made by [Carlos Abalde](https://github.com/carlosabalde).
+
+**LUA**
+
+* [mobile-detect.lua](https://github.com/yourpalmark/mobile-detect.lua) is a port of Mobile-Detect to Lua for 
+NGINX HTTP servers. Follows closely to mobile-detect.js. Supports all methods that server-side 
+mobile-detect.js supports. Fully unit-tested and synced with Travis CI (Build Passing badge included). 
+Made by [Mark Walters](https://github.com/yourpalmark).
+
+**PHP**
+
+**WordPress**
+
+* [WordPress Mobile Detect](https://wordpress.org/plugins/wp-mobile-detect/) - Gives you the ability to wrap that 
+infographic in a `[notdevice][/notdevice]` shortcode so at the server level WordPress will 
+decide to show that content only if the user is NOT on a phone or tablet. 
+Made by [Jesse Friedman](https://profiles.wordpress.org/professor44/).
+
+* [mobble](https://wordpress.org/plugins/mobble/) - provides mobile related conditional functions for your site. 
+e.g. `is_iphone()`, `is_mobile()` and `is_tablet()`. Made by Scott Evans.
+
+* [WordPress Responsage](https://github.com/iamspacehead/responsage) - A small WordPress theme plugin that allows 
+you to make your images responsive. Made by [Adrian Ciaschetti](https://github.com/iamspacehead).
+    
+* [WP247 Body Classes](https://wordpress.org/plugins/wp247-body-classes/) - Add unique classes to the `body` tag for 
+easy styling based on various attributes (archive, user, post, mobile) and various WordPress "is" functions. 
+Mobile attributes include type of device, Operating System, Browser, etc. Examples: .is-mobile, .is-not-mobile, 
+.is-tablet, .is-ios, .is-not-ios, .is-androidos, .is-chromebrowser. 
+Made by [wescleveland56](https://github.com/wescleveland56).
+
+**Drupal**
+
+* [Drupal Mobile Switch](https://www.drupal.org/project/mobile_switch) - The Mobile Switch Drupal module provides a 
+automatic theme switch functionality for mobile devices, detected by Browscap or Mobile Detect. 
+Made by [Siegfried Neumann](https://www.drupal.org/user/45267).
+
+* [Drupal Context Mobile Detect](https://www.drupal.org/project/context_mobile_detect) - This is a Drupal context module 
+which integrates Context and PHP Mobile Detect library.
+Created by [Artem Shymko](https://www.drupal.org/user/432492).
+
+* [Drupal Mobile Detect](https://www.drupal.org/project/mobile_detect]) - Lightweight mobile detect module for Drupal
+ created by [Matthew Donadio](https://www.drupal.org/user/325244).
+
+**Joomla**
+
+* [yagendoo Joomla! Mobile Detection Plugin](http://www.yagendoo.com/en/blog/free-mobile-detection-plugin-for-joomla.html) - Lightweight PHP plugin for Joomla! 
+that detects a mobile browser using the Mobile Detect class.
+Made by yagendoo media.
+ 
+* [User Agent Detector plugin](https://github.com/renekreijveld/UserAgentDetector) - This system plugin detects the user 
+agent of your website visitor and sets a session variable accordingly. Based on the user agent, the plugin detects if the 
+site is running on a desktop pc, tablet or smartphone. It can also detect if the visitor is a spider bot (search engine). 
+Session variable that is set: `ualayout`. Possible values: desktop, tablet, mobile, bot.
+Made by @ReneKreijveld.
+
+**Magento**
+
+* [Magento helper](http://www.magentocommerce.com/magento-connect/catalog/product/view/id/16835/) from Optimise Web enables 
+the use of all functions provided by Mobile Detect. Made by [Kathir Vel](http://www.kathirvel.com).
+
+* [Magento 2 Mobile Detect Theme Change](https://github.com/EaDesgin/magento2-mobiledetect) is an extension for Magento 2 
+that will change the theme or redirect to a different URL. Also containing a helper to check for the device type.
+
+**PrestaShop**
+
+* [PrestaShop](https://www.prestashop.com) is a free, secure and open source shopping cart platform. Mobile_Detect 
+is included in the default package since 1.5.x.
+
+**Laravel**
+
+* [Agent](https://github.com/jenssegers/agent) is a user agent class for Laravel based on Mobile Detect with some 
+additional functionality. 
+Made by [Jens Segers](https://github.com/jenssegers).
+
+* [BrowserDetect](https://github.com/hisorange/browser-detect) is a browser and mobile detection package, collects 
+and wrap together the best user-agent identifiers for Laravel. 
+Created by [Varga Zsolt](https://github.com/hisorange).
+
+**Zend Framework**
+
+* [ZF2 Mobile-Detect](https://github.com/neilime/zf2-mobile-detect.git) is a Zend Framework 2 module that provides 
+Mobile-Detect features (Mobile_Detect class as a service, helper for views and plugin controllers). 
+Made by [neilime](https://github.com/neilime).
+
+* [ZF2 MobileDetectModule](https://github.com/nikolaposa/MobileDetectModule) facilitates integration of a PHP MobileDetect 
+class with some ZF2-based application. Has similar idea like the existing ZF2 Mobile-Detect module, 
+but differs in initialization and provision routine of the actual Mobile_Detect class. 
+Appropriate view helper and controller plugin also have different conceptions. 
+Made by [Nikola Posa](https://github.com/nikolaposa).
+
+**Symfony**
+
+* [Symfony2 Mobile Detect Bundle](https://github.com/suncat2000/MobileDetectBundle) is a bundle for detecting mobile devices, 
+manage mobile view and redirect to the mobile and tablet version.
+Made by [Nikolay Ivlev](https://github.com/suncat2000).
+
+* [Silex Mobile Detect Service Provider](https://github.com/jbinfo/MobileDetectServiceProvider) is a service provider to 
+interact with Mobile detect class methods.
+Made by [Lhassan Baazzi](https://github.com/jbinfo).
+
+**Slim Framework**
+
+* [Slim_Mobile_Detect](https://github.com/zguillez/slim_mobile_detect) implements Mobile_Detect lib for different 
+responses write on Slim Framework App.
+
+**ExpressionEngine**
+
+* [EE2 Detect Mobile](https://github.com/garethtdavies/detect-mobile) is a lightweight PHP plugin for EE2 that detects
+ a mobile browser using the Mobile Detect class. Made by [Gareth Davies](https://github.com/garethtdavies).
+
+**Yii Framework**
+
+* [Yii Extension](https://github.com/iamsalnikov/MobileDetect) - Mobile detect plugin for Yii framework. 
+Made by [Alexey Salnikov](https://github.com/iamsalnikov).
+
+* [Yii Extension](https://github.com/candasm/yii1-mobile-detect-component) - Mobile detect component for Yii framework 
+1.x version which supports composer package manager. Made by [Candas Minareci](https://github.com/candasm).
+
+* [Yii2 Device Detect](https://github.com/alexandernst/yii2-device-detect/) - Yii2 extension for Mobile-Detect library. 
+Made by [Alexander Nestorov](https://github.com/alexandernst).
+
+**CakePHP**
+
+* [CakePHP MobileDetect](https://github.com/chronon/CakePHP-MobileDetectComponent-Plugin) is a plugin component for 
+CakePHP 2.x. Made by [Gregory Gaskill](https://github.com/chronon).
+
+**FuelPHP**
+
+* [Special Agent](https://github.com/rob-bar/special_agent) is a FuelPHP package which uses php-mobile-detect to 
+determine whether a device is mobile or not. It overrides the Fuelphp Agent class its methods. 
+Made by [Robbie Bardjin](https://github.com/rob-bar).
+
+
+**TYPO3**
+
+* [px_mobiledetect](https://typo3.org/extensions/repository/view/px_mobiledetect) is an extension that helps to detect 
+visitor's mobile device class (if that’s tablet or mobile device like smartphone). Made by Alexander Tretyak.
+
+**Other**
+
+* [PageCache](https://github.com/mmamedov/page-cache) is a lightweight PHP library for full page cache, 
+with built-in Mobile-Detect support. Made by [Muhammed Mamedov](https://github.com/mmamedov).
+
+* [Statamic CMS Mobile Detect](https://github.com/haikulab/statamic-mobile-detect) is a plugin. 
+Made by [Sergei Filippov](https://github.com/haikulab/statamic-mobile-detect) of Haiku Lab.
+
+* [Kohana Mobile Detect](https://github.com/madeinnordeste/kohana-mobile-detect) is an example of implementation of 
+Mobile_Detect class with Kohana framework. 
+Written by [Luiz Alberto S. Ribeiro](https://github.com/madeinnordeste).
+
+* [MemHT](https://www.memht.com) is a Free PHP CMS and Blog that permit the creation and the management online 
+of websites with few and easy steps. Has the class included in the core.
+
+* [concrete5](https://www.concrete5.org) is a CMS that is free and open source. The library is included in the core.
+
+* [engine7](https://github.com/QOXCorp/exengine) is PHP Open Source Framework. The Mobile_Detect class is included in 
+the engine.
+
+* [Zikula](http://zikula.org) is a free and open-source Content Management Framework, which allows you to run 
+impressive websites and build powerful online applications. The core uses Mobile-Detect to switch to a special 
+Mobile theme, using jQueryMobile.
+
+* [UserAgentInfo](https://github.com/quentin389/UserAgentInfo) is a PHP class for parsing user agent strings 
+(HTTP_USER_AGENT). Includes mobile checks, bot checks, browser types/versions and more.
+Based on browscap, Mobile_Detect and ua-parser. Created for high traffic websites and fast batch processing. 
+Made by [quentin389](https://github.com/quentin389).
+
+* [LJ Mobile Detect](https://github.com/lewisjenkins/craft-lj-mobiledetect) is a simple implementation of Mobile Detect 
+for Craft CMS. Made by [Lewis Jenkins](https://github.com/lewisjenkins).
+
+* [Grav Plugin Mobile Detect](https://github.com/dimitrilongo/grav-plugin-mobile-detect/) is a simple implementation 
+of Mobile Detect for Grav CMS. Made by [Dimitri Longo](https://github.com/dimitrilongo).
+
+
+**Perl**
+
+ * [MobileDetect.pm](https://www.buzzerstar.com/development/) is a Perl module for Mobile Detect. 
+ Made by [Sebastian Enger](https://devop.tools/).
+
+**Python**
+
+* [pymobiledetect](https://pypi.python.org/pypi/pymobiledetect) - Mobile detect python package. 
+Made by Bas van Oostveen. 
+
+**Ruby**
+
+* [mobile_detect.rb](https://github.com/ktaragorn/mobile_detect) is a Ruby gem using the JSON data exposed by the 
+php project and implementing a basic subset of the API (as much as can be done by the exposed data). 
+Made by [Karthik T](https://github.com/ktaragorn).
+
+**Go**
+
+* [GoMobileDetect](https://github.com/Shaked/gomobiledetect) is a Go port of Mobile Detect class. 
+Made by [https://github.com/Shaked](Shaked).
+
+
+**LUA**
+
+* [ua-lua](https://github.com/robinef/ua-lua) is a small lib written in LUA providing device type detection. 
+ua-lua is detecting mobile or tablet devices based on user-agent inside nginx daemon. 
+Made by [Frédéric Robinet](https://github.com/robinef).
diff --git a/library/Mobile_Detect/composer.json b/vendor/mobiledetect/mobiledetectlib/composer.json
similarity index 86%
rename from library/Mobile_Detect/composer.json
rename to vendor/mobiledetect/mobiledetectlib/composer.json
index c56611fb6..0131e4937 100644
--- a/library/Mobile_Detect/composer.json
+++ b/vendor/mobiledetect/mobiledetectlib/composer.json
@@ -17,9 +17,7 @@
         "php": ">=5.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
-        "johnkary/phpunit-speedtrap": "~1.0@dev",
-        "codeclimate/php-test-reporter": "dev-master"
+        "phpunit/phpunit": "*"
     },
     "autoload": {
         "classmap": ["Mobile_Detect.php"],
diff --git a/vendor/mobiledetect/mobiledetectlib/export/exportToJSON.php b/vendor/mobiledetect/mobiledetectlib/export/exportToJSON.php
new file mode 100644
index 000000000..e2c72aece
--- /dev/null
+++ b/vendor/mobiledetect/mobiledetectlib/export/exportToJSON.php
@@ -0,0 +1,67 @@
+ $detect->getScriptVersion(),
+
+	// All headers that trigger 'isMobile' to be 'true',
+	// before reaching the User-Agent match detection.
+	'headerMatch' => $detect->getMobileHeaders(),
+
+	// All possible User-Agent headers.
+	'uaHttpHeaders' => $detect->getUaHttpHeaders(),
+
+	// All the regexes that trigger 'isMobile' or 'isTablet'
+	// to be true.
+	'uaMatch' => array(
+		// If match is found, triggers 'isMobile' to be true.
+		'phones'   => $detect->getPhoneDevices(),
+		// Triggers 'isTablet' to be true.
+		'tablets'  => $detect->getTabletDevices(),
+		// If match is found, triggers 'isMobile' to be true.
+		'browsers' => $detect->getBrowsers(),
+		// If match is found, triggers 'isMobile' to be true.
+		'os'       => $detect->getOperatingSystems(),
+		// Various utilities. To be further discussed.
+		'utilities' => $detect->getUtilities()
+	)
+);
+
+$fileName = dirname(__FILE__).'/../Mobile_Detect.json';
+// Write the JSON file to disk.11
+// You can import this file in your app.
+if (file_put_contents(
+	$fileName, 
+	function_exists('json_format') ? json_format($json) : json_encode($json)
+)) {
+	echo 'Done. Check '.realpath($fileName).' file.';
+}
+else {
+	echo 'Failed to write '.realpath($fileName).' to disk.';
+}
diff --git a/library/Mobile_Detect/namespaced/Detection/MobileDetect.php b/vendor/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
similarity index 96%
rename from library/Mobile_Detect/namespaced/Detection/MobileDetect.php
rename to vendor/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
index ca70fe807..ca7efec23 100644
--- a/library/Mobile_Detect/namespaced/Detection/MobileDetect.php
+++ b/vendor/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
@@ -4,7 +4,7 @@
  * the Symfony Universal ClassLoader by Fabien Potencier. Since PSR-0 handles an underscore in
  * classnames (on the filesystem) as a slash, "Mobile_Detect.php" autoloaders will try to convert
  * the classname and path to "Mobile\Detect.php". This script will ensure autoloading with:
- *  - Namespace:	   Detection
+ *  - Namespace:       Detection
  *  - Classname:       MobileDetect
  *  - Namespased:      \Detection\MobileDetect
  *  - Autoload path:   ./namespaced
diff --git a/vendor/mobiledetect/mobiledetectlib/ruleset.xml b/vendor/mobiledetect/mobiledetectlib/ruleset.xml
new file mode 100644
index 000000000..21462efd9
--- /dev/null
+++ b/vendor/mobiledetect/mobiledetectlib/ruleset.xml
@@ -0,0 +1,187 @@
+
+
+ The PSR-2 coding standard.
+ 
+
+ 
+
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+  
+   
+  
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+  
+   
+   
+  
+ 
+
+ 
+ 
+  
+   
+  
+ 
+ 
+  0
+ 
+ 
+  0
+ 
+ 
+  0
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+  
+   
+  
+ 
+ 
+
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+ 
+
+ 
+
+ 
+ 
+  
+   
+  
+ 
+ 
+  0
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+ 
+  0
+ 
+
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+
+ 
+
+ 
+ 
+
diff --git a/view/global.css b/view/global.css
index 3fb31a30c..b8fe5723f 100644
--- a/view/global.css
+++ b/view/global.css
@@ -273,19 +273,19 @@ img.acpopup-img {
 
 /* plain text editor upload/select popup */
 
-.fbrowser .path a { padding: 5px; }
-.fbrowser .path a:before { content: "/"; padding-right: 5px;}
+.fbrowser .path a, .fbrowser .path .btn-link { padding: 5px; }
+.fbrowser .path a:before, .fbrowser .path .btn-link:before { content: "/"; padding-right: 5px;}
 .fbrowser .folders ul { list-style-type: none; padding-left: 10px;}
 .fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; }
 .fbrowser.image .photo-album-image-wrapper { float: left; }
-.fbrowser.image a img { height: 48px; }
-.fbrowser.image a p { display: none;}
+.fbrowser.image a img, .fbrowser.image .btn-link img { height: 48px; }
+.fbrowser.image a p, .fbrowser.image .btn-link p { display: none;}
 .fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; }
 .fbrowser.file img { display: inline; }
 .fbrowser.file p  { display: inline; white-space: nowrap; }
 .fbrowser .upload { clear: both; padding-top: 1em;}
 .fbrowser .error { background: #ffeeee; border: 1px solid #994444; color: #994444; padding: 0.5em;}
-.fbrowser .error a.close { float: right; font-weight: bold; }
+.fbrowser .error .close { float: right; font-weight: bold; }
 .fbrowser .error.hidden { display: none; }
 
 a {
diff --git a/view/lang/es/messages.po b/view/lang/es/messages.po
index ec0480022..3091790cb 100644
--- a/view/lang/es/messages.po
+++ b/view/lang/es/messages.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
-# Albert, 2016
+# Albert, 2016-2017
 # Albert, 2016
 # Tobias Diekershoff , 2011
 # Manuel Pérez , 2011
@@ -35,8 +35,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 07:46+0100\n"
-"PO-Revision-Date: 2016-12-28 11:37+0000\n"
+"POT-Creation-Date: 2017-03-20 08:24+0100\n"
+"PO-Revision-Date: 2017-03-26 15:18+0000\n"
 "Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -45,356 +45,286 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/contact_widgets.php:6
-msgid "Add New Contact"
-msgstr "Añadir nuevo contacto"
+#: boot.php:976
+msgid "Delete this item?"
+msgstr "¿Eliminar este elemento?"
 
-#: include/contact_widgets.php:7
-msgid "Enter address or web location"
-msgstr "Escribe la dirección o página web"
-
-#: include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Ejemplo: miguel@ejemplo.com, http://ejemplo.com/miguel"
-
-#: include/contact_widgets.php:10 include/identity.php:218
-#: mod/allfriends.php:82 mod/dirfind.php:201 mod/match.php:87
-#: mod/suggest.php:101
-msgid "Connect"
-msgstr "Conectar"
-
-#: include/contact_widgets.php:24
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitación disponible"
-msgstr[1] "%d invitaviones disponibles"
-
-#: include/contact_widgets.php:30
-msgid "Find People"
-msgstr "Buscar personas"
-
-#: include/contact_widgets.php:31
-msgid "Enter name or interest"
-msgstr "Introduzce nombre o intereses"
-
-#: include/contact_widgets.php:32 include/Contact.php:354
-#: include/conversation.php:981 mod/allfriends.php:66 mod/dirfind.php:204
-#: mod/match.php:72 mod/suggest.php:83 mod/contacts.php:602 mod/follow.php:103
-msgid "Connect/Follow"
-msgstr "Conectar/Seguir"
-
-#: include/contact_widgets.php:33
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Ejemplos: Robert Morgenstein, Pesca"
-
-#: include/contact_widgets.php:34 mod/directory.php:204 mod/contacts.php:798
-msgid "Find"
-msgstr "Buscar"
-
-#: include/contact_widgets.php:35 mod/suggest.php:114
-#: view/theme/vier/theme.php:203
-msgid "Friend Suggestions"
-msgstr "Sugerencias de amigos"
-
-#: include/contact_widgets.php:36 view/theme/vier/theme.php:202
-msgid "Similar Interests"
-msgstr "Intereses similares"
-
-#: include/contact_widgets.php:37
-msgid "Random Profile"
-msgstr "Perfil aleatorio"
-
-#: include/contact_widgets.php:38 view/theme/vier/theme.php:204
-msgid "Invite Friends"
-msgstr "Invitar amigos"
-
-#: include/contact_widgets.php:108
-msgid "Networks"
-msgstr "Redes"
-
-#: include/contact_widgets.php:111
-msgid "All Networks"
-msgstr "Todas las redes"
-
-#: include/contact_widgets.php:141 include/features.php:110
-msgid "Saved Folders"
-msgstr "Directorios guardados"
-
-#: include/contact_widgets.php:144 include/contact_widgets.php:176
-msgid "Everything"
-msgstr "Todo"
-
-#: include/contact_widgets.php:173
-msgid "Categories"
-msgstr "Categorías"
-
-#: include/contact_widgets.php:237
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] "%d contacto en común"
-msgstr[1] "%d contactos en común"
-
-#: include/contact_widgets.php:242 include/ForumManager.php:119
-#: include/items.php:2245 mod/content.php:624 object/Item.php:432
-#: view/theme/vier/theme.php:260 boot.php:972
+#: boot.php:977 include/ForumManager.php:119 include/contact_widgets.php:253
+#: include/items.php:2254 mod/content.php:624 object/Item.php:420
+#: view/theme/vier/theme.php:255
 msgid "show more"
 msgstr "ver más"
 
-#: include/ForumManager.php:114 include/nav.php:131 include/text.php:1025
-#: view/theme/vier/theme.php:255
+#: boot.php:978
+msgid "show fewer"
+msgstr "ver menos"
+
+#: boot.php:1667
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Falló la actualización de %s. Mira los registros de errores."
+
+#: boot.php:1779
+msgid "Create a New Account"
+msgstr "Crear una nueva cuenta"
+
+#: boot.php:1780 include/nav.php:109 mod/register.php:289
+msgid "Register"
+msgstr "Registrarse"
+
+#: boot.php:1804 include/nav.php:78 view/theme/frio/theme.php:243
+msgid "Logout"
+msgstr "Salir"
+
+#: boot.php:1805 include/nav.php:95 mod/bookmarklet.php:12
+msgid "Login"
+msgstr "Acceder"
+
+#: boot.php:1807 mod/lostpass.php:161
+msgid "Nickname or Email: "
+msgstr "Apodo o Correo electrónico: "
+
+#: boot.php:1808
+msgid "Password: "
+msgstr "Contraseña: "
+
+#: boot.php:1809
+msgid "Remember me"
+msgstr "Recordarme"
+
+#: boot.php:1812
+msgid "Or login using OpenID: "
+msgstr "O inicia sesión usando OpenID: "
+
+#: boot.php:1818
+msgid "Forgot your password?"
+msgstr "¿Olvidaste la contraseña?"
+
+#: boot.php:1819 mod/lostpass.php:110
+msgid "Password Reset"
+msgstr "Restablecer la contraseña"
+
+#: boot.php:1821
+msgid "Website Terms of Service"
+msgstr "Términos de uso del sitio"
+
+#: boot.php:1822
+msgid "terms of service"
+msgstr "Términos de uso"
+
+#: boot.php:1824
+msgid "Website Privacy Policy"
+msgstr "Política de privacidad del sitio"
+
+#: boot.php:1825
+msgid "privacy policy"
+msgstr "Política de privacidad"
+
+#: include/Contact.php:387 include/Contact.php:400 include/Contact.php:445
+#: include/conversation.php:970 include/conversation.php:986
+#: mod/allfriends.php:68 mod/directory.php:157 mod/dirfind.php:209
+#: mod/match.php:73 mod/suggest.php:82
+msgid "View Profile"
+msgstr "Ver perfil"
+
+#: include/Contact.php:401 include/contact_widgets.php:32
+#: include/conversation.php:983 mod/allfriends.php:69 mod/contacts.php:610
+#: mod/dirfind.php:210 mod/follow.php:106 mod/match.php:74 mod/suggest.php:83
+msgid "Connect/Follow"
+msgstr "Conectar/Seguir"
+
+#: include/Contact.php:444 include/conversation.php:969
+msgid "View Status"
+msgstr "Ver estado"
+
+#: include/Contact.php:446 include/conversation.php:971
+msgid "View Photos"
+msgstr "Ver fotos"
+
+#: include/Contact.php:447 include/conversation.php:972
+msgid "Network Posts"
+msgstr "Publicaciones en la red"
+
+#: include/Contact.php:448 include/conversation.php:973
+msgid "View Contact"
+msgstr "Ver contacto"
+
+#: include/Contact.php:449
+msgid "Drop Contact"
+msgstr "Eliminar contacto"
+
+#: include/Contact.php:450 include/conversation.php:974
+msgid "Send PM"
+msgstr "Enviar mensaje privado"
+
+#: include/Contact.php:451 include/conversation.php:978
+msgid "Poke"
+msgstr "Toque"
+
+#: include/Contact.php:828
+msgid "Organisation"
+msgstr "Organización"
+
+#: include/Contact.php:831
+msgid "News"
+msgstr "Noticias"
+
+#: include/Contact.php:834
+msgid "Forum"
+msgstr "Foro"
+
+#: include/ForumManager.php:114 include/nav.php:131 include/text.php:1027
+#: view/theme/vier/theme.php:250
 msgid "Forums"
 msgstr "Foros"
 
-#: include/ForumManager.php:116 view/theme/vier/theme.php:257
+#: include/ForumManager.php:116 view/theme/vier/theme.php:252
 msgid "External link to forum"
 msgstr "Enlace externo al foro"
 
-#: include/profile_selectors.php:6
-msgid "Male"
-msgstr "Hombre"
+#: include/NotificationsManager.php:153
+msgid "System"
+msgstr "Sistema"
 
-#: include/profile_selectors.php:6
-msgid "Female"
-msgstr "Mujer"
+#: include/NotificationsManager.php:160 include/nav.php:158 mod/admin.php:421
+#: view/theme/frio/theme.php:253
+msgid "Network"
+msgstr "Red"
 
-#: include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Actualmente Hombre"
+#: include/NotificationsManager.php:167 mod/network.php:829
+#: mod/profiles.php:695
+msgid "Personal"
+msgstr "Personal"
 
-#: include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Actualmente Mujer"
+#: include/NotificationsManager.php:174 include/nav.php:105
+#: include/nav.php:161
+msgid "Home"
+msgstr "Inicio"
 
-#: include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Mayormente Hombre"
+#: include/NotificationsManager.php:181 include/nav.php:166
+msgid "Introductions"
+msgstr "Presentaciones"
 
-#: include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Mayormente Mujer"
-
-#: include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgenérico"
-
-#: include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Bisexual"
-
-#: include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transexual"
-
-#: include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Hermafrodita"
-
-#: include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Neutro"
-
-#: include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "Sin especificar"
-
-#: include/profile_selectors.php:6
-msgid "Other"
-msgstr "Otro"
-
-#: include/profile_selectors.php:6 include/conversation.php:1487
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "Indeciso"
-msgstr[1] "Indeciso"
-
-#: include/profile_selectors.php:23
-msgid "Males"
-msgstr "Hombres"
-
-#: include/profile_selectors.php:23
-msgid "Females"
-msgstr "Mujeres"
-
-#: include/profile_selectors.php:23
-msgid "Gay"
-msgstr "Gay"
-
-#: include/profile_selectors.php:23
-msgid "Lesbian"
-msgstr "Lesbiana"
-
-#: include/profile_selectors.php:23
-msgid "No Preference"
-msgstr "Sin preferencias"
-
-#: include/profile_selectors.php:23
-msgid "Bisexual"
-msgstr "Bisexual"
-
-#: include/profile_selectors.php:23
-msgid "Autosexual"
-msgstr "Autosexual"
-
-#: include/profile_selectors.php:23
-msgid "Abstinent"
-msgstr "Célibe"
-
-#: include/profile_selectors.php:23
-msgid "Virgin"
-msgstr "Virgen"
-
-#: include/profile_selectors.php:23
-msgid "Deviant"
-msgstr "Desviado"
-
-#: include/profile_selectors.php:23
-msgid "Fetish"
-msgstr "Fetichista"
-
-#: include/profile_selectors.php:23
-msgid "Oodles"
-msgstr "Orgiástico"
-
-#: include/profile_selectors.php:23
-msgid "Nonsexual"
-msgstr "Asexual"
-
-#: include/profile_selectors.php:42
-msgid "Single"
-msgstr "Soltero"
-
-#: include/profile_selectors.php:42
-msgid "Lonely"
-msgstr "Solitario"
-
-#: include/profile_selectors.php:42
-msgid "Available"
-msgstr "Disponible"
-
-#: include/profile_selectors.php:42
-msgid "Unavailable"
-msgstr "No disponible"
-
-#: include/profile_selectors.php:42
-msgid "Has crush"
-msgstr "Enamorado"
-
-#: include/profile_selectors.php:42
-msgid "Infatuated"
-msgstr "Loco/a por alguien"
-
-#: include/profile_selectors.php:42
-msgid "Dating"
-msgstr "De citas"
-
-#: include/profile_selectors.php:42
-msgid "Unfaithful"
-msgstr "Infiel"
-
-#: include/profile_selectors.php:42
-msgid "Sex Addict"
-msgstr "Adicto al sexo"
-
-#: include/profile_selectors.php:42 include/user.php:280 include/user.php:284
-msgid "Friends"
-msgstr "Amigos"
-
-#: include/profile_selectors.php:42
-msgid "Friends/Benefits"
-msgstr "Amigos con beneficios"
-
-#: include/profile_selectors.php:42
-msgid "Casual"
-msgstr "Casual"
-
-#: include/profile_selectors.php:42
-msgid "Engaged"
-msgstr "Comprometido/a"
-
-#: include/profile_selectors.php:42
-msgid "Married"
-msgstr "Casado/a"
-
-#: include/profile_selectors.php:42
-msgid "Imaginarily married"
-msgstr "Casado imaginario"
-
-#: include/profile_selectors.php:42
-msgid "Partners"
-msgstr "Socios"
-
-#: include/profile_selectors.php:42
-msgid "Cohabiting"
-msgstr "Cohabitando"
-
-#: include/profile_selectors.php:42
-msgid "Common law"
-msgstr "Pareja de hecho"
-
-#: include/profile_selectors.php:42
-msgid "Happy"
-msgstr "Feliz"
-
-#: include/profile_selectors.php:42
-msgid "Not looking"
-msgstr "No busca relación"
-
-#: include/profile_selectors.php:42
-msgid "Swinger"
-msgstr "Swinger"
-
-#: include/profile_selectors.php:42
-msgid "Betrayed"
-msgstr "Traicionado/a"
-
-#: include/profile_selectors.php:42
-msgid "Separated"
-msgstr "Separado/a"
-
-#: include/profile_selectors.php:42
-msgid "Unstable"
-msgstr "Inestable"
-
-#: include/profile_selectors.php:42
-msgid "Divorced"
-msgstr "Divorciado/a"
-
-#: include/profile_selectors.php:42
-msgid "Imaginarily divorced"
-msgstr "Divorciado imaginario"
-
-#: include/profile_selectors.php:42
-msgid "Widowed"
-msgstr "Viudo/a"
-
-#: include/profile_selectors.php:42
-msgid "Uncertain"
-msgstr "Incierto"
-
-#: include/profile_selectors.php:42
-msgid "It's complicated"
-msgstr "Es complicado"
-
-#: include/profile_selectors.php:42
-msgid "Don't care"
-msgstr "No te importa"
-
-#: include/profile_selectors.php:42
-msgid "Ask me"
-msgstr "Pregúntame"
-
-#: include/dba_pdo.php:72 include/dba.php:56
+#: include/NotificationsManager.php:239 include/NotificationsManager.php:251
 #, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "No se puede encontrar información DNS para la base de datos del servidor '%s'"
+msgid "%s commented on %s's post"
+msgstr "%s comentó la publicación de %s"
+
+#: include/NotificationsManager.php:250
+#, php-format
+msgid "%s created a new post"
+msgstr "%s creó una nueva publicación"
+
+#: include/NotificationsManager.php:265
+#, php-format
+msgid "%s liked %s's post"
+msgstr "A %s le gusta la publicación de %s"
+
+#: include/NotificationsManager.php:278
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "A %s no le gusta la publicación de %s"
+
+#: include/NotificationsManager.php:291
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s está asistiendo al evento %s's"
+
+#: include/NotificationsManager.php:304
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s no está asistiendo al evento %s's"
+
+#: include/NotificationsManager.php:317
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s podría asistir al evento %s's"
+
+#: include/NotificationsManager.php:334
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s es ahora es amigo de %s"
+
+#: include/NotificationsManager.php:770
+msgid "Friend Suggestion"
+msgstr "Propuestas de amistad"
+
+#: include/NotificationsManager.php:803
+msgid "Friend/Connect Request"
+msgstr "Solicitud de Amistad/Conexión"
+
+#: include/NotificationsManager.php:803
+msgid "New Follower"
+msgstr "Nuevo seguidor"
+
+#: include/Photo.php:1038 include/Photo.php:1054 include/Photo.php:1062
+#: include/Photo.php:1087 include/message.php:146 mod/item.php:462
+#: mod/wall_upload.php:216 mod/wall_upload.php:230 mod/wall_upload.php:237
+msgid "Wall Photos"
+msgstr "Foto del Muro"
+
+#: include/acl_selectors.php:341
+msgid "Post to Email"
+msgstr "Publicar mediante correo electrónico"
+
+#: include/acl_selectors.php:346
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Conectores deshabilitados, ya que \"%s\" es habilitado."
+
+#: include/acl_selectors.php:347 mod/settings.php:1188
+msgid "Hide your profile details from unknown viewers?"
+msgstr "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?"
+
+#: include/acl_selectors.php:352
+msgid "Visible to everybody"
+msgstr "Visible para cualquiera"
+
+#: include/acl_selectors.php:353 view/theme/vier/config.php:108
+msgid "show"
+msgstr "mostrar"
+
+#: include/acl_selectors.php:354 view/theme/vier/config.php:108
+msgid "don't show"
+msgstr "no mostrar"
+
+#: include/acl_selectors.php:360 mod/editpost.php:123
+msgid "CC: email addresses"
+msgstr "CC: dirección de correo electrónico"
+
+#: include/acl_selectors.php:361 mod/editpost.php:130
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com"
+
+#: include/acl_selectors.php:363 mod/events.php:516 mod/photos.php:1176
+#: mod/photos.php:1558
+msgid "Permissions"
+msgstr "Permisos"
+
+#: include/acl_selectors.php:364
+msgid "Close"
+msgstr "Cerrado"
+
+#: include/api.php:1021
+#, php-format
+msgid "Daily posting limit of %d posts reached. The post was rejected."
+msgstr "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada."
+
+#: include/api.php:1041
+#, php-format
+msgid "Weekly posting limit of %d posts reached. The post was rejected."
+msgstr "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada."
+
+#: include/api.php:1062
+#, php-format
+msgid "Monthly posting limit of %d posts reached. The post was rejected."
+msgstr "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada."
 
 #: include/auth.php:45
 msgid "Logged out."
 msgstr "Sesión finalizada"
 
-#: include/auth.php:116 include/auth.php:178 mod/openid.php:100
+#: include/auth.php:116 include/auth.php:178 mod/openid.php:110
 msgid "Login failed."
 msgstr "Accesso fallido."
 
@@ -408,52 +338,50 @@ msgstr "Se ha encontrado un problema para acceder con el OpenID que has escrito.
 msgid "The error message was:"
 msgstr "El mensaje del error fue:"
 
-#: include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"may apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "Un grupo eliminado con este nombre fue restablecido. Los permisos existentes pueden aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente."
+#: include/bb2diaspora.php:199 include/event.php:16 mod/localtime.php:12
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
 
-#: include/group.php:209
-msgid "Default privacy group for new contacts"
-msgstr "Grupo por defecto para nuevos contactos"
+#: include/bb2diaspora.php:205 include/event.php:33 include/event.php:51
+#: include/event.php:488
+msgid "Starts:"
+msgstr "Inicio:"
 
-#: include/group.php:242
-msgid "Everybody"
-msgstr "Todo el mundo"
+#: include/bb2diaspora.php:213 include/event.php:36 include/event.php:57
+#: include/event.php:489
+msgid "Finishes:"
+msgstr "Final:"
 
-#: include/group.php:265
-msgid "edit"
-msgstr "editar"
+#: include/bb2diaspora.php:221 include/event.php:39 include/event.php:63
+#: include/event.php:490 include/identity.php:331 mod/contacts.php:636
+#: mod/directory.php:139 mod/events.php:501 mod/notifications.php:238
+msgid "Location:"
+msgstr "Localización:"
 
-#: include/group.php:286 mod/newmember.php:61
-msgid "Groups"
-msgstr "Grupos"
+#: include/bbcode.php:350 include/bbcode.php:1055 include/bbcode.php:1056
+msgid "Image/photo"
+msgstr "Imagen/Foto"
 
-#: include/group.php:288
-msgid "Edit groups"
-msgstr "Editar grupo"
+#: include/bbcode.php:467
+#, php-format
+msgid "%2$s %3$s"
+msgstr "%2$s %3$s"
 
-#: include/group.php:290
-msgid "Edit group"
-msgstr "Editar grupo"
+#: include/bbcode.php:1015 include/bbcode.php:1035
+msgid "$1 wrote:"
+msgstr "$1 escribió:"
 
-#: include/group.php:291
-msgid "Create a new group"
-msgstr "Crear un nuevo grupo"
+#: include/bbcode.php:1064 include/bbcode.php:1065
+msgid "Encrypted content"
+msgstr "Contenido cifrado"
 
-#: include/group.php:292 mod/group.php:94 mod/group.php:178
-msgid "Group Name: "
-msgstr "Nombre del grupo: "
+#: include/bbcode.php:1169
+msgid "Invalid source protocol"
+msgstr "Protocolo de fuente inválido"
 
-#: include/group.php:294
-msgid "Contacts not in any group"
-msgstr "Contactos sin grupo"
-
-#: include/group.php:296 mod/network.php:201
-msgid "add"
-msgstr "añadir"
+#: include/bbcode.php:1179
+msgid "Invalid link protocol"
+msgstr "Protocolo de enlace inválido"
 
 #: include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
@@ -479,19 +407,19 @@ msgstr "OK, probablemente inofensivo"
 msgid "Reputable, has my trust"
 msgstr "Buena reputación, tiene mi confianza"
 
-#: include/contact_selectors.php:56 mod/admin.php:890
+#: include/contact_selectors.php:56 mod/admin.php:893
 msgid "Frequently"
 msgstr "Frequentemente"
 
-#: include/contact_selectors.php:57 mod/admin.php:891
+#: include/contact_selectors.php:57 mod/admin.php:894
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: include/contact_selectors.php:58 mod/admin.php:892
+#: include/contact_selectors.php:58 mod/admin.php:895
 msgid "Twice daily"
 msgstr "Dos veces al día"
 
-#: include/contact_selectors.php:59 mod/admin.php:893
+#: include/contact_selectors.php:59 mod/admin.php:896
 msgid "Daily"
 msgstr "Diariamente"
 
@@ -503,7 +431,7 @@ msgstr "Semanalmente"
 msgid "Monthly"
 msgstr "Mensualmente"
 
-#: include/contact_selectors.php:76 mod/dfrn_request.php:868
+#: include/contact_selectors.php:76 mod/dfrn_request.php:881
 msgid "Friendica"
 msgstr "Friendica"
 
@@ -516,12 +444,12 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: include/contact_selectors.php:79 include/contact_selectors.php:86
-#: mod/admin.php:1396 mod/admin.php:1409 mod/admin.php:1422 mod/admin.php:1440
+#: mod/admin.php:1405 mod/admin.php:1418 mod/admin.php:1431 mod/admin.php:1449
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: include/contact_selectors.php:80 mod/settings.php:842
-#: mod/dfrn_request.php:870
+#: include/contact_selectors.php:80 mod/dfrn_request.php:883
+#: mod/settings.php:848
 msgid "Diaspora"
 msgstr "Diaspora*"
 
@@ -566,253 +494,669 @@ msgid "GNU Social"
 msgstr "GNUsocial (OStatus)"
 
 #: include/contact_selectors.php:92
+msgid "pnut"
+msgstr "pnut"
+
+#: include/contact_selectors.php:93
 msgid "App.net"
 msgstr "App.net"
 
-#: include/contact_selectors.php:103
+#: include/contact_selectors.php:104
 msgid "Hubzilla/Redmatrix"
 msgstr "Hubzilla/Redmatrix"
 
-#: include/acl_selectors.php:327
-msgid "Post to Email"
-msgstr "Publicar mediante correo electrónico"
+#: include/contact_widgets.php:6
+msgid "Add New Contact"
+msgstr "Añadir nuevo contacto"
 
-#: include/acl_selectors.php:332
+#: include/contact_widgets.php:7
+msgid "Enter address or web location"
+msgstr "Escribe la dirección o página web"
+
+#: include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Ejemplo: miguel@ejemplo.com, http://ejemplo.com/miguel"
+
+#: include/contact_widgets.php:10 include/identity.php:219
+#: mod/allfriends.php:85 mod/dirfind.php:207 mod/match.php:89
+#: mod/suggest.php:101
+msgid "Connect"
+msgstr "Conectar"
+
+#: include/contact_widgets.php:24
 #, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Conectores deshabilitados, ya que \"%s\" es habilitado."
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitación disponible"
+msgstr[1] "%d invitaviones disponibles"
 
-#: include/acl_selectors.php:333 mod/settings.php:1181
-msgid "Hide your profile details from unknown viewers?"
-msgstr "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?"
+#: include/contact_widgets.php:30
+msgid "Find People"
+msgstr "Buscar personas"
 
-#: include/acl_selectors.php:338
-msgid "Visible to everybody"
-msgstr "Visible para cualquiera"
+#: include/contact_widgets.php:31
+msgid "Enter name or interest"
+msgstr "Introduzce nombre o intereses"
 
-#: include/acl_selectors.php:339 view/theme/vier/config.php:103
-msgid "show"
-msgstr "mostrar"
+#: include/contact_widgets.php:33
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Ejemplos: Robert Morgenstein, Pesca"
 
-#: include/acl_selectors.php:340 view/theme/vier/config.php:103
-msgid "don't show"
-msgstr "no mostrar"
+#: include/contact_widgets.php:34 mod/contacts.php:806 mod/directory.php:206
+msgid "Find"
+msgstr "Buscar"
 
-#: include/acl_selectors.php:346 mod/editpost.php:133
-msgid "CC: email addresses"
-msgstr "CC: dirección de correo electrónico"
+#: include/contact_widgets.php:35 mod/suggest.php:114
+#: view/theme/vier/theme.php:198
+msgid "Friend Suggestions"
+msgstr "Sugerencias de amigos"
 
-#: include/acl_selectors.php:347 mod/editpost.php:140
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com"
+#: include/contact_widgets.php:36 view/theme/vier/theme.php:197
+msgid "Similar Interests"
+msgstr "Intereses similares"
 
-#: include/acl_selectors.php:349 mod/events.php:509 mod/photos.php:1156
-#: mod/photos.php:1535
-msgid "Permissions"
-msgstr "Permisos"
+#: include/contact_widgets.php:37
+msgid "Random Profile"
+msgstr "Perfil aleatorio"
 
-#: include/acl_selectors.php:350
-msgid "Close"
-msgstr "Cerrado"
+#: include/contact_widgets.php:38 view/theme/vier/theme.php:199
+msgid "Invite Friends"
+msgstr "Invitar amigos"
 
-#: include/like.php:163 include/conversation.php:130
-#: include/conversation.php:266 include/text.php:1804 mod/subthread.php:87
+#: include/contact_widgets.php:115
+msgid "Networks"
+msgstr "Redes"
+
+#: include/contact_widgets.php:118
+msgid "All Networks"
+msgstr "Todas las redes"
+
+#: include/contact_widgets.php:150 include/features.php:104
+msgid "Saved Folders"
+msgstr "Directorios guardados"
+
+#: include/contact_widgets.php:153 include/contact_widgets.php:187
+msgid "Everything"
+msgstr "Todo"
+
+#: include/contact_widgets.php:184
+msgid "Categories"
+msgstr "Categorías"
+
+#: include/contact_widgets.php:248
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d contacto en común"
+msgstr[1] "%d contactos en común"
+
+#: include/conversation.php:122 include/conversation.php:258
+#: include/like.php:180 include/text.php:1804
+msgid "event"
+msgstr "evento"
+
+#: include/conversation.php:125 include/conversation.php:134
+#: include/conversation.php:261 include/conversation.php:270
+#: include/diaspora.php:1530 include/like.php:178 mod/subthread.php:88
+#: mod/tagger.php:62
+msgid "status"
+msgstr "estado"
+
+#: include/conversation.php:130 include/conversation.php:266
+#: include/like.php:178 include/text.php:1806 mod/subthread.php:88
 #: mod/tagger.php:62
 msgid "photo"
 msgstr "foto"
 
-#: include/like.php:163 include/diaspora.php:1406 include/conversation.php:125
-#: include/conversation.php:134 include/conversation.php:261
-#: include/conversation.php:270 mod/subthread.php:87 mod/tagger.php:62
-msgid "status"
-msgstr "estado"
-
-#: include/like.php:165 include/conversation.php:122
-#: include/conversation.php:258 include/text.php:1802
-msgid "event"
-msgstr "evento"
-
-#: include/like.php:182 include/diaspora.php:1402 include/conversation.php:141
+#: include/conversation.php:141 include/diaspora.php:1526 include/like.php:27
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
 
-#: include/like.php:184 include/conversation.php:144
+#: include/conversation.php:144 include/like.php:31 include/like.php:36
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s no le gusta %3$s de %2$s"
 
-#: include/like.php:186
+#: include/conversation.php:147
 #, php-format
-msgid "%1$s is attending %2$s's %3$s"
+msgid "%1$s attends %2$s's %3$s"
 msgstr "%1$s atenderá %2$s's %3$s"
 
-#: include/like.php:188
+#: include/conversation.php:150
 #, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr "%1$s no atenderá %2$s's %3$s"
 
-#: include/like.php:190
+#: include/conversation.php:153
 #, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s puede que atienda %2$s's %3$s"
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr "%1$s atenderá quizás %2$s's %3$s"
 
-#: include/message.php:15 include/message.php:173
-msgid "[no subject]"
-msgstr "[sin asunto]"
-
-#: include/message.php:145 include/Photo.php:1040 include/Photo.php:1056
-#: include/Photo.php:1064 include/Photo.php:1089 mod/wall_upload.php:218
-#: mod/wall_upload.php:232 mod/wall_upload.php:239 mod/item.php:478
-msgid "Wall Photos"
-msgstr "Foto del Muro"
-
-#: include/plugin.php:526 include/plugin.php:528
-msgid "Click here to upgrade."
-msgstr "Pulsa aquí para actualizar."
-
-#: include/plugin.php:534
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Esta acción excede los límites permitidos por tu subscripción."
-
-#: include/plugin.php:539
-msgid "This action is not available under your subscription plan."
-msgstr "Esta acción no está permitida para tu subscripción."
-
-#: include/uimport.php:94
-msgid "Error decoding account file"
-msgstr "Error decodificando el archivo de cuenta"
-
-#: include/uimport.php:100
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Error! No hay datos de versión en el archivo! ¿Es esto de una cuenta friendica? "
-
-#: include/uimport.php:116 include/uimport.php:127
-msgid "Error! Cannot check nickname"
-msgstr "Error! No puedo consultar el apodo"
-
-#: include/uimport.php:120 include/uimport.php:131
+#: include/conversation.php:185 mod/dfrn_confirm.php:478
 #, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "La cuenta '%s' ya existe en este servidor!"
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s ahora es amigo de %2$s"
 
-#: include/uimport.php:153
-msgid "User creation error"
-msgstr "Error al crear la cuenta"
-
-#: include/uimport.php:173
-msgid "User profile creation error"
-msgstr "Error de creación del perfil de la cuenta"
-
-#: include/uimport.php:222
+#: include/conversation.php:219
 #, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d contactos no encontrado"
-msgstr[1] "%d contactos no importado"
+msgid "%1$s poked %2$s"
+msgstr "%1$s le dio un toque a %2$s"
 
-#: include/uimport.php:292
-msgid "Done. You can now login with your username and password"
-msgstr "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña."
+#: include/conversation.php:239 mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s está actualmente %2$s"
 
-#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:705
+#: include/conversation.php:278 mod/tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s"
+
+#: include/conversation.php:303
+msgid "post/item"
+msgstr "publicación/tema"
+
+#: include/conversation.php:304
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s ha marcado %3$s de %2$s como Favorito"
+
+#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629
+#: mod/profiles.php:346
+msgid "Likes"
+msgstr "Me gusta"
+
+#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629
+#: mod/profiles.php:350
+msgid "Dislikes"
+msgstr "No me gusta"
+
+#: include/conversation.php:588 include/conversation.php:1473
+#: mod/content.php:373 mod/photos.php:1630
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Atendiendo"
+msgstr[1] "Atendiendo"
+
+#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1630
+msgid "Not attending"
+msgstr "No atendiendo"
+
+#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1630
+msgid "Might attend"
+msgstr "Puede que atienda"
+
+#: include/conversation.php:710 mod/content.php:453 mod/content.php:759
+#: mod/photos.php:1703 object/Item.php:137
+msgid "Select"
+msgstr "Seleccionar"
+
+#: include/conversation.php:711 mod/admin.php:1423 mod/contacts.php:816
+#: mod/contacts.php:1015 mod/content.php:454 mod/content.php:760
+#: mod/group.php:181 mod/photos.php:1704 mod/settings.php:744
+#: object/Item.php:138
+msgid "Delete"
+msgstr "Eliminar"
+
+#: include/conversation.php:755 mod/content.php:487 mod/content.php:915
+#: mod/content.php:916 object/Item.php:356 object/Item.php:357
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Ver perfil de %s @ %s"
+
+#: include/conversation.php:767 object/Item.php:344
+msgid "Categories:"
+msgstr "Categorías:"
+
+#: include/conversation.php:768 object/Item.php:345
+msgid "Filed under:"
+msgstr "Archivado en:"
+
+#: include/conversation.php:775 mod/content.php:497 mod/content.php:928
+#: object/Item.php:370
+#, php-format
+msgid "%s from %s"
+msgstr "%s de %s"
+
+#: include/conversation.php:791 mod/content.php:513
+msgid "View in context"
+msgstr "Verlo en contexto"
+
+#: include/conversation.php:793 include/conversation.php:1256
+#: mod/content.php:515 mod/content.php:953 mod/editpost.php:114
+#: mod/message.php:337 mod/message.php:522 mod/photos.php:1592
+#: mod/wallmessage.php:140 object/Item.php:395
+msgid "Please wait"
+msgstr "Por favor, espera"
+
+#: include/conversation.php:872
+msgid "remove"
+msgstr "eliminar"
+
+#: include/conversation.php:876
+msgid "Delete Selected Items"
+msgstr "Eliminar el elemento seleccionado"
+
+#: include/conversation.php:968
+msgid "Follow Thread"
+msgstr "Seguir publicacion"
+
+#: include/conversation.php:1100
+#, php-format
+msgid "%s likes this."
+msgstr "A %s le gusta esto."
+
+#: include/conversation.php:1103
+#, php-format
+msgid "%s doesn't like this."
+msgstr "A %s no le gusta esto."
+
+#: include/conversation.php:1106
+#, php-format
+msgid "%s attends."
+msgstr "%s atiende."
+
+#: include/conversation.php:1109
+#, php-format
+msgid "%s doesn't attend."
+msgstr "%s no atenderá."
+
+#: include/conversation.php:1112
+#, php-format
+msgid "%s attends maybe."
+msgstr "%s quizás atenderá"
+
+#: include/conversation.php:1122
+msgid "and"
+msgstr "y"
+
+#: include/conversation.php:1128
+#, php-format
+msgid ", and %d other people"
+msgstr " y a otras %d personas"
+
+#: include/conversation.php:1137
+#, php-format
+msgid "%2$d people like this"
+msgstr "%2$d personas les gusta esto"
+
+#: include/conversation.php:1138
+#, php-format
+msgid "%s like this."
+msgstr "A %s le gusta esto."
+
+#: include/conversation.php:1141
+#, php-format
+msgid "%2$d people don't like this"
+msgstr "%2$d personas no les gusta esto"
+
+#: include/conversation.php:1142
+#, php-format
+msgid "%s don't like this."
+msgstr "A %s no le gusta esto."
+
+#: include/conversation.php:1145
+#, php-format
+msgid "%2$d people attend"
+msgstr "%2$d personas atienden"
+
+#: include/conversation.php:1146
+#, php-format
+msgid "%s attend."
+msgstr "%s atiende."
+
+#: include/conversation.php:1149
+#, php-format
+msgid "%2$d people don't attend"
+msgstr "%2$d personasno atienden"
+
+#: include/conversation.php:1150
+#, php-format
+msgid "%s don't attend."
+msgstr "%s no atiende."
+
+#: include/conversation.php:1153
+#, php-format
+msgid "%2$d people attend maybe"
+msgstr "%2$d people quizá asistan"
+
+#: include/conversation.php:1154
+#, php-format
+msgid "%s anttend maybe."
+msgstr "%s atiende quizás."
+
+#: include/conversation.php:1184 include/conversation.php:1200
+msgid "Visible to everybody"
+msgstr "Visible para cualquiera"
+
+#: include/conversation.php:1185 include/conversation.php:1201
+#: mod/message.php:271 mod/message.php:278 mod/message.php:418
+#: mod/message.php:425 mod/wallmessage.php:114 mod/wallmessage.php:121
+msgid "Please enter a link URL:"
+msgstr "Introduce la dirección del enlace:"
+
+#: include/conversation.php:1186 include/conversation.php:1202
+msgid "Please enter a video link/URL:"
+msgstr "Por favor, introduce la URL/enlace del vídeo:"
+
+#: include/conversation.php:1187 include/conversation.php:1203
+msgid "Please enter an audio link/URL:"
+msgstr "Por favor, introduce la URL/enlace del audio:"
+
+#: include/conversation.php:1188 include/conversation.php:1204
+msgid "Tag term:"
+msgstr "Etiquetar:"
+
+#: include/conversation.php:1189 include/conversation.php:1205
+#: mod/filer.php:30
+msgid "Save to Folder:"
+msgstr "Guardar en directorio:"
+
+#: include/conversation.php:1190 include/conversation.php:1206
+msgid "Where are you right now?"
+msgstr "¿Dónde estás ahora?"
+
+#: include/conversation.php:1191
+msgid "Delete item(s)?"
+msgstr "¿Borrar objeto(s)?"
+
+#: include/conversation.php:1237
+msgid "Share"
+msgstr "Compartir"
+
+#: include/conversation.php:1238 mod/editpost.php:100 mod/message.php:335
+#: mod/message.php:519 mod/wallmessage.php:138
+msgid "Upload photo"
+msgstr "Subir foto"
+
+#: include/conversation.php:1239 mod/editpost.php:101
+msgid "upload photo"
+msgstr "subir imagen"
+
+#: include/conversation.php:1240 mod/editpost.php:102
+msgid "Attach file"
+msgstr "Adjuntar archivo"
+
+#: include/conversation.php:1241 mod/editpost.php:103
+msgid "attach file"
+msgstr "adjuntar archivo"
+
+#: include/conversation.php:1242 mod/editpost.php:104 mod/message.php:336
+#: mod/message.php:520 mod/wallmessage.php:139
+msgid "Insert web link"
+msgstr "Insertar enlace"
+
+#: include/conversation.php:1243 mod/editpost.php:105
+msgid "web link"
+msgstr "enlace web"
+
+#: include/conversation.php:1244 mod/editpost.php:106
+msgid "Insert video link"
+msgstr "Insertar enlace del vídeo"
+
+#: include/conversation.php:1245 mod/editpost.php:107
+msgid "video link"
+msgstr "enlace de video"
+
+#: include/conversation.php:1246 mod/editpost.php:108
+msgid "Insert audio link"
+msgstr "Insertar vínculo del audio"
+
+#: include/conversation.php:1247 mod/editpost.php:109
+msgid "audio link"
+msgstr "enlace de audio"
+
+#: include/conversation.php:1248 mod/editpost.php:110
+msgid "Set your location"
+msgstr "Configurar tu localización"
+
+#: include/conversation.php:1249 mod/editpost.php:111
+msgid "set location"
+msgstr "establecer tu ubicación"
+
+#: include/conversation.php:1250 mod/editpost.php:112
+msgid "Clear browser location"
+msgstr "Borrar la localización del navegador"
+
+#: include/conversation.php:1251 mod/editpost.php:113
+msgid "clear location"
+msgstr "limpiar la localización"
+
+#: include/conversation.php:1253 mod/editpost.php:127
+msgid "Set title"
+msgstr "Establecer el título"
+
+#: include/conversation.php:1255 mod/editpost.php:129
+msgid "Categories (comma-separated list)"
+msgstr "Categorías (lista separada por comas)"
+
+#: include/conversation.php:1257 mod/editpost.php:115
+msgid "Permission settings"
+msgstr "Configuración de permisos"
+
+#: include/conversation.php:1258 mod/editpost.php:144
+msgid "permissions"
+msgstr "permisos"
+
+#: include/conversation.php:1266 mod/editpost.php:124
+msgid "Public post"
+msgstr "Publicación pública"
+
+#: include/conversation.php:1271 mod/content.php:737 mod/editpost.php:135
+#: mod/events.php:511 mod/photos.php:1613 mod/photos.php:1661
+#: mod/photos.php:1747 object/Item.php:714
+msgid "Preview"
+msgstr "Vista previa"
+
+#: include/conversation.php:1275 include/items.php:1983 mod/contacts.php:455
+#: mod/dfrn_request.php:889 mod/editpost.php:138 mod/fbrowser.php:100
+#: mod/fbrowser.php:135 mod/follow.php:124 mod/message.php:209
+#: mod/photos.php:240 mod/photos.php:331 mod/settings.php:682
+#: mod/settings.php:708 mod/suggest.php:32 mod/tagrm.php:11 mod/tagrm.php:96
+#: mod/videos.php:132
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: include/conversation.php:1281
+msgid "Post to Groups"
+msgstr "Publicar hacia grupos"
+
+#: include/conversation.php:1282
+msgid "Post to Contacts"
+msgstr "Publicar hacia contactos"
+
+#: include/conversation.php:1283
+msgid "Private post"
+msgstr "Publicación privada"
+
+#: include/conversation.php:1288 include/identity.php:259 mod/editpost.php:142
+msgid "Message"
+msgstr "Mensaje"
+
+#: include/conversation.php:1289 mod/editpost.php:143
+msgid "Browser"
+msgstr "Navegador"
+
+#: include/conversation.php:1445
+msgid "View all"
+msgstr "Ver todos los contactos"
+
+#: include/conversation.php:1467
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Me gusta"
+msgstr[1] "Me gusta"
+
+#: include/conversation.php:1470
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "No me gusta"
+msgstr[1] "No me gusta"
+
+#: include/conversation.php:1476
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "No atendiendo"
+msgstr[1] "No atendiendo"
+
+#: include/conversation.php:1479 include/profile_selectors.php:6
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "Indeciso"
+msgstr[1] "Indeciso"
+
+#: include/datetime.php:58 include/datetime.php:60 mod/profiles.php:697
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: include/datetime.php:183 include/identity.php:629
+#: include/datetime.php:184 include/identity.php:641
 msgid "Birthday:"
 msgstr "Fecha de nacimiento:"
 
-#: include/datetime.php:185 mod/profiles.php:728
+#: include/datetime.php:186 mod/profiles.php:720
 msgid "Age: "
 msgstr "Edad: "
 
-#: include/datetime.php:187
+#: include/datetime.php:188
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "YYYY-MM-DD o MM-DD"
 
-#: include/datetime.php:341
+#: include/datetime.php:343
 msgid "never"
 msgstr "nunca"
 
-#: include/datetime.php:347
+#: include/datetime.php:349
 msgid "less than a second ago"
 msgstr "hace menos de un segundo"
 
-#: include/datetime.php:350
+#: include/datetime.php:352
 msgid "year"
 msgstr "año"
 
-#: include/datetime.php:350
+#: include/datetime.php:352
 msgid "years"
 msgstr "años"
 
-#: include/datetime.php:351 include/event.php:480 mod/cal.php:284
-#: mod/events.php:389
+#: include/datetime.php:353 include/event.php:481 mod/cal.php:279
+#: mod/events.php:396
 msgid "month"
 msgstr "mes"
 
-#: include/datetime.php:351
+#: include/datetime.php:353
 msgid "months"
 msgstr "meses"
 
-#: include/datetime.php:352 include/event.php:481 mod/cal.php:285
-#: mod/events.php:390
+#: include/datetime.php:354 include/event.php:482 mod/cal.php:280
+#: mod/events.php:397
 msgid "week"
 msgstr "semana"
 
-#: include/datetime.php:352
+#: include/datetime.php:354
 msgid "weeks"
 msgstr "semanas"
 
-#: include/datetime.php:353 include/event.php:482 mod/cal.php:286
-#: mod/events.php:391
+#: include/datetime.php:355 include/event.php:483 mod/cal.php:281
+#: mod/events.php:398
 msgid "day"
 msgstr "día"
 
-#: include/datetime.php:353
+#: include/datetime.php:355
 msgid "days"
 msgstr "días"
 
-#: include/datetime.php:354
+#: include/datetime.php:356
 msgid "hour"
 msgstr "hora"
 
-#: include/datetime.php:354
+#: include/datetime.php:356
 msgid "hours"
 msgstr "horas"
 
-#: include/datetime.php:355
+#: include/datetime.php:357
 msgid "minute"
 msgstr "minuto"
 
-#: include/datetime.php:355
+#: include/datetime.php:357
 msgid "minutes"
 msgstr "minutos"
 
-#: include/datetime.php:356
+#: include/datetime.php:358
 msgid "second"
 msgstr "segundo"
 
-#: include/datetime.php:356
+#: include/datetime.php:358
 msgid "seconds"
 msgstr "segundos"
 
-#: include/datetime.php:365
+#: include/datetime.php:367
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr "hace %1$d %2$s"
 
-#: include/datetime.php:572
+#: include/datetime.php:585
 #, php-format
 msgid "%s's birthday"
 msgstr "Cumpleaños de %s"
 
-#: include/datetime.php:573 include/dfrn.php:1109
+#: include/datetime.php:586 include/dfrn.php:1131
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Feliz cumpleaños %s"
 
+#: include/dba.php:43 include/dba_pdo.php:72
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "No se puede encontrar información DNS para la base de datos del servidor '%s'"
+
+#: include/dbstructure.php:36
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
+msgstr "\n\t\t\tLos desarolladores de friendica publicaron una actualización  %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido."
+
+#: include/dbstructure.php:41
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "El mensaje de error es\n[pre]%s[/pre]"
+
+#: include/dbstructure.php:199
+msgid "Errors encountered creating database tables."
+msgstr "Se han encontrados errores creando las tablas de la base de datos."
+
+#: include/dbstructure.php:333 include/dbstructure.php:341
+#: include/dbstructure.php:349 include/dbstructure.php:354
+#: include/dbstructure.php:359
+msgid "Errors encountered performing database changes."
+msgstr "Errores encontrados al ejecutar cambios en la base de datos."
+
+#: include/delivery.php:427
+msgid "(no subject)"
+msgstr "(sin asunto)"
+
+#: include/delivery.php:439 include/enotify.php:43
+msgid "noreply"
+msgstr "no responder"
+
+#: include/dfrn.php:1130
+#, php-format
+msgid "%s\\'s birthday"
+msgstr "%s\\'s cumpleaños"
+
+#: include/diaspora.php:2087
+msgid "Sharing notification from Diaspora network"
+msgstr "Compartir notificaciones con la red Diaspora*"
+
+#: include/diaspora.php:3096
+msgid "Attachments:"
+msgstr "Archivos adjuntos:"
+
 #: include/enotify.php:24
 msgid "Friendica Notification"
 msgstr "Notificación de Friendica"
@@ -831,10 +1175,6 @@ msgstr "%s Administrador"
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s, %2$s Administrador"
 
-#: include/enotify.php:43 include/delivery.php:457
-msgid "noreply"
-msgstr "no responder"
-
 #: include/enotify.php:70
 #, php-format
 msgid "%s "
@@ -1110,211 +1450,815 @@ msgstr "Nombre completo:\t%1$s\\nUbicación del sitio:\t%2$s\\nLogin Nombre:\t%3
 msgid "Please visit %s to approve or reject the request."
 msgstr "Por favor visita %s para aprobar o negar la solicitud."
 
-#: include/event.php:16 include/bb2diaspora.php:152 mod/localtime.php:12
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
-
-#: include/event.php:33 include/event.php:51 include/event.php:487
-#: include/bb2diaspora.php:158
-msgid "Starts:"
-msgstr "Inicio:"
-
-#: include/event.php:36 include/event.php:57 include/event.php:488
-#: include/bb2diaspora.php:166
-msgid "Finishes:"
-msgstr "Final:"
-
-#: include/event.php:39 include/event.php:63 include/event.php:489
-#: include/bb2diaspora.php:174 include/identity.php:328
-#: mod/notifications.php:232 mod/directory.php:137 mod/events.php:494
-#: mod/contacts.php:628
-msgid "Location:"
-msgstr "Localización:"
-
-#: include/event.php:441
+#: include/event.php:442
 msgid "Sun"
 msgstr "Dom"
 
-#: include/event.php:442
+#: include/event.php:443
 msgid "Mon"
 msgstr "Lun"
 
-#: include/event.php:443
+#: include/event.php:444
 msgid "Tue"
 msgstr "Mar"
 
-#: include/event.php:444
+#: include/event.php:445
 msgid "Wed"
 msgstr "Mie"
 
-#: include/event.php:445
+#: include/event.php:446
 msgid "Thu"
 msgstr "Jue"
 
-#: include/event.php:446
+#: include/event.php:447
 msgid "Fri"
 msgstr "Vie"
 
-#: include/event.php:447
+#: include/event.php:448
 msgid "Sat"
 msgstr "Sab"
 
-#: include/event.php:448 include/text.php:1130 mod/settings.php:972
+#: include/event.php:449 include/text.php:1132 mod/settings.php:981
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/event.php:449 include/text.php:1130 mod/settings.php:972
+#: include/event.php:450 include/text.php:1132 mod/settings.php:981
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/event.php:450 include/text.php:1130
+#: include/event.php:451 include/text.php:1132
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/event.php:451 include/text.php:1130
+#: include/event.php:452 include/text.php:1132
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/event.php:452 include/text.php:1130
+#: include/event.php:453 include/text.php:1132
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/event.php:453 include/text.php:1130
+#: include/event.php:454 include/text.php:1132
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/event.php:454 include/text.php:1130
+#: include/event.php:455 include/text.php:1132
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/event.php:455
+#: include/event.php:456
 msgid "Jan"
 msgstr "Ene"
 
-#: include/event.php:456
+#: include/event.php:457
 msgid "Feb"
 msgstr "Feb"
 
-#: include/event.php:457
+#: include/event.php:458
 msgid "Mar"
 msgstr "Mar"
 
-#: include/event.php:458
+#: include/event.php:459
 msgid "Apr"
 msgstr "Abr"
 
-#: include/event.php:459 include/event.php:471 include/text.php:1134
+#: include/event.php:460 include/event.php:472 include/text.php:1136
 msgid "May"
 msgstr "Mayo"
 
-#: include/event.php:460
+#: include/event.php:461
 msgid "Jun"
 msgstr "Jun"
 
-#: include/event.php:461
+#: include/event.php:462
 msgid "Jul"
 msgstr "Jul"
 
-#: include/event.php:462
+#: include/event.php:463
 msgid "Aug"
 msgstr "Ago"
 
-#: include/event.php:463
+#: include/event.php:464
 msgid "Sept"
 msgstr "Sept"
 
-#: include/event.php:464
+#: include/event.php:465
 msgid "Oct"
 msgstr "Oct"
 
-#: include/event.php:465
+#: include/event.php:466
 msgid "Nov"
 msgstr "Nov"
 
-#: include/event.php:466
+#: include/event.php:467
 msgid "Dec"
 msgstr "Dec"
 
-#: include/event.php:467 include/text.php:1134
+#: include/event.php:468 include/text.php:1136
 msgid "January"
 msgstr "Enero"
 
-#: include/event.php:468 include/text.php:1134
+#: include/event.php:469 include/text.php:1136
 msgid "February"
 msgstr "Febrero"
 
-#: include/event.php:469 include/text.php:1134
+#: include/event.php:470 include/text.php:1136
 msgid "March"
 msgstr "Marzo"
 
-#: include/event.php:470 include/text.php:1134
+#: include/event.php:471 include/text.php:1136
 msgid "April"
 msgstr "Abril"
 
-#: include/event.php:472 include/text.php:1134
+#: include/event.php:473 include/text.php:1136
 msgid "June"
 msgstr "Junio"
 
-#: include/event.php:473 include/text.php:1134
+#: include/event.php:474 include/text.php:1136
 msgid "July"
 msgstr "Julio"
 
-#: include/event.php:474 include/text.php:1134
+#: include/event.php:475 include/text.php:1136
 msgid "August"
 msgstr "Agosto"
 
-#: include/event.php:475 include/text.php:1134
+#: include/event.php:476 include/text.php:1136
 msgid "September"
 msgstr "Septiembre"
 
-#: include/event.php:476 include/text.php:1134
+#: include/event.php:477 include/text.php:1136
 msgid "October"
 msgstr "Octubre"
 
-#: include/event.php:477 include/text.php:1134
+#: include/event.php:478 include/text.php:1136
 msgid "November"
 msgstr "Noviembre"
 
-#: include/event.php:478 include/text.php:1134
+#: include/event.php:479 include/text.php:1136
 msgid "December"
 msgstr "Diciembre"
 
-#: include/event.php:479 mod/cal.php:283 mod/events.php:388
+#: include/event.php:480 mod/cal.php:278 mod/events.php:395
 msgid "today"
 msgstr "hoy"
 
-#: include/event.php:483
+#: include/event.php:484
 msgid "all-day"
 msgstr "todo el día"
 
-#: include/event.php:485
+#: include/event.php:486
 msgid "No events to display"
 msgstr "No hay eventos a mostrar"
 
-#: include/event.php:574
+#: include/event.php:596
 msgid "l, F j"
 msgstr "l, F j"
 
-#: include/event.php:593
+#: include/event.php:615
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: include/event.php:615 include/text.php:1532 include/text.php:1539
+#: include/event.php:637 include/text.php:1534 include/text.php:1541
 msgid "link to source"
 msgstr "Enlace al original"
 
-#: include/event.php:850
+#: include/event.php:872
 msgid "Export"
 msgstr "Exportar"
 
-#: include/event.php:851
+#: include/event.php:873
 msgid "Export calendar as ical"
 msgstr "Exportar calendario como ical"
 
-#: include/event.php:852
+#: include/event.php:874
 msgid "Export calendar as csv"
 msgstr "Exportar calendario como csv"
 
+#: include/features.php:65
+msgid "General Features"
+msgstr "Opciones generales"
+
+#: include/features.php:67
+msgid "Multiple Profiles"
+msgstr "Perfiles multiples"
+
+#: include/features.php:67
+msgid "Ability to create multiple profiles"
+msgstr "Capacidad de crear perfiles multiples. Cada pagina/perfil/usuario puede tener diferentes perfiles/apariencias. Las mismas pueden ser visibles para determinados contactos seleccionados dentro de la red friendica."
+
+#: include/features.php:68
+msgid "Photo Location"
+msgstr "Localización foto"
+
+#: include/features.php:68
+msgid ""
+"Photo metadata is normally stripped. This extracts the location (if present)"
+" prior to stripping metadata and links it to a map."
+msgstr "Normalmente los meta datos de las imágenes son eliminados. Esto extraerá la localización si presente antes de eliminar los meta datos y enlaza la misma con el mapa."
+
+#: include/features.php:69
+msgid "Export Public Calendar"
+msgstr "Exportar Calendario Público"
+
+#: include/features.php:69
+msgid "Ability for visitors to download the public calendar"
+msgstr "Posibilidad de los visitantes de descargar el calendario público"
+
+#: include/features.php:74
+msgid "Post Composition Features"
+msgstr "Opciones de edición de publicaciones."
+
+#: include/features.php:75
+msgid "Post Preview"
+msgstr "Previsualizar publicaciones"
+
+#: include/features.php:75
+msgid "Allow previewing posts and comments before publishing them"
+msgstr "Permitir la previsualización de publicaciones antes de publicar las mismas."
+
+#: include/features.php:76
+msgid "Auto-mention Forums"
+msgstr "Auto-mencionar foros"
+
+#: include/features.php:76
+msgid ""
+"Add/remove mention when a forum page is selected/deselected in ACL window."
+msgstr "Añadir/eliminar mención cuando un foro es seleccionado/deseleccionado en la ventana ACL."
+
+#: include/features.php:81
+msgid "Network Sidebar Widgets"
+msgstr "Accesorios de red del panel lateral"
+
+#: include/features.php:82
+msgid "Search by Date"
+msgstr "Buscar por fecha"
+
+#: include/features.php:82
+msgid "Ability to select posts by date ranges"
+msgstr "Habilidad de seleccionar publicaciones por fecha"
+
+#: include/features.php:83 include/features.php:113
+msgid "List Forums"
+msgstr "Listar foros"
+
+#: include/features.php:83
+msgid "Enable widget to display the forums your are connected with"
+msgstr "Habilitar la pestaña para mostrar los foros en que estas participando."
+
+#: include/features.php:84
+msgid "Group Filter"
+msgstr "Filtro del grupo"
+
+#: include/features.php:84
+msgid "Enable widget to display Network posts only from selected group"
+msgstr "Habilitar accesorios para visualizar publicaciones en la red solo de grupos seleccionados"
+
+#: include/features.php:85
+msgid "Network Filter"
+msgstr "Filtro de red"
+
+#: include/features.php:85
+msgid "Enable widget to display Network posts only from selected network"
+msgstr "Habilitar accesorios para visualizar publicaciones solo de las redes seleccionadas."
+
+#: include/features.php:86 mod/network.php:199 mod/search.php:34
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
+
+#: include/features.php:86
+msgid "Save search terms for re-use"
+msgstr "Guardar términos de búsqueda para su reutilizacion"
+
+#: include/features.php:91
+msgid "Network Tabs"
+msgstr "Pestañas de redes"
+
+#: include/features.php:92
+msgid "Network Personal Tab"
+msgstr "Pestaña actividad personal"
+
+#: include/features.php:92
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Habilitar para visualizar solo publicaciones con las que se ha interactuado"
+
+#: include/features.php:93
+msgid "Network New Tab"
+msgstr "Pestaña nuevo en la red"
+
+#: include/features.php:93
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr "Activar para mostrar solo publicaciones nuevas en la red (de las ultimas 12 horas)"
+
+#: include/features.php:94
+msgid "Network Shared Links Tab"
+msgstr "Pestaña publicaciones con enlaces"
+
+#: include/features.php:94
+msgid "Enable tab to display only Network posts with links in them"
+msgstr "Habilitar para visualizar solo publicaciones que contienen enlaces"
+
+#: include/features.php:99
+msgid "Post/Comment Tools"
+msgstr "Herramienta de publicaciones/respuestas"
+
+#: include/features.php:100
+msgid "Multiple Deletion"
+msgstr "Borrar múltiples publicaciones"
+
+#: include/features.php:100
+msgid "Select and delete multiple posts/comments at once"
+msgstr "Habilidad de seleccionar y borrar varias publicaciones/comentarios a la vez"
+
+#: include/features.php:101
+msgid "Edit Sent Posts"
+msgstr "Editar temas enviados"
+
+#: include/features.php:101
+msgid "Edit and correct posts and comments after sending"
+msgstr "Editar y corregir publicaciones y respuestas enviados. Las ediciones solo son comunicados dentro de la red friendica. No se modificaran copias enviadas a diaspora, OStatus/GNUsocial/Quitter u otros servicios conectados."
+
+#: include/features.php:102
+msgid "Tagging"
+msgstr "taggear"
+
+#: include/features.php:102
+msgid "Ability to tag existing posts"
+msgstr "Habilidad de taggear publicaciones existentes"
+
+#: include/features.php:103
+msgid "Post Categories"
+msgstr "Categorías de publicaciones"
+
+#: include/features.php:103
+msgid "Add categories to your posts"
+msgstr "Agregue categorías a sus publicaciones. Las mismas serán visualizadas en su pagina de inicio."
+
+#: include/features.php:104
+msgid "Ability to file posts under folders"
+msgstr "Archivar publicaciones en carpetas"
+
+#: include/features.php:105
+msgid "Dislike Posts"
+msgstr "Desaprobar publicación (dislike)"
+
+#: include/features.php:105
+msgid "Ability to dislike posts/comments"
+msgstr "Habilidad de expresar desacuerdo en publicaciones y comentarios. Esta función solo es visualizado en la red friendica."
+
+#: include/features.php:106
+msgid "Star Posts"
+msgstr "Fijar publicaciones"
+
+#: include/features.php:106
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Habilidad de marcar - observar fijamente publicaciones.\nEl simbolo de estrella es habilitado. Se recibirán notificaciones sobre comentarios, además una pestaña de publicaciones fijadas es habilitada. En las opciones de expiración de publicaciones se puede filtrar estas publicaciones para no ser eliminados contrario a las publicaciones demás de los contactos."
+
+#: include/features.php:107
+msgid "Mute Post Notifications"
+msgstr "Silenciar notificaciones de una publicacion"
+
+#: include/features.php:107
+msgid "Ability to mute notifications for a thread"
+msgstr "Habilidad de silenciar notificaciones sobre nuevos comentarios en una publicación."
+
+#: include/features.php:112
+msgid "Advanced Profile Settings"
+msgstr "Ajustes avanzados del perfil"
+
+#: include/features.php:113
+msgid "Show visitors public community forums at the Advanced Profile Page"
+msgstr "Mostrar a los visitantes foros públicos en las que se esta participando en el pagina avanzada de perfiles."
+
+#: include/follow.php:81 mod/dfrn_request.php:512
+msgid "Disallowed profile URL."
+msgstr "Dirección de perfil no permitida."
+
+#: include/follow.php:86
+msgid "Connect URL missing."
+msgstr "Falta el conector URL."
+
+#: include/follow.php:114
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Este sitio no está configurado para permitir la comunicación con otras redes."
+
+#: include/follow.php:115 include/follow.php:129
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "No se ha descubierto protocolos de comunicación o fuentes compatibles."
+
+#: include/follow.php:127
+msgid "The profile address specified does not provide adequate information."
+msgstr "La dirección del perfil especificado no proporciona información adecuada."
+
+#: include/follow.php:132
+msgid "An author or name was not found."
+msgstr "No se ha encontrado un autor o nombre."
+
+#: include/follow.php:135
+msgid "No browser URL could be matched to this address."
+msgstr "Ninguna dirección concuerda con la suministrada."
+
+#: include/follow.php:138
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Imposible identificar la dirección @ con algún protocolo conocido o dirección de contacto."
+
+#: include/follow.php:139
+msgid "Use mailto: in front of address to force email check."
+msgstr "Escribe mailto: al principio de la dirección para forzar el envío."
+
+#: include/follow.php:145
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio."
+
+#: include/follow.php:150
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas."
+
+#: include/follow.php:251
+msgid "Unable to retrieve contact information."
+msgstr "No ha sido posible recibir la información del contacto."
+
+#: include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"may apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Un grupo eliminado con este nombre fue restablecido. Los permisos existentes pueden aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente."
+
+#: include/group.php:210
+msgid "Default privacy group for new contacts"
+msgstr "Grupo por defecto para nuevos contactos"
+
+#: include/group.php:243
+msgid "Everybody"
+msgstr "Todo el mundo"
+
+#: include/group.php:266
+msgid "edit"
+msgstr "editar"
+
+#: include/group.php:287 mod/newmember.php:61
+msgid "Groups"
+msgstr "Grupos"
+
+#: include/group.php:289
+msgid "Edit groups"
+msgstr "Editar grupo"
+
+#: include/group.php:291
+msgid "Edit group"
+msgstr "Editar grupo"
+
+#: include/group.php:292
+msgid "Create a new group"
+msgstr "Crear un nuevo grupo"
+
+#: include/group.php:293 mod/group.php:98 mod/group.php:188
+msgid "Group Name: "
+msgstr "Nombre del grupo: "
+
+#: include/group.php:295
+msgid "Contacts not in any group"
+msgstr "Contactos sin grupo"
+
+#: include/group.php:297 mod/network.php:200
+msgid "add"
+msgstr "añadir"
+
+#: include/identity.php:43
+msgid "Requested account is not available."
+msgstr "La cuenta solicitada no está disponible."
+
+#: include/identity.php:52 mod/profile.php:21
+msgid "Requested profile is not available."
+msgstr "El perfil solicitado no está disponible."
+
+#: include/identity.php:96 include/identity.php:314 include/identity.php:737
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: include/identity.php:254
+msgid "Atom feed"
+msgstr "Atom feed"
+
+#: include/identity.php:285 include/nav.php:189
+msgid "Profiles"
+msgstr "Perfiles"
+
+#: include/identity.php:285
+msgid "Manage/edit profiles"
+msgstr "Administrar/editar perfiles"
+
+#: include/identity.php:290 include/identity.php:316 mod/profiles.php:789
+msgid "Change profile photo"
+msgstr "Cambiar foto del perfil"
+
+#: include/identity.php:291 mod/profiles.php:790
+msgid "Create New Profile"
+msgstr "Crear nuevo perfil"
+
+#: include/identity.php:301 mod/profiles.php:779
+msgid "Profile Image"
+msgstr "Imagen del Perfil"
+
+#: include/identity.php:304 mod/profiles.php:781
+msgid "visible to everybody"
+msgstr "Visible para todos"
+
+#: include/identity.php:305 mod/profiles.php:683 mod/profiles.php:782
+msgid "Edit visibility"
+msgstr "Editar visibilidad"
+
+#: include/identity.php:333 include/identity.php:628 mod/directory.php:141
+#: mod/notifications.php:244
+msgid "Gender:"
+msgstr "Género:"
+
+#: include/identity.php:336 include/identity.php:648 mod/directory.php:143
+msgid "Status:"
+msgstr "Estado:"
+
+#: include/identity.php:338 include/identity.php:664 mod/directory.php:145
+msgid "Homepage:"
+msgstr "Página de inicio:"
+
+#: include/identity.php:340 include/identity.php:684 mod/contacts.php:640
+#: mod/directory.php:147 mod/notifications.php:240
+msgid "About:"
+msgstr "Acerca de:"
+
+#: include/identity.php:342 mod/contacts.php:638
+msgid "XMPP:"
+msgstr "XMPP:"
+
+#: include/identity.php:428 mod/contacts.php:55 mod/notifications.php:252
+msgid "Network:"
+msgstr "Red:"
+
+#: include/identity.php:457 include/identity.php:547
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: include/identity.php:458 include/identity.php:548
+msgid "F d"
+msgstr "F d"
+
+#: include/identity.php:509 include/identity.php:594
+msgid "[today]"
+msgstr "[hoy]"
+
+#: include/identity.php:521
+msgid "Birthday Reminders"
+msgstr "Recordatorios de cumpleaños"
+
+#: include/identity.php:522
+msgid "Birthdays this week:"
+msgstr "Cumpleaños esta semana:"
+
+#: include/identity.php:581
+msgid "[No description]"
+msgstr "[Sin descripción]"
+
+#: include/identity.php:605
+msgid "Event Reminders"
+msgstr "Recordatorios de eventos"
+
+#: include/identity.php:606
+msgid "Events this week:"
+msgstr "Eventos de esta semana:"
+
+#: include/identity.php:617 include/identity.php:741 include/identity.php:774
+#: include/nav.php:82 mod/contacts.php:647 mod/contacts.php:849
+#: mod/newmember.php:32 mod/profperm.php:105 view/theme/frio/theme.php:247
+msgid "Profile"
+msgstr "Perfil"
+
+#: include/identity.php:626 mod/settings.php:1286
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: include/identity.php:633
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: include/identity.php:634
+msgid "j F"
+msgstr "j F"
+
+#: include/identity.php:645
+msgid "Age:"
+msgstr "Edad:"
+
+#: include/identity.php:656
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "por %1$d %2$s"
+
+#: include/identity.php:660 mod/profiles.php:702
+msgid "Sexual Preference:"
+msgstr "Preferencia sexual:"
+
+#: include/identity.php:668 mod/profiles.php:729
+msgid "Hometown:"
+msgstr "Ciudad de origen:"
+
+#: include/identity.php:672 mod/contacts.php:642 mod/follow.php:137
+#: mod/notifications.php:242
+msgid "Tags:"
+msgstr "Etiquetas:"
+
+#: include/identity.php:676 mod/profiles.php:730
+msgid "Political Views:"
+msgstr "Ideas políticas:"
+
+#: include/identity.php:680
+msgid "Religion:"
+msgstr "Religión:"
+
+#: include/identity.php:688
+msgid "Hobbies/Interests:"
+msgstr "Aficiones/Intereses:"
+
+#: include/identity.php:692 mod/profiles.php:734
+msgid "Likes:"
+msgstr "Me gusta:"
+
+#: include/identity.php:696 mod/profiles.php:735
+msgid "Dislikes:"
+msgstr "No me gusta:"
+
+#: include/identity.php:700
+msgid "Contact information and Social Networks:"
+msgstr "Información de contacto y Redes sociales:"
+
+#: include/identity.php:704
+msgid "Musical interests:"
+msgstr "Intereses musicales:"
+
+#: include/identity.php:708
+msgid "Books, literature:"
+msgstr "Libros, literatura:"
+
+#: include/identity.php:712
+msgid "Television:"
+msgstr "Televisión:"
+
+#: include/identity.php:716
+msgid "Film/dance/culture/entertainment:"
+msgstr "Películas/baile/cultura/entretenimiento:"
+
+#: include/identity.php:720
+msgid "Love/Romance:"
+msgstr "Amor/Romance:"
+
+#: include/identity.php:724
+msgid "Work/employment:"
+msgstr "Trabajo/ocupación:"
+
+#: include/identity.php:728
+msgid "School/education:"
+msgstr "Escuela/estudios:"
+
+#: include/identity.php:733
+msgid "Forums:"
+msgstr "Foros:"
+
+#: include/identity.php:742 mod/events.php:514
+msgid "Basic"
+msgstr "Basic"
+
+#: include/identity.php:743 mod/admin.php:972 mod/contacts.php:878
+#: mod/events.php:515
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: include/identity.php:766 include/nav.php:81 mod/contacts.php:645
+#: mod/contacts.php:841 view/theme/frio/theme.php:246
+msgid "Status"
+msgstr "Estado"
+
+#: include/identity.php:769 mod/contacts.php:844 mod/follow.php:145
+msgid "Status Messages and Posts"
+msgstr "Mensajes de Estado y Publicaciones"
+
+#: include/identity.php:777 mod/contacts.php:852
+msgid "Profile Details"
+msgstr "Detalles del Perfil"
+
+#: include/identity.php:782 include/nav.php:83 mod/fbrowser.php:31
+#: view/theme/frio/theme.php:248
+msgid "Photos"
+msgstr "Fotografías"
+
+#: include/identity.php:785 mod/photos.php:89
+msgid "Photo Albums"
+msgstr "Álbum de Fotos"
+
+#: include/identity.php:790 include/identity.php:793 include/nav.php:84
+#: view/theme/frio/theme.php:249
+msgid "Videos"
+msgstr "Videos"
+
+#: include/identity.php:802 include/identity.php:813 include/nav.php:85
+#: include/nav.php:149 mod/cal.php:270 mod/events.php:386
+#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
+msgid "Events"
+msgstr "Eventos"
+
+#: include/identity.php:805 include/identity.php:816 include/nav.php:149
+#: view/theme/frio/theme.php:254
+msgid "Events and Calendar"
+msgstr "Eventos y Calendario"
+
+#: include/identity.php:824 mod/notes.php:47
+msgid "Personal Notes"
+msgstr "Notas personales"
+
+#: include/identity.php:827
+msgid "Only You Can See This"
+msgstr "Únicamente tú puedes ver esto"
+
+#: include/identity.php:835 include/identity.php:838 include/nav.php:128
+#: include/nav.php:192 include/text.php:1024 mod/contacts.php:800
+#: mod/contacts.php:861 mod/viewcontacts.php:121 view/theme/frio/theme.php:257
+msgid "Contacts"
+msgstr "Contactos"
+
+#: include/items.php:1584 mod/dfrn_confirm.php:735 mod/dfrn_request.php:754
+msgid "[Name Withheld]"
+msgstr "[Nombre oculto]"
+
+#: include/items.php:1939 mod/admin.php:240 mod/admin.php:1480
+#: mod/admin.php:1731 mod/display.php:103 mod/display.php:279
+#: mod/display.php:484 mod/notice.php:15 mod/viewsrc.php:15
+msgid "Item not found."
+msgstr "Elemento no encontrado."
+
+#: include/items.php:1978
+msgid "Do you really want to delete this item?"
+msgstr "¿Realmente quieres borrar este objeto?"
+
+#: include/items.php:1980 mod/api.php:105 mod/contacts.php:452
+#: mod/dfrn_request.php:875 mod/follow.php:113 mod/message.php:206
+#: mod/profiles.php:640 mod/profiles.php:643 mod/profiles.php:669
+#: mod/register.php:245 mod/settings.php:1171 mod/settings.php:1177
+#: mod/settings.php:1184 mod/settings.php:1188 mod/settings.php:1193
+#: mod/settings.php:1198 mod/settings.php:1203 mod/settings.php:1208
+#: mod/settings.php:1234 mod/settings.php:1235 mod/settings.php:1236
+#: mod/settings.php:1237 mod/settings.php:1238 mod/suggest.php:29
+msgid "Yes"
+msgstr "Sí"
+
+#: include/items.php:2143 index.php:407 mod/allfriends.php:12 mod/api.php:26
+#: mod/api.php:31 mod/attach.php:33 mod/cal.php:299 mod/common.php:18
+#: mod/contacts.php:360 mod/crepair.php:102 mod/delegate.php:12
+#: mod/dfrn_confirm.php:61 mod/dirfind.php:11 mod/display.php:481
+#: mod/editpost.php:10 mod/events.php:195 mod/follow.php:11 mod/follow.php:74
+#: mod/follow.php:158 mod/fsuggest.php:79 mod/group.php:19 mod/invite.php:15
+#: mod/invite.php:103 mod/item.php:193 mod/item.php:205 mod/manage.php:98
+#: mod/message.php:46 mod/message.php:171 mod/mood.php:115 mod/network.php:4
+#: mod/nogroup.php:27 mod/notes.php:23 mod/notifications.php:71
+#: mod/ostatus_subscribe.php:9 mod/photos.php:161 mod/photos.php:1092
+#: mod/poke.php:154 mod/profile_photo.php:19 mod/profile_photo.php:180
+#: mod/profile_photo.php:191 mod/profile_photo.php:204 mod/profiles.php:166
+#: mod/profiles.php:607 mod/register.php:42 mod/regmod.php:113
+#: mod/repair_ostatus.php:9 mod/settings.php:22 mod/settings.php:130
+#: mod/settings.php:668 mod/suggest.php:58 mod/uimport.php:24
+#: mod/viewcontacts.php:46 mod/wall_attach.php:67 mod/wall_attach.php:70
+#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/wallmessage.php:9
+#: mod/wallmessage.php:33 mod/wallmessage.php:73 mod/wallmessage.php:97
+msgid "Permission denied."
+msgstr "Permiso denegado."
+
+#: include/items.php:2248
+msgid "Archives"
+msgstr "Archivos"
+
+#: include/like.php:41
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr "%1$s atenderá %2$s's %3$s"
+
+#: include/like.php:46
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr "%1$s no atenderá %2$s's %3$s"
+
+#: include/like.php:51
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr "%1$s puede que atienda %2$s's %3$s"
+
+#: include/message.php:15 include/message.php:169
+msgid "[no subject]"
+msgstr "[sin asunto]"
+
 #: include/nav.php:35 mod/navigation.php:19
 msgid "Nothing new here"
 msgstr "Nada nuevo por aquí"
@@ -1323,62 +2267,31 @@ msgstr "Nada nuevo por aquí"
 msgid "Clear notifications"
 msgstr "Limpiar notificaciones"
 
-#: include/nav.php:40 include/text.php:1015
+#: include/nav.php:40 include/text.php:1017
 msgid "@name, !forum, #tags, content"
 msgstr "@name, !forum, #tags, contenido"
 
-#: include/nav.php:78 view/theme/frio/theme.php:246 boot.php:1792
-msgid "Logout"
-msgstr "Salir"
-
-#: include/nav.php:78 view/theme/frio/theme.php:246
+#: include/nav.php:78 view/theme/frio/theme.php:243
 msgid "End this session"
 msgstr "Cerrar la sesión"
 
-#: include/nav.php:81 include/identity.php:714 mod/contacts.php:637
-#: mod/contacts.php:833 view/theme/frio/theme.php:249
-msgid "Status"
-msgstr "Estado"
-
-#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:249
+#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
 msgid "Your posts and conversations"
 msgstr "Tus publicaciones y conversaciones"
 
-#: include/nav.php:82 include/identity.php:605 include/identity.php:691
-#: include/identity.php:722 mod/profperm.php:104 mod/newmember.php:32
-#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:250
-msgid "Profile"
-msgstr "Perfil"
-
-#: include/nav.php:82 view/theme/frio/theme.php:250
+#: include/nav.php:82 view/theme/frio/theme.php:247
 msgid "Your profile page"
 msgstr "Tu página de perfil"
 
-#: include/nav.php:83 include/identity.php:730 mod/fbrowser.php:32
-#: view/theme/frio/theme.php:251
-msgid "Photos"
-msgstr "Fotografías"
-
-#: include/nav.php:83 view/theme/frio/theme.php:251
+#: include/nav.php:83 view/theme/frio/theme.php:248
 msgid "Your photos"
 msgstr "Tus fotos"
 
-#: include/nav.php:84 include/identity.php:738 include/identity.php:741
-#: view/theme/frio/theme.php:252
-msgid "Videos"
-msgstr "Videos"
-
-#: include/nav.php:84 view/theme/frio/theme.php:252
+#: include/nav.php:84 view/theme/frio/theme.php:249
 msgid "Your videos"
 msgstr "Tus videos"
 
-#: include/nav.php:85 include/nav.php:149 include/identity.php:750
-#: include/identity.php:761 mod/cal.php:275 mod/events.php:379
-#: view/theme/frio/theme.php:253 view/theme/frio/theme.php:257
-msgid "Events"
-msgstr "Eventos"
-
-#: include/nav.php:85 view/theme/frio/theme.php:253
+#: include/nav.php:85 view/theme/frio/theme.php:250
 msgid "Your events"
 msgstr "Tus eventos"
 
@@ -1390,32 +2303,19 @@ msgstr "Notas personales"
 msgid "Your personal notes"
 msgstr "Tus notas personales"
 
-#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1793
-msgid "Login"
-msgstr "Acceder"
-
 #: include/nav.php:95
 msgid "Sign in"
 msgstr "Date de alta"
 
-#: include/nav.php:105 include/nav.php:161
-#: include/NotificationsManager.php:174
-msgid "Home"
-msgstr "Inicio"
-
 #: include/nav.php:105
 msgid "Home Page"
 msgstr "Página de inicio"
 
-#: include/nav.php:109 mod/register.php:289 boot.php:1768
-msgid "Register"
-msgstr "Registrarse"
-
 #: include/nav.php:109
 msgid "Create an account"
 msgstr "Crea una cuenta"
 
-#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298
+#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:293
 msgid "Help"
 msgstr "Ayuda"
 
@@ -1431,7 +2331,7 @@ msgstr "Aplicaciones"
 msgid "Addon applications, utilities, games"
 msgstr "Aplicaciones, utilidades, juegos"
 
-#: include/nav.php:123 include/text.php:1012 mod/search.php:149
+#: include/nav.php:123 include/text.php:1014 mod/search.php:149
 msgid "Search"
 msgstr "Buscar"
 
@@ -1439,20 +2339,14 @@ msgstr "Buscar"
 msgid "Search site content"
 msgstr " Busca contenido en la página"
 
-#: include/nav.php:126 include/text.php:1020
+#: include/nav.php:126 include/text.php:1022
 msgid "Full Text"
 msgstr "Texto completo"
 
-#: include/nav.php:127 include/text.php:1021
+#: include/nav.php:127 include/text.php:1023
 msgid "Tags"
 msgstr "Tags"
 
-#: include/nav.php:128 include/nav.php:192 include/identity.php:783
-#: include/identity.php:786 include/text.php:1022 mod/contacts.php:792
-#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:260
-msgid "Contacts"
-msgstr "Contactos"
-
 #: include/nav.php:143 include/nav.php:145 mod/community.php:36
 msgid "Community"
 msgstr "Comunidad"
@@ -1465,11 +2359,6 @@ msgstr "Conversaciones en este sitio"
 msgid "Conversations on the network"
 msgstr "Conversaciones en la red"
 
-#: include/nav.php:149 include/identity.php:753 include/identity.php:764
-#: view/theme/frio/theme.php:257
-msgid "Events and Calendar"
-msgstr "Eventos y Calendario"
-
 #: include/nav.php:152
 msgid "Directory"
 msgstr "Directorio"
@@ -1486,12 +2375,7 @@ msgstr "Información"
 msgid "Information about this friendica instance"
 msgstr "Información sobre esta instancia de friendica"
 
-#: include/nav.php:158 include/NotificationsManager.php:160 mod/admin.php:411
-#: view/theme/frio/theme.php:256
-msgid "Network"
-msgstr "Red"
-
-#: include/nav.php:158 view/theme/frio/theme.php:256
+#: include/nav.php:158 view/theme/frio/theme.php:253
 msgid "Conversations from your friends"
 msgstr "Conversaciones de tus amigos"
 
@@ -1503,10 +2387,6 @@ msgstr "Reseteo de la red"
 msgid "Load Network page with no filters"
 msgstr "Cargar pagina de redes sin filtros"
 
-#: include/nav.php:166 include/NotificationsManager.php:181
-msgid "Introductions"
-msgstr "Presentaciones"
-
 #: include/nav.php:166
 msgid "Friend Requests"
 msgstr "Solicitudes de amistad"
@@ -1519,7 +2399,7 @@ msgstr "Notificaciones"
 msgid "See all notifications"
 msgstr "Ver todas las notificaciones"
 
-#: include/nav.php:171 mod/settings.php:902
+#: include/nav.php:171 mod/settings.php:906
 msgid "Mark as seen"
 msgstr "Marcar como leído"
 
@@ -1527,11 +2407,11 @@ msgstr "Marcar como leído"
 msgid "Mark all system notifications seen"
 msgstr "Marcar todas las notificaciones del sistema como leídas"
 
-#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:258
+#: include/nav.php:175 mod/message.php:179 view/theme/frio/theme.php:255
 msgid "Messages"
 msgstr "Mensajes"
 
-#: include/nav.php:175 view/theme/frio/theme.php:258
+#: include/nav.php:175 view/theme/frio/theme.php:255
 msgid "Private mail"
 msgstr "Correo privado"
 
@@ -1563,28 +2443,24 @@ msgstr "Delegaciones"
 msgid "Delegate Page Management"
 msgstr "Delegar la administración de la página"
 
-#: include/nav.php:186 mod/newmember.php:22 mod/settings.php:111
-#: mod/admin.php:1524 mod/admin.php:1782 view/theme/frio/theme.php:259
+#: include/nav.php:186 mod/admin.php:1533 mod/admin.php:1809
+#: mod/newmember.php:22 mod/settings.php:111 view/theme/frio/theme.php:256
 msgid "Settings"
 msgstr "Configuración"
 
-#: include/nav.php:186 view/theme/frio/theme.php:259
+#: include/nav.php:186 view/theme/frio/theme.php:256
 msgid "Account settings"
 msgstr "Configuración de tu cuenta"
 
-#: include/nav.php:189 include/identity.php:282
-msgid "Profiles"
-msgstr "Perfiles"
-
 #: include/nav.php:189
 msgid "Manage/Edit Profiles"
 msgstr "Manejar/editar Perfiles"
 
-#: include/nav.php:192 view/theme/frio/theme.php:260
+#: include/nav.php:192 view/theme/frio/theme.php:257
 msgid "Manage/edit friends and contacts"
 msgstr "Administrar/editar amigos y contactos"
 
-#: include/nav.php:197 mod/admin.php:186
+#: include/nav.php:197 mod/admin.php:192
 msgid "Admin"
 msgstr "Admin"
 
@@ -1600,1182 +2476,325 @@ msgstr "Navegación"
 msgid "Site map"
 msgstr "Mapa del sitio"
 
-#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62
-#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211
-#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807
+#: include/network.php:622
+msgid "view full size"
+msgstr "Ver a tamaño completo"
+
+#: include/oembed.php:266
+msgid "Embedded content"
+msgstr "Contenido integrado"
+
+#: include/oembed.php:274
+msgid "Embedding disabled"
+msgstr "Contenido incrustrado desabilitado"
+
+#: include/ostatus.php:1832
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s sigue ahora a %s."
+
+#: include/ostatus.php:1833
+msgid "following"
+msgstr "siguiendo"
+
+#: include/ostatus.php:1836
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s dejó de seguir a %s."
+
+#: include/ostatus.php:1837
+msgid "stopped following"
+msgstr "dejó de seguir"
+
+#: include/photos.php:57 include/photos.php:67 mod/fbrowser.php:40
+#: mod/fbrowser.php:61 mod/photos.php:182 mod/photos.php:1106
+#: mod/photos.php:1231 mod/photos.php:1252 mod/photos.php:1817
+#: mod/photos.php:1829
 msgid "Contact Photos"
 msgstr "Foto del contacto"
 
-#: include/security.php:22
+#: include/plugin.php:530 include/plugin.php:532
+msgid "Click here to upgrade."
+msgstr "Pulsa aquí para actualizar."
+
+#: include/plugin.php:538
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Esta acción excede los límites permitidos por tu subscripción."
+
+#: include/plugin.php:543
+msgid "This action is not available under your subscription plan."
+msgstr "Esta acción no está permitida para tu subscripción."
+
+#: include/profile_selectors.php:6
+msgid "Male"
+msgstr "Hombre"
+
+#: include/profile_selectors.php:6
+msgid "Female"
+msgstr "Mujer"
+
+#: include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Actualmente Hombre"
+
+#: include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Actualmente Mujer"
+
+#: include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Mayormente Hombre"
+
+#: include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Mayormente Mujer"
+
+#: include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgenérico"
+
+#: include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Bisexual"
+
+#: include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transexual"
+
+#: include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermafrodita"
+
+#: include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neutro"
+
+#: include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "Sin especificar"
+
+#: include/profile_selectors.php:6
+msgid "Other"
+msgstr "Otro"
+
+#: include/profile_selectors.php:23
+msgid "Males"
+msgstr "Hombres"
+
+#: include/profile_selectors.php:23
+msgid "Females"
+msgstr "Mujeres"
+
+#: include/profile_selectors.php:23
+msgid "Gay"
+msgstr "Gay"
+
+#: include/profile_selectors.php:23
+msgid "Lesbian"
+msgstr "Lesbiana"
+
+#: include/profile_selectors.php:23
+msgid "No Preference"
+msgstr "Sin preferencias"
+
+#: include/profile_selectors.php:23
+msgid "Bisexual"
+msgstr "Bisexual"
+
+#: include/profile_selectors.php:23
+msgid "Autosexual"
+msgstr "Autosexual"
+
+#: include/profile_selectors.php:23
+msgid "Abstinent"
+msgstr "Célibe"
+
+#: include/profile_selectors.php:23
+msgid "Virgin"
+msgstr "Virgen"
+
+#: include/profile_selectors.php:23
+msgid "Deviant"
+msgstr "Desviado"
+
+#: include/profile_selectors.php:23
+msgid "Fetish"
+msgstr "Fetichista"
+
+#: include/profile_selectors.php:23
+msgid "Oodles"
+msgstr "Orgiástico"
+
+#: include/profile_selectors.php:23
+msgid "Nonsexual"
+msgstr "Asexual"
+
+#: include/profile_selectors.php:42
+msgid "Single"
+msgstr "Soltero"
+
+#: include/profile_selectors.php:42
+msgid "Lonely"
+msgstr "Solitario"
+
+#: include/profile_selectors.php:42
+msgid "Available"
+msgstr "Disponible"
+
+#: include/profile_selectors.php:42
+msgid "Unavailable"
+msgstr "No disponible"
+
+#: include/profile_selectors.php:42
+msgid "Has crush"
+msgstr "Enamorado"
+
+#: include/profile_selectors.php:42
+msgid "Infatuated"
+msgstr "Loco/a por alguien"
+
+#: include/profile_selectors.php:42
+msgid "Dating"
+msgstr "De citas"
+
+#: include/profile_selectors.php:42
+msgid "Unfaithful"
+msgstr "Infiel"
+
+#: include/profile_selectors.php:42
+msgid "Sex Addict"
+msgstr "Adicto al sexo"
+
+#: include/profile_selectors.php:42 include/user.php:280 include/user.php:284
+msgid "Friends"
+msgstr "Amigos"
+
+#: include/profile_selectors.php:42
+msgid "Friends/Benefits"
+msgstr "Amigos con beneficios"
+
+#: include/profile_selectors.php:42
+msgid "Casual"
+msgstr "Casual"
+
+#: include/profile_selectors.php:42
+msgid "Engaged"
+msgstr "Comprometido/a"
+
+#: include/profile_selectors.php:42
+msgid "Married"
+msgstr "Casado/a"
+
+#: include/profile_selectors.php:42
+msgid "Imaginarily married"
+msgstr "Casado imaginario"
+
+#: include/profile_selectors.php:42
+msgid "Partners"
+msgstr "Socios"
+
+#: include/profile_selectors.php:42
+msgid "Cohabiting"
+msgstr "Cohabitando"
+
+#: include/profile_selectors.php:42
+msgid "Common law"
+msgstr "Pareja de hecho"
+
+#: include/profile_selectors.php:42
+msgid "Happy"
+msgstr "Feliz"
+
+#: include/profile_selectors.php:42
+msgid "Not looking"
+msgstr "No busca relación"
+
+#: include/profile_selectors.php:42
+msgid "Swinger"
+msgstr "Swinger"
+
+#: include/profile_selectors.php:42
+msgid "Betrayed"
+msgstr "Traicionado/a"
+
+#: include/profile_selectors.php:42
+msgid "Separated"
+msgstr "Separado/a"
+
+#: include/profile_selectors.php:42
+msgid "Unstable"
+msgstr "Inestable"
+
+#: include/profile_selectors.php:42
+msgid "Divorced"
+msgstr "Divorciado/a"
+
+#: include/profile_selectors.php:42
+msgid "Imaginarily divorced"
+msgstr "Divorciado imaginario"
+
+#: include/profile_selectors.php:42
+msgid "Widowed"
+msgstr "Viudo/a"
+
+#: include/profile_selectors.php:42
+msgid "Uncertain"
+msgstr "Incierto"
+
+#: include/profile_selectors.php:42
+msgid "It's complicated"
+msgstr "Es complicado"
+
+#: include/profile_selectors.php:42
+msgid "Don't care"
+msgstr "No te importa"
+
+#: include/profile_selectors.php:42
+msgid "Ask me"
+msgstr "Pregúntame"
+
+#: include/security.php:61
 msgid "Welcome "
 msgstr "Bienvenido "
 
-#: include/security.php:23
+#: include/security.php:62
 msgid "Please upload a profile photo."
 msgstr "Por favor sube una foto para tu perfil."
 
-#: include/security.php:26
+#: include/security.php:65
 msgid "Welcome back "
 msgstr "Bienvenido de nuevo "
 
-#: include/security.php:373
+#: include/security.php:429
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo."
 
-#: include/NotificationsManager.php:153
-msgid "System"
-msgstr "Sistema"
-
-#: include/NotificationsManager.php:167 mod/profiles.php:703
-#: mod/network.php:845
-msgid "Personal"
-msgstr "Personal"
-
-#: include/NotificationsManager.php:234 include/NotificationsManager.php:244
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s comentó la publicación de %s"
-
-#: include/NotificationsManager.php:243
-#, php-format
-msgid "%s created a new post"
-msgstr "%s creó una nueva publicación"
-
-#: include/NotificationsManager.php:256
-#, php-format
-msgid "%s liked %s's post"
-msgstr "A %s le gusta la publicación de %s"
-
-#: include/NotificationsManager.php:267
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "A %s no le gusta la publicación de %s"
-
-#: include/NotificationsManager.php:278
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s está asistiendo al evento %s's"
-
-#: include/NotificationsManager.php:289
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s no está asistiendo al evento %s's"
-
-#: include/NotificationsManager.php:300
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s podría asistir al evento %s's"
-
-#: include/NotificationsManager.php:315
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s es ahora es amigo de %s"
-
-#: include/NotificationsManager.php:748
-msgid "Friend Suggestion"
-msgstr "Propuestas de amistad"
-
-#: include/NotificationsManager.php:781
-msgid "Friend/Connect Request"
-msgstr "Solicitud de Amistad/Conexión"
-
-#: include/NotificationsManager.php:781
-msgid "New Follower"
-msgstr "Nuevo seguidor"
-
-#: include/dbstructure.php:26
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr "\n\t\t\tLos desarolladores de friendica publicaron una actualización  %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido."
-
-#: include/dbstructure.php:31
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "El mensaje de error es\n[pre]%s[/pre]"
-
-#: include/dbstructure.php:183
-msgid "Errors encountered creating database tables."
-msgstr "Se han encontrados errores creando las tablas de la base de datos."
-
-#: include/dbstructure.php:260
-msgid "Errors encountered performing database changes."
-msgstr "Errores encontrados al ejecutar cambios en la base de datos."
-
-#: include/delivery.php:446
-msgid "(no subject)"
-msgstr "(sin asunto)"
-
-#: include/diaspora.php:1958
-msgid "Sharing notification from Diaspora network"
-msgstr "Compartir notificaciones con la red Diaspora*"
-
-#: include/diaspora.php:2864
-msgid "Attachments:"
-msgstr "Archivos adjuntos:"
-
-#: include/network.php:595
-msgid "view full size"
-msgstr "Ver a tamaño completo"
-
-#: include/Contact.php:340 include/Contact.php:353 include/Contact.php:398
-#: include/conversation.php:968 include/conversation.php:984
-#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
-#: mod/match.php:71 mod/suggest.php:82
-msgid "View Profile"
-msgstr "Ver perfil"
-
-#: include/Contact.php:397 include/conversation.php:967
-msgid "View Status"
-msgstr "Ver estado"
-
-#: include/Contact.php:399 include/conversation.php:969
-msgid "View Photos"
-msgstr "Ver fotos"
-
-#: include/Contact.php:400 include/conversation.php:970
-msgid "Network Posts"
-msgstr "Publicaciones en la red"
-
-#: include/Contact.php:401 include/conversation.php:971
-msgid "View Contact"
-msgstr "Ver contacto"
-
-#: include/Contact.php:402
-msgid "Drop Contact"
-msgstr "Eliminar contacto"
-
-#: include/Contact.php:403 include/conversation.php:972
-msgid "Send PM"
-msgstr "Enviar mensaje privado"
-
-#: include/Contact.php:404 include/conversation.php:976
-msgid "Poke"
-msgstr "Toque"
-
-#: include/Contact.php:775
-msgid "Organisation"
-msgstr "Organización"
-
-#: include/Contact.php:778
-msgid "News"
-msgstr "Noticias"
-
-#: include/Contact.php:781
-msgid "Forum"
-msgstr "Foro"
-
-#: include/api.php:1018
-#, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
-msgstr "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada."
-
-#: include/api.php:1038
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
-msgstr "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada."
-
-#: include/api.php:1059
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
-msgstr "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada."
-
-#: include/bbcode.php:350 include/bbcode.php:1057 include/bbcode.php:1058
-msgid "Image/photo"
-msgstr "Imagen/Foto"
-
-#: include/bbcode.php:467
-#, php-format
-msgid "%2$s %3$s"
-msgstr "%2$s %3$s"
-
-#: include/bbcode.php:1017 include/bbcode.php:1037
-msgid "$1 wrote:"
-msgstr "$1 escribió:"
-
-#: include/bbcode.php:1066 include/bbcode.php:1067
-msgid "Encrypted content"
-msgstr "Contenido cifrado"
-
-#: include/bbcode.php:1169
-msgid "Invalid source protocol"
-msgstr "Protocolo de fuente inválido"
-
-#: include/bbcode.php:1179
-msgid "Invalid link protocol"
-msgstr "Protocolo de enlace inválido"
-
-#: include/conversation.php:147
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr "%1$s atenderá %2$s's %3$s"
-
-#: include/conversation.php:150
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr "%1$s no atenderá %2$s's %3$s"
-
-#: include/conversation.php:153
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr "%1$s atenderá quizás %2$s's %3$s"
-
-#: include/conversation.php:185 mod/dfrn_confirm.php:477
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s ahora es amigo de %2$s"
-
-#: include/conversation.php:219
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s le dio un toque a %2$s"
-
-#: include/conversation.php:239 mod/mood.php:62
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s está actualmente %2$s"
-
-#: include/conversation.php:278 mod/tagger.php:95
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s"
-
-#: include/conversation.php:303
-msgid "post/item"
-msgstr "publicación/tema"
-
-#: include/conversation.php:304
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "%1$s ha marcado %3$s de %2$s como Favorito"
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346
-#: mod/photos.php:1607
-msgid "Likes"
-msgstr "Me gusta"
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350
-#: mod/photos.php:1607
-msgid "Dislikes"
-msgstr "No me gusta"
-
-#: include/conversation.php:586 include/conversation.php:1481
-#: mod/content.php:373 mod/photos.php:1608
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Atendiendo"
-msgstr[1] "Atendiendo"
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Not attending"
-msgstr "No atendiendo"
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Might attend"
-msgstr "Puede que atienda"
-
-#: include/conversation.php:708 mod/content.php:453 mod/content.php:758
-#: mod/photos.php:1681 object/Item.php:133
-msgid "Select"
-msgstr "Seleccionar"
-
-#: include/conversation.php:709 mod/group.php:171 mod/content.php:454
-#: mod/content.php:759 mod/photos.php:1682 mod/settings.php:741
-#: mod/admin.php:1414 mod/contacts.php:808 mod/contacts.php:1007
-#: object/Item.php:134
-msgid "Delete"
-msgstr "Eliminar"
-
-#: include/conversation.php:753 mod/content.php:487 mod/content.php:910
-#: mod/content.php:911 object/Item.php:367 object/Item.php:368
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Ver perfil de %s @ %s"
-
-#: include/conversation.php:765 object/Item.php:355
-msgid "Categories:"
-msgstr "Categorías:"
-
-#: include/conversation.php:766 object/Item.php:356
-msgid "Filed under:"
-msgstr "Archivado en:"
-
-#: include/conversation.php:773 mod/content.php:497 mod/content.php:923
-#: object/Item.php:381
-#, php-format
-msgid "%s from %s"
-msgstr "%s de %s"
-
-#: include/conversation.php:789 mod/content.php:513
-msgid "View in context"
-msgstr "Verlo en contexto"
-
-#: include/conversation.php:791 include/conversation.php:1264
-#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
-#: mod/message.php:548 mod/content.php:515 mod/content.php:948
-#: mod/photos.php:1570 object/Item.php:406
-msgid "Please wait"
-msgstr "Por favor, espera"
-
-#: include/conversation.php:870
-msgid "remove"
-msgstr "eliminar"
-
-#: include/conversation.php:874
-msgid "Delete Selected Items"
-msgstr "Eliminar el elemento seleccionado"
-
-#: include/conversation.php:966
-msgid "Follow Thread"
-msgstr "Seguir publicacion"
-
-#: include/conversation.php:1097
-#, php-format
-msgid "%s likes this."
-msgstr "A %s le gusta esto."
-
-#: include/conversation.php:1100
-#, php-format
-msgid "%s doesn't like this."
-msgstr "A %s no le gusta esto."
-
-#: include/conversation.php:1103
-#, php-format
-msgid "%s attends."
-msgstr "%s atiende."
-
-#: include/conversation.php:1106
-#, php-format
-msgid "%s doesn't attend."
-msgstr "%s no atenderá."
-
-#: include/conversation.php:1109
-#, php-format
-msgid "%s attends maybe."
-msgstr "%s quizás atenderá"
-
-#: include/conversation.php:1119
-msgid "and"
-msgstr "y"
-
-#: include/conversation.php:1125
-#, php-format
-msgid ", and %d other people"
-msgstr " y a otras %d personas"
-
-#: include/conversation.php:1134
-#, php-format
-msgid "%2$d people like this"
-msgstr "%2$d personas les gusta esto"
-
-#: include/conversation.php:1135
-#, php-format
-msgid "%s like this."
-msgstr "A %s le gusta esto."
-
-#: include/conversation.php:1138
-#, php-format
-msgid "%2$d people don't like this"
-msgstr "%2$d personas no les gusta esto"
-
-#: include/conversation.php:1139
-#, php-format
-msgid "%s don't like this."
-msgstr "A %s no le gusta esto."
-
-#: include/conversation.php:1142
-#, php-format
-msgid "%2$d people attend"
-msgstr "%2$d personas atienden"
-
-#: include/conversation.php:1143
-#, php-format
-msgid "%s attend."
-msgstr "%s atiende."
-
-#: include/conversation.php:1146
-#, php-format
-msgid "%2$d people don't attend"
-msgstr "%2$d personasno atienden"
-
-#: include/conversation.php:1147
-#, php-format
-msgid "%s don't attend."
-msgstr "%s no atiende."
-
-#: include/conversation.php:1150
-#, php-format
-msgid "%2$d people attend maybe"
-msgstr "%2$d people quizá asistan"
-
-#: include/conversation.php:1151
-#, php-format
-msgid "%s anttend maybe."
-msgstr "%s atiende quizás."
-
-#: include/conversation.php:1190 include/conversation.php:1208
-msgid "Visible to everybody"
-msgstr "Visible para cualquiera"
-
-#: include/conversation.php:1191 include/conversation.php:1209
-#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291
-#: mod/message.php:299 mod/message.php:442 mod/message.php:450
-msgid "Please enter a link URL:"
-msgstr "Introduce la dirección del enlace:"
-
-#: include/conversation.php:1192 include/conversation.php:1210
-msgid "Please enter a video link/URL:"
-msgstr "Por favor, introduce la URL/enlace del vídeo:"
-
-#: include/conversation.php:1193 include/conversation.php:1211
-msgid "Please enter an audio link/URL:"
-msgstr "Por favor, introduce la URL/enlace del audio:"
-
-#: include/conversation.php:1194 include/conversation.php:1212
-msgid "Tag term:"
-msgstr "Etiquetar:"
-
-#: include/conversation.php:1195 include/conversation.php:1213
-#: mod/filer.php:30
-msgid "Save to Folder:"
-msgstr "Guardar en directorio:"
-
-#: include/conversation.php:1196 include/conversation.php:1214
-msgid "Where are you right now?"
-msgstr "¿Dónde estás ahora?"
-
-#: include/conversation.php:1197
-msgid "Delete item(s)?"
-msgstr "¿Borrar objeto(s)?"
-
-#: include/conversation.php:1245 mod/photos.php:1569
-msgid "Share"
-msgstr "Compartir"
-
-#: include/conversation.php:1246 mod/editpost.php:110 mod/wallmessage.php:154
-#: mod/message.php:354 mod/message.php:545
-msgid "Upload photo"
-msgstr "Subir foto"
-
-#: include/conversation.php:1247 mod/editpost.php:111
-msgid "upload photo"
-msgstr "subir imagen"
-
-#: include/conversation.php:1248 mod/editpost.php:112
-msgid "Attach file"
-msgstr "Adjuntar archivo"
-
-#: include/conversation.php:1249 mod/editpost.php:113
-msgid "attach file"
-msgstr "adjuntar archivo"
-
-#: include/conversation.php:1250 mod/editpost.php:114 mod/wallmessage.php:155
-#: mod/message.php:355 mod/message.php:546
-msgid "Insert web link"
-msgstr "Insertar enlace"
-
-#: include/conversation.php:1251 mod/editpost.php:115
-msgid "web link"
-msgstr "enlace web"
-
-#: include/conversation.php:1252 mod/editpost.php:116
-msgid "Insert video link"
-msgstr "Insertar enlace del vídeo"
-
-#: include/conversation.php:1253 mod/editpost.php:117
-msgid "video link"
-msgstr "enlace de video"
-
-#: include/conversation.php:1254 mod/editpost.php:118
-msgid "Insert audio link"
-msgstr "Insertar vínculo del audio"
-
-#: include/conversation.php:1255 mod/editpost.php:119
-msgid "audio link"
-msgstr "enlace de audio"
-
-#: include/conversation.php:1256 mod/editpost.php:120
-msgid "Set your location"
-msgstr "Configurar tu localización"
-
-#: include/conversation.php:1257 mod/editpost.php:121
-msgid "set location"
-msgstr "establecer tu ubicación"
-
-#: include/conversation.php:1258 mod/editpost.php:122
-msgid "Clear browser location"
-msgstr "Borrar la localización del navegador"
-
-#: include/conversation.php:1259 mod/editpost.php:123
-msgid "clear location"
-msgstr "limpiar la localización"
-
-#: include/conversation.php:1261 mod/editpost.php:137
-msgid "Set title"
-msgstr "Establecer el título"
-
-#: include/conversation.php:1263 mod/editpost.php:139
-msgid "Categories (comma-separated list)"
-msgstr "Categorías (lista separada por comas)"
-
-#: include/conversation.php:1265 mod/editpost.php:125
-msgid "Permission settings"
-msgstr "Configuración de permisos"
-
-#: include/conversation.php:1266 mod/editpost.php:154
-msgid "permissions"
-msgstr "permisos"
-
-#: include/conversation.php:1274 mod/editpost.php:134
-msgid "Public post"
-msgstr "Publicación pública"
-
-#: include/conversation.php:1279 mod/editpost.php:145 mod/content.php:737
-#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639
-#: mod/photos.php:1725 object/Item.php:729
-msgid "Preview"
-msgstr "Vista previa"
-
-#: include/conversation.php:1283 include/items.php:1974 mod/fbrowser.php:101
-#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/editpost.php:148
-#: mod/message.php:220 mod/suggest.php:32 mod/photos.php:235
-#: mod/photos.php:322 mod/settings.php:679 mod/settings.php:705
-#: mod/videos.php:128 mod/contacts.php:445 mod/dfrn_request.php:876
-#: mod/follow.php:121
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: include/conversation.php:1289
-msgid "Post to Groups"
-msgstr "Publicar hacia grupos"
-
-#: include/conversation.php:1290
-msgid "Post to Contacts"
-msgstr "Publicar hacia contactos"
-
-#: include/conversation.php:1291
-msgid "Private post"
-msgstr "Publicación privada"
-
-#: include/conversation.php:1296 include/identity.php:256 mod/editpost.php:152
-msgid "Message"
-msgstr "Mensaje"
-
-#: include/conversation.php:1297 mod/editpost.php:153
-msgid "Browser"
-msgstr "Navegador"
-
-#: include/conversation.php:1453
-msgid "View all"
-msgstr "Ver todos los contactos"
-
-#: include/conversation.php:1475
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Me gusta"
-msgstr[1] "Me gusta"
-
-#: include/conversation.php:1478
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "No me gusta"
-msgstr[1] "No me gusta"
-
-#: include/conversation.php:1484
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "No atendiendo"
-msgstr[1] "No atendiendo"
-
-#: include/dfrn.php:1108
-#, php-format
-msgid "%s\\'s birthday"
-msgstr "%s\\'s cumpleaños"
-
-#: include/features.php:70
-msgid "General Features"
-msgstr "Opciones generales"
-
-#: include/features.php:72
-msgid "Multiple Profiles"
-msgstr "Perfiles multiples"
-
-#: include/features.php:72
-msgid "Ability to create multiple profiles"
-msgstr "Capacidad de crear perfiles multiples. Cada pagina/perfil/usuario puede tener diferentes perfiles/apariencias. Las mismas pueden ser visibles para determinados contactos seleccionados dentro de la red friendica."
-
-#: include/features.php:73
-msgid "Photo Location"
-msgstr "Localización foto"
-
-#: include/features.php:73
-msgid ""
-"Photo metadata is normally stripped. This extracts the location (if present)"
-" prior to stripping metadata and links it to a map."
-msgstr "Normalmente los meta datos de las imágenes son eliminados. Esto extraerá la localización si presente antes de eliminar los meta datos y enlaza la misma con el mapa."
-
-#: include/features.php:74
-msgid "Export Public Calendar"
-msgstr "Exportar Calendario Público"
-
-#: include/features.php:74
-msgid "Ability for visitors to download the public calendar"
-msgstr "Posibilidad de los visitantes de descargar el calendario público"
-
-#: include/features.php:79
-msgid "Post Composition Features"
-msgstr "Opciones de edición de publicaciones."
-
-#: include/features.php:80
-msgid "Richtext Editor"
-msgstr "Editor de texto sofisticado (richt text editor)"
-
-#: include/features.php:80
-msgid "Enable richtext editor"
-msgstr "Habilitar editor de textos sofisticado"
-
-#: include/features.php:81
-msgid "Post Preview"
-msgstr "Previsualizar publicaciones"
-
-#: include/features.php:81
-msgid "Allow previewing posts and comments before publishing them"
-msgstr "Permitir la previsualización de publicaciones antes de publicar las mismas."
-
-#: include/features.php:82
-msgid "Auto-mention Forums"
-msgstr "Auto-mencionar foros"
-
-#: include/features.php:82
-msgid ""
-"Add/remove mention when a forum page is selected/deselected in ACL window."
-msgstr "Añadir/eliminar mención cuando un foro es seleccionado/deseleccionado en la ventana ACL."
-
-#: include/features.php:87
-msgid "Network Sidebar Widgets"
-msgstr "Accesorios de red del panel lateral"
-
-#: include/features.php:88
-msgid "Search by Date"
-msgstr "Buscar por fecha"
-
-#: include/features.php:88
-msgid "Ability to select posts by date ranges"
-msgstr "Habilidad de seleccionar publicaciones por fecha"
-
-#: include/features.php:89 include/features.php:119
-msgid "List Forums"
-msgstr "Listar foros"
-
-#: include/features.php:89
-msgid "Enable widget to display the forums your are connected with"
-msgstr "Habilitar la pestaña para mostrar los foros en que estas participando."
-
-#: include/features.php:90
-msgid "Group Filter"
-msgstr "Filtro del grupo"
-
-#: include/features.php:90
-msgid "Enable widget to display Network posts only from selected group"
-msgstr "Habilitar accesorios para visualizar publicaciones en la red solo de grupos seleccionados"
-
-#: include/features.php:91
-msgid "Network Filter"
-msgstr "Filtro de red"
-
-#: include/features.php:91
-msgid "Enable widget to display Network posts only from selected network"
-msgstr "Habilitar accesorios para visualizar publicaciones solo de las redes seleccionadas."
-
-#: include/features.php:92 mod/search.php:34 mod/network.php:200
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
-#: include/features.php:92
-msgid "Save search terms for re-use"
-msgstr "Guardar términos de búsqueda para su reutilizacion"
-
-#: include/features.php:97
-msgid "Network Tabs"
-msgstr "Pestañas de redes"
-
-#: include/features.php:98
-msgid "Network Personal Tab"
-msgstr "Pestaña actividad personal"
-
-#: include/features.php:98
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr "Habilitar para visualizar solo publicaciones con las que se ha interactuado"
-
-#: include/features.php:99
-msgid "Network New Tab"
-msgstr "Pestaña nuevo en la red"
-
-#: include/features.php:99
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
-msgstr "Activar para mostrar solo publicaciones nuevas en la red (de las ultimas 12 horas)"
-
-#: include/features.php:100
-msgid "Network Shared Links Tab"
-msgstr "Pestaña publicaciones con enlaces"
-
-#: include/features.php:100
-msgid "Enable tab to display only Network posts with links in them"
-msgstr "Habilitar para visualizar solo publicaciones que contienen enlaces"
-
-#: include/features.php:105
-msgid "Post/Comment Tools"
-msgstr "Herramienta de publicaciones/respuestas"
-
-#: include/features.php:106
-msgid "Multiple Deletion"
-msgstr "Borrar múltiples publicaciones"
-
-#: include/features.php:106
-msgid "Select and delete multiple posts/comments at once"
-msgstr "Habilidad de seleccionar y borrar varias publicaciones/comentarios a la vez"
-
-#: include/features.php:107
-msgid "Edit Sent Posts"
-msgstr "Editar temas enviados"
-
-#: include/features.php:107
-msgid "Edit and correct posts and comments after sending"
-msgstr "Editar y corregir publicaciones y respuestas enviados. Las ediciones solo son comunicados dentro de la red friendica. No se modificaran copias enviadas a diaspora, OStatus/GNUsocial/Quitter u otros servicios conectados."
-
-#: include/features.php:108
-msgid "Tagging"
-msgstr "taggear"
-
-#: include/features.php:108
-msgid "Ability to tag existing posts"
-msgstr "Habilidad de taggear publicaciones existentes"
-
-#: include/features.php:109
-msgid "Post Categories"
-msgstr "Categorías de publicaciones"
-
-#: include/features.php:109
-msgid "Add categories to your posts"
-msgstr "Agregue categorías a sus publicaciones. Las mismas serán visualizadas en su pagina de inicio."
-
-#: include/features.php:110
-msgid "Ability to file posts under folders"
-msgstr "Archivar publicaciones en carpetas"
-
-#: include/features.php:111
-msgid "Dislike Posts"
-msgstr "Desaprobar publicación (dislike)"
-
-#: include/features.php:111
-msgid "Ability to dislike posts/comments"
-msgstr "Habilidad de expresar desacuerdo en publicaciones y comentarios. Esta función solo es visualizado en la red friendica."
-
-#: include/features.php:112
-msgid "Star Posts"
-msgstr "Fijar publicaciones"
-
-#: include/features.php:112
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Habilidad de marcar - observar fijamente publicaciones.\nEl simbolo de estrella es habilitado. Se recibirán notificaciones sobre comentarios, además una pestaña de publicaciones fijadas es habilitada. En las opciones de expiración de publicaciones se puede filtrar estas publicaciones para no ser eliminados contrario a las publicaciones demás de los contactos."
-
-#: include/features.php:113
-msgid "Mute Post Notifications"
-msgstr "Silenciar notificaciones de una publicacion"
-
-#: include/features.php:113
-msgid "Ability to mute notifications for a thread"
-msgstr "Habilidad de silenciar notificaciones sobre nuevos comentarios en una publicación."
-
-#: include/features.php:118
-msgid "Advanced Profile Settings"
-msgstr "Ajustes avanzados del perfil"
-
-#: include/features.php:119
-msgid "Show visitors public community forums at the Advanced Profile Page"
-msgstr "Mostrar a los visitantes foros públicos en las que se esta participando en el pagina avanzada de perfiles."
-
-#: include/follow.php:81 mod/dfrn_request.php:509
-msgid "Disallowed profile URL."
-msgstr "Dirección de perfil no permitida."
-
-#: include/follow.php:86
-msgid "Connect URL missing."
-msgstr "Falta el conector URL."
-
-#: include/follow.php:113
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Este sitio no está configurado para permitir la comunicación con otras redes."
-
-#: include/follow.php:114 include/follow.php:134
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "No se ha descubierto protocolos de comunicación o fuentes compatibles."
-
-#: include/follow.php:132
-msgid "The profile address specified does not provide adequate information."
-msgstr "La dirección del perfil especificado no proporciona información adecuada."
-
-#: include/follow.php:136
-msgid "An author or name was not found."
-msgstr "No se ha encontrado un autor o nombre."
-
-#: include/follow.php:138
-msgid "No browser URL could be matched to this address."
-msgstr "Ninguna dirección concuerda con la suministrada."
-
-#: include/follow.php:140
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Imposible identificar la dirección @ con algún protocolo conocido o dirección de contacto."
-
-#: include/follow.php:141
-msgid "Use mailto: in front of address to force email check."
-msgstr "Escribe mailto: al principio de la dirección para forzar el envío."
-
-#: include/follow.php:147
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio."
-
-#: include/follow.php:157
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas."
-
-#: include/follow.php:258
-msgid "Unable to retrieve contact information."
-msgstr "No ha sido posible recibir la información del contacto."
-
-#: include/identity.php:42
-msgid "Requested account is not available."
-msgstr "La cuenta solicitada no está disponible."
-
-#: include/identity.php:51 mod/profile.php:21
-msgid "Requested profile is not available."
-msgstr "El perfil solicitado no está disponible."
-
-#: include/identity.php:95 include/identity.php:311 include/identity.php:688
-msgid "Edit profile"
-msgstr "Editar perfil"
-
-#: include/identity.php:251
-msgid "Atom feed"
-msgstr "Atom feed"
-
-#: include/identity.php:282
-msgid "Manage/edit profiles"
-msgstr "Administrar/editar perfiles"
-
-#: include/identity.php:287 include/identity.php:313 mod/profiles.php:795
-msgid "Change profile photo"
-msgstr "Cambiar foto del perfil"
-
-#: include/identity.php:288 mod/profiles.php:796
-msgid "Create New Profile"
-msgstr "Crear nuevo perfil"
-
-#: include/identity.php:298 mod/profiles.php:785
-msgid "Profile Image"
-msgstr "Imagen del Perfil"
-
-#: include/identity.php:301 mod/profiles.php:787
-msgid "visible to everybody"
-msgstr "Visible para todos"
-
-#: include/identity.php:302 mod/profiles.php:691 mod/profiles.php:788
-msgid "Edit visibility"
-msgstr "Editar visibilidad"
-
-#: include/identity.php:330 include/identity.php:616 mod/notifications.php:238
-#: mod/directory.php:139
-msgid "Gender:"
-msgstr "Género:"
-
-#: include/identity.php:333 include/identity.php:636 mod/directory.php:141
-msgid "Status:"
-msgstr "Estado:"
-
-#: include/identity.php:335 include/identity.php:647 mod/directory.php:143
-msgid "Homepage:"
-msgstr "Página de inicio:"
-
-#: include/identity.php:337 include/identity.php:657 mod/notifications.php:234
-#: mod/directory.php:145 mod/contacts.php:632
-msgid "About:"
-msgstr "Acerca de:"
-
-#: include/identity.php:339 mod/contacts.php:630
-msgid "XMPP:"
-msgstr "XMPP:"
-
-#: include/identity.php:422 mod/notifications.php:246 mod/contacts.php:50
-msgid "Network:"
-msgstr "Red:"
-
-#: include/identity.php:451 include/identity.php:535
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: include/identity.php:452 include/identity.php:536
-msgid "F d"
-msgstr "F d"
-
-#: include/identity.php:497 include/identity.php:582
-msgid "[today]"
-msgstr "[hoy]"
-
-#: include/identity.php:509
-msgid "Birthday Reminders"
-msgstr "Recordatorios de cumpleaños"
-
-#: include/identity.php:510
-msgid "Birthdays this week:"
-msgstr "Cumpleaños esta semana:"
-
-#: include/identity.php:569
-msgid "[No description]"
-msgstr "[Sin descripción]"
-
-#: include/identity.php:593
-msgid "Event Reminders"
-msgstr "Recordatorios de eventos"
-
-#: include/identity.php:594
-msgid "Events this week:"
-msgstr "Eventos de esta semana:"
-
-#: include/identity.php:614 mod/settings.php:1279
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: include/identity.php:621
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: include/identity.php:622
-msgid "j F"
-msgstr "j F"
-
-#: include/identity.php:633
-msgid "Age:"
-msgstr "Edad:"
-
-#: include/identity.php:642
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "por %1$d %2$s"
-
-#: include/identity.php:645 mod/profiles.php:710
-msgid "Sexual Preference:"
-msgstr "Preferencia sexual:"
-
-#: include/identity.php:649 mod/profiles.php:737
-msgid "Hometown:"
-msgstr "Ciudad de origen:"
-
-#: include/identity.php:651 mod/notifications.php:236 mod/contacts.php:634
-#: mod/follow.php:134
-msgid "Tags:"
-msgstr "Etiquetas:"
-
-#: include/identity.php:653 mod/profiles.php:738
-msgid "Political Views:"
-msgstr "Ideas políticas:"
-
-#: include/identity.php:655
-msgid "Religion:"
-msgstr "Religión:"
-
-#: include/identity.php:659
-msgid "Hobbies/Interests:"
-msgstr "Aficiones/Intereses:"
-
-#: include/identity.php:661 mod/profiles.php:742
-msgid "Likes:"
-msgstr "Me gusta:"
-
-#: include/identity.php:663 mod/profiles.php:743
-msgid "Dislikes:"
-msgstr "No me gusta:"
-
-#: include/identity.php:666
-msgid "Contact information and Social Networks:"
-msgstr "Información de contacto y Redes sociales:"
-
-#: include/identity.php:668
-msgid "Musical interests:"
-msgstr "Intereses musicales:"
-
-#: include/identity.php:670
-msgid "Books, literature:"
-msgstr "Libros, literatura:"
-
-#: include/identity.php:672
-msgid "Television:"
-msgstr "Televisión:"
-
-#: include/identity.php:674
-msgid "Film/dance/culture/entertainment:"
-msgstr "Películas/baile/cultura/entretenimiento:"
-
-#: include/identity.php:676
-msgid "Love/Romance:"
-msgstr "Amor/Romance:"
-
-#: include/identity.php:678
-msgid "Work/employment:"
-msgstr "Trabajo/ocupación:"
-
-#: include/identity.php:680
-msgid "School/education:"
-msgstr "Escuela/estudios:"
-
-#: include/identity.php:684
-msgid "Forums:"
-msgstr "Foros:"
-
-#: include/identity.php:692 mod/events.php:507
-msgid "Basic"
-msgstr "Basic"
-
-#: include/identity.php:693 mod/events.php:508 mod/admin.php:959
-#: mod/contacts.php:870
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: include/identity.php:717 mod/contacts.php:836 mod/follow.php:142
-msgid "Status Messages and Posts"
-msgstr "Mensajes de Estado y Publicaciones"
-
-#: include/identity.php:725 mod/contacts.php:844
-msgid "Profile Details"
-msgstr "Detalles del Perfil"
-
-#: include/identity.php:733 mod/photos.php:87
-msgid "Photo Albums"
-msgstr "Álbum de Fotos"
-
-#: include/identity.php:772 mod/notes.php:46
-msgid "Personal Notes"
-msgstr "Notas personales"
-
-#: include/identity.php:775
-msgid "Only You Can See This"
-msgstr "Únicamente tú puedes ver esto"
-
-#: include/items.php:1575 mod/dfrn_confirm.php:730 mod/dfrn_request.php:746
-msgid "[Name Withheld]"
-msgstr "[Nombre oculto]"
-
-#: include/items.php:1930 mod/viewsrc.php:15 mod/notice.php:15
-#: mod/display.php:103 mod/display.php:279 mod/display.php:478
-#: mod/admin.php:234 mod/admin.php:1471 mod/admin.php:1705
-msgid "Item not found."
-msgstr "Elemento no encontrado."
-
-#: include/items.php:1969
-msgid "Do you really want to delete this item?"
-msgstr "¿Realmente quieres borrar este objeto?"
-
-#: include/items.php:1971 mod/api.php:105 mod/message.php:217
-#: mod/profiles.php:648 mod/profiles.php:651 mod/profiles.php:677
-#: mod/suggest.php:29 mod/register.php:245 mod/settings.php:1163
-#: mod/settings.php:1169 mod/settings.php:1177 mod/settings.php:1181
-#: mod/settings.php:1186 mod/settings.php:1192 mod/settings.php:1198
-#: mod/settings.php:1204 mod/settings.php:1230 mod/settings.php:1231
-#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
-#: mod/contacts.php:442 mod/dfrn_request.php:862 mod/follow.php:110
-msgid "Yes"
-msgstr "Sí"
-
-#: include/items.php:2134 mod/notes.php:22 mod/uimport.php:23
-#: mod/nogroup.php:25 mod/invite.php:15 mod/invite.php:101
-#: mod/repair_ostatus.php:9 mod/delegate.php:12 mod/attach.php:33
-#: mod/editpost.php:10 mod/group.php:19 mod/wallmessage.php:9
-#: mod/wallmessage.php:33 mod/wallmessage.php:79 mod/wallmessage.php:103
-#: mod/api.php:26 mod/api.php:31 mod/ostatus_subscribe.php:9
-#: mod/message.php:46 mod/message.php:182 mod/manage.php:96
-#: mod/crepair.php:100 mod/fsuggest.php:78 mod/mood.php:114 mod/poke.php:150
-#: mod/profile_photo.php:19 mod/profile_photo.php:175
-#: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/regmod.php:110
-#: mod/notifications.php:71 mod/profiles.php:166 mod/profiles.php:605
-#: mod/allfriends.php:12 mod/cal.php:304 mod/common.php:18 mod/dirfind.php:11
-#: mod/display.php:475 mod/events.php:190 mod/suggest.php:58
-#: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42
-#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:665
-#: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/wall_upload.php:77
-#: mod/wall_upload.php:80 mod/contacts.php:350 mod/dfrn_confirm.php:61
-#: mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 mod/item.php:199
-#: mod/item.php:211 mod/network.php:4 mod/viewcontacts.php:45 index.php:401
-msgid "Permission denied."
-msgstr "Permiso denegado."
-
-#: include/items.php:2239
-msgid "Archives"
-msgstr "Archivos"
-
-#: include/oembed.php:264
-msgid "Embedded content"
-msgstr "Contenido integrado"
-
-#: include/oembed.php:272
-msgid "Embedding disabled"
-msgstr "Contenido incrustrado desabilitado"
-
-#: include/ostatus.php:1825
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s sigue ahora a %s."
-
-#: include/ostatus.php:1826
-msgid "following"
-msgstr "siguiendo"
-
-#: include/ostatus.php:1829
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s dejó de seguir a %s."
-
-#: include/ostatus.php:1830
-msgid "stopped following"
-msgstr "dejó de seguir"
-
-#: include/text.php:304
+#: include/text.php:307
 msgid "newer"
 msgstr "más nuevo"
 
-#: include/text.php:306
+#: include/text.php:308
 msgid "older"
 msgstr "más antiguo"
 
-#: include/text.php:311
-msgid "prev"
-msgstr "ant."
-
 #: include/text.php:313
 msgid "first"
 msgstr "primera"
 
-#: include/text.php:345
-msgid "last"
-msgstr "última"
+#: include/text.php:314
+msgid "prev"
+msgstr "ant."
 
 #: include/text.php:348
 msgid "next"
 msgstr "sig."
 
+#: include/text.php:349
+msgid "last"
+msgstr "última"
+
 #: include/text.php:403
 msgid "Loading more entries..."
 msgstr "Cargar mas entradas .."
@@ -2788,190 +2807,225 @@ msgstr "El fin"
 msgid "No contacts"
 msgstr "Sin contactos"
 
-#: include/text.php:912
+#: include/text.php:914
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Contacto"
 msgstr[1] "%d Contactos"
 
-#: include/text.php:925
+#: include/text.php:927
 msgid "View Contacts"
 msgstr "Ver contactos"
 
-#: include/text.php:1013 mod/notes.php:61 mod/filer.php:31
-#: mod/editpost.php:109
+#: include/text.php:1015 mod/editpost.php:99 mod/filer.php:31 mod/notes.php:62
 msgid "Save"
 msgstr "Guardar"
 
-#: include/text.php:1076
+#: include/text.php:1078
 msgid "poke"
 msgstr "tocar"
 
-#: include/text.php:1076
+#: include/text.php:1078
 msgid "poked"
 msgstr "tocó a"
 
-#: include/text.php:1077
+#: include/text.php:1079
 msgid "ping"
 msgstr "hacer \"ping\""
 
-#: include/text.php:1077
+#: include/text.php:1079
 msgid "pinged"
 msgstr "hizo \"ping\" a"
 
-#: include/text.php:1078
+#: include/text.php:1080
 msgid "prod"
 msgstr "empujar"
 
-#: include/text.php:1078
+#: include/text.php:1080
 msgid "prodded"
 msgstr "empujó a"
 
-#: include/text.php:1079
+#: include/text.php:1081
 msgid "slap"
 msgstr "abofetear"
 
-#: include/text.php:1079
+#: include/text.php:1081
 msgid "slapped"
 msgstr "abofeteó a"
 
-#: include/text.php:1080
+#: include/text.php:1082
 msgid "finger"
 msgstr "meter dedo"
 
-#: include/text.php:1080
+#: include/text.php:1082
 msgid "fingered"
 msgstr "le metió un dedo a"
 
-#: include/text.php:1081
+#: include/text.php:1083
 msgid "rebuff"
 msgstr "desairar"
 
-#: include/text.php:1081
+#: include/text.php:1083
 msgid "rebuffed"
 msgstr "desairó a"
 
-#: include/text.php:1095
+#: include/text.php:1097
 msgid "happy"
 msgstr "feliz"
 
-#: include/text.php:1096
+#: include/text.php:1098
 msgid "sad"
 msgstr "triste"
 
-#: include/text.php:1097
+#: include/text.php:1099
 msgid "mellow"
 msgstr "sentimental"
 
-#: include/text.php:1098
+#: include/text.php:1100
 msgid "tired"
 msgstr "cansado"
 
-#: include/text.php:1099
+#: include/text.php:1101
 msgid "perky"
 msgstr "alegre"
 
-#: include/text.php:1100
+#: include/text.php:1102
 msgid "angry"
 msgstr "furioso"
 
-#: include/text.php:1101
+#: include/text.php:1103
 msgid "stupified"
 msgstr "estupefacto"
 
-#: include/text.php:1102
+#: include/text.php:1104
 msgid "puzzled"
 msgstr "extrañado"
 
-#: include/text.php:1103
+#: include/text.php:1105
 msgid "interested"
 msgstr "interesado"
 
-#: include/text.php:1104
+#: include/text.php:1106
 msgid "bitter"
 msgstr "rencoroso"
 
-#: include/text.php:1105
+#: include/text.php:1107
 msgid "cheerful"
 msgstr "jovial"
 
-#: include/text.php:1106
+#: include/text.php:1108
 msgid "alive"
 msgstr "vivo"
 
-#: include/text.php:1107
+#: include/text.php:1109
 msgid "annoyed"
 msgstr "enojado"
 
-#: include/text.php:1108
+#: include/text.php:1110
 msgid "anxious"
 msgstr "ansioso"
 
-#: include/text.php:1109
+#: include/text.php:1111
 msgid "cranky"
 msgstr "irritable"
 
-#: include/text.php:1110
+#: include/text.php:1112
 msgid "disturbed"
 msgstr "perturbado"
 
-#: include/text.php:1111
+#: include/text.php:1113
 msgid "frustrated"
 msgstr "frustrado"
 
-#: include/text.php:1112
+#: include/text.php:1114
 msgid "motivated"
 msgstr "motivado"
 
-#: include/text.php:1113
+#: include/text.php:1115
 msgid "relaxed"
 msgstr "relajado"
 
-#: include/text.php:1114
+#: include/text.php:1116
 msgid "surprised"
 msgstr "sorprendido"
 
-#: include/text.php:1324 mod/videos.php:380
+#: include/text.php:1326 mod/videos.php:384
 msgid "View Video"
 msgstr "Ver vídeo"
 
-#: include/text.php:1356
+#: include/text.php:1358
 msgid "bytes"
 msgstr "bytes"
 
-#: include/text.php:1388 include/text.php:1400
+#: include/text.php:1390 include/text.php:1402
 msgid "Click to open/close"
 msgstr "Pulsa para abrir/cerrar"
 
-#: include/text.php:1526
+#: include/text.php:1528
 msgid "View on separate page"
 msgstr "Ver en pagina aparte"
 
-#: include/text.php:1527
+#: include/text.php:1529
 msgid "view on separate page"
 msgstr "ver en pagina aparte"
 
-#: include/text.php:1806
+#: include/text.php:1808
 msgid "activity"
 msgstr "Actividad"
 
-#: include/text.php:1808 mod/content.php:623 object/Item.php:431
-#: object/Item.php:444
+#: include/text.php:1810 mod/content.php:623 object/Item.php:419
+#: object/Item.php:431
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] "Comentario"
 
-#: include/text.php:1809
+#: include/text.php:1811
 msgid "post"
 msgstr "Publicación"
 
-#: include/text.php:1977
+#: include/text.php:1979
 msgid "Item filed"
 msgstr "Elemento archivado"
 
-#: include/user.php:39 mod/settings.php:373
+#: include/uimport.php:91
+msgid "Error decoding account file"
+msgstr "Error decodificando el archivo de cuenta"
+
+#: include/uimport.php:97
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Error! No hay datos de versión en el archivo! ¿Es esto de una cuenta friendica? "
+
+#: include/uimport.php:113 include/uimport.php:124
+msgid "Error! Cannot check nickname"
+msgstr "Error! No puedo consultar el apodo"
+
+#: include/uimport.php:117 include/uimport.php:128
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "La cuenta '%s' ya existe en este servidor!"
+
+#: include/uimport.php:150
+msgid "User creation error"
+msgstr "Error al crear la cuenta"
+
+#: include/uimport.php:170
+msgid "User profile creation error"
+msgstr "Error de creación del perfil de la cuenta"
+
+#: include/uimport.php:219
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d contactos no encontrado"
+msgstr[1] "%d contactos no importado"
+
+#: include/uimport.php:289
+msgid "Done. You can now login with your username and password"
+msgstr "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña."
+
+#: include/user.php:39 mod/settings.php:375
 msgid "Passwords do not match. Password unchanged."
 msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada."
 
@@ -3037,7 +3091,7 @@ msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado."
 msgid "An error occurred during registration. Please try again."
 msgstr "Se produjo un error durante el registro. Por favor, inténtalo de nuevo."
 
-#: include/user.php:256 view/theme/duepuntozero/config.php:44
+#: include/user.php:256 view/theme/duepuntozero/config.php:43
 msgid "default"
 msgstr "predeterminado"
 
@@ -3045,16 +3099,15 @@ msgstr "predeterminado"
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo."
 
-#: include/user.php:326 include/user.php:333 include/user.php:340
-#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
-#: mod/profile_photo.php:210 mod/profile_photo.php:302
-#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180
-#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232
-#: mod/photos.php:1819
+#: include/user.php:326 include/user.php:334 include/user.php:342
+#: mod/photos.php:68 mod/photos.php:182 mod/photos.php:768 mod/photos.php:1231
+#: mod/photos.php:1252 mod/photos.php:1839 mod/profile_photo.php:74
+#: mod/profile_photo.php:82 mod/profile_photo.php:90 mod/profile_photo.php:215
+#: mod/profile_photo.php:310 mod/profile_photo.php:320
 msgid "Profile Photos"
 msgstr "Foto del perfil"
 
-#: include/user.php:414
+#: include/user.php:417
 #, php-format
 msgid ""
 "\n"
@@ -3063,12 +3116,12 @@ msgid ""
 "\t"
 msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrarse en %2$s. Su cuenta está pendiente de aprobación por el administrador.\n\t"
 
-#: include/user.php:424
+#: include/user.php:427
 #, php-format
 msgid "Registration at %s"
 msgstr "Registro en %s"
 
-#: include/user.php:434
+#: include/user.php:437
 #, php-format
 msgid ""
 "\n"
@@ -3077,7 +3130,7 @@ msgid ""
 "\t"
 msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrar en %2$s. Su cuenta ha sido creada.\n\t"
 
-#: include/user.php:438
+#: include/user.php:441
 #, php-format
 msgid ""
 "\n"
@@ -3107,104 +3160,3230 @@ msgid ""
 "\t\tThank you and welcome to %2$s."
 msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3$s\n\t\t\tNombre de la cuenta:\t\t%1$s\n\t\t\tContraseña:\t\t%5$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %2$s."
 
-#: include/user.php:470 mod/admin.php:1213
+#: include/user.php:473 mod/admin.php:1223
 #, php-format
 msgid "Registration details for %s"
 msgstr "Detalles de registro para %s"
 
-#: mod/oexchange.php:25
-msgid "Post successful."
-msgstr "¡Publicado!"
+#: index.php:248 mod/apps.php:7
+msgid "You must be logged in to use addons. "
+msgstr "Tienes que estar registrado para tener acceso a los accesorios."
 
-#: mod/viewsrc.php:7
-msgid "Access denied."
-msgstr "Acceso denegado."
+#: index.php:292 mod/fetch.php:12 mod/fetch.php:39 mod/fetch.php:48
+#: mod/help.php:53 mod/p.php:16 mod/p.php:43 mod/p.php:52
+msgid "Not Found"
+msgstr "No se ha encontrado"
 
-#: mod/home.php:35
+#: index.php:295 mod/help.php:56
+msgid "Page not found."
+msgstr "Página no encontrada."
+
+#: index.php:406 mod/group.php:76 mod/profperm.php:20
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: index.php:457
+msgid "toggle mobile"
+msgstr "Cambiar a versión móvil"
+
+#: mod/admin.php:96
+msgid "Theme settings updated."
+msgstr "Configuración de la apariencia actualizada."
+
+#: mod/admin.php:162 mod/admin.php:967
+msgid "Site"
+msgstr "Sitio"
+
+#: mod/admin.php:163 mod/admin.php:901 mod/admin.php:1413 mod/admin.php:1429
+msgid "Users"
+msgstr "Usuarios"
+
+#: mod/admin.php:164 mod/admin.php:1531 mod/admin.php:1594 mod/settings.php:74
+msgid "Plugins"
+msgstr "Módulos"
+
+#: mod/admin.php:165 mod/admin.php:1807 mod/admin.php:1857
+msgid "Themes"
+msgstr "Temas"
+
+#: mod/admin.php:166 mod/settings.php:52
+msgid "Additional features"
+msgstr "Características adicionales"
+
+#: mod/admin.php:167
+msgid "DB updates"
+msgstr "Actualizaciones de la Base de Datos"
+
+#: mod/admin.php:168 mod/admin.php:416
+msgid "Inspect Queue"
+msgstr "Inspeccionar cola"
+
+#: mod/admin.php:169 mod/admin.php:382
+msgid "Federation Statistics"
+msgstr "Estadísticas de federación"
+
+#: mod/admin.php:183 mod/admin.php:194 mod/admin.php:1931
+msgid "Logs"
+msgstr "Registros"
+
+#: mod/admin.php:184 mod/admin.php:1999
+msgid "View Logs"
+msgstr "Ver registro de depuración"
+
+#: mod/admin.php:185
+msgid "probe address"
+msgstr "probar direccion"
+
+#: mod/admin.php:186
+msgid "check webfinger"
+msgstr "Verificar webfinger"
+
+#: mod/admin.php:193
+msgid "Plugin Features"
+msgstr "Características del módulo"
+
+#: mod/admin.php:195
+msgid "diagnostics"
+msgstr "diagnosticos"
+
+#: mod/admin.php:196
+msgid "User registrations waiting for confirmation"
+msgstr "Registro de usuarios esperando la confirmación"
+
+#: mod/admin.php:312
+msgid "unknown"
+msgstr "desconocido"
+
+#: mod/admin.php:375
+msgid ""
+"This page offers you some numbers to the known part of the federated social "
+"network your Friendica node is part of. These numbers are not complete but "
+"only reflect the part of the network your node is aware of."
+msgstr "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. "
+
+#: mod/admin.php:376
+msgid ""
+"The Auto Discovered Contact Directory feature is not enabled, it "
+"will improve the data displayed here."
+msgstr "El modulo directorio de contactos encontrados no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí."
+
+#: mod/admin.php:381 mod/admin.php:415 mod/admin.php:493 mod/admin.php:966
+#: mod/admin.php:1412 mod/admin.php:1530 mod/admin.php:1593 mod/admin.php:1806
+#: mod/admin.php:1856 mod/admin.php:1930 mod/admin.php:1998
+msgid "Administration"
+msgstr "Administración"
+
+#: mod/admin.php:388
 #, php-format
-msgid "Welcome to %s"
-msgstr "Bienvenido a %s"
+msgid "Currently this node is aware of %d nodes from the following platforms:"
+msgstr "Actualmente este nodo reconoce %d nodos de las siguientes plataformas:"
 
-#: mod/notify.php:60
-msgid "No more system notifications."
-msgstr "No hay más notificaciones del sistema."
+#: mod/admin.php:418
+msgid "ID"
+msgstr "ID"
 
-#: mod/notify.php:64 mod/notifications.php:111
-msgid "System Notifications"
-msgstr "Notificaciones del sistema"
+#: mod/admin.php:419
+msgid "Recipient Name"
+msgstr "Nombre del recipiente"
 
-#: mod/search.php:25 mod/network.php:191
-msgid "Remove term"
-msgstr "Eliminar término"
+#: mod/admin.php:420
+msgid "Recipient Profile"
+msgstr "Perfil del recipiente"
 
-#: mod/search.php:93 mod/search.php:99 mod/community.php:22
-#: mod/directory.php:37 mod/display.php:200 mod/photos.php:944
-#: mod/videos.php:194 mod/dfrn_request.php:791 mod/viewcontacts.php:35
+#: mod/admin.php:422
+msgid "Created"
+msgstr "Creado"
+
+#: mod/admin.php:423
+msgid "Last Tried"
+msgstr "Ultimo intento"
+
+#: mod/admin.php:424
+msgid ""
+"This page lists the content of the queue for outgoing postings. These are "
+"postings the initial delivery failed for. They will be resend later and "
+"eventually deleted if the delivery fails permanently."
+msgstr "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. "
+
+#: mod/admin.php:449
+#, php-format
+msgid ""
+"Your DB still runs with MyISAM tables. You should change the engine type to "
+"InnoDB. As Friendica will use InnoDB only features in the future, you should"
+" change this! See here for a guide that may be helpful "
+"converting the table engines. You may also use the "
+"convert_innodb.sql in the /util directory of your "
+"Friendica installation.
    "
+msgstr "Su DB aún funciona con las tablas MyISAM. Debería cambiar el tipo de motror a InnoDB. ¡Como Friendica sólo usará las características de InnoDB en el futuro, debería cambiar esto! Vea aquí para una guía que puede ayudar a convertir las tablas de motor. También puede usar convert_innodb.sql en el directorio /util de su instalación de Friendica.
    "
+
+#: mod/admin.php:454
+msgid ""
+"You are using a MySQL version which does not support all features that "
+"Friendica uses. You should consider switching to MariaDB."
+msgstr "Está usando una versión de MySQL que no soporta todas las características de Friendica. Debería considerar cambiar a MariaDB."
+
+#: mod/admin.php:458 mod/admin.php:1362
+msgid "Normal Account"
+msgstr "Cuenta normal"
+
+#: mod/admin.php:459 mod/admin.php:1363
+msgid "Soapbox Account"
+msgstr "Cuenta tribuna"
+
+#: mod/admin.php:460 mod/admin.php:1364
+msgid "Community/Celebrity Account"
+msgstr "Cuenta de Comunidad/Celebridad"
+
+#: mod/admin.php:461 mod/admin.php:1365
+msgid "Automatic Friend Account"
+msgstr "Cuenta de amistad automática"
+
+#: mod/admin.php:462
+msgid "Blog Account"
+msgstr "Cuenta de blog"
+
+#: mod/admin.php:463
+msgid "Private Forum"
+msgstr "Foro privado"
+
+#: mod/admin.php:488
+msgid "Message queues"
+msgstr "Cola de mensajes"
+
+#: mod/admin.php:494
+msgid "Summary"
+msgstr "Resumen"
+
+#: mod/admin.php:496
+msgid "Registered users"
+msgstr "Usuarios registrados"
+
+#: mod/admin.php:498
+msgid "Pending registrations"
+msgstr "Pendientes de registro"
+
+#: mod/admin.php:499
+msgid "Version"
+msgstr "Versión"
+
+#: mod/admin.php:504
+msgid "Active plugins"
+msgstr "Módulos activos"
+
+#: mod/admin.php:529
+msgid "Can not parse base url. Must have at least ://"
+msgstr "No se puede resolver la direccion URL base.\nDeberá tener al menos ://"
+
+#: mod/admin.php:819
+msgid "RINO2 needs mcrypt php extension to work."
+msgstr "RINO2 precisa la extensión mcrypt para funcionar.  "
+
+#: mod/admin.php:827
+msgid "Site settings updated."
+msgstr "Configuración de actualización."
+
+#: mod/admin.php:855 mod/settings.php:943
+msgid "No special theme for mobile devices"
+msgstr "No hay tema especial para dispositivos móviles"
+
+#: mod/admin.php:884
+msgid "No community page"
+msgstr "No hay pagina de comunidad"
+
+#: mod/admin.php:885
+msgid "Public postings from users of this site"
+msgstr "Temas públicos de perfiles de este sitio."
+
+#: mod/admin.php:886
+msgid "Global community page"
+msgstr "Pagina global de comunidad"
+
+#: mod/admin.php:891 mod/contacts.php:538
+msgid "Never"
+msgstr "Nunca"
+
+#: mod/admin.php:892
+msgid "At post arrival"
+msgstr "A la llegada de una publicación"
+
+#: mod/admin.php:900 mod/contacts.php:565
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#: mod/admin.php:902
+msgid "Users, Global Contacts"
+msgstr "Perfiles, contactos globales"
+
+#: mod/admin.php:903
+msgid "Users, Global Contacts/fallback"
+msgstr "Perfiles, contactos globales/fallback"
+
+#: mod/admin.php:907
+msgid "One month"
+msgstr "Un mes"
+
+#: mod/admin.php:908
+msgid "Three months"
+msgstr "Tres meses"
+
+#: mod/admin.php:909
+msgid "Half a year"
+msgstr "Medio año"
+
+#: mod/admin.php:910
+msgid "One year"
+msgstr "Un año"
+
+#: mod/admin.php:915
+msgid "Multi user instance"
+msgstr "Sesión multi usuario"
+
+#: mod/admin.php:938
+msgid "Closed"
+msgstr "Cerrado"
+
+#: mod/admin.php:939
+msgid "Requires approval"
+msgstr "Requiere aprobación"
+
+#: mod/admin.php:940
+msgid "Open"
+msgstr "Abierto"
+
+#: mod/admin.php:944
+msgid "No SSL policy, links will track page SSL state"
+msgstr "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página"
+
+#: mod/admin.php:945
+msgid "Force all links to use SSL"
+msgstr "Forzar todos los enlaces a utilizar SSL"
+
+#: mod/admin.php:946
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Certificación personal, usa SSL solo para enlaces locales (no recomendado)"
+
+#: mod/admin.php:968 mod/admin.php:1595 mod/admin.php:1858 mod/admin.php:1932
+#: mod/admin.php:2085 mod/settings.php:681 mod/settings.php:792
+#: mod/settings.php:841 mod/settings.php:908 mod/settings.php:1005
+#: mod/settings.php:1271
+msgid "Save Settings"
+msgstr "Guardar configuración"
+
+#: mod/admin.php:969 mod/register.php:272
+msgid "Registration"
+msgstr "Registro"
+
+#: mod/admin.php:970
+msgid "File upload"
+msgstr "Subida de archivo"
+
+#: mod/admin.php:971
+msgid "Policies"
+msgstr "Políticas"
+
+#: mod/admin.php:973
+msgid "Auto Discovered Contact Directory"
+msgstr "Directorio de contactos descubierto automáticamente"
+
+#: mod/admin.php:974
+msgid "Performance"
+msgstr "Rendimiento"
+
+#: mod/admin.php:975
+msgid "Worker"
+msgstr "Trabajador (??)"
+
+#: mod/admin.php:976
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr "Reubicación - ADVERTENCIA: función avanzada. Puede hacer a este servidor inaccesible. "
+
+#: mod/admin.php:979
+msgid "Site name"
+msgstr "Nombre del sitio"
+
+#: mod/admin.php:980
+msgid "Host name"
+msgstr "Nombre de dominio"
+
+#: mod/admin.php:981
+msgid "Sender Email"
+msgstr "Dirección de origen de correo electrónico"
+
+#: mod/admin.php:981
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr "La dirección de correo electrónico que el servidor debería usar como dirección de envío."
+
+#: mod/admin.php:982
+msgid "Banner/Logo"
+msgstr "Imagen/Logotipo"
+
+#: mod/admin.php:983
+msgid "Shortcut icon"
+msgstr "Icono de atajo"
+
+#: mod/admin.php:983
+msgid "Link to an icon that will be used for browsers."
+msgstr "Enlace hacia un icono que sera usado para el navegador."
+
+#: mod/admin.php:984
+msgid "Touch icon"
+msgstr "Icono touch"
+
+#: mod/admin.php:984
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr "Enlace para un icono que sera usado para tablets y moviles."
+
+#: mod/admin.php:985
+msgid "Additional Info"
+msgstr "Información adicional"
+
+#: mod/admin.php:985
+#, php-format
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/siteinfo."
+msgstr "Para servidores públicos: información adicional  que sera publicado en %s/siteinfo."
+
+#: mod/admin.php:986
+msgid "System language"
+msgstr "Idioma"
+
+#: mod/admin.php:987
+msgid "System theme"
+msgstr "Tema"
+
+#: mod/admin.php:987
+msgid ""
+"Default system theme - may be over-ridden by user profiles - change theme settings"
+msgstr "Tema por defecto del sistema, los usuarios podrán elegir el suyo propio en su configuración cambiar configuración del tema"
+
+#: mod/admin.php:988
+msgid "Mobile system theme"
+msgstr "Tema de sistema móvil"
+
+#: mod/admin.php:988
+msgid "Theme for mobile devices"
+msgstr "Tema para dispositivos móviles"
+
+#: mod/admin.php:989
+msgid "SSL link policy"
+msgstr "Política de enlaces SSL"
+
+#: mod/admin.php:989
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Determina si los enlaces generados deben ser forzados a utilizar SSL"
+
+#: mod/admin.php:990
+msgid "Force SSL"
+msgstr "Forzar SSL"
+
+#: mod/admin.php:990
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
+" to endless loops."
+msgstr "Forzar todos las consultas No-SSL a SSL. - ATENCIÓN: en algunos sistemas esto puede generar comportamiento recursivo interminable."
+
+#: mod/admin.php:991
+msgid "Hide help entry from navigation menu"
+msgstr "Ocultar la ayuda en el menú de navegación"
+
+#: mod/admin.php:991
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr "Oculta la entrada de las páginas de Ayuda en el menú de navegación. Todavía se puede acceder escribiendo /ayuda directamente."
+
+#: mod/admin.php:992
+msgid "Single user instance"
+msgstr "Sesión de usuario único"
+
+#: mod/admin.php:992
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr "Haz esta sesión multi-usuario o usuario único para el usuario"
+
+#: mod/admin.php:993
+msgid "Maximum image size"
+msgstr "Tamaño máximo de la imagen"
+
+#: mod/admin.php:993
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Tamaño máximo en bytes de las imágenes a subir. Por defecto es 0, que quiere decir que no hay límite."
+
+#: mod/admin.php:994
+msgid "Maximum image length"
+msgstr "Largo máximo de imagen"
+
+#: mod/admin.php:994
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr "Longitud máxima en píxeles del lado más largo de las imágenes subidas. Por defecto es -1, que significa que no hay límites."
+
+#: mod/admin.php:995
+msgid "JPEG image quality"
+msgstr "Calidad de imagen JPEG"
+
+#: mod/admin.php:995
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr "Los archivos JPEG subidos se guardarán con este ajuste de calidad [0-100]. Por defecto es 100, que es calidad máxima."
+
+#: mod/admin.php:997
+msgid "Register policy"
+msgstr "Política de registros"
+
+#: mod/admin.php:998
+msgid "Maximum Daily Registrations"
+msgstr "Registros Máximos Diarios"
+
+#: mod/admin.php:998
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user"
+" registrations to accept per day.  If register is set to closed, this "
+"setting has no effect."
+msgstr "Si anteriormente se ha permitido el registro, esto establece el número máximo de registro de nuevos usuarios aceptados por día. Si el registro se establece como cerrado, esta opción no tiene efecto."
+
+#: mod/admin.php:999
+msgid "Register text"
+msgstr "Términos"
+
+#: mod/admin.php:999
+msgid "Will be displayed prominently on the registration page."
+msgstr "Se mostrará en un lugar destacado en la página de registro."
+
+#: mod/admin.php:1000
+msgid "Accounts abandoned after x days"
+msgstr "Cuentas abandonadas después de x días"
+
+#: mod/admin.php:1000
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "No gastará recursos del sistema creando sondeos a sitios externos para cuentas abandonadas. Introduce 0 para ningún límite temporal."
+
+#: mod/admin.php:1001
+msgid "Allowed friend domains"
+msgstr "Dominios amigos permitidos"
+
+#: mod/admin.php:1001
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Lista separada por comas de los dominios que están autorizados para establecer conexiones con este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
+
+#: mod/admin.php:1002
+msgid "Allowed email domains"
+msgstr "Dominios de correo permitidos"
+
+#: mod/admin.php:1002
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Lista separada por comas de los dominios que están autorizados en las direcciones de correo para registrarse en este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
+
+#: mod/admin.php:1003
+msgid "Block public"
+msgstr "Bloqueo público"
+
+#: mod/admin.php:1003
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Marca para bloquear el acceso público a todas las páginas personales, aún siendo públicas, hasta que no hayas iniciado tu sesión."
+
+#: mod/admin.php:1004
+msgid "Force publish"
+msgstr "Forzar publicación"
+
+#: mod/admin.php:1004
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Marca para forzar que todos los perfiles de este sitio sean listados en el directorio del sitio."
+
+#: mod/admin.php:1005
+msgid "Global directory URL"
+msgstr "URL del directorio global."
+
+#: mod/admin.php:1005
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
+msgstr "URL del directorio global. Si se deja este campo vacío, el directorio global sera completamente inaccesible para la instancia."
+
+#: mod/admin.php:1006
+msgid "Allow threaded items"
+msgstr "Permitir elementos en hilo"
+
+#: mod/admin.php:1006
+msgid "Allow infinite level threading for items on this site."
+msgstr "Permitir infinitos niveles de hilo para los elementos de este sitio."
+
+#: mod/admin.php:1007
+msgid "Private posts by default for new users"
+msgstr "Publicaciones privadas por defecto para usuarios nuevos"
+
+#: mod/admin.php:1007
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr "Ajusta los permisos de publicación por defecto a los miembros nuevos al grupo privado por defecto en vez del público."
+
+#: mod/admin.php:1008
+msgid "Don't include post content in email notifications"
+msgstr "No incluir el contenido del post en las notificaciones de correo electrónico"
+
+#: mod/admin.php:1008
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr "No incluye el contenido de un mensaje/comentario/mensaje privado/etc. en las notificaciones de correo electrónico que se envían desde este sitio, como una medida de privacidad."
+
+#: mod/admin.php:1009
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr "Deshabilitar acceso a addons listados en el menú de aplicaciones."
+
+#: mod/admin.php:1009
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr "Habilitando esta opción restringe el acceso a addons en el menú de aplicaciones a usuarios identificados."
+
+#: mod/admin.php:1010
+msgid "Don't embed private images in posts"
+msgstr "No agregar imágenes privados en las publicaciones"
+
+#: mod/admin.php:1010
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a "
+"while."
+msgstr "No reemplazar imágenes privadas guardadas localmente en el servidor con imágenes integrados en los envíos. Esto significa que contactos que reciben publicaciones tendrán que autenticarse y cargar cada imagen, lo que puede demorar."
+
+#: mod/admin.php:1011
+msgid "Allow Users to set remote_self"
+msgstr "Permitir a los usuarios de definir perfiles_remotos"
+
+#: mod/admin.php:1011
+msgid ""
+"With checking this, every user is allowed to mark every contact as a "
+"remote_self in the repair contact dialog. Setting this flag on a contact "
+"causes mirroring every posting of that contact in the users stream."
+msgstr "Al habilitar esta opción, cada perfil tiene el permiso de marcar cualquiera de sus contactos como un perfil_remoto. Habilitar la opción perfil_remoto para un contacto genera que todas las publicaciones  de este contacto seran re-publicado  en el muro del perfil."
+
+#: mod/admin.php:1012
+msgid "Block multiple registrations"
+msgstr "Bloquear registros multiples"
+
+#: mod/admin.php:1012
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Impedir que los usuarios registren cuentas adicionales para su uso como páginas."
+
+#: mod/admin.php:1013
+msgid "OpenID support"
+msgstr "Soporte OpenID"
+
+#: mod/admin.php:1013
+msgid "OpenID support for registration and logins."
+msgstr "Soporte OpenID para registros y accesos."
+
+#: mod/admin.php:1014
+msgid "Fullname check"
+msgstr "Comprobar Nombre completo"
+
+#: mod/admin.php:1014
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Fuerza a los usuarios a registrarse con un espacio entre su nombre y su apellido en el campo Nombre completo como medida anti-spam"
+
+#: mod/admin.php:1015
+msgid "UTF-8 Regular expressions"
+msgstr "Expresiones regulares UTF-8"
+
+#: mod/admin.php:1015
+msgid "Use PHP UTF8 regular expressions"
+msgstr "Usar expresiones regulares de UTF8 en PHP"
+
+#: mod/admin.php:1016
+msgid "Community Page Style"
+msgstr "Estilo de pagina de comunidad"
+
+#: mod/admin.php:1016
+msgid ""
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
+msgstr "Tipo de pagina de comunidad a visualizar. 'Comunidad global' muestra todas las publicaciones publicas de la red abierta federada que llega a este servidor."
+
+#: mod/admin.php:1017
+msgid "Posts per user on community page"
+msgstr "Publicaciones por usuario en la pagina de comunidad"
+
+#: mod/admin.php:1017
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
+msgstr "El numero máximo de publicaciones por usuario que aparecerán en la pagina de comunidad. (No valido para 'comunidad global')"
+
+#: mod/admin.php:1018
+msgid "Enable OStatus support"
+msgstr "Permitir soporte OStatus"
+
+#: mod/admin.php:1018
+msgid ""
+"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr "Proporcionar OStatus compatibilidad integrada (StatusNet, GNU Social, Quitter etc.). Todas las comunicaciones en OStatus son publicas así que eventuales advertencias serán ocasionalmente desplegadas."
+
+#: mod/admin.php:1019
+msgid "OStatus conversation completion interval"
+msgstr "Intervalo de actualización de conversaciones OStatus"
+
+#: mod/admin.php:1019
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr "Cuan seguido el recolector deberá buscar nuevas entradas en OStatus? Esto puede ser un trabajo de mucha carga para los recursos del servidor."
+
+#: mod/admin.php:1020
+msgid "Only import OStatus threads from our contacts"
+msgstr "Solo importar OStatus temas de nuestros (?) contactos."
+
+#: mod/admin.php:1020
+msgid ""
+"Normally we import every content from our OStatus contacts. With this option"
+" we only store threads that are started by a contact that is known on our "
+"system."
+msgstr "Normalmente importamos todo el contenido de los contactos de OStatus. Con esta opción solamente se guardan temas que fueron iniciados por contactos que son conocidos de la instancia.\n(nota de traducción, no se entiende muy bien la función en base al texto original)"
+
+#: mod/admin.php:1021
+msgid "OStatus support can only be enabled if threading is enabled."
+msgstr "Solo se puede habilitar el soporte OStatus  si threading (comentarios en fila) se encuentra habilitado."
+
+#: mod/admin.php:1023
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub"
+" directory."
+msgstr "El soporte para Diaspora* no se puede habilitar porque friendica se instalo en un directorio subalterno (sub directory)."
+
+#: mod/admin.php:1024
+msgid "Enable Diaspora support"
+msgstr "Habilitar el soporte para Diaspora*"
+
+#: mod/admin.php:1024
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Provee una compatibilidad con la red de Diaspora."
+
+#: mod/admin.php:1025
+msgid "Only allow Friendica contacts"
+msgstr "Permitir solo contactos de Friendica"
+
+#: mod/admin.php:1025
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Todos los contactos deben usar protocolos de Friendica. El resto de protocolos serán desactivados."
+
+#: mod/admin.php:1026
+msgid "Verify SSL"
+msgstr "Verificar SSL"
+
+#: mod/admin.php:1026
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you"
+" cannot connect (at all) to self-signed SSL sites."
+msgstr "Si quieres puedes activar la comprobación estricta de certificados. Esto significa que serás incapaz de conectar con ningún sitio que use certificados SSL autofirmados."
+
+#: mod/admin.php:1027
+msgid "Proxy user"
+msgstr "Usuario proxy"
+
+#: mod/admin.php:1028
+msgid "Proxy URL"
+msgstr "Dirección proxy"
+
+#: mod/admin.php:1029
+msgid "Network timeout"
+msgstr "Tiempo de espera de red"
+
+#: mod/admin.php:1029
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Valor en segundos. Usar 0 para dejarlo sin límites (no se recomienda)."
+
+#: mod/admin.php:1030
+msgid "Maximum Load Average"
+msgstr "Promedio de carga máxima"
+
+#: mod/admin.php:1030
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Carga máxima del sistema antes de que la entrega y los procesos de sondeo sean retrasados - por defecto 50."
+
+#: mod/admin.php:1031
+msgid "Maximum Load Average (Frontend)"
+msgstr "Carga máxima promedio (frontend)"
+
+#: mod/admin.php:1031
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr "Carga máxima del sistema antes de que el frontend cancele el servicio - por defecto 50."
+
+#: mod/admin.php:1032
+msgid "Maximum table size for optimization"
+msgstr "Tamaño máximo de las tablas para la optimización."
+
+#: mod/admin.php:1032
+msgid ""
+"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
+"Enter -1 to disable it."
+msgstr "Tamaño máximo de tablas (en MB) para la optimización automática - por defecto 100MB. Ingrese -1 para deshabilitar."
+
+#: mod/admin.php:1033
+msgid "Minimum level of fragmentation"
+msgstr "Nivel mínimo de fragmentación "
+
+#: mod/admin.php:1033
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
+msgstr "Nivel mínimo de fragmentación para para comenzar la optimización - valor por defecto es 30%. "
+
+#: mod/admin.php:1035
+msgid "Periodical check of global contacts"
+msgstr "Verificación periódica de los contactos globales."
+
+#: mod/admin.php:1035
+msgid ""
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
+msgstr "Habilitado los contactos globales son verificado periódicamente  por datos faltantes o datos obsoletos como también por la vitalidad de los contactos y servidores."
+
+#: mod/admin.php:1036
+msgid "Days between requery"
+msgstr "Días entre búsquedas"
+
+#: mod/admin.php:1036
+msgid "Number of days after which a server is requeried for his contacts."
+msgstr "Cantidad de días hasta que un servidor es consultado por sus contactos."
+
+#: mod/admin.php:1037
+msgid "Discover contacts from other servers"
+msgstr "Descubrir contactos de otros servidores"
+
+#: mod/admin.php:1037
+msgid ""
+"Periodically query other servers for contacts. You can choose between "
+"'users': the users on the remote system, 'Global Contacts': active contacts "
+"that are known on the system. The fallback is meant for Redmatrix servers "
+"and older friendica servers, where global contacts weren't available. The "
+"fallback increases the server load, so the recommened setting is 'Users, "
+"Global Contacts'."
+msgstr "Recoger periódicamente información sobre perfiles en otros servidores. Puede elegir entre 'usuarios': perfiles de un sistema remoto, 'contactos globales': contactos activos que son conocidos por el servidor. El fallback es para servidors redmatrix y instalaciones viejas de friendica en las que los contactos no estaban a disposición. El fallback aumenta la carga del servidor, asi que la configuración recomendada es 'usuarios, contactos globales'"
+
+#: mod/admin.php:1038
+msgid "Timeframe for fetching global contacts"
+msgstr "Intervalos de tiempo para revisar contactos globales."
+
+#: mod/admin.php:1038
+msgid ""
+"When the discovery is activated, this value defines the timeframe for the "
+"activity of the global contacts that are fetched from other servers."
+msgstr "Cuando la revisacion es activada, este valor define el intervalo de tiempo de la actividad de los contactos globales que son recolectados de los servidores. (?)"
+
+#: mod/admin.php:1039
+msgid "Search the local directory"
+msgstr "Buscar el directorio local"
+
+#: mod/admin.php:1039
+msgid ""
+"Search the local directory instead of the global directory. When searching "
+"locally, every search will be executed on the global directory in the "
+"background. This improves the search results when the search is repeated."
+msgstr "Buscar en el directorio local en vez del directorio global. Cuando se busca localmente, cada busqueda sera efectuada en el directorio global en el background. Esto mejora los resultados de la busqueda cuando la misma es repetida."
+
+#: mod/admin.php:1041
+msgid "Publish server information"
+msgstr "Publicar información del servidor"
+
+#: mod/admin.php:1041
+msgid ""
+"If enabled, general server and usage data will be published. The data "
+"contains the name and version of the server, number of users with public "
+"profiles, number of posts and the activated protocols and connectors. See the-federation.info for details."
+msgstr "Si habilitado, datos generales del servidor y estadisticas de uso serán publicados. Los datos contienen el nombre y la versión del servidor, numero de usuarios con perfiles públicos, cantidad de temas publicados y los protocolos y conectores activados. Vea the-federation.info por detalles."
+
+#: mod/admin.php:1043
+msgid "Use MySQL full text engine"
+msgstr "Usar motor MySQL de texto completo"
+
+#: mod/admin.php:1043
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr "Activa el motor de texto completo. Agiliza las búsquedas, pero solo busca cuatro o más caracteres."
+
+#: mod/admin.php:1044
+msgid "Suppress Tags"
+msgstr "Suprimir tags"
+
+#: mod/admin.php:1044
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr "Suprimir la lista de tags al final de una publicación."
+
+#: mod/admin.php:1045
+msgid "Path to item cache"
+msgstr "Ruta a la caché del objeto"
+
+#: mod/admin.php:1045
+msgid "The item caches buffers generated bbcode and external images."
+msgstr "El buffer de cache de items generado para bbcodes e imágenes externas. "
+
+#: mod/admin.php:1046
+msgid "Cache duration in seconds"
+msgstr "Duración de la caché en segundos"
+
+#: mod/admin.php:1046
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day). To disable the item cache, set the value to -1."
+msgstr "¿Por cuanto tiempo deberían los archives ser almacenados en el cache? Valor por defecto 86400 segundos (un día). Para deshabilita el item cache, ajuste el valor a -1."
+
+#: mod/admin.php:1047
+msgid "Maximum numbers of comments per post"
+msgstr "Numero máximo de respuestas por tema"
+
+#: mod/admin.php:1047
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr "¿Cuantos comentarios deberían ser mostrados por tema? Valor por defecto es 100."
+
+#: mod/admin.php:1048
+msgid "Temp path"
+msgstr "Ruta a los temporales"
+
+#: mod/admin.php:1048
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
+msgstr "Si tiene un sistema restringido en donde el servidor web no puede acceder la dirección del sistema temp, ingrese una dirección alternativa aquí. "
+
+#: mod/admin.php:1049
+msgid "Base path to installation"
+msgstr "Ruta base para la instalación"
+
+#: mod/admin.php:1049
+msgid ""
+"If the system cannot detect the correct path to your installation, enter the"
+" correct path here. This setting should only be set if you are using a "
+"restricted system and symbolic links to your webroot."
+msgstr "Si el sistema no puede detectar el acceso correcto a la instalación, ingrese la dirección correcta aquí. Esta configuración solo debería utilizarse si si usa un sistema restringido y enlaces simbolicos a su webroot."
+
+#: mod/admin.php:1050
+msgid "Disable picture proxy"
+msgstr "Deshabilitar proxy de imagen"
+
+#: mod/admin.php:1050
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on"
+" systems with very low bandwith."
+msgstr "El proxy de imagen mejora el performance y privacidad. No debería ser usado en sistemas con poco ancho de banda."
+
+#: mod/admin.php:1051
+msgid "Only search in tags"
+msgstr "Solo buscar en tags"
+
+#: mod/admin.php:1051
+msgid "On large systems the text search can slow down the system extremely."
+msgstr "En sistemas grandes, la búsqueda de texto puede enlentecer el sistema gravemente."
+
+#: mod/admin.php:1053
+msgid "New base url"
+msgstr "Nueva URLbase"
+
+#: mod/admin.php:1053
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts"
+" of all users."
+msgstr "Cambiar base URL para este servidor. Envía mensajes de relocalisación a todos los contactos DFRN."
+
+#: mod/admin.php:1055
+msgid "RINO Encryption"
+msgstr "Encryptado RINO"
+
+#: mod/admin.php:1055
+msgid "Encryption layer between nodes."
+msgstr "Capa de encryptación entre nodos."
+
+#: mod/admin.php:1056
+msgid "Embedly API key"
+msgstr "Embedly llave de API (API key) "
+
+#: mod/admin.php:1056
+msgid ""
+"Embedly is used to fetch additional data for "
+"web pages. This is an optional parameter."
+msgstr "Embedly es usado para recolectar datos adicionales para paginas web. Esto es un parámetro opcional."
+
+#: mod/admin.php:1058
+msgid "Maximum number of parallel workers"
+msgstr "Numero máximo de trabajos paralelos de fondo."
+
+#: mod/admin.php:1058
+msgid ""
+"On shared hosters set this to 2. On larger systems, values of 10 are great. "
+"Default value is 4."
+msgstr "Ajustar a 2 en un servidor compartido (shared hosting).\nEn sistemas grandes valores como 10 son excelentes.\nValor por defecto es 4."
+
+#: mod/admin.php:1059
+msgid "Don't use 'proc_open' with the worker"
+msgstr "No use 'proc_open' junto al \"trabajador\"!"
+
+#: mod/admin.php:1059
+msgid ""
+"Enable this if your system doesn't allow the use of 'proc_open'. This can "
+"happen on shared hosters. If this is enabled you should increase the "
+"frequency of poller calls in your crontab."
+msgstr "Habilite esta función si el sistema no permite el uso de 'proc_open'. Esto suelo suceder en servidores compartidos (shared hosting). Si esta función se habilita se debería incrementar la frecuencia de llamadas del poller (poller calls) en la pestaña de trabajos cron. (¡en el hosting?)"
+
+#: mod/admin.php:1060
+msgid "Enable fastlane"
+msgstr "Habilitar ascenso rápido"
+
+#: mod/admin.php:1060
+msgid ""
+"When enabed, the fastlane mechanism starts an additional worker if processes"
+" with higher priority are blocked by processes of lower priority."
+msgstr "Cuando está habilitado, el mecanismo ascenso rápido inicia un trabajador adicional si los procesos de mayor prioridad son bloqueados por prcesos de menor prioridad."
+
+#: mod/admin.php:1061
+msgid "Enable frontend worker"
+msgstr "Habilitar trabajador de interfaz"
+
+#: mod/admin.php:1061
+msgid ""
+"When enabled the Worker process is triggered when backend access is "
+"performed (e.g. messages being delivered). On smaller sites you might want "
+"to call yourdomain.tld/worker on a regular basis via an external cron job. "
+"You should only enable this option if you cannot utilize cron/scheduled jobs"
+" on your server. The worker background process needs to be activated for "
+"this."
+msgstr "Cuando está habilitado, el proceso de Trabajador se activa cuando se ejecuta el acceso de respaldo (ej. mensajes siendo entregados). En páginas más pequeñas usted puede querer llamar a yourdomain.tld/worker en una base regular mediante un trabajo cron externo. Sólo debería habilitar esta opción si no puede utilizar trabajos cron/scheduled en su servidor. El proceso de trabajador en segundo plano necesita ser activado para eso."
+
+#: mod/admin.php:1091
+msgid "Update has been marked successful"
+msgstr "La actualización se ha completado con éxito"
+
+#: mod/admin.php:1099
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr "Actualización de base de datos %s fue aplicada con éxito."
+
+#: mod/admin.php:1102
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr "El paso de actualización de la estructura de la base de datos %s fallo con el mensaje de error: %s"
+
+#: mod/admin.php:1116
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr "Paso %s fallo con el error: %s"
+
+#: mod/admin.php:1119
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Actualización %s aplicada con éxito."
+
+#: mod/admin.php:1122
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "La actualización %s no ha informado, se desconoce el estado."
+
+#: mod/admin.php:1125
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr "No había función adicional de actualización %s que necesitaba ser requerida."
+
+#: mod/admin.php:1145
+msgid "No failed updates."
+msgstr "Actualizaciones sin fallos."
+
+#: mod/admin.php:1146
+msgid "Check database structure"
+msgstr "Revisar estructura de la base de datos"
+
+#: mod/admin.php:1151
+msgid "Failed Updates"
+msgstr "Actualizaciones fallidas"
+
+#: mod/admin.php:1152
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr "No se incluyen las anteriores a la 1139, que no indicaban su estado."
+
+#: mod/admin.php:1153
+msgid "Mark success (if update was manually applied)"
+msgstr "Marcar como correcta (si actualizaste manualmente)"
+
+#: mod/admin.php:1154
+msgid "Attempt to execute this update step automatically"
+msgstr "Intentando ejecutar este paso automáticamente"
+
+#: mod/admin.php:1188
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
+msgstr "\n\t\t\tEstimado %1$s,\n\t\t\t\tel administrador de %2$s ha creado una cuenta para usted."
+
+#: mod/admin.php:1191
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tThank you and welcome to %4$s."
+msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%1$s\n\t\t\tNombre de la cuenta:\t\t%2$s\n\t\t\tContraseña:\t\t%3$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %4$s."
+
+#: mod/admin.php:1235
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s usuario bloqueado/desbloqueado"
+msgstr[1] "%s usuarios bloqueados/desbloqueados"
+
+#: mod/admin.php:1242
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s usuario eliminado"
+msgstr[1] "%s usuarios eliminados"
+
+#: mod/admin.php:1289
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Usuario '%s' eliminado"
+
+#: mod/admin.php:1297
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Usuario '%s' desbloqueado"
+
+#: mod/admin.php:1297
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Usuario '%s' bloqueado'"
+
+#: mod/admin.php:1405 mod/admin.php:1418 mod/admin.php:1431 mod/admin.php:1447
+#: mod/crepair.php:167 mod/settings.php:683 mod/settings.php:709
+msgid "Name"
+msgstr "Nombre"
+
+#: mod/admin.php:1405 mod/admin.php:1431
+msgid "Register date"
+msgstr "Fecha de registro"
+
+#: mod/admin.php:1405 mod/admin.php:1431
+msgid "Last login"
+msgstr "Último acceso"
+
+#: mod/admin.php:1405 mod/admin.php:1431
+msgid "Last item"
+msgstr "Último elemento"
+
+#: mod/admin.php:1405 mod/settings.php:43
+msgid "Account"
+msgstr "Cuenta"
+
+#: mod/admin.php:1414
+msgid "Add User"
+msgstr "Agregar usuario"
+
+#: mod/admin.php:1415
+msgid "select all"
+msgstr "seleccionar todo"
+
+#: mod/admin.php:1416
+msgid "User registrations waiting for confirm"
+msgstr "Registro de usuarios esperando confirmación"
+
+#: mod/admin.php:1417
+msgid "User waiting for permanent deletion"
+msgstr "Usuario esperando anulación permanente."
+
+#: mod/admin.php:1418
+msgid "Request date"
+msgstr "Solicitud de fecha"
+
+#: mod/admin.php:1419
+msgid "No registrations."
+msgstr "Sin registros."
+
+#: mod/admin.php:1420
+msgid "Note from the user"
+msgstr "Nota para el usuario"
+
+#: mod/admin.php:1421 mod/notifications.php:176 mod/notifications.php:255
+msgid "Approve"
+msgstr "Aprobar"
+
+#: mod/admin.php:1422
+msgid "Deny"
+msgstr "Denegado"
+
+#: mod/admin.php:1424 mod/contacts.php:613 mod/contacts.php:813
+#: mod/contacts.php:991
+msgid "Block"
+msgstr "Bloquear"
+
+#: mod/admin.php:1425 mod/contacts.php:613 mod/contacts.php:813
+#: mod/contacts.php:991
+msgid "Unblock"
+msgstr "Desbloquear"
+
+#: mod/admin.php:1426
+msgid "Site admin"
+msgstr "Administrador de la web"
+
+#: mod/admin.php:1427
+msgid "Account expired"
+msgstr "Cuenta caducada"
+
+#: mod/admin.php:1430
+msgid "New User"
+msgstr "Nuevo usuario"
+
+#: mod/admin.php:1431
+msgid "Deleted since"
+msgstr "Borrado desde"
+
+#: mod/admin.php:1436
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
+
+#: mod/admin.php:1437
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
+
+#: mod/admin.php:1447
+msgid "Name of the new user."
+msgstr "Nombre del nuevo usuario"
+
+#: mod/admin.php:1448
+msgid "Nickname"
+msgstr "Apodo"
+
+#: mod/admin.php:1448
+msgid "Nickname of the new user."
+msgstr "Apodo del nuevo perfil."
+
+#: mod/admin.php:1449
+msgid "Email address of the new user."
+msgstr "Dirección de correo del nuevo perfil."
+
+#: mod/admin.php:1492
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Módulo %s deshabilitado."
+
+#: mod/admin.php:1496
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Módulo %s habilitado."
+
+#: mod/admin.php:1507 mod/admin.php:1759
+msgid "Disable"
+msgstr "Desactivado"
+
+#: mod/admin.php:1509 mod/admin.php:1761
+msgid "Enable"
+msgstr "Activado"
+
+#: mod/admin.php:1532 mod/admin.php:1808
+msgid "Toggle"
+msgstr "Activar"
+
+#: mod/admin.php:1540 mod/admin.php:1817
+msgid "Author: "
+msgstr "Autor:"
+
+#: mod/admin.php:1541 mod/admin.php:1818
+msgid "Maintainer: "
+msgstr "Mantenedor: "
+
+#: mod/admin.php:1596
+msgid "Reload active plugins"
+msgstr "Recargar plugins activos"
+
+#: mod/admin.php:1601
+#, php-format
+msgid ""
+"There are currently no plugins available on your node. You can find the "
+"official plugin repository at %1$s and might find other interesting plugins "
+"in the open plugin registry at %2$s"
+msgstr "No ay plugins habilitados en este nodo. Encontrara los repositorios oficiales de plugins en %1$s y posiblemente encontrara mas plugins interesantes en el registro abierto de plugins aquí %2$s ."
+
+#: mod/admin.php:1720
+msgid "No themes found."
+msgstr "No se encontraron temas."
+
+#: mod/admin.php:1799
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+#: mod/admin.php:1859
+msgid "Reload active themes"
+msgstr "Recargar interfaces de usuario activos"
+
+#: mod/admin.php:1864
+#, php-format
+msgid "No themes found on the system. They should be paced in %1$s"
+msgstr "No se encuentran interfaces en el sistema. Deberían estar localizados (paced) en  %1$s"
+
+#: mod/admin.php:1865
+msgid "[Experimental]"
+msgstr "[Experimental]"
+
+#: mod/admin.php:1866
+msgid "[Unsupported]"
+msgstr "[Sin soporte]"
+
+#: mod/admin.php:1890
+msgid "Log settings updated."
+msgstr "Configuración de registro actualizada."
+
+#: mod/admin.php:1922
+msgid "PHP log currently enabled."
+msgstr "Registro PHP actualmente disponible."
+
+#: mod/admin.php:1924
+msgid "PHP log currently disabled."
+msgstr "Registro PHP actualmente deshabilitado."
+
+#: mod/admin.php:1933
+msgid "Clear"
+msgstr "Limpiar"
+
+#: mod/admin.php:1938
+msgid "Enable Debugging"
+msgstr "Habilitar debugging"
+
+#: mod/admin.php:1939
+msgid "Log file"
+msgstr "Archivo de registro"
+
+#: mod/admin.php:1939
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica."
+
+#: mod/admin.php:1940
+msgid "Log level"
+msgstr "Nivel de registro"
+
+#: mod/admin.php:1943
+msgid "PHP logging"
+msgstr "PHP logging"
+
+#: mod/admin.php:1944
+msgid ""
+"To enable logging of PHP errors and warnings you can add the following to "
+"the .htconfig.php file of your installation. The filename set in the "
+"'error_log' line is relative to the friendica top-level directory and must "
+"be writeable by the web server. The option '1' for 'log_errors' and "
+"'display_errors' is to enable these options, set to '0' to disable them."
+msgstr "Para habilitar la documentación de los errores PHP y las advertencias se puede agregar lo siguiente al archivo .htconfig.php de la instalación (ftp). La dirección definido en el 'error_log' es relativo al directorio friendica principal (top-level directory) y debe de ser habilitado para la escritura por el servidor web. La opción '1' para 'log_errors' y 'display_errors' es para habilitar estas opciones, '0' para deshabilitarlo."
+
+#: mod/admin.php:2074 mod/admin.php:2075 mod/settings.php:782
+msgid "Off"
+msgstr "Apagado"
+
+#: mod/admin.php:2074 mod/admin.php:2075 mod/settings.php:782
+msgid "On"
+msgstr "Encendido"
+
+#: mod/admin.php:2075
+#, php-format
+msgid "Lock feature %s"
+msgstr "Trancar opción %s "
+
+#: mod/admin.php:2083
+msgid "Manage Additional Features"
+msgstr "Administrar opciones adicionales"
+
+#: mod/allfriends.php:46
+msgid "No friends to display."
+msgstr "No hay amigos para mostrar."
+
+#: mod/api.php:76 mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autorizar la conexión de la aplicación"
+
+#: mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Regresa a tu aplicación e introduce este código de seguridad:"
+
+#: mod/api.php:89
+msgid "Please login to continue."
+msgstr "Inicia sesión para continuar."
+
+#: mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "¿Quieres autorizar a esta aplicación el acceso a tus mensajes y contactos, y/o crear nuevas publicaciones para ti?"
+
+#: mod/api.php:106 mod/dfrn_request.php:875 mod/follow.php:113
+#: mod/profiles.php:640 mod/profiles.php:644 mod/profiles.php:669
+#: mod/register.php:246 mod/settings.php:1171 mod/settings.php:1177
+#: mod/settings.php:1184 mod/settings.php:1188 mod/settings.php:1193
+#: mod/settings.php:1198 mod/settings.php:1203 mod/settings.php:1208
+#: mod/settings.php:1234 mod/settings.php:1235 mod/settings.php:1236
+#: mod/settings.php:1237 mod/settings.php:1238
+msgid "No"
+msgstr "No"
+
+#: mod/apps.php:11
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#: mod/apps.php:14
+msgid "No installed applications."
+msgstr "Sin aplicaciones"
+
+#: mod/attach.php:8
+msgid "Item not available."
+msgstr "Elemento no disponible."
+
+#: mod/attach.php:20
+msgid "Item was not found."
+msgstr "Elemento no encontrado."
+
+#: mod/babel.php:17
+msgid "Source (bbcode) text:"
+msgstr "Texto fuente (bbcode):"
+
+#: mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
+msgstr "Fuente (Diaspora) para pasar a BBcode:"
+
+#: mod/babel.php:31
+msgid "Source input: "
+msgstr "Entrada: "
+
+#: mod/babel.php:35
+msgid "bb2html (raw HTML): "
+msgstr "bb2html (raw HTML): "
+
+#: mod/babel.php:39
+msgid "bb2html: "
+msgstr "bb2html: "
+
+#: mod/babel.php:43
+msgid "bb2html2bb: "
+msgstr "bb2html2bb: "
+
+#: mod/babel.php:47
+msgid "bb2md: "
+msgstr "bb2md: "
+
+#: mod/babel.php:51
+msgid "bb2md2html: "
+msgstr "bb2md2html: "
+
+#: mod/babel.php:55
+msgid "bb2dia2bb: "
+msgstr "bb2dia2bb: "
+
+#: mod/babel.php:59
+msgid "bb2md2html2bb: "
+msgstr "bb2md2html2bb: "
+
+#: mod/babel.php:69
+msgid "Source input (Diaspora format): "
+msgstr "Fuente (formato Diaspora): "
+
+#: mod/babel.php:74
+msgid "diaspora2bb: "
+msgstr "diaspora2bb: "
+
+#: mod/bookmarklet.php:41
+msgid "The post was created"
+msgstr "La publicación fue creada"
+
+#: mod/cal.php:143 mod/display.php:328 mod/profile.php:154
+msgid "Access to this profile has been restricted."
+msgstr "El acceso a este perfil ha sido restringido."
+
+#: mod/cal.php:271 mod/events.php:387
+msgid "View"
+msgstr "Vista"
+
+#: mod/cal.php:272 mod/events.php:389
+msgid "Previous"
+msgstr "Previo"
+
+#: mod/cal.php:273 mod/events.php:390 mod/install.php:235
+msgid "Next"
+msgstr "Siguiente"
+
+#: mod/cal.php:282 mod/events.php:399
+msgid "list"
+msgstr "lista"
+
+#: mod/cal.php:292
+msgid "User not found"
+msgstr "Usuario no encontrado"
+
+#: mod/cal.php:308
+msgid "This calendar format is not supported"
+msgstr "Este formato de calendario no se soporta"
+
+#: mod/cal.php:310
+msgid "No exportable data found"
+msgstr "No se ha encontrado información exportable"
+
+#: mod/cal.php:325
+msgid "calendar"
+msgstr "calendario"
+
+#: mod/common.php:91
+msgid "No contacts in common."
+msgstr "Sin contactos en común."
+
+#: mod/common.php:141 mod/contacts.php:871
+msgid "Common Friends"
+msgstr "Amigos comunes"
+
+#: mod/community.php:22 mod/dfrn_request.php:799 mod/directory.php:37
+#: mod/display.php:200 mod/photos.php:964 mod/search.php:93 mod/search.php:99
+#: mod/videos.php:198 mod/viewcontacts.php:36
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
-#: mod/search.php:100
-msgid "Only logged in users are permitted to perform a search."
-msgstr "Solo usuarios activos tienen permiso para ejecutar búsquedas."
+#: mod/community.php:27
+msgid "Not available."
+msgstr "No disponible"
 
-#: mod/search.php:124
-msgid "Too Many Requests"
-msgstr "Demasiadas consultas"
-
-#: mod/search.php:125
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr "Se permite solo una búsqueda por minuto para usuarios no identificados."
-
-#: mod/search.php:224 mod/community.php:66 mod/community.php:75
+#: mod/community.php:54 mod/search.php:224
 msgid "No results."
 msgstr "Sin resultados."
 
-#: mod/search.php:230
+#: mod/contacts.php:134
 #, php-format
-msgid "Items tagged with: %s"
-msgstr "Objetos taggeado con: %s"
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d contacto editado."
+msgstr[1] "%d contacts edited."
 
-#: mod/search.php:232 mod/contacts.php:797 mod/network.php:146
+#: mod/contacts.php:169 mod/contacts.php:378
+msgid "Could not access contact record."
+msgstr "No se pudo acceder a los datos del contacto."
+
+#: mod/contacts.php:183
+msgid "Could not locate selected profile."
+msgstr "No se pudo encontrar el perfil seleccionado."
+
+#: mod/contacts.php:216
+msgid "Contact updated."
+msgstr "Contacto actualizado."
+
+#: mod/contacts.php:218 mod/dfrn_request.php:588
+msgid "Failed to update contact record."
+msgstr "Error al actualizar el contacto."
+
+#: mod/contacts.php:399
+msgid "Contact has been blocked"
+msgstr "El contacto ha sido bloqueado"
+
+#: mod/contacts.php:399
+msgid "Contact has been unblocked"
+msgstr "El contacto ha sido desbloqueado"
+
+#: mod/contacts.php:410
+msgid "Contact has been ignored"
+msgstr "El contacto ha sido ignorado"
+
+#: mod/contacts.php:410
+msgid "Contact has been unignored"
+msgstr "El contacto ya no está ignorado"
+
+#: mod/contacts.php:422
+msgid "Contact has been archived"
+msgstr "El contacto ha sido archivado"
+
+#: mod/contacts.php:422
+msgid "Contact has been unarchived"
+msgstr "El contacto ya no está archivado"
+
+#: mod/contacts.php:447
+msgid "Drop contact"
+msgstr "Eliminar contacto"
+
+#: mod/contacts.php:450 mod/contacts.php:809
+msgid "Do you really want to delete this contact?"
+msgstr "¿Estás seguro de que quieres eliminar este contacto?"
+
+#: mod/contacts.php:469
+msgid "Contact has been removed."
+msgstr "El contacto ha sido eliminado"
+
+#: mod/contacts.php:506
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Ahora tienes una amistad mutua con %s"
+
+#: mod/contacts.php:510
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Estás compartiendo con %s"
+
+#: mod/contacts.php:515
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s está compartiendo contigo"
+
+#: mod/contacts.php:535
+msgid "Private communications are not available for this contact."
+msgstr "Las comunicaciones privadas no está disponibles para este contacto."
+
+#: mod/contacts.php:542
+msgid "(Update was successful)"
+msgstr "(La actualización se ha completado)"
+
+#: mod/contacts.php:542
+msgid "(Update was not successful)"
+msgstr "(La actualización no se ha completado)"
+
+#: mod/contacts.php:544 mod/contacts.php:972
+msgid "Suggest friends"
+msgstr "Sugerir amigos"
+
+#: mod/contacts.php:548
+#, php-format
+msgid "Network type: %s"
+msgstr "Tipo de red: %s"
+
+#: mod/contacts.php:561
+msgid "Communications lost with this contact!"
+msgstr "¡Se ha perdido la comunicación con este contacto!"
+
+#: mod/contacts.php:564
+msgid "Fetch further information for feeds"
+msgstr "Recaudar informacion complementaria de los feeds"
+
+#: mod/contacts.php:565
+msgid "Fetch information"
+msgstr "Recaudar informacion"
+
+#: mod/contacts.php:565
+msgid "Fetch information and keywords"
+msgstr "Recaudar informacion y palabras claves"
+
+#: mod/contacts.php:583
+msgid "Contact"
+msgstr "Contacto"
+
+#: mod/contacts.php:585 mod/content.php:728 mod/crepair.php:156
+#: mod/events.php:513 mod/fsuggest.php:108 mod/install.php:276
+#: mod/install.php:316 mod/invite.php:142 mod/localtime.php:45
+#: mod/manage.php:145 mod/message.php:338 mod/message.php:521 mod/mood.php:138
+#: mod/photos.php:1124 mod/photos.php:1246 mod/photos.php:1562
+#: mod/photos.php:1612 mod/photos.php:1660 mod/photos.php:1746
+#: mod/poke.php:203 mod/profiles.php:680 object/Item.php:705
+#: view/theme/duepuntozero/config.php:61 view/theme/frio/config.php:64
+#: view/theme/quattro/config.php:67 view/theme/vier/config.php:112
+msgid "Submit"
+msgstr "Envíar"
+
+#: mod/contacts.php:586
+msgid "Profile Visibility"
+msgstr "Visibilidad del Perfil"
+
+#: mod/contacts.php:587
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura."
+
+#: mod/contacts.php:588
+msgid "Contact Information / Notes"
+msgstr "Información del Contacto / Notas"
+
+#: mod/contacts.php:589
+msgid "Edit contact notes"
+msgstr "Editar notas del contacto"
+
+#: mod/contacts.php:594 mod/contacts.php:938 mod/nogroup.php:43
+#: mod/viewcontacts.php:102
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Ver el perfil de %s [%s]"
+
+#: mod/contacts.php:595
+msgid "Block/Unblock contact"
+msgstr "Boquear/Desbloquear contacto"
+
+#: mod/contacts.php:596
+msgid "Ignore contact"
+msgstr "Ignorar contacto"
+
+#: mod/contacts.php:597
+msgid "Repair URL settings"
+msgstr "Configuración de reparación de la dirección"
+
+#: mod/contacts.php:598
+msgid "View conversations"
+msgstr "Ver conversaciones"
+
+#: mod/contacts.php:604
+msgid "Last update:"
+msgstr "Última actualización:"
+
+#: mod/contacts.php:606
+msgid "Update public posts"
+msgstr "Actualizar publicaciones públicas"
+
+#: mod/contacts.php:608 mod/contacts.php:982
+msgid "Update now"
+msgstr "Actualizar ahora"
+
+#: mod/contacts.php:614 mod/contacts.php:814 mod/contacts.php:999
+msgid "Unignore"
+msgstr "Quitar de Ignorados"
+
+#: mod/contacts.php:614 mod/contacts.php:814 mod/contacts.php:999
+#: mod/notifications.php:60 mod/notifications.php:179
+#: mod/notifications.php:257
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: mod/contacts.php:618
+msgid "Currently blocked"
+msgstr "Bloqueados"
+
+#: mod/contacts.php:619
+msgid "Currently ignored"
+msgstr "Ignorados"
+
+#: mod/contacts.php:620
+msgid "Currently archived"
+msgstr "Archivados"
+
+#: mod/contacts.php:621 mod/notifications.php:172 mod/notifications.php:245
+msgid "Hide this contact from others"
+msgstr "Ocultar este contacto a los demás."
+
+#: mod/contacts.php:621
+msgid ""
+"Replies/likes to your public posts may still be visible"
+msgstr "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía pueden ser visibles."
+
+#: mod/contacts.php:622
+msgid "Notification for new posts"
+msgstr "Notificacion de nuevos temas."
+
+#: mod/contacts.php:622
+msgid "Send a notification of every new post of this contact"
+msgstr "Enviar una notificacion por nuevos temas de este contacto."
+
+#: mod/contacts.php:625
+msgid "Blacklisted keywords"
+msgstr "Lista negra de palabras"
+
+#: mod/contacts.php:625
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
+msgstr "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado"
+
+#: mod/contacts.php:632 mod/follow.php:129 mod/notifications.php:249
+msgid "Profile URL"
+msgstr "URL Perfil"
+
+#: mod/contacts.php:643
+msgid "Actions"
+msgstr "Acciones"
+
+#: mod/contacts.php:646
+msgid "Contact Settings"
+msgstr "Ajustes del contacto"
+
+#: mod/contacts.php:692
+msgid "Suggestions"
+msgstr "Sugerencias"
+
+#: mod/contacts.php:695
+msgid "Suggest potential friends"
+msgstr "Amistades potenciales sugeridas"
+
+#: mod/contacts.php:700 mod/group.php:202
+msgid "All Contacts"
+msgstr "Todos los contactos"
+
+#: mod/contacts.php:703
+msgid "Show all contacts"
+msgstr "Mostrar todos los contactos"
+
+#: mod/contacts.php:708
+msgid "Unblocked"
+msgstr "Desbloqueados"
+
+#: mod/contacts.php:711
+msgid "Only show unblocked contacts"
+msgstr "Mostrar solo contactos sin bloquear"
+
+#: mod/contacts.php:717
+msgid "Blocked"
+msgstr "Bloqueados"
+
+#: mod/contacts.php:720
+msgid "Only show blocked contacts"
+msgstr "Mostrar solo contactos bloqueados"
+
+#: mod/contacts.php:726
+msgid "Ignored"
+msgstr "Ignorados"
+
+#: mod/contacts.php:729
+msgid "Only show ignored contacts"
+msgstr "Mostrar solo contactos ignorados"
+
+#: mod/contacts.php:735
+msgid "Archived"
+msgstr "Archivados"
+
+#: mod/contacts.php:738
+msgid "Only show archived contacts"
+msgstr "Mostrar solo contactos archivados"
+
+#: mod/contacts.php:744
+msgid "Hidden"
+msgstr "Ocultos"
+
+#: mod/contacts.php:747
+msgid "Only show hidden contacts"
+msgstr "Mostrar solo contactos ocultos"
+
+#: mod/contacts.php:804
+msgid "Search your contacts"
+msgstr "Buscar en tus contactos"
+
+#: mod/contacts.php:805 mod/network.php:145 mod/search.php:232
 #, php-format
 msgid "Results for: %s"
 msgstr "Resultados para: %s"
 
-#: mod/friendica.php:70
+#: mod/contacts.php:812 mod/settings.php:160 mod/settings.php:707
+msgid "Update"
+msgstr "Actualizar"
+
+#: mod/contacts.php:815 mod/contacts.php:1007
+msgid "Archive"
+msgstr "Archivo"
+
+#: mod/contacts.php:815 mod/contacts.php:1007
+msgid "Unarchive"
+msgstr "Sin archivar"
+
+#: mod/contacts.php:818
+msgid "Batch Actions"
+msgstr "Accones en lote"
+
+#: mod/contacts.php:864
+msgid "View all contacts"
+msgstr "Ver todos los contactos"
+
+#: mod/contacts.php:874
+msgid "View all common friends"
+msgstr "Ver todos los conocidos en común "
+
+#: mod/contacts.php:881
+msgid "Advanced Contact Settings"
+msgstr "Configuración avanzada"
+
+#: mod/contacts.php:915
+msgid "Mutual Friendship"
+msgstr "Amistad recíproca"
+
+#: mod/contacts.php:919
+msgid "is a fan of yours"
+msgstr "es tu fan"
+
+#: mod/contacts.php:923
+msgid "you are a fan of"
+msgstr "eres fan de"
+
+#: mod/contacts.php:939 mod/nogroup.php:44
+msgid "Edit contact"
+msgstr "Modificar contacto"
+
+#: mod/contacts.php:993
+msgid "Toggle Blocked status"
+msgstr "Cambiar bloqueados"
+
+#: mod/contacts.php:1001
+msgid "Toggle Ignored status"
+msgstr "Cambiar ignorados"
+
+#: mod/contacts.php:1009
+msgid "Toggle Archive status"
+msgstr "Cambiar archivados"
+
+#: mod/contacts.php:1017
+msgid "Delete contact"
+msgstr "Eliminar contacto"
+
+#: mod/content.php:119 mod/network.php:468
+msgid "No such group"
+msgstr "Ningún grupo"
+
+#: mod/content.php:130 mod/group.php:203 mod/network.php:495
+msgid "Group is empty"
+msgstr "El grupo está vacío"
+
+#: mod/content.php:135 mod/network.php:499
+#, php-format
+msgid "Group: %s"
+msgstr "Grupo: %s"
+
+#: mod/content.php:325 object/Item.php:96
+msgid "This entry was edited"
+msgstr "Esta entrada fue editada"
+
+#: mod/content.php:621 object/Item.php:417
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d comentario"
+msgstr[1] "%d comentarios"
+
+#: mod/content.php:638 mod/photos.php:1402 object/Item.php:117
+msgid "Private Message"
+msgstr "Mensaje privado"
+
+#: mod/content.php:702 mod/photos.php:1590 object/Item.php:274
+msgid "I like this (toggle)"
+msgstr "Me gusta esto (cambiar)"
+
+#: mod/content.php:702 object/Item.php:274
+msgid "like"
+msgstr "me gusta"
+
+#: mod/content.php:703 mod/photos.php:1591 object/Item.php:275
+msgid "I don't like this (toggle)"
+msgstr "No me gusta esto (cambiar)"
+
+#: mod/content.php:703 object/Item.php:275
+msgid "dislike"
+msgstr "no me gusta"
+
+#: mod/content.php:705 object/Item.php:278
+msgid "Share this"
+msgstr "Compartir esto"
+
+#: mod/content.php:705 object/Item.php:278
+msgid "share"
+msgstr "compartir"
+
+#: mod/content.php:725 mod/photos.php:1609 mod/photos.php:1657
+#: mod/photos.php:1743 object/Item.php:702
+msgid "This is you"
+msgstr "Este eres tú"
+
+#: mod/content.php:727 mod/content.php:950 mod/photos.php:1611
+#: mod/photos.php:1659 mod/photos.php:1745 object/Item.php:392
+#: object/Item.php:704
+msgid "Comment"
+msgstr "Comentar"
+
+#: mod/content.php:729 object/Item.php:706
+msgid "Bold"
+msgstr "Negrita"
+
+#: mod/content.php:730 object/Item.php:707
+msgid "Italic"
+msgstr "Cursiva"
+
+#: mod/content.php:731 object/Item.php:708
+msgid "Underline"
+msgstr "Subrayado"
+
+#: mod/content.php:732 object/Item.php:709
+msgid "Quote"
+msgstr "Cita"
+
+#: mod/content.php:733 object/Item.php:710
+msgid "Code"
+msgstr "Código"
+
+#: mod/content.php:734 object/Item.php:711
+msgid "Image"
+msgstr "Imagen"
+
+#: mod/content.php:735 object/Item.php:712
+msgid "Link"
+msgstr "Enlace"
+
+#: mod/content.php:736 object/Item.php:713
+msgid "Video"
+msgstr "Vídeo"
+
+#: mod/content.php:746 mod/settings.php:743 object/Item.php:122
+#: object/Item.php:124
+msgid "Edit"
+msgstr "Editar"
+
+#: mod/content.php:772 object/Item.php:238
+msgid "add star"
+msgstr "Añadir estrella"
+
+#: mod/content.php:773 object/Item.php:239
+msgid "remove star"
+msgstr "Quitar estrella"
+
+#: mod/content.php:774 object/Item.php:240
+msgid "toggle star status"
+msgstr "Añadir a destacados"
+
+#: mod/content.php:777 object/Item.php:243
+msgid "starred"
+msgstr "marcados con estrellas"
+
+#: mod/content.php:778 mod/content.php:800 object/Item.php:263
+msgid "add tag"
+msgstr "añadir etiqueta"
+
+#: mod/content.php:789 object/Item.php:251
+msgid "ignore thread"
+msgstr "ignorar publicación"
+
+#: mod/content.php:790 object/Item.php:252
+msgid "unignore thread"
+msgstr "revertir ignorar publicacion"
+
+#: mod/content.php:791 object/Item.php:253
+msgid "toggle ignore status"
+msgstr "cambiar estatus de observación"
+
+#: mod/content.php:794 mod/ostatus_subscribe.php:73 object/Item.php:256
+msgid "ignored"
+msgstr "ignorado"
+
+#: mod/content.php:805 object/Item.php:141
+msgid "save to folder"
+msgstr "grabado en directorio"
+
+#: mod/content.php:853 object/Item.php:212
+msgid "I will attend"
+msgstr "Voy a estar presente"
+
+#: mod/content.php:853 object/Item.php:212
+msgid "I will not attend"
+msgstr "No voy a estar presente"
+
+#: mod/content.php:853 object/Item.php:212
+msgid "I might attend"
+msgstr "Puede que voy a estar presente"
+
+#: mod/content.php:917 object/Item.php:358
+msgid "to"
+msgstr "a"
+
+#: mod/content.php:918 object/Item.php:360
+msgid "Wall-to-Wall"
+msgstr "Muro-A-Muro"
+
+#: mod/content.php:919 object/Item.php:361
+msgid "via Wall-To-Wall:"
+msgstr "via Muro-A-Muro:"
+
+#: mod/credits.php:16
+msgid "Credits"
+msgstr "Creditos"
+
+#: mod/credits.php:17
+msgid ""
+"Friendica is a community project, that would not be possible without the "
+"help of many people. Here is a list of those who have contributed to the "
+"code or the translation of Friendica. Thank you all!"
+msgstr "Friendica es un proyecto comunitario, que no seria posible sin la ayuda de mucha gente. Aquí una lista de de aquellos que aportaron al código o la traducción de friendica.\nGracias a todos! "
+
+#: mod/crepair.php:89
+msgid "Contact settings applied."
+msgstr "Contacto configurado con éxito."
+
+#: mod/crepair.php:91
+msgid "Contact update failed."
+msgstr "Error al actualizar el Contacto."
+
+#: mod/crepair.php:116 mod/dfrn_confirm.php:126 mod/fsuggest.php:21
+#: mod/fsuggest.php:93
+msgid "Contact not found."
+msgstr "Contacto no encontrado."
+
+#: mod/crepair.php:122
+msgid ""
+"WARNING: This is highly advanced and if you enter incorrect"
+" information your communications with this contact may stop working."
+msgstr "ADVERTENCIA: Esto es muy avanzado y si se introduce información incorrecta tu conexión con este contacto puede dejar de funcionar."
+
+#: mod/crepair.php:123
+msgid ""
+"Please use your browser 'Back' button now if you are "
+"uncertain what to do on this page."
+msgstr "Por favor usa el botón 'Atás' de tu navegador ahora si no tienes claro qué hacer en esta página."
+
+#: mod/crepair.php:136 mod/crepair.php:138
+msgid "No mirroring"
+msgstr "No espejar"
+
+#: mod/crepair.php:136
+msgid "Mirror as forwarded posting"
+msgstr "Espejar como reenvio"
+
+#: mod/crepair.php:136 mod/crepair.php:138
+msgid "Mirror as my own posting"
+msgstr "Espejar como publicación propia"
+
+#: mod/crepair.php:152
+msgid "Return to contact editor"
+msgstr "Volver al editor de contactos"
+
+#: mod/crepair.php:154
+msgid "Refetch contact data"
+msgstr "Volver a solicitar datos del contacto."
+
+#: mod/crepair.php:158
+msgid "Remote Self"
+msgstr "Perfil remoto"
+
+#: mod/crepair.php:161
+msgid "Mirror postings from this contact"
+msgstr "Espejar publicaciones de este contacto"
+
+#: mod/crepair.php:163
+msgid ""
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
+msgstr "Marcar este contacto como perfil_remoto, esto generara que friendica reenvía nuevas publicaciones desde esta cuenta."
+
+#: mod/crepair.php:168
+msgid "Account Nickname"
+msgstr "Apodo de la cuenta"
+
+#: mod/crepair.php:169
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Etiqueta - Sobrescribe el Nombre/Apodo"
+
+#: mod/crepair.php:170
+msgid "Account URL"
+msgstr "Dirección de la cuenta"
+
+#: mod/crepair.php:171
+msgid "Friend Request URL"
+msgstr "Dirección de la solicitud de amistad"
+
+#: mod/crepair.php:172
+msgid "Friend Confirm URL"
+msgstr "Dirección de confirmación de tu amigo "
+
+#: mod/crepair.php:173
+msgid "Notification Endpoint URL"
+msgstr "Dirección URL de la notificación"
+
+#: mod/crepair.php:174
+msgid "Poll/Feed URL"
+msgstr "Dirección del Sondeo/Fuentes"
+
+#: mod/crepair.php:175
+msgid "New photo from this URL"
+msgstr "Nueva foto de esta dirección"
+
+#: mod/delegate.php:101
+msgid "No potential page delegates located."
+msgstr "No se han localizado delegados potenciales de la página."
+
+#: mod/delegate.php:132
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Los delegados tienen la capacidad de gestionar todos los aspectos de esta cuenta/página, excepto los ajustes básicos de la cuenta. Por favor, no delegues tu cuenta personal a nadie en quien no confíes completamente."
+
+#: mod/delegate.php:133
+msgid "Existing Page Managers"
+msgstr "Administradores actuales de la página"
+
+#: mod/delegate.php:135
+msgid "Existing Page Delegates"
+msgstr "Delegados actuales de la página"
+
+#: mod/delegate.php:137
+msgid "Potential Delegates"
+msgstr "Delegados potenciales"
+
+#: mod/delegate.php:139 mod/tagrm.php:95
+msgid "Remove"
+msgstr "Eliminar"
+
+#: mod/delegate.php:140
+msgid "Add"
+msgstr "Añadir"
+
+#: mod/delegate.php:141
+msgid "No entries."
+msgstr "Sin entradas."
+
+#: mod/dfrn_confirm.php:70 mod/profiles.php:19 mod/profiles.php:134
+#: mod/profiles.php:180 mod/profiles.php:619
+msgid "Profile not found."
+msgstr "Perfil no encontrado."
+
+#: mod/dfrn_confirm.php:127
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Esto puede ocurrir a veces si la conexión fue solicitada por ambas personas y ya hubiera sido aprobada."
+
+#: mod/dfrn_confirm.php:244
+msgid "Response from remote site was not understood."
+msgstr "La respuesta desde el sitio remoto no ha sido entendida."
+
+#: mod/dfrn_confirm.php:253 mod/dfrn_confirm.php:258
+msgid "Unexpected response from remote site: "
+msgstr "Respuesta inesperada desde el sitio remoto: "
+
+#: mod/dfrn_confirm.php:267
+msgid "Confirmation completed successfully."
+msgstr "Confirmación completada con éxito."
+
+#: mod/dfrn_confirm.php:269 mod/dfrn_confirm.php:283 mod/dfrn_confirm.php:290
+msgid "Remote site reported: "
+msgstr "El sito remoto informó: "
+
+#: mod/dfrn_confirm.php:281
+msgid "Temporary failure. Please wait and try again."
+msgstr "Error temporal. Por favor, espere y vuelva a intentarlo."
+
+#: mod/dfrn_confirm.php:288
+msgid "Introduction failed or was revoked."
+msgstr "La presentación ha fallado o ha sido anulada."
+
+#: mod/dfrn_confirm.php:418
+msgid "Unable to set contact photo."
+msgstr "Imposible establecer la foto del contacto."
+
+#: mod/dfrn_confirm.php:559
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "No se ha encontrado a ningún '%s' "
+
+#: mod/dfrn_confirm.php:569
+msgid "Our site encryption key is apparently messed up."
+msgstr "Nuestra clave de cifrado del sitio es aparentemente un lío."
+
+#: mod/dfrn_confirm.php:580
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Se ha proporcionado una dirección vacía o no hemos podido descifrarla."
+
+#: mod/dfrn_confirm.php:601
+msgid "Contact record was not found for you on our site."
+msgstr "El contacto no se ha encontrado en nuestra base de datos."
+
+#: mod/dfrn_confirm.php:615
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "La clave pública del sitio no está disponible en los datos del contacto para %s."
+
+#: mod/dfrn_confirm.php:635
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr "La identificación proporcionada por el sistema es un duplicado de nuestro sistema. Debería funcionar si lo intentas de nuevo."
+
+#: mod/dfrn_confirm.php:646
+msgid "Unable to set your contact credentials on our system."
+msgstr "No se puede establecer las credenciales de tu contacto en nuestro sistema."
+
+#: mod/dfrn_confirm.php:708
+msgid "Unable to update your contact profile details on our system"
+msgstr "No se puede actualizar los datos de tu perfil de contacto en nuestro sistema"
+
+#: mod/dfrn_confirm.php:780
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr "%1$s se ha unido a %2$s"
+
+#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:539
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s te da la bienvenida a %2$s"
+
+#: mod/dfrn_request.php:101
+msgid "This introduction has already been accepted."
+msgstr "Esta presentación ya ha sido aceptada."
+
+#: mod/dfrn_request.php:124 mod/dfrn_request.php:523
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "La dirección del perfil no es válida o no contiene información del perfil."
+
+#: mod/dfrn_request.php:129 mod/dfrn_request.php:528
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Aviso: La dirección del perfil no tiene un nombre de propietario identificable."
+
+#: mod/dfrn_request.php:132 mod/dfrn_request.php:531
+msgid "Warning: profile location has no profile photo."
+msgstr "Aviso: la dirección del perfil no tiene foto de perfil."
+
+#: mod/dfrn_request.php:136 mod/dfrn_request.php:535
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] "no se encontró %d parámetro requerido en el lugar determinado"
+msgstr[1] "no se encontraron %d parámetros requeridos en el lugar determinado"
+
+#: mod/dfrn_request.php:180
+msgid "Introduction complete."
+msgstr "Presentación completa."
+
+#: mod/dfrn_request.php:225
+msgid "Unrecoverable protocol error."
+msgstr "Error de protocolo irrecuperable."
+
+#: mod/dfrn_request.php:253
+msgid "Profile unavailable."
+msgstr "Perfil no disponible."
+
+#: mod/dfrn_request.php:280
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s ha recibido demasiadas solicitudes de conexión hoy."
+
+#: mod/dfrn_request.php:281
+msgid "Spam protection measures have been invoked."
+msgstr "Han sido activadas las medidas de protección contra spam."
+
+#: mod/dfrn_request.php:282
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "Tus amigos serán avisados para que lo intenten de nuevo pasadas 24 horas."
+
+#: mod/dfrn_request.php:344
+msgid "Invalid locator"
+msgstr "Localizador no válido"
+
+#: mod/dfrn_request.php:353
+msgid "Invalid email address."
+msgstr "Dirección de correo incorrecta"
+
+#: mod/dfrn_request.php:378
+msgid "This account has not been configured for email. Request failed."
+msgstr "Esta cuenta no ha sido configurada para el correo. Fallo de solicitud."
+
+#: mod/dfrn_request.php:481
+msgid "You have already introduced yourself here."
+msgstr "Ya te has presentado aquí."
+
+#: mod/dfrn_request.php:485
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Al parecer, ya eres amigo de %s."
+
+#: mod/dfrn_request.php:506
+msgid "Invalid profile URL."
+msgstr "Dirección de perfil no válida."
+
+#: mod/dfrn_request.php:609
+msgid "Your introduction has been sent."
+msgstr "Tu presentación ha sido enviada."
+
+#: mod/dfrn_request.php:651
+msgid ""
+"Remote subscription can't be done for your network. Please subscribe "
+"directly on your system."
+msgstr "La subscripción remota no se podrá hacer para tu red. Por favor contacta directamente desde tu sistema."
+
+#: mod/dfrn_request.php:672
+msgid "Please login to confirm introduction."
+msgstr "Inicia sesión para confirmar la presentación."
+
+#: mod/dfrn_request.php:682
+msgid ""
+"Incorrect identity currently logged in. Please login to "
+"this profile."
+msgstr "Sesión iniciada con la identificación incorrecta. Entra en este perfil."
+
+#: mod/dfrn_request.php:696 mod/dfrn_request.php:713
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: mod/dfrn_request.php:708
+msgid "Hide this contact"
+msgstr "Ocultar este contacto"
+
+#: mod/dfrn_request.php:711
+#, php-format
+msgid "Welcome home %s."
+msgstr "Bienvenido a casa %s"
+
+#: mod/dfrn_request.php:712
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Por favor, confirma tu solicitud de presentación/conexión con %s."
+
+#: mod/dfrn_request.php:843
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr "Por favor introduce tu dirección ID de una de las siguientes redes sociales soportadas:"
+
+#: mod/dfrn_request.php:867
+#, php-format
+msgid ""
+"If you are not yet a member of the free social web, follow this link to find a public Friendica site and "
+"join us today."
+msgstr "Si aun no eres miembro de la red social libre  seguí este enlace para encontrara un sitio disponible de friendica y acompañanos hoy mismo"
+
+#: mod/dfrn_request.php:872
+msgid "Friend/Connection Request"
+msgstr "Solicitud de Amistad/Conexión"
+
+#: mod/dfrn_request.php:873
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
+
+#: mod/dfrn_request.php:874 mod/follow.php:112
+msgid "Please answer the following:"
+msgstr "Por favor responde lo siguiente:"
+
+#: mod/dfrn_request.php:875 mod/follow.php:113
+#, php-format
+msgid "Does %s know you?"
+msgstr "¿%s te conoce?"
+
+#: mod/dfrn_request.php:879 mod/follow.php:114
+msgid "Add a personal note:"
+msgstr "Añade una nota personal:"
+
+#: mod/dfrn_request.php:882
+msgid "StatusNet/Federated Social Web"
+msgstr "StatusNet/Web Social Federada"
+
+#: mod/dfrn_request.php:884
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search"
+" bar."
+msgstr "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora."
+
+#: mod/dfrn_request.php:885 mod/follow.php:120
+msgid "Your Identity Address:"
+msgstr "Dirección de tu perfil:"
+
+#: mod/dfrn_request.php:888 mod/follow.php:19
+msgid "Submit Request"
+msgstr "Enviar solicitud"
+
+#: mod/directory.php:199 view/theme/vier/theme.php:196
+msgid "Global Directory"
+msgstr "Directorio global"
+
+#: mod/directory.php:201
+msgid "Find on this site"
+msgstr "Buscar en este sitio"
+
+#: mod/directory.php:203
+msgid "Results for:"
+msgstr "Resultados para:"
+
+#: mod/directory.php:205
+msgid "Site Directory"
+msgstr "Directorio del sitio"
+
+#: mod/directory.php:212
+msgid "No entries (some entries may be hidden)."
+msgstr "Sin entradas (algunas pueden que estén ocultas)."
+
+#: mod/dirfind.php:37
+#, php-format
+msgid "People Search - %s"
+msgstr "Buscar perfiles - %s"
+
+#: mod/dirfind.php:48
+#, php-format
+msgid "Forum Search - %s"
+msgstr "Búsqueda de foro - %s"
+
+#: mod/dirfind.php:245 mod/match.php:109
+msgid "No matches"
+msgstr "Sin conincidencias"
+
+#: mod/display.php:479
+msgid "Item has been removed."
+msgstr "El elemento ha sido eliminado."
+
+#: mod/editpost.php:17 mod/editpost.php:27
+msgid "Item not found"
+msgstr "Elemento no encontrado"
+
+#: mod/editpost.php:32
+msgid "Edit post"
+msgstr "Editar publicación"
+
+#: mod/events.php:100 mod/events.php:102
+msgid "Event can not end before it has started."
+msgstr "Un evento no puede terminar antes de su comienzo."
+
+#: mod/events.php:109 mod/events.php:111
+msgid "Event title and start time are required."
+msgstr "Título del evento y hora de inicio requeridas."
+
+#: mod/events.php:388
+msgid "Create New Event"
+msgstr "Crea un evento nuevo"
+
+#: mod/events.php:489
+msgid "Event details"
+msgstr "Detalles del evento"
+
+#: mod/events.php:490
+msgid "Starting date and Title are required."
+msgstr "Se requiere fecha de comienzo y titulo"
+
+#: mod/events.php:491 mod/events.php:492
+msgid "Event Starts:"
+msgstr "Inicio del evento:"
+
+#: mod/events.php:491 mod/events.php:503 mod/profiles.php:708
+msgid "Required"
+msgstr "Obligatorio"
+
+#: mod/events.php:493 mod/events.php:509
+msgid "Finish date/time is not known or not relevant"
+msgstr "La fecha/hora de finalización no es conocida o es irrelevante."
+
+#: mod/events.php:495 mod/events.php:496
+msgid "Event Finishes:"
+msgstr "Finalización del evento:"
+
+#: mod/events.php:497 mod/events.php:510
+msgid "Adjust for viewer timezone"
+msgstr "Ajuste de zona horaria"
+
+#: mod/events.php:499
+msgid "Description:"
+msgstr "Descripción:"
+
+#: mod/events.php:503 mod/events.php:505
+msgid "Title:"
+msgstr "Título:"
+
+#: mod/events.php:506 mod/events.php:507
+msgid "Share this event"
+msgstr "Comparte este evento"
+
+#: mod/fbrowser.php:132
+msgid "Files"
+msgstr "Archivos"
+
+#: mod/filer.php:30
+msgid "- select -"
+msgstr "- seleccionar -"
+
+#: mod/follow.php:30
+msgid "You already added this contact."
+msgstr "Ya has añadido este contacto."
+
+#: mod/follow.php:39
+msgid "Diaspora support isn't enabled. Contact can't be added."
+msgstr "El soporte de Diaspora* no esta habilitado, el contacto no puede ser agregado."
+
+#: mod/follow.php:46
+msgid "OStatus support is disabled. Contact can't be added."
+msgstr "El soporte de OStatus no esta habilitado, el contacto no puede ser agregado."
+
+#: mod/follow.php:53
+msgid "The network type couldn't be detected. Contact can't be added."
+msgstr "No se pudo detectar el tipo de red. Contacto no puede ser agregado."
+
+#: mod/follow.php:186
+msgid "Contact added"
+msgstr "Contacto añadido"
+
+#: mod/friendica.php:72
 msgid "This is Friendica, version"
 msgstr "Esto es Friendica, versión"
 
-#: mod/friendica.php:71
+#: mod/friendica.php:73
 msgid "running at web location"
 msgstr "ejecutándose en la dirección web"
 
-#: mod/friendica.php:73
+#: mod/friendica.php:75
 msgid ""
 "Please visit Friendica.com to learn "
 "more about the Friendica project."
 msgstr "Por favor, visita Friendica.com para saber más sobre el proyecto Friendica."
 
-#: mod/friendica.php:75
+#: mod/friendica.php:77
 msgid "Bug reports and issues: please visit"
 msgstr "Reporte de fallos y problemas: por favor visita"
 
-#: mod/friendica.php:75
+#: mod/friendica.php:77
 msgid "the bugtracker at github"
 msgstr "aviso de fallas (bugs) en github"
 
-#: mod/friendica.php:76
+#: mod/friendica.php:78
 msgid ""
 "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
 "dot com"
 msgstr "Sugerencias, elogios, donaciones, etc. por favor manda un correo a Info arroba Friendica punto com"
 
-#: mod/friendica.php:90
+#: mod/friendica.php:92
 msgid "Installed plugins/addons/apps:"
 msgstr "Módulos/extensiones/aplicaciones instalados:"
 
-#: mod/friendica.php:103
+#: mod/friendica.php:105
 msgid "No installed plugins/addons/apps"
 msgstr "Módulos/extensiones/aplicaciones no instalados"
 
+#: mod/fsuggest.php:64
+msgid "Friend suggestion sent."
+msgstr "Solicitud de amistad enviada."
+
+#: mod/fsuggest.php:98
+msgid "Suggest Friends"
+msgstr "Sugerencias de amistad"
+
+#: mod/fsuggest.php:100
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Recomienda un amigo a %s"
+
+#: mod/group.php:29
+msgid "Group created."
+msgstr "Grupo creado."
+
+#: mod/group.php:35
+msgid "Could not create group."
+msgstr "Imposible crear el grupo."
+
+#: mod/group.php:49 mod/group.php:150
+msgid "Group not found."
+msgstr "Grupo no encontrado."
+
+#: mod/group.php:63
+msgid "Group name changed."
+msgstr "El nombre del grupo ha cambiado."
+
+#: mod/group.php:91
+msgid "Save Group"
+msgstr "Guardar grupo"
+
+#: mod/group.php:97
+msgid "Create a group of contacts/friends."
+msgstr "Crea un grupo de contactos/amigos."
+
+#: mod/group.php:122
+msgid "Group removed."
+msgstr "Grupo eliminado."
+
+#: mod/group.php:124
+msgid "Unable to remove group."
+msgstr "No se puede eliminar el grupo."
+
+#: mod/group.php:187
+msgid "Group Editor"
+msgstr "Editor de grupos"
+
+#: mod/group.php:200
+msgid "Members"
+msgstr "Miembros"
+
+#: mod/group.php:233 mod/profperm.php:107
+msgid "Click on a contact to add or remove."
+msgstr "Pulsa en un contacto para añadirlo o eliminarlo."
+
+#: mod/hcard.php:11
+msgid "No profile"
+msgstr "Nigún perfil"
+
+#: mod/help.php:41
+msgid "Help:"
+msgstr "Ayuda:"
+
+#: mod/home.php:39
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenido a %s"
+
+#: mod/install.php:140
+msgid "Friendica Communications Server - Setup"
+msgstr "Servidor de comunicación Friendica - Configuración"
+
+#: mod/install.php:146
+msgid "Could not connect to database."
+msgstr "No es posible la conexión con la base de datos."
+
+#: mod/install.php:150
+msgid "Could not create table."
+msgstr "No se puede crear la tabla."
+
+#: mod/install.php:156
+msgid "Your Friendica site database has been installed."
+msgstr "La base de datos de su sitio web de Friendica ha sido instalada."
+
+#: mod/install.php:161
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql."
+
+#: mod/install.php:162 mod/install.php:234 mod/install.php:609
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Por favor, consulta el archivo \"INSTALL.txt\"."
+
+#: mod/install.php:174
+msgid "Database already in use."
+msgstr "Base de datos ya se encuentra en uso"
+
+#: mod/install.php:231
+msgid "System check"
+msgstr "Verificación del sistema"
+
+#: mod/install.php:236
+msgid "Check again"
+msgstr "Compruebalo de nuevo"
+
+#: mod/install.php:255
+msgid "Database connection"
+msgstr "Conexión con la base de datos"
+
+#: mod/install.php:256
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos."
+
+#: mod/install.php:257
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones."
+
+#: mod/install.php:258
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar."
+
+#: mod/install.php:262
+msgid "Database Server Name"
+msgstr "Nombre del servidor de la base de datos"
+
+#: mod/install.php:263
+msgid "Database Login Name"
+msgstr "Usuario de la base de datos"
+
+#: mod/install.php:264
+msgid "Database Login Password"
+msgstr "Contraseña de la base de datos"
+
+#: mod/install.php:264
+msgid "For security reasons the password must not be empty"
+msgstr "Por razones de seguridad la contraseña no debe estar vacía"
+
+#: mod/install.php:265
+msgid "Database Name"
+msgstr "Nombre de la base de datos"
+
+#: mod/install.php:266 mod/install.php:307
+msgid "Site administrator email address"
+msgstr "Dirección de correo del administrador de la web"
+
+#: mod/install.php:266 mod/install.php:307
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web."
+
+#: mod/install.php:270 mod/install.php:310
+msgid "Please select a default timezone for your website"
+msgstr "Por favor, selecciona la zona horaria predeterminada para tu web"
+
+#: mod/install.php:297
+msgid "Site settings"
+msgstr "Configuración de la página web"
+
+#: mod/install.php:311
+msgid "System Language:"
+msgstr "Sistema de idioma:"
+
+#: mod/install.php:311
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
+msgstr "Seleccione el idioma por defecto para su interfaz de instalación de Friendica y para enviar emails."
+
+#: mod/install.php:351
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "No se pudo encontrar una versión de la línea de comandos de PHP en la ruta del servidor web."
+
+#: mod/install.php:352
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron. See 'Setup the poller'"
+msgstr "Si no tienes una versión de command line de php installado en el servidor, no sera posible de efectuar polling como trabajo de fondo a traves de cron. Vea 'Setup the poller'"
+
+#: mod/install.php:356
+msgid "PHP executable path"
+msgstr "Dirección al ejecutable PHP"
+
+#: mod/install.php:356
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación."
+
+#: mod/install.php:361
+msgid "Command line PHP"
+msgstr "Línea de comandos PHP"
+
+#: mod/install.php:370
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr "El ejecutable PHP no es e lphp cli binary (podria ser versión cgi-fgci)"
+
+#: mod/install.php:371
+msgid "Found PHP version: "
+msgstr "Versión PHP encontrada:"
+
+#: mod/install.php:373
+msgid "PHP cli binary"
+msgstr "PHP cli binario"
+
+#: mod/install.php:384
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado."
+
+#: mod/install.php:385
+msgid "This is required for message delivery to work."
+msgstr "Esto es necesario para que funcione la entrega de mensajes."
+
+#: mod/install.php:387
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: mod/install.php:410
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado"
+
+#: mod/install.php:411
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: mod/install.php:413
+msgid "Generate encryption keys"
+msgstr "Generar claves de encriptación"
+
+#: mod/install.php:420
+msgid "libCurl PHP module"
+msgstr "Módulo PHP libCurl"
+
+#: mod/install.php:421
+msgid "GD graphics PHP module"
+msgstr "Módulo PHP gráficos GD"
+
+#: mod/install.php:422
+msgid "OpenSSL PHP module"
+msgstr "Módulo PHP OpenSSL"
+
+#: mod/install.php:423
+msgid "mysqli PHP module"
+msgstr "Módulo PHP mysqli"
+
+#: mod/install.php:424
+msgid "mb_string PHP module"
+msgstr "Módulo PHP mb_string"
+
+#: mod/install.php:425
+msgid "mcrypt PHP module"
+msgstr "modulo mycrypt PHP"
+
+#: mod/install.php:426
+msgid "XML PHP module"
+msgstr "Módulo XML PHP"
+
+#: mod/install.php:427
+msgid "iconv module"
+msgstr "Módulo iconv"
+
+#: mod/install.php:431 mod/install.php:433
+msgid "Apache mod_rewrite module"
+msgstr "Módulo mod_rewrite de Apache"
+
+#: mod/install.php:431
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado."
+
+#: mod/install.php:439
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Error: El módulo de PHP libcurl es necesario, pero no está instalado."
+
+#: mod/install.php:443
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado."
+
+#: mod/install.php:447
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Error: El módulo de PHP openssl es necesario, pero  no está instalado."
+
+#: mod/install.php:451
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Error: El módulo de PHP mysqli es necesario, pero no está instalado."
+
+#: mod/install.php:455
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Error: El módulo de PHP mb_string es necesario, pero no está instalado."
+
+#: mod/install.php:459
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Error: modulo mycrypt PHP requerido pero no instalado."
+
+#: mod/install.php:463
+msgid "Error: iconv PHP module required but not installed."
+msgstr "Error: módulo iconv PHP requerido pero no instalado."
+
+#: mod/install.php:472
+msgid ""
+"If you are using php_cli, please make sure that mcrypt module is enabled in "
+"its config file"
+msgstr "Si está utilizando php_cli, por favor asegúrese de que el módulo mcrypt está habilitado en este archivo de configuración"
+
+#: mod/install.php:475
+msgid ""
+"Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 "
+"encryption layer."
+msgstr "Función mycrypt_create_iv() no esta definido. Esto es preciso para habilitar RINO2 encryption layer."
+
+#: mod/install.php:477
+msgid "mcrypt_create_iv() function"
+msgstr "mcrypt_create_iv() función"
+
+#: mod/install.php:485
+msgid "Error, XML PHP module required but not installed."
+msgstr "Error, módulo XML PHP requerido pero no instalado."
+
+#: mod/install.php:500
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo."
+
+#: mod/install.php:501
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas."
+
+#: mod/install.php:502
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Friendica top folder."
+msgstr "Al final obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica."
+
+#: mod/install.php:503
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones."
+
+#: mod/install.php:506
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php tiene permiso de escritura"
+
+#: mod/install.php:516
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica usa el motor de templates Smarty3 para renderizar su visualisacion web. Smarty3 compila templates hacia PHP para acelerar la velocidad del renderizar."
+
+#: mod/install.php:517
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr "Para poder guardar estos templates compilados, el servidor web necesita acceso de escritura en el directorio /view/smarty3/ en el árbol de raíz de la instalación friendica."
+
+#: mod/install.php:518
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Por favor asegure que el usuario que utiliza el servidor web (ejemplo: www-data) tiene permisos de escritura en esta carpeta."
+
+#: mod/install.php:519
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Nota: como medida de seguridad deberia dar acceso de escritura solo a /view/smarty3 / → no al los archivos template (.tpl) que contiene."
+
+#: mod/install.php:522
+msgid "view/smarty3 is writable"
+msgstr "Se puede escribir en /view/smarty3"
+
+#: mod/install.php:538
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración."
+
+#: mod/install.php:540
+msgid "Url rewrite is working"
+msgstr "Reescribiendo la dirección..."
+
+#: mod/install.php:559
+msgid "ImageMagick PHP extension is not installed"
+msgstr "No está instalada la extensión ImageMagick PHP"
+
+#: mod/install.php:561
+msgid "ImageMagick PHP extension is installed"
+msgstr "ImageMagick PHP extension is installed"
+
+#: mod/install.php:563
+msgid "ImageMagick supports GIF"
+msgstr "ImageMagick supporta GIF"
+
+#: mod/install.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web."
+
+#: mod/install.php:607
+msgid "
    What next
    "
+msgstr "
    ¿Ahora qué?
    "
+
+#: mod/install.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo"
+
+#: mod/invite.php:28
+msgid "Total invitation limit exceeded."
+msgstr "Límite total de invitaciones excedido."
+
+#: mod/invite.php:51
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : No es una dirección de correo válida."
+
+#: mod/invite.php:76
+msgid "Please join us on Friendica"
+msgstr "Únete a nosotros en Friendica"
+
+#: mod/invite.php:87
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Límite de invitaciones sobrepasado. Contacta con el administrador del sitio."
+
+#: mod/invite.php:91
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Ha fallado la entrega del mensaje."
+
+#: mod/invite.php:95
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d mensaje enviado."
+msgstr[1] "%d mensajes enviados."
+
+#: mod/invite.php:114
+msgid "You have no more invitations available"
+msgstr "No tienes más invitaciones disponibles"
+
+#: mod/invite.php:122
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many"
+" other social networks."
+msgstr "Visita %s para ver una lista de servidores públicos donde puedes darte de alta. Los miembros de otros servidores de Friendica pueden conectarse entre ellos, así como con miembros de otras redes sociales diferentes."
+
+#: mod/invite.php:124
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Para aceptar la invitación visita y regístrate en %s o en cualquier otro servidor público de Friendica."
+
+#: mod/invite.php:125
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr "Los servidores de Friendica están interconectados para crear una enorme red social centrada en la privacidad y controlada por sus miembros. También se puede conectar con muchas redes sociales tradicionales. Mira en %s para poder ver un listado de servidores alternativos de Friendica donde puedes darte de alta."
+
+#: mod/invite.php:128
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Discúlpanos. Este sistema no está configurado actualmente para conectar con otros servidores públicos o invitar nuevos miembros."
+
+#: mod/invite.php:134
+msgid "Send invitations"
+msgstr "Enviar invitaciones"
+
+#: mod/invite.php:135
+msgid "Enter email addresses, one per line:"
+msgstr "Introduce las direcciones de correo, una por línea:"
+
+#: mod/invite.php:136 mod/message.php:332 mod/message.php:515
+#: mod/wallmessage.php:135
+msgid "Your message:"
+msgstr "Tu mensaje:"
+
+#: mod/invite.php:137
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr "Estás cordialmente invitado a unirte a mi y a otros amigos en Friendica, creemos juntos una red social mejor."
+
+#: mod/invite.php:139
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Tienes que proporcionar el siguiente código: $invite_code"
+
+#: mod/invite.php:139
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Una vez registrado, por favor contacta conmigo a través de mi página de perfil en:"
+
+#: mod/invite.php:141
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
+msgstr "Para más información sobre el Proyecto Friendica y sobre por qué pensamos que es algo importante, visita http://friendica.com"
+
+#: mod/item.php:118
+msgid "Unable to locate original post."
+msgstr "No se puede encontrar la publicación original."
+
+#: mod/item.php:336
+msgid "Empty post discarded."
+msgstr "Publicación vacía descartada."
+
+#: mod/item.php:889
+msgid "System error. Post not saved."
+msgstr "Error del sistema. Mensaje no guardado."
+
+#: mod/item.php:979
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Este mensaje te lo ha enviado %s, miembro de la red social Friendica."
+
+#: mod/item.php:981
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "Los puedes visitar en línea en %s"
+
+#: mod/item.php:982
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes."
+
+#: mod/item.php:986
+#, php-format
+msgid "%s posted an update."
+msgstr "%s ha publicado una actualización."
+
+#: mod/localtime.php:24
+msgid "Time Conversion"
+msgstr "Conversión horária"
+
+#: mod/localtime.php:26
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr "Friendica ofrece este servicio para compartir eventos con otros servidores de la red friendica y amigos en zonas de horarios desconocidos."
+
+#: mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
+msgstr "Tiempo UTC: %s"
+
+#: mod/localtime.php:33
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Zona horaria actual: %s"
+
+#: mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Zona horaria local convertida: %s"
+
+#: mod/localtime.php:41
+msgid "Please select your timezone:"
+msgstr "Por favor, selecciona tu zona horaria:"
+
+#: mod/lockview.php:32 mod/lockview.php:40
+msgid "Remote privacy information not available."
+msgstr "Privacidad de la información remota no disponible."
+
+#: mod/lockview.php:49
+msgid "Visible to:"
+msgstr "Visible para:"
+
 #: mod/lostpass.php:19
 msgid "No valid account found."
 msgstr "No se ha encontrado ninguna cuenta válida"
@@ -3213,7 +6392,7 @@ msgstr "No se ha encontrado ninguna cuenta válida"
 msgid "Password reset request issued. Check your email."
 msgstr "Solicitud de restablecimiento de contraseña enviada. Revisa tu correo."
 
-#: mod/lostpass.php:42
+#: mod/lostpass.php:41
 #, php-format
 msgid ""
 "\n"
@@ -3229,7 +6408,7 @@ msgid ""
 "\t\tissued this request."
 msgstr "\n\t\tEstimado %1$s,\n\t\t\tUna consulta llego recientemente a \"%2$s\" para renovar su\n\t\tcontraseña. Para confirmar esta solicitud por favor seleccione el enlace de verificación mas \n\t\tabajo o copie a pegue el mismo en la barra de dirección de su navegador.\n\n\t\tSi NO ha solicitado este cambio por favor NO SIGA este enlace\n\t\tproporcionado y ignore o borre este mail.\n\n\t\tSu contraseña no sera cambiada hasta que podamos verificar que usted haza\n\t\tsolicitado este cambio.."
 
-#: mod/lostpass.php:53
+#: mod/lostpass.php:52
 #, php-format
 msgid ""
 "\n"
@@ -3246,38 +6425,34 @@ msgid ""
 "\t\tLogin Name:\t%3$s"
 msgstr "\n\t\tSiga este enlace para verificar su identidad:\n\n\t\t%1$s\n\n\t\tA continuación recibirá un mensaje consecutivo conteniendo la nueva contraseña.\n\t\tPodrá cambiar la contraseña después de haber accedido a la cuenta.\n\n\t\tLos detalles del acceso son las siguientes:\n\n\t\tDirección del sitio:\t%2$s\n\t\tNombre de la cuenta:\t%3$s"
 
-#: mod/lostpass.php:72
+#: mod/lostpass.php:71
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Contraseña restablecida enviada a %s"
 
-#: mod/lostpass.php:92
+#: mod/lostpass.php:91
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña."
 
-#: mod/lostpass.php:109 boot.php:1807
-msgid "Password Reset"
-msgstr "Restablecer la contraseña"
-
-#: mod/lostpass.php:110
+#: mod/lostpass.php:111
 msgid "Your password has been reset as requested."
 msgstr "Tu contraseña ha sido restablecida como solicitaste."
 
-#: mod/lostpass.php:111
+#: mod/lostpass.php:112
 msgid "Your new password is"
 msgstr "Tu nueva contraseña es"
 
-#: mod/lostpass.php:112
+#: mod/lostpass.php:113
 msgid "Save or copy your new password - and then"
 msgstr "Guarda o copia tu nueva contraseña y luego"
 
-#: mod/lostpass.php:113
+#: mod/lostpass.php:114
 msgid "click here to login"
 msgstr "pulsa aquí para acceder"
 
-#: mod/lostpass.php:114
+#: mod/lostpass.php:115
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
@@ -3323,371 +6498,214 @@ msgid ""
 "your email for further instructions."
 msgstr "Introduce tu correo para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales."
 
-#: mod/lostpass.php:161 boot.php:1795
-msgid "Nickname or Email: "
-msgstr "Apodo o Correo electrónico: "
-
 #: mod/lostpass.php:162
 msgid "Reset"
 msgstr "Restablecer"
 
-#: mod/hcard.php:10
-msgid "No profile"
-msgstr "Nigún perfil"
+#: mod/maintenance.php:20
+msgid "System down for maintenance"
+msgstr "Servicio suspendido por mantenimiento"
 
-#: mod/help.php:41
-msgid "Help:"
-msgstr "Ayuda:"
+#: mod/manage.php:141
+msgid "Manage Identities and/or Pages"
+msgstr "Administrar identidades y/o páginas"
 
-#: mod/help.php:53 mod/p.php:16 mod/p.php:43 mod/p.php:52 mod/fetch.php:12
-#: mod/fetch.php:39 mod/fetch.php:48 index.php:288
-msgid "Not Found"
-msgstr "No se ha encontrado"
-
-#: mod/help.php:56 index.php:291
-msgid "Page not found."
-msgstr "Página no encontrada."
-
-#: mod/lockview.php:31 mod/lockview.php:39
-msgid "Remote privacy information not available."
-msgstr "Privacidad de la información remota no disponible."
-
-#: mod/lockview.php:48
-msgid "Visible to:"
-msgstr "Visible para:"
-
-#: mod/openid.php:24
-msgid "OpenID protocol error. No ID returned."
-msgstr "Error de protocolo OpenID. ID no devuelta."
-
-#: mod/openid.php:60
+#: mod/manage.php:142
 msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr "Cuenta no encontrada y el registro OpenID no está permitido en ese sitio."
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Cambia entre diferentes identidades o páginas de Comunidad/Grupos que comparten los detalles de tu cuenta o sobre los que tienes permisos para administrar"
 
-#: mod/uimport.php:50 mod/register.php:198
+#: mod/manage.php:143
+msgid "Select an identity to manage: "
+msgstr "Selecciona una identidad a gestionar:"
+
+#: mod/match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado."
+
+#: mod/match.php:88
+msgid "is interested in:"
+msgstr "estás interesado en:"
+
+#: mod/match.php:102
+msgid "Profile Match"
+msgstr "Coincidencias de Perfil"
+
+#: mod/message.php:60 mod/wallmessage.php:50
+msgid "No recipient selected."
+msgstr "Ningún destinatario seleccionado"
+
+#: mod/message.php:64
+msgid "Unable to locate contact information."
+msgstr "No se puede encontrar información del contacto."
+
+#: mod/message.php:67 mod/wallmessage.php:56
+msgid "Message could not be sent."
+msgstr "El mensaje no ha podido ser enviado."
+
+#: mod/message.php:70 mod/wallmessage.php:59
+msgid "Message collection failure."
+msgstr "Fallo en la recolección de mensajes."
+
+#: mod/message.php:73 mod/wallmessage.php:62
+msgid "Message sent."
+msgstr "Mensaje enviado."
+
+#: mod/message.php:204
+msgid "Do you really want to delete this message?"
+msgstr "¿Estás seguro de que quieres borrar este mensaje?"
+
+#: mod/message.php:224
+msgid "Message deleted."
+msgstr "Mensaje eliminado."
+
+#: mod/message.php:255
+msgid "Conversation removed."
+msgstr "Conversación eliminada."
+
+#: mod/message.php:322 mod/wallmessage.php:126
+msgid "Send Private Message"
+msgstr "Enviar mensaje privado"
+
+#: mod/message.php:323 mod/message.php:510 mod/wallmessage.php:128
+msgid "To:"
+msgstr "Para:"
+
+#: mod/message.php:328 mod/message.php:512 mod/wallmessage.php:129
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: mod/message.php:364
+msgid "No messages."
+msgstr "No hay mensajes."
+
+#: mod/message.php:403
+msgid "Message not available."
+msgstr "Mensaje no disponibile."
+
+#: mod/message.php:477
+msgid "Delete message"
+msgstr "Borrar mensaje"
+
+#: mod/message.php:503 mod/message.php:583
+msgid "Delete conversation"
+msgstr "Eliminar conversación"
+
+#: mod/message.php:505
 msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor."
+"No secure communications available. You may be able to "
+"respond from the sender's profile page."
+msgstr "No hay comunicaciones seguras disponibles. Podrías responder desde la página de perfil del remitente. "
 
-#: mod/uimport.php:64 mod/register.php:295
-msgid "Import"
-msgstr "Importar"
+#: mod/message.php:509
+msgid "Send Reply"
+msgstr "Enviar respuesta"
 
-#: mod/uimport.php:66
-msgid "Move account"
-msgstr "Mover cuenta"
-
-#: mod/uimport.php:67
-msgid "You can import an account from another Friendica server."
-msgstr "Puedes importar una cuenta desde otro servidor de Friendica."
-
-#: mod/uimport.php:68
-msgid ""
-"You need to export your account from the old server and upload it here. We "
-"will recreate your old account here with all your contacts. We will try also"
-" to inform your friends that you moved here."
-msgstr "Necesitas exportar tu cuenta del antiguo servidor y subirla aquí. Volveremos a crear tu antigua cuenta con todos tus contactos aquí. También intentaremos de informar a tus amigos de que te has mudado."
-
-#: mod/uimport.php:69
-msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (GNU Social/Statusnet) or from Diaspora"
-msgstr "Esta característica es experimental. No podemos importar contactos desde la red OStatus (statusnet/identi.ca) o desde Diaspora*"
-
-#: mod/uimport.php:70
-msgid "Account file"
-msgstr "Archivo de la cuenta"
-
-#: mod/uimport.php:70
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
-msgstr "Para exportar el perfil vaya a \"Configuracion -> Exportar sus datos personales\" y seleccione \"Exportar cuenta\""
-
-#: mod/nogroup.php:41 mod/contacts.php:586 mod/contacts.php:930
-#: mod/viewcontacts.php:97
+#: mod/message.php:553
 #, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Ver el perfil de %s [%s]"
+msgid "Unknown sender - %s"
+msgstr "Remitente desconocido - %s"
 
-#: mod/nogroup.php:42 mod/contacts.php:931
-msgid "Edit contact"
-msgstr "Modificar contacto"
-
-#: mod/nogroup.php:63
-msgid "Contacts who are not members of a group"
-msgstr "Contactos sin grupo"
-
-#: mod/uexport.php:29
-msgid "Export account"
-msgstr "Exportar cuenta"
-
-#: mod/uexport.php:29
-msgid ""
-"Export your account info and contacts. Use this to make a backup of your "
-"account and/or to move it to another server."
-msgstr "Exporta la información de tu cuenta y tus contactos. Úsalo para guardar una copia de seguridad de tu cuenta y/o moverla a otro servidor."
-
-#: mod/uexport.php:30
-msgid "Export all"
-msgstr "Exportar todo"
-
-#: mod/uexport.php:30
-msgid ""
-"Export your accout info, contacts and all your items as json. Could be a "
-"very big file, and could take a lot of time. Use this to make a full backup "
-"of your account (photos are not exported)"
-msgstr "Exporta la información de tu cuenta, contactos y lo demás en JSON. Puede ser un archivo bastante grande, por lo que llevará tiempo. Úsalo para hacer una copia de seguridad completa de tu cuenta (las fotos no se exportarán)"
-
-#: mod/uexport.php:37 mod/settings.php:95
-msgid "Export personal data"
-msgstr "Exportación de datos personales"
-
-#: mod/invite.php:27
-msgid "Total invitation limit exceeded."
-msgstr "Límite total de invitaciones excedido."
-
-#: mod/invite.php:49
+#: mod/message.php:555
 #, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : No es una dirección de correo válida."
+msgid "You and %s"
+msgstr "Tú y %s"
 
-#: mod/invite.php:73
-msgid "Please join us on Friendica"
-msgstr "Únete a nosotros en Friendica"
-
-#: mod/invite.php:84
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Límite de invitaciones sobrepasado. Contacta con el administrador del sitio."
-
-#: mod/invite.php:89
+#: mod/message.php:557
 #, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Ha fallado la entrega del mensaje."
+msgid "%s and You"
+msgstr "%s y Tú"
 
-#: mod/invite.php:93
+#: mod/message.php:586
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
+
+#: mod/message.php:589
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d mensaje enviado."
-msgstr[1] "%d mensajes enviados."
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mensaje"
+msgstr[1] "%d mensajes"
 
-#: mod/invite.php:112
-msgid "You have no more invitations available"
-msgstr "No tienes más invitaciones disponibles"
+#: mod/mood.php:134
+msgid "Mood"
+msgstr "Ánimo"
 
-#: mod/invite.php:120
+#: mod/mood.php:135
+msgid "Set your current mood and tell your friends"
+msgstr "Coloca tu ánimo actual y cuéntaselo a tus amigos"
+
+#: mod/network.php:190 mod/search.php:25
+msgid "Remove term"
+msgstr "Eliminar término"
+
+#: mod/network.php:397
 #, php-format
 msgid ""
-"Visit %s for a list of public sites that you can join. Friendica members on "
-"other sites can all connect with each other, as well as with members of many"
-" other social networks."
-msgstr "Visita %s para ver una lista de servidores públicos donde puedes darte de alta. Los miembros de otros servidores de Friendica pueden conectarse entre ellos, así como con miembros de otras redes sociales diferentes."
+"Warning: This group contains %s member from a network that doesn't allow non"
+" public messages."
+msgid_plural ""
+"Warning: This group contains %s members from a network that doesn't allow "
+"non public messages."
+msgstr[0] "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos."
+msgstr[1] "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos."
 
-#: mod/invite.php:122
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr "Para aceptar la invitación visita y regístrate en %s o en cualquier otro servidor público de Friendica."
+#: mod/network.php:400
+msgid "Messages in this group won't be send to these receivers."
+msgstr "Los mensajes de este grupo no se enviarán a estos receptores."
 
-#: mod/invite.php:123
-#, php-format
-msgid ""
-"Friendica sites all inter-connect to create a huge privacy-enhanced social "
-"web that is owned and controlled by its members. They can also connect with "
-"many traditional social networks. See %s for a list of alternate Friendica "
-"sites you can join."
-msgstr "Los servidores de Friendica están interconectados para crear una enorme red social centrada en la privacidad y controlada por sus miembros. También se puede conectar con muchas redes sociales tradicionales. Mira en %s para poder ver un listado de servidores alternativos de Friendica donde puedes darte de alta."
+#: mod/network.php:528
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente."
 
-#: mod/invite.php:126
-msgid ""
-"Our apologies. This system is not currently configured to connect with other"
-" public sites or invite members."
-msgstr "Discúlpanos. Este sistema no está configurado actualmente para conectar con otros servidores públicos o invitar nuevos miembros."
+#: mod/network.php:533
+msgid "Invalid contact."
+msgstr "Contacto erróneo."
 
-#: mod/invite.php:132
-msgid "Send invitations"
-msgstr "Enviar invitaciones"
+#: mod/network.php:810
+msgid "Commented Order"
+msgstr "Orden de comentarios"
 
-#: mod/invite.php:133
-msgid "Enter email addresses, one per line:"
-msgstr "Introduce las direcciones de correo, una por línea:"
+#: mod/network.php:813
+msgid "Sort by Comment Date"
+msgstr "Ordenar por fecha de comentarios"
 
-#: mod/invite.php:134 mod/wallmessage.php:151 mod/message.php:351
-#: mod/message.php:541
-msgid "Your message:"
-msgstr "Tu mensaje:"
+#: mod/network.php:818
+msgid "Posted Order"
+msgstr "Orden de publicación"
 
-#: mod/invite.php:135
-msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
-msgstr "Estás cordialmente invitado a unirte a mi y a otros amigos en Friendica, creemos juntos una red social mejor."
+#: mod/network.php:821
+msgid "Sort by Post Date"
+msgstr "Ordenar por fecha de publicación"
 
-#: mod/invite.php:137
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Tienes que proporcionar el siguiente código: $invite_code"
+#: mod/network.php:832
+msgid "Posts that mention or involve you"
+msgstr "Publicaciones que te mencionan o involucran"
 
-#: mod/invite.php:137
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "Una vez registrado, por favor contacta conmigo a través de mi página de perfil en:"
+#: mod/network.php:840
+msgid "New"
+msgstr "Nuevo"
 
-#: mod/invite.php:139
-msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendica.com"
-msgstr "Para más información sobre el Proyecto Friendica y sobre por qué pensamos que es algo importante, visita http://friendica.com"
+#: mod/network.php:843
+msgid "Activity Stream - by date"
+msgstr "Corriente de actividad por fecha"
 
-#: mod/invite.php:140 mod/localtime.php:45 mod/message.php:357
-#: mod/message.php:547 mod/manage.php:143 mod/crepair.php:154
-#: mod/content.php:728 mod/fsuggest.php:107 mod/mood.php:137 mod/poke.php:199
-#: mod/profiles.php:688 mod/events.php:506 mod/photos.php:1104
-#: mod/photos.php:1226 mod/photos.php:1539 mod/photos.php:1590
-#: mod/photos.php:1638 mod/photos.php:1724 mod/contacts.php:577
-#: mod/install.php:272 mod/install.php:312 object/Item.php:720
-#: view/theme/frio/config.php:59 view/theme/quattro/config.php:64
-#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59
-msgid "Submit"
-msgstr "Envíar"
+#: mod/network.php:851
+msgid "Shared Links"
+msgstr "Enlaces compartidos"
 
-#: mod/fbrowser.php:133
-msgid "Files"
-msgstr "Archivos"
+#: mod/network.php:854
+msgid "Interesting Links"
+msgstr "Enlaces interesantes"
 
-#: mod/profperm.php:19 mod/group.php:72 index.php:400
-msgid "Permission denied"
-msgstr "Permiso denegado"
+#: mod/network.php:862
+msgid "Starred"
+msgstr "Favoritos"
 
-#: mod/profperm.php:25 mod/profperm.php:56
-msgid "Invalid profile identifier."
-msgstr "Identificador de perfil no válido."
-
-#: mod/profperm.php:102
-msgid "Profile Visibility Editor"
-msgstr "Editor de visibilidad del perfil"
-
-#: mod/profperm.php:106 mod/group.php:223
-msgid "Click on a contact to add or remove."
-msgstr "Pulsa en un contacto para añadirlo o eliminarlo."
-
-#: mod/profperm.php:115
-msgid "Visible To"
-msgstr "Visible para"
-
-#: mod/profperm.php:131
-msgid "All Contacts (with secure profile access)"
-msgstr "Todos los contactos (con perfil de acceso seguro)"
-
-#: mod/tagrm.php:41
-msgid "Tag removed"
-msgstr "Etiqueta eliminada"
-
-#: mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr "Eliminar etiqueta"
-
-#: mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr "Selecciona una etiqueta para eliminar: "
-
-#: mod/tagrm.php:93 mod/delegate.php:139
-msgid "Remove"
-msgstr "Eliminar"
-
-#: mod/repair_ostatus.php:14
-msgid "Resubscribing to OStatus contacts"
-msgstr "Resubscribir a contactos de OStatus"
-
-#: mod/repair_ostatus.php:30
-msgid "Error"
-msgstr "error"
-
-#: mod/repair_ostatus.php:44 mod/ostatus_subscribe.php:51
-msgid "Done"
-msgstr "hecho!"
-
-#: mod/repair_ostatus.php:50 mod/ostatus_subscribe.php:73
-msgid "Keep this window open until done."
-msgstr "Mantén esta ventana abierta hasta que el proceso ha terminado."
-
-#: mod/delegate.php:101
-msgid "No potential page delegates located."
-msgstr "No se han localizado delegados potenciales de la página."
-
-#: mod/delegate.php:132
-msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
-msgstr "Los delegados tienen la capacidad de gestionar todos los aspectos de esta cuenta/página, excepto los ajustes básicos de la cuenta. Por favor, no delegues tu cuenta personal a nadie en quien no confíes completamente."
-
-#: mod/delegate.php:133
-msgid "Existing Page Managers"
-msgstr "Administradores actuales de la página"
-
-#: mod/delegate.php:135
-msgid "Existing Page Delegates"
-msgstr "Delegados actuales de la página"
-
-#: mod/delegate.php:137
-msgid "Potential Delegates"
-msgstr "Delegados potenciales"
-
-#: mod/delegate.php:140
-msgid "Add"
-msgstr "Añadir"
-
-#: mod/delegate.php:141
-msgid "No entries."
-msgstr "Sin entradas."
-
-#: mod/credits.php:16
-msgid "Credits"
-msgstr "Creditos"
-
-#: mod/credits.php:17
-msgid ""
-"Friendica is a community project, that would not be possible without the "
-"help of many people. Here is a list of those who have contributed to the "
-"code or the translation of Friendica. Thank you all!"
-msgstr "Friendica es un proyecto comunitario, que no seria posible sin la ayuda de mucha gente. Aquí una lista de de aquellos que aportaron al código o la traducción de friendica.\nGracias a todos! "
-
-#: mod/filer.php:30
-msgid "- select -"
-msgstr "- seleccionar -"
-
-#: mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s está siguiendo las %3$s de %2$s"
-
-#: mod/attach.php:8
-msgid "Item not available."
-msgstr "Elemento no disponible."
-
-#: mod/attach.php:20
-msgid "Item was not found."
-msgstr "Elemento no encontrado."
-
-#: mod/apps.php:7 index.php:244
-msgid "You must be logged in to use addons. "
-msgstr "Tienes que estar registrado para tener acceso a los accesorios."
-
-#: mod/apps.php:11
-msgid "Applications"
-msgstr "Aplicaciones"
-
-#: mod/apps.php:14
-msgid "No installed applications."
-msgstr "Sin aplicaciones"
-
-#: mod/p.php:9
-msgid "Not Extended"
-msgstr "No extendido"
+#: mod/network.php:865
+msgid "Favourite Posts"
+msgstr "Publicaciones favoritas"
 
 #: mod/newmember.php:6
 msgid "Welcome to Friendica"
@@ -3739,7 +6757,7 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Revisa las otras configuraciones, especialmente la configuración de privacidad. Un listado de directorio sin publicar es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan cómo ponerse en contacto contigo."
 
-#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:707
+#: mod/newmember.php:36 mod/profile_photo.php:256 mod/profiles.php:699
 msgid "Upload Profile Photo"
 msgstr "Subir foto del Perfil"
 
@@ -3858,750 +6876,27 @@ msgid ""
 " features and resources."
 msgstr "Puedes consultar nuestra página de Ayuda para más información y recursos de ayuda."
 
-#: mod/removeme.php:46 mod/removeme.php:49
-msgid "Remove My Account"
-msgstr "Eliminar mi cuenta"
-
-#: mod/removeme.php:47
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "Esto eliminará por completo tu cuenta. Una vez hecho no se puede deshacer."
-
-#: mod/removeme.php:48
-msgid "Please enter your password for verification:"
-msgstr "Por favor, introduce tu contraseña para la verificación:"
-
-#: mod/editpost.php:17 mod/editpost.php:27
-msgid "Item not found"
-msgstr "Elemento no encontrado"
-
-#: mod/editpost.php:40
-msgid "Edit post"
-msgstr "Editar publicación"
-
-#: mod/localtime.php:24
-msgid "Time Conversion"
-msgstr "Conversión horária"
-
-#: mod/localtime.php:26
-msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
-msgstr "Friendica ofrece este servicio para compartir eventos con otros servidores de la red friendica y amigos en zonas de horarios desconocidos."
-
-#: mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
-msgstr "Tiempo UTC: %s"
-
-#: mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
-msgstr "Zona horaria actual: %s"
-
-#: mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
-msgstr "Zona horaria local convertida: %s"
-
-#: mod/localtime.php:41
-msgid "Please select your timezone:"
-msgstr "Por favor, selecciona tu zona horaria:"
-
-#: mod/bookmarklet.php:41
-msgid "The post was created"
-msgstr "La publicación fue creada"
-
-#: mod/group.php:29
-msgid "Group created."
-msgstr "Grupo creado."
-
-#: mod/group.php:35
-msgid "Could not create group."
-msgstr "Imposible crear el grupo."
-
-#: mod/group.php:47 mod/group.php:140
-msgid "Group not found."
-msgstr "Grupo no encontrado."
-
-#: mod/group.php:60
-msgid "Group name changed."
-msgstr "El nombre del grupo ha cambiado."
-
-#: mod/group.php:87
-msgid "Save Group"
-msgstr "Guardar grupo"
-
-#: mod/group.php:93
-msgid "Create a group of contacts/friends."
-msgstr "Crea un grupo de contactos/amigos."
-
-#: mod/group.php:113
-msgid "Group removed."
-msgstr "Grupo eliminado."
-
-#: mod/group.php:115
-msgid "Unable to remove group."
-msgstr "No se puede eliminar el grupo."
-
-#: mod/group.php:177
-msgid "Group Editor"
-msgstr "Editor de grupos"
-
-#: mod/group.php:190
-msgid "Members"
-msgstr "Miembros"
-
-#: mod/group.php:192 mod/contacts.php:692
-msgid "All Contacts"
-msgstr "Todos los contactos"
-
-#: mod/group.php:193 mod/content.php:130 mod/network.php:496
-msgid "Group is empty"
-msgstr "El grupo está vacío"
-
-#: mod/wallmessage.php:42 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Excedido el número máximo de mensajes para %s. El mensaje no se ha enviado."
-
-#: mod/wallmessage.php:56 mod/message.php:71
-msgid "No recipient selected."
-msgstr "Ningún destinatario seleccionado"
-
-#: mod/wallmessage.php:59
-msgid "Unable to check your home location."
-msgstr "Imposible comprobar tu servidor de inicio."
-
-#: mod/wallmessage.php:62 mod/message.php:78
-msgid "Message could not be sent."
-msgstr "El mensaje no ha podido ser enviado."
-
-#: mod/wallmessage.php:65 mod/message.php:81
-msgid "Message collection failure."
-msgstr "Fallo en la recolección de mensajes."
-
-#: mod/wallmessage.php:68 mod/message.php:84
-msgid "Message sent."
-msgstr "Mensaje enviado."
-
-#: mod/wallmessage.php:86 mod/wallmessage.php:95
-msgid "No recipient."
-msgstr "Sin receptor."
-
-#: mod/wallmessage.php:142 mod/message.php:341
-msgid "Send Private Message"
-msgstr "Enviar mensaje privado"
-
-#: mod/wallmessage.php:143
-#, php-format
-msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
-msgstr "Si quieres que %s te responda, asegúrate de que la configuración de privacidad permite enviar correo privado a desconocidos."
-
-#: mod/wallmessage.php:144 mod/message.php:342 mod/message.php:536
-msgid "To:"
-msgstr "Para:"
-
-#: mod/wallmessage.php:145 mod/message.php:347 mod/message.php:538
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: mod/share.php:38
-msgid "link"
-msgstr "enlace"
-
-#: mod/api.php:76 mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Autorizar la conexión de la aplicación"
-
-#: mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Regresa a tu aplicación e introduce este código de seguridad:"
-
-#: mod/api.php:89
-msgid "Please login to continue."
-msgstr "Inicia sesión para continuar."
-
-#: mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "¿Quieres autorizar a esta aplicación el acceso a tus mensajes y contactos, y/o crear nuevas publicaciones para ti?"
-
-#: mod/api.php:106 mod/profiles.php:648 mod/profiles.php:652
-#: mod/profiles.php:677 mod/register.php:246 mod/settings.php:1163
-#: mod/settings.php:1169 mod/settings.php:1177 mod/settings.php:1181
-#: mod/settings.php:1186 mod/settings.php:1192 mod/settings.php:1198
-#: mod/settings.php:1204 mod/settings.php:1230 mod/settings.php:1231
-#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
-#: mod/dfrn_request.php:862 mod/follow.php:110
-msgid "No"
-msgstr "No"
-
-#: mod/babel.php:17
-msgid "Source (bbcode) text:"
-msgstr "Texto fuente (bbcode):"
-
-#: mod/babel.php:23
-msgid "Source (Diaspora) text to convert to BBcode:"
-msgstr "Fuente (Diaspora) para pasar a BBcode:"
-
-#: mod/babel.php:31
-msgid "Source input: "
-msgstr "Entrada: "
-
-#: mod/babel.php:35
-msgid "bb2html (raw HTML): "
-msgstr "bb2html (raw HTML): "
-
-#: mod/babel.php:39
-msgid "bb2html: "
-msgstr "bb2html: "
-
-#: mod/babel.php:43
-msgid "bb2html2bb: "
-msgstr "bb2html2bb: "
-
-#: mod/babel.php:47
-msgid "bb2md: "
-msgstr "bb2md: "
-
-#: mod/babel.php:51
-msgid "bb2md2html: "
-msgstr "bb2md2html: "
-
-#: mod/babel.php:55
-msgid "bb2dia2bb: "
-msgstr "bb2dia2bb: "
-
-#: mod/babel.php:59
-msgid "bb2md2html2bb: "
-msgstr "bb2md2html2bb: "
-
-#: mod/babel.php:69
-msgid "Source input (Diaspora format): "
-msgstr "Fuente (formato Diaspora): "
-
-#: mod/babel.php:74
-msgid "diaspora2bb: "
-msgstr "diaspora2bb: "
-
-#: mod/ostatus_subscribe.php:14
-msgid "Subscribing to OStatus contacts"
-msgstr "Subscribir a los contactos de OStatus"
-
-#: mod/ostatus_subscribe.php:25
-msgid "No contact provided."
-msgstr "Sin suministro de datos de contacto."
-
-#: mod/ostatus_subscribe.php:30
-msgid "Couldn't fetch information for contact."
-msgstr "No se ha podido conseguir la información del contacto."
-
-#: mod/ostatus_subscribe.php:38
-msgid "Couldn't fetch friends for contact."
-msgstr "No se ha podido conseguir datos de amigos para contactar."
-
-#: mod/ostatus_subscribe.php:65
-msgid "success"
-msgstr "exito!"
-
-#: mod/ostatus_subscribe.php:67
-msgid "failed"
-msgstr "fallido!"
-
-#: mod/ostatus_subscribe.php:69 mod/content.php:792 object/Item.php:245
-msgid "ignored"
-msgstr "ignorado"
-
-#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:537
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s te da la bienvenida a %2$s"
-
-#: mod/message.php:75
-msgid "Unable to locate contact information."
-msgstr "No se puede encontrar información del contacto."
-
-#: mod/message.php:215
-msgid "Do you really want to delete this message?"
-msgstr "¿Estás seguro de que quieres borrar este mensaje?"
-
-#: mod/message.php:235
-msgid "Message deleted."
-msgstr "Mensaje eliminado."
-
-#: mod/message.php:266
-msgid "Conversation removed."
-msgstr "Conversación eliminada."
-
-#: mod/message.php:383
-msgid "No messages."
-msgstr "No hay mensajes."
-
-#: mod/message.php:426
-msgid "Message not available."
-msgstr "Mensaje no disponibile."
-
-#: mod/message.php:503
-msgid "Delete message"
-msgstr "Borrar mensaje"
-
-#: mod/message.php:529 mod/message.php:609
-msgid "Delete conversation"
-msgstr "Eliminar conversación"
-
-#: mod/message.php:531
-msgid ""
-"No secure communications available. You may be able to "
-"respond from the sender's profile page."
-msgstr "No hay comunicaciones seguras disponibles. Podrías responder desde la página de perfil del remitente. "
-
-#: mod/message.php:535
-msgid "Send Reply"
-msgstr "Enviar respuesta"
-
-#: mod/message.php:579
-#, php-format
-msgid "Unknown sender - %s"
-msgstr "Remitente desconocido - %s"
-
-#: mod/message.php:581
-#, php-format
-msgid "You and %s"
-msgstr "Tú y %s"
-
-#: mod/message.php:583
-#, php-format
-msgid "%s and You"
-msgstr "%s y Tú"
-
-#: mod/message.php:612
-msgid "D, d M Y - g:i A"
-msgstr "D, d M Y - g:i A"
-
-#: mod/message.php:615
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d mensaje"
-msgstr[1] "%d mensajes"
-
-#: mod/manage.php:139
-msgid "Manage Identities and/or Pages"
-msgstr "Administrar identidades y/o páginas"
-
-#: mod/manage.php:140
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
-msgstr "Cambia entre diferentes identidades o páginas de Comunidad/Grupos que comparten los detalles de tu cuenta o sobre los que tienes permisos para administrar"
-
-#: mod/manage.php:141
-msgid "Select an identity to manage: "
-msgstr "Selecciona una identidad a gestionar:"
-
-#: mod/crepair.php:87
-msgid "Contact settings applied."
-msgstr "Contacto configurado con éxito."
-
-#: mod/crepair.php:89
-msgid "Contact update failed."
-msgstr "Error al actualizar el Contacto."
-
-#: mod/crepair.php:114 mod/fsuggest.php:20 mod/fsuggest.php:92
-#: mod/dfrn_confirm.php:126
-msgid "Contact not found."
-msgstr "Contacto no encontrado."
-
-#: mod/crepair.php:120
-msgid ""
-"WARNING: This is highly advanced and if you enter incorrect"
-" information your communications with this contact may stop working."
-msgstr "ADVERTENCIA: Esto es muy avanzado y si se introduce información incorrecta tu conexión con este contacto puede dejar de funcionar."
-
-#: mod/crepair.php:121
-msgid ""
-"Please use your browser 'Back' button now if you are "
-"uncertain what to do on this page."
-msgstr "Por favor usa el botón 'Atás' de tu navegador ahora si no tienes claro qué hacer en esta página."
-
-#: mod/crepair.php:134 mod/crepair.php:136
-msgid "No mirroring"
-msgstr "No espejar"
-
-#: mod/crepair.php:134
-msgid "Mirror as forwarded posting"
-msgstr "Espejar como reenvio"
-
-#: mod/crepair.php:134 mod/crepair.php:136
-msgid "Mirror as my own posting"
-msgstr "Espejar como publicación propia"
-
-#: mod/crepair.php:150
-msgid "Return to contact editor"
-msgstr "Volver al editor de contactos"
-
-#: mod/crepair.php:152
-msgid "Refetch contact data"
-msgstr "Volver a solicitar datos del contacto."
-
-#: mod/crepair.php:156
-msgid "Remote Self"
-msgstr "Perfil remoto"
-
-#: mod/crepair.php:159
-msgid "Mirror postings from this contact"
-msgstr "Espejar publicaciones de este contacto"
-
-#: mod/crepair.php:161
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
-msgstr "Marcar este contacto como perfil_remoto, esto generara que friendica reenvía nuevas publicaciones desde esta cuenta."
-
-#: mod/crepair.php:165 mod/settings.php:680 mod/settings.php:706
-#: mod/admin.php:1396 mod/admin.php:1409 mod/admin.php:1422 mod/admin.php:1438
-msgid "Name"
-msgstr "Nombre"
-
-#: mod/crepair.php:166
-msgid "Account Nickname"
-msgstr "Apodo de la cuenta"
-
-#: mod/crepair.php:167
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Etiqueta - Sobrescribe el Nombre/Apodo"
-
-#: mod/crepair.php:168
-msgid "Account URL"
-msgstr "Dirección de la cuenta"
-
-#: mod/crepair.php:169
-msgid "Friend Request URL"
-msgstr "Dirección de la solicitud de amistad"
-
-#: mod/crepair.php:170
-msgid "Friend Confirm URL"
-msgstr "Dirección de confirmación de tu amigo "
-
-#: mod/crepair.php:171
-msgid "Notification Endpoint URL"
-msgstr "Dirección URL de la notificación"
-
-#: mod/crepair.php:172
-msgid "Poll/Feed URL"
-msgstr "Dirección del Sondeo/Fuentes"
-
-#: mod/crepair.php:173
-msgid "New photo from this URL"
-msgstr "Nueva foto de esta dirección"
-
-#: mod/content.php:119 mod/network.php:469
-msgid "No such group"
-msgstr "Ningún grupo"
-
-#: mod/content.php:135 mod/network.php:500
-#, php-format
-msgid "Group: %s"
-msgstr "Grupo: %s"
-
-#: mod/content.php:325 object/Item.php:95
-msgid "This entry was edited"
-msgstr "Esta entrada fue editada"
-
-#: mod/content.php:621 object/Item.php:429
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d comentario"
-msgstr[1] "%d comentarios"
-
-#: mod/content.php:638 mod/photos.php:1379 object/Item.php:117
-msgid "Private Message"
-msgstr "Mensaje privado"
-
-#: mod/content.php:702 mod/photos.php:1567 object/Item.php:263
-msgid "I like this (toggle)"
-msgstr "Me gusta esto (cambiar)"
-
-#: mod/content.php:702 object/Item.php:263
-msgid "like"
-msgstr "me gusta"
-
-#: mod/content.php:703 mod/photos.php:1568 object/Item.php:264
-msgid "I don't like this (toggle)"
-msgstr "No me gusta esto (cambiar)"
-
-#: mod/content.php:703 object/Item.php:264
-msgid "dislike"
-msgstr "no me gusta"
-
-#: mod/content.php:705 object/Item.php:266
-msgid "Share this"
-msgstr "Compartir esto"
-
-#: mod/content.php:705 object/Item.php:266
-msgid "share"
-msgstr "compartir"
-
-#: mod/content.php:725 mod/photos.php:1587 mod/photos.php:1635
-#: mod/photos.php:1721 object/Item.php:717
-msgid "This is you"
-msgstr "Este eres tú"
-
-#: mod/content.php:727 mod/content.php:945 mod/photos.php:1589
-#: mod/photos.php:1637 mod/photos.php:1723 object/Item.php:403
-#: object/Item.php:719 boot.php:971
-msgid "Comment"
-msgstr "Comentar"
-
-#: mod/content.php:729 object/Item.php:721
-msgid "Bold"
-msgstr "Negrita"
-
-#: mod/content.php:730 object/Item.php:722
-msgid "Italic"
-msgstr "Cursiva"
-
-#: mod/content.php:731 object/Item.php:723
-msgid "Underline"
-msgstr "Subrayado"
-
-#: mod/content.php:732 object/Item.php:724
-msgid "Quote"
-msgstr "Cita"
-
-#: mod/content.php:733 object/Item.php:725
-msgid "Code"
-msgstr "Código"
-
-#: mod/content.php:734 object/Item.php:726
-msgid "Image"
-msgstr "Imagen"
-
-#: mod/content.php:735 object/Item.php:727
-msgid "Link"
-msgstr "Enlace"
-
-#: mod/content.php:736 object/Item.php:728
-msgid "Video"
-msgstr "Vídeo"
-
-#: mod/content.php:746 mod/settings.php:740 object/Item.php:122
-#: object/Item.php:124
-msgid "Edit"
-msgstr "Editar"
-
-#: mod/content.php:771 object/Item.php:227
-msgid "add star"
-msgstr "Añadir estrella"
-
-#: mod/content.php:772 object/Item.php:228
-msgid "remove star"
-msgstr "Quitar estrella"
-
-#: mod/content.php:773 object/Item.php:229
-msgid "toggle star status"
-msgstr "Añadir a destacados"
-
-#: mod/content.php:776 object/Item.php:232
-msgid "starred"
-msgstr "marcados con estrellas"
-
-#: mod/content.php:777 mod/content.php:798 object/Item.php:252
-msgid "add tag"
-msgstr "añadir etiqueta"
-
-#: mod/content.php:787 object/Item.php:240
-msgid "ignore thread"
-msgstr "ignorar publicación"
-
-#: mod/content.php:788 object/Item.php:241
-msgid "unignore thread"
-msgstr "revertir ignorar publicacion"
-
-#: mod/content.php:789 object/Item.php:242
-msgid "toggle ignore status"
-msgstr "cambiar estatus de observación"
-
-#: mod/content.php:803 object/Item.php:137
-msgid "save to folder"
-msgstr "grabado en directorio"
-
-#: mod/content.php:848 object/Item.php:201
-msgid "I will attend"
-msgstr "Voy a estar presente"
-
-#: mod/content.php:848 object/Item.php:201
-msgid "I will not attend"
-msgstr "No voy a estar presente"
-
-#: mod/content.php:848 object/Item.php:201
-msgid "I might attend"
-msgstr "Puede que voy a estar presente"
-
-#: mod/content.php:912 object/Item.php:369
-msgid "to"
-msgstr "a"
-
-#: mod/content.php:913 object/Item.php:371
-msgid "Wall-to-Wall"
-msgstr "Muro-A-Muro"
-
-#: mod/content.php:914 object/Item.php:372
-msgid "via Wall-To-Wall:"
-msgstr "via Muro-A-Muro:"
-
-#: mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Solicitud de amistad enviada."
-
-#: mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Sugerencias de amistad"
-
-#: mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Recomienda un amigo a %s"
-
-#: mod/mood.php:133
-msgid "Mood"
-msgstr "Ánimo"
-
-#: mod/mood.php:134
-msgid "Set your current mood and tell your friends"
-msgstr "Coloca tu ánimo actual y cuéntaselo a tus amigos"
-
-#: mod/poke.php:192
-msgid "Poke/Prod"
-msgstr "Toque/Empujón"
-
-#: mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr "da un toque, empujón o similar a alguien"
-
-#: mod/poke.php:194
-msgid "Recipient"
-msgstr "Receptor"
-
-#: mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr "Elige qué desea hacer con el receptor"
-
-#: mod/poke.php:198
-msgid "Make this post private"
-msgstr "Hacer esta publicación privada"
-
-#: mod/profile_photo.php:44
-msgid "Image uploaded but image cropping failed."
-msgstr "Imagen recibida, pero ha fallado al recortarla."
-
-#: mod/profile_photo.php:77 mod/profile_photo.php:84 mod/profile_photo.php:91
-#: mod/profile_photo.php:314
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Ha fallado la reducción de las dimensiones de la imagen [%s]."
-
-#: mod/profile_photo.php:124
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente."
-
-#: mod/profile_photo.php:134
-msgid "Unable to process image"
-msgstr "Imposible procesar la imagen"
-
-#: mod/profile_photo.php:150 mod/photos.php:786 mod/wall_upload.php:151
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "La imagen excede el limite de %s"
-
-#: mod/profile_photo.php:159 mod/photos.php:826 mod/wall_upload.php:188
-msgid "Unable to process image."
-msgstr "Imposible procesar la imagen."
-
-#: mod/profile_photo.php:248
-msgid "Upload File:"
-msgstr "Subir archivo:"
-
-#: mod/profile_photo.php:249
-msgid "Select a profile:"
-msgstr "Elige un perfil:"
-
-#: mod/profile_photo.php:251
-msgid "Upload"
-msgstr "Subir"
-
-#: mod/profile_photo.php:254
-msgid "or"
-msgstr "o"
-
-#: mod/profile_photo.php:254
-msgid "skip this step"
-msgstr "saltar este paso"
-
-#: mod/profile_photo.php:254
-msgid "select a photo from your photo albums"
-msgstr "elige una foto de tus álbumes"
-
-#: mod/profile_photo.php:268
-msgid "Crop Image"
-msgstr "Recortar imagen"
-
-#: mod/profile_photo.php:269
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Por favor, ajusta el recorte de la imagen para optimizarla."
-
-#: mod/profile_photo.php:271
-msgid "Done Editing"
-msgstr "Editado"
-
-#: mod/profile_photo.php:305
-msgid "Image uploaded successfully."
-msgstr "Imagen subida con éxito."
-
-#: mod/profile_photo.php:307 mod/photos.php:853 mod/wall_upload.php:221
-msgid "Image upload failed."
-msgstr "Error al subir la imagen."
-
-#: mod/regmod.php:55
-msgid "Account approved."
-msgstr "Cuenta aprobada."
-
-#: mod/regmod.php:92
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registro anulado para %s"
-
-#: mod/regmod.php:104
-msgid "Please login."
-msgstr "Por favor accede."
+#: mod/nogroup.php:65
+msgid "Contacts who are not members of a group"
+msgstr "Contactos sin grupo"
 
 #: mod/notifications.php:35
 msgid "Invalid request identifier."
 msgstr "Solicitud de identificación no válida."
 
 #: mod/notifications.php:44 mod/notifications.php:180
-#: mod/notifications.php:252
+#: mod/notifications.php:258
 msgid "Discard"
 msgstr "Descartar"
 
-#: mod/notifications.php:60 mod/notifications.php:179
-#: mod/notifications.php:251 mod/contacts.php:606 mod/contacts.php:806
-#: mod/contacts.php:991
-msgid "Ignore"
-msgstr "Ignorar"
-
 #: mod/notifications.php:105
 msgid "Network Notifications"
 msgstr "Notificaciones de Red"
 
+#: mod/notifications.php:111 mod/notify.php:69
+msgid "System Notifications"
+msgstr "Notificaciones del sistema"
+
 #: mod/notifications.php:117
 msgid "Personal Notifications"
 msgstr "Notificaciones personales"
@@ -4618,7 +6913,7 @@ msgstr "Mostrar peticiones ignoradas"
 msgid "Hide Ignored Requests"
 msgstr "Ocultar peticiones ignoradas"
 
-#: mod/notifications.php:164 mod/notifications.php:222
+#: mod/notifications.php:164 mod/notifications.php:228
 msgid "Notification type: "
 msgstr "Tipo de notificación: "
 
@@ -4627,22 +6922,14 @@ msgstr "Tipo de notificación: "
 msgid "suggested by %s"
 msgstr "sugerido por %s"
 
-#: mod/notifications.php:172 mod/notifications.php:239 mod/contacts.php:613
-msgid "Hide this contact from others"
-msgstr "Ocultar este contacto a los demás."
-
-#: mod/notifications.php:173 mod/notifications.php:240
+#: mod/notifications.php:173 mod/notifications.php:246
 msgid "Post a new friend activity"
 msgstr "Publica tu nueva amistad"
 
-#: mod/notifications.php:173 mod/notifications.php:240
+#: mod/notifications.php:173 mod/notifications.php:246
 msgid "if applicable"
 msgstr "Si corresponde"
 
-#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1412
-msgid "Approve"
-msgstr "Aprobar"
-
 #: mod/notifications.php:195
 msgid "Claims to be known to you: "
 msgstr "Dice conocerte: "
@@ -4655,57 +6942,408 @@ msgstr "sí"
 msgid "no"
 msgstr "no"
 
-#: mod/notifications.php:197
-msgid ""
-"Shall your connection be bidirectional or not? \"Friend\" implies that you "
-"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that "
-"you allow to read but you do not want to read theirs. Approve as: "
-msgstr "¿Deberá la coneccion ser bidireccional?\n\"Amigo\" implica que permitas la lectura y subscribas a las publicaciones del contacto.\n\"Admirador\" significa que permitas la lectura de tus publicaciones pero que no quieras ver sus publicaciones.\n\nAprobar como:"
+#: mod/notifications.php:197 mod/notifications.php:202
+msgid "Shall your connection be bidirectional or not?"
+msgstr "¿Su conexión debe ser bidireccional o no?"
 
-#: mod/notifications.php:200
+#: mod/notifications.php:198 mod/notifications.php:203
+#, php-format
 msgid ""
-"Shall your connection be bidirectional or not? \"Friend\" implies that you "
-"allow to read and you subscribe to their posts. \"Sharer\" means that you "
-"allow to read but you do not want to read theirs. Approve as: "
-msgstr "¿Deberá la coneccion ser bidireccional?\n\"Amigo\" implica que permitas la lectura y subscribas a las publicaciones del contacto.\n\"Sharer\" significa que permitas la lectura de tus publicaciones pero que no quieras ver sus publicaciones.\n\nAprobar como:"
+"Accepting %s as a friend allows %s to subscribe to your posts, and you will "
+"also receive updates from them in your news feed."
+msgstr "Aceptar a %s como amigo le permite a %s suscribirse a sus publicaciones, y usted también recibirá actualizaciones de ellos en sus noticias."
 
-#: mod/notifications.php:209
+#: mod/notifications.php:199
+#, php-format
+msgid ""
+"Accepting %s as a subscriber allows them to subscribe to your posts, but you"
+" will not receive updates from them in your news feed."
+msgstr "Aceptar a %s como suscriptor les permite suscribirse a sus publicaciones, pero usted no recibirá actualizaciones de ellos en sus noticias."
+
+#: mod/notifications.php:204
+#, php-format
+msgid ""
+"Accepting %s as a sharer allows them to subscribe to your posts, but you "
+"will not receive updates from them in your news feed."
+msgstr "Aceptar a %s como participante les permite suscribirse a sus publicaciones, pero usted no recibirá actualizaciones de ellos en sus noticias."
+
+#: mod/notifications.php:215
 msgid "Friend"
 msgstr "Amigo"
 
-#: mod/notifications.php:210
+#: mod/notifications.php:216
 msgid "Sharer"
 msgstr "Lector"
 
-#: mod/notifications.php:210
-msgid "Fan/Admirer"
-msgstr "Fan/Admirador"
+#: mod/notifications.php:216
+msgid "Subscriber"
+msgstr "Suscriptor"
 
-#: mod/notifications.php:243 mod/contacts.php:624 mod/follow.php:126
-msgid "Profile URL"
-msgstr "URL Perfil"
-
-#: mod/notifications.php:260
+#: mod/notifications.php:266
 msgid "No introductions."
 msgstr "Sin presentaciones."
 
-#: mod/notifications.php:299
+#: mod/notifications.php:307
 msgid "Show unread"
 msgstr "Mostrar no leído"
 
-#: mod/notifications.php:299
+#: mod/notifications.php:307
 msgid "Show all"
 msgstr "Mostrar todo"
 
-#: mod/notifications.php:305
+#: mod/notifications.php:313
 #, php-format
 msgid "No more %s notifications."
 msgstr "No más notificaciones de %s."
 
-#: mod/profiles.php:19 mod/profiles.php:134 mod/profiles.php:180
-#: mod/profiles.php:617 mod/dfrn_confirm.php:70
-msgid "Profile not found."
-msgstr "Perfil no encontrado."
+#: mod/notify.php:65
+msgid "No more system notifications."
+msgstr "No hay más notificaciones del sistema."
+
+#: mod/oexchange.php:21
+msgid "Post successful."
+msgstr "¡Publicado!"
+
+#: mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr "Error de protocolo OpenID. ID no devuelta."
+
+#: mod/openid.php:60
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Cuenta no encontrada y el registro OpenID no está permitido en ese sitio."
+
+#: mod/ostatus_subscribe.php:14
+msgid "Subscribing to OStatus contacts"
+msgstr "Subscribir a los contactos de OStatus"
+
+#: mod/ostatus_subscribe.php:25
+msgid "No contact provided."
+msgstr "Sin suministro de datos de contacto."
+
+#: mod/ostatus_subscribe.php:31
+msgid "Couldn't fetch information for contact."
+msgstr "No se ha podido conseguir la información del contacto."
+
+#: mod/ostatus_subscribe.php:40
+msgid "Couldn't fetch friends for contact."
+msgstr "No se ha podido conseguir datos de amigos para contactar."
+
+#: mod/ostatus_subscribe.php:54 mod/repair_ostatus.php:44
+msgid "Done"
+msgstr "hecho!"
+
+#: mod/ostatus_subscribe.php:68
+msgid "success"
+msgstr "exito!"
+
+#: mod/ostatus_subscribe.php:70
+msgid "failed"
+msgstr "fallido!"
+
+#: mod/ostatus_subscribe.php:78 mod/repair_ostatus.php:50
+msgid "Keep this window open until done."
+msgstr "Mantén esta ventana abierta hasta que el proceso ha terminado."
+
+#: mod/p.php:9
+msgid "Not Extended"
+msgstr "No extendido"
+
+#: mod/photos.php:90 mod/photos.php:1876
+msgid "Recent Photos"
+msgstr "Fotos recientes"
+
+#: mod/photos.php:93 mod/photos.php:1303 mod/photos.php:1878
+msgid "Upload New Photos"
+msgstr "Subir nuevas fotos"
+
+#: mod/photos.php:107 mod/settings.php:36
+msgid "everybody"
+msgstr "todos"
+
+#: mod/photos.php:171
+msgid "Contact information unavailable"
+msgstr "Información del contacto no disponible"
+
+#: mod/photos.php:192
+msgid "Album not found."
+msgstr "Álbum no encontrado."
+
+#: mod/photos.php:225 mod/photos.php:237 mod/photos.php:1247
+msgid "Delete Album"
+msgstr "Eliminar álbum"
+
+#: mod/photos.php:235
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "¿Estás seguro de quieres borrar este álbum y todas sus fotos?"
+
+#: mod/photos.php:317 mod/photos.php:328 mod/photos.php:1563
+msgid "Delete Photo"
+msgstr "Eliminar foto"
+
+#: mod/photos.php:326
+msgid "Do you really want to delete this photo?"
+msgstr "¿Estás seguro de que quieres borrar esta foto?"
+
+#: mod/photos.php:705
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s fue etiquetado en %2$s por %3$s"
+
+#: mod/photos.php:705
+msgid "a photo"
+msgstr "una foto"
+
+#: mod/photos.php:803 mod/profile_photo.php:156 mod/wall_upload.php:151
+#, php-format
+msgid "Image exceeds size limit of %s"
+msgstr "La imagen excede el limite de %s"
+
+#: mod/photos.php:811
+msgid "Image file is empty."
+msgstr "El archivo de imagen está vacío."
+
+#: mod/photos.php:844 mod/profile_photo.php:165 mod/wall_upload.php:186
+msgid "Unable to process image."
+msgstr "Imposible procesar la imagen."
+
+#: mod/photos.php:871 mod/profile_photo.php:315 mod/wall_upload.php:219
+msgid "Image upload failed."
+msgstr "Error al subir la imagen."
+
+#: mod/photos.php:974
+msgid "No photos selected"
+msgstr "Ninguna foto seleccionada"
+
+#: mod/photos.php:1074 mod/videos.php:309
+msgid "Access to this item is restricted."
+msgstr "El acceso a este elemento está restringido."
+
+#: mod/photos.php:1134
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr "Has usado %1$.2f MB de %2$.2f MB de tu álbum de fotos."
+
+#: mod/photos.php:1168
+msgid "Upload Photos"
+msgstr "Subir fotos"
+
+#: mod/photos.php:1172 mod/photos.php:1242
+msgid "New album name: "
+msgstr "Nombre del nuevo álbum: "
+
+#: mod/photos.php:1173
+msgid "or existing album name: "
+msgstr "o nombre de un álbum existente: "
+
+#: mod/photos.php:1174
+msgid "Do not show a status post for this upload"
+msgstr "No actualizar tu estado con este envío"
+
+#: mod/photos.php:1185 mod/photos.php:1567 mod/settings.php:1307
+msgid "Show to Groups"
+msgstr "Mostrar a los Grupos"
+
+#: mod/photos.php:1186 mod/photos.php:1568 mod/settings.php:1308
+msgid "Show to Contacts"
+msgstr "Mostrar a los Contactos"
+
+#: mod/photos.php:1187
+msgid "Private Photo"
+msgstr "Foto Privada"
+
+#: mod/photos.php:1188
+msgid "Public Photo"
+msgstr "Foto Pública"
+
+#: mod/photos.php:1254
+msgid "Edit Album"
+msgstr "Modificar álbum"
+
+#: mod/photos.php:1260
+msgid "Show Newest First"
+msgstr "Mostrar más nuevos primero"
+
+#: mod/photos.php:1262
+msgid "Show Oldest First"
+msgstr "Mostrar más antiguos primero"
+
+#: mod/photos.php:1289 mod/photos.php:1861
+msgid "View Photo"
+msgstr "Ver foto"
+
+#: mod/photos.php:1335
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
+
+#: mod/photos.php:1337
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: mod/photos.php:1395
+msgid "View photo"
+msgstr "Ver foto"
+
+#: mod/photos.php:1395
+msgid "Edit photo"
+msgstr "Modificar foto"
+
+#: mod/photos.php:1396
+msgid "Use as profile photo"
+msgstr "Usar como foto del perfil"
+
+#: mod/photos.php:1421
+msgid "View Full Size"
+msgstr "Ver a tamaño completo"
+
+#: mod/photos.php:1507
+msgid "Tags: "
+msgstr "Etiquetas: "
+
+#: mod/photos.php:1510
+msgid "[Remove any tag]"
+msgstr "[Borrar todas las etiquetas]"
+
+#: mod/photos.php:1549
+msgid "New album name"
+msgstr "Nuevo nombre del álbum"
+
+#: mod/photos.php:1550
+msgid "Caption"
+msgstr "Título"
+
+#: mod/photos.php:1551
+msgid "Add a Tag"
+msgstr "Añadir una etiqueta"
+
+#: mod/photos.php:1551
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Ejemplo: @juan, @Barbara_Ruiz, @julia@example.com, #California, #camping"
+
+#: mod/photos.php:1552
+msgid "Do not rotate"
+msgstr "No rotar"
+
+#: mod/photos.php:1553
+msgid "Rotate CW (right)"
+msgstr "Girar a la derecha"
+
+#: mod/photos.php:1554
+msgid "Rotate CCW (left)"
+msgstr "Girar a la izquierda"
+
+#: mod/photos.php:1569
+msgid "Private photo"
+msgstr "Foto privada"
+
+#: mod/photos.php:1570
+msgid "Public photo"
+msgstr "Foto pública"
+
+#: mod/photos.php:1792
+msgid "Map"
+msgstr "Mapa"
+
+#: mod/photos.php:1867 mod/videos.php:391
+msgid "View Album"
+msgstr "Ver Álbum"
+
+#: mod/ping.php:270
+msgid "{0} wants to be your friend"
+msgstr "{0} quiere ser tu amigo"
+
+#: mod/ping.php:285
+msgid "{0} sent you a message"
+msgstr "{0} te ha enviado un mensaje"
+
+#: mod/ping.php:300
+msgid "{0} requested registration"
+msgstr "{0} solicitudes de registro"
+
+#: mod/poke.php:196
+msgid "Poke/Prod"
+msgstr "Toque/Empujón"
+
+#: mod/poke.php:197
+msgid "poke, prod or do other things to somebody"
+msgstr "da un toque, empujón o similar a alguien"
+
+#: mod/poke.php:198
+msgid "Recipient"
+msgstr "Receptor"
+
+#: mod/poke.php:199
+msgid "Choose what you wish to do to recipient"
+msgstr "Elige qué desea hacer con el receptor"
+
+#: mod/poke.php:202
+msgid "Make this post private"
+msgstr "Hacer esta publicación privada"
+
+#: mod/profile.php:174
+msgid "Tips for New Members"
+msgstr "Consejos para nuevos miembros"
+
+#: mod/profile_photo.php:44
+msgid "Image uploaded but image cropping failed."
+msgstr "Imagen recibida, pero ha fallado al recortarla."
+
+#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93
+#: mod/profile_photo.php:323
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "Ha fallado la reducción de las dimensiones de la imagen [%s]."
+
+#: mod/profile_photo.php:127
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente."
+
+#: mod/profile_photo.php:137
+msgid "Unable to process image"
+msgstr "Imposible procesar la imagen"
+
+#: mod/profile_photo.php:254
+msgid "Upload File:"
+msgstr "Subir archivo:"
+
+#: mod/profile_photo.php:255
+msgid "Select a profile:"
+msgstr "Elige un perfil:"
+
+#: mod/profile_photo.php:257
+msgid "Upload"
+msgstr "Subir"
+
+#: mod/profile_photo.php:260
+msgid "or"
+msgstr "o"
+
+#: mod/profile_photo.php:260
+msgid "skip this step"
+msgstr "saltar este paso"
+
+#: mod/profile_photo.php:260
+msgid "select a photo from your photo albums"
+msgstr "elige una foto de tus álbumes"
+
+#: mod/profile_photo.php:274
+msgid "Crop Image"
+msgstr "Recortar imagen"
+
+#: mod/profile_photo.php:275
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Por favor, ajusta el recorte de la imagen para optimizarla."
+
+#: mod/profile_photo.php:277
+msgid "Done Editing"
+msgstr "Editado"
+
+#: mod/profile_photo.php:313
+msgid "Image uploaded successfully."
+msgstr "Imagen subida con éxito."
 
 #: mod/profiles.php:38
 msgid "Profile deleted."
@@ -4763,7 +7401,7 @@ msgstr "XMPP"
 msgid "Homepage"
 msgstr "Página de inicio"
 
-#: mod/profiles.php:381 mod/profiles.php:702
+#: mod/profiles.php:381 mod/profiles.php:694
 msgid "Interests"
 msgstr "Intereses"
 
@@ -4771,7 +7409,7 @@ msgstr "Intereses"
 msgid "Address"
 msgstr "Dirección"
 
-#: mod/profiles.php:392 mod/profiles.php:698
+#: mod/profiles.php:392 mod/profiles.php:690
 msgid "Location"
 msgstr "Ubicación"
 
@@ -4779,600 +7417,248 @@ msgstr "Ubicación"
 msgid "Profile updated."
 msgstr "Perfil actualizado."
 
-#: mod/profiles.php:564
+#: mod/profiles.php:565
 msgid " and "
 msgstr " y "
 
-#: mod/profiles.php:572
+#: mod/profiles.php:573
 msgid "public profile"
 msgstr "perfil público"
 
-#: mod/profiles.php:575
+#: mod/profiles.php:576
 #, php-format
 msgid "%1$s changed %2$s to “%3$s”"
 msgstr "%1$s cambió su %2$s a “%3$s”"
 
-#: mod/profiles.php:576
+#: mod/profiles.php:577
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr " - Visita %1$s's %2$s"
 
-#: mod/profiles.php:579
+#: mod/profiles.php:580
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s tiene una actualización %2$s, cambiando %3$s."
 
-#: mod/profiles.php:645
+#: mod/profiles.php:637
 msgid "Hide contacts and friends:"
 msgstr "Ocultar contactos y amigos"
 
-#: mod/profiles.php:650
+#: mod/profiles.php:642
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "¿Ocultar tu lista de contactos/amigos en este perfil?"
 
-#: mod/profiles.php:674
+#: mod/profiles.php:666
 msgid "Show more profile fields:"
 msgstr "Mostrar mas campos del perfil:"
 
-#: mod/profiles.php:686
+#: mod/profiles.php:678
 msgid "Profile Actions"
 msgstr "Acciones de perfil"
 
-#: mod/profiles.php:687
+#: mod/profiles.php:679
 msgid "Edit Profile Details"
 msgstr "Editar detalles de tu perfil"
 
-#: mod/profiles.php:689
+#: mod/profiles.php:681
 msgid "Change Profile Photo"
 msgstr "Cambiar imagen del Perfil"
 
-#: mod/profiles.php:690
+#: mod/profiles.php:682
 msgid "View this profile"
 msgstr "Ver este perfil"
 
-#: mod/profiles.php:692
+#: mod/profiles.php:684
 msgid "Create a new profile using these settings"
 msgstr "¿Crear un nuevo perfil con esta configuración?"
 
-#: mod/profiles.php:693
+#: mod/profiles.php:685
 msgid "Clone this profile"
 msgstr "Clonar este perfil"
 
-#: mod/profiles.php:694
+#: mod/profiles.php:686
 msgid "Delete this profile"
 msgstr "Eliminar este perfil"
 
-#: mod/profiles.php:696
+#: mod/profiles.php:688
 msgid "Basic information"
 msgstr "Información básica"
 
-#: mod/profiles.php:697
+#: mod/profiles.php:689
 msgid "Profile picture"
 msgstr "Imagen del perfil"
 
-#: mod/profiles.php:699
+#: mod/profiles.php:691
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: mod/profiles.php:700
+#: mod/profiles.php:692
 msgid "Status information"
 msgstr "Información del estatus"
 
-#: mod/profiles.php:701
+#: mod/profiles.php:693
 msgid "Additional information"
 msgstr "Información addicional"
 
-#: mod/profiles.php:704
+#: mod/profiles.php:696
 msgid "Relation"
 msgstr "Relación"
 
-#: mod/profiles.php:708
+#: mod/profiles.php:700
 msgid "Your Gender:"
 msgstr "Género:"
 
-#: mod/profiles.php:709
+#: mod/profiles.php:701
 msgid "♥ Marital Status:"
 msgstr " Estado civil:"
 
-#: mod/profiles.php:711
+#: mod/profiles.php:703
 msgid "Example: fishing photography software"
 msgstr "Ejemplo: pesca fotografía software"
 
-#: mod/profiles.php:716
+#: mod/profiles.php:708
 msgid "Profile Name:"
 msgstr "Nombres del perfil:"
 
-#: mod/profiles.php:716 mod/events.php:484 mod/events.php:496
-msgid "Required"
-msgstr "Obligatorio"
-
-#: mod/profiles.php:718
+#: mod/profiles.php:710
 msgid ""
 "This is your public profile.
    It may "
 "be visible to anybody using the internet."
 msgstr "Éste es tu perfil público.
    Puede ser visto por cualquier usuario de internet."
 
-#: mod/profiles.php:719
+#: mod/profiles.php:711
 msgid "Your Full Name:"
 msgstr "Tu nombre completo:"
 
-#: mod/profiles.php:720
+#: mod/profiles.php:712
 msgid "Title/Description:"
 msgstr "Título/Descrición:"
 
-#: mod/profiles.php:723
+#: mod/profiles.php:715
 msgid "Street Address:"
 msgstr "Dirección"
 
-#: mod/profiles.php:724
+#: mod/profiles.php:716
 msgid "Locality/City:"
 msgstr "Localidad/Ciudad:"
 
-#: mod/profiles.php:725
+#: mod/profiles.php:717
 msgid "Region/State:"
 msgstr "Región/Estado:"
 
-#: mod/profiles.php:726
+#: mod/profiles.php:718
 msgid "Postal/Zip Code:"
 msgstr "Código postal:"
 
-#: mod/profiles.php:727
+#: mod/profiles.php:719
 msgid "Country:"
 msgstr "País"
 
-#: mod/profiles.php:731
+#: mod/profiles.php:723
 msgid "Who: (if applicable)"
 msgstr "¿Quién? (si es aplicable)"
 
-#: mod/profiles.php:731
+#: mod/profiles.php:723
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Ejemplos: cathy123, Cathy Williams, cathy@example.com"
 
-#: mod/profiles.php:732
+#: mod/profiles.php:724
 msgid "Since [date]:"
 msgstr "Desde [fecha]:"
 
-#: mod/profiles.php:734
+#: mod/profiles.php:726
 msgid "Tell us about yourself..."
 msgstr "Háblanos sobre ti..."
 
-#: mod/profiles.php:735
+#: mod/profiles.php:727
 msgid "XMPP (Jabber) address:"
 msgstr "Dirección XMPP (Jabber):"
 
-#: mod/profiles.php:735
+#: mod/profiles.php:727
 msgid ""
 "The XMPP address will be propagated to your contacts so that they can follow"
 " you."
 msgstr "La dirección XMPP será propagada entre sus contactos para que puedan seguirle."
 
-#: mod/profiles.php:736
+#: mod/profiles.php:728
 msgid "Homepage URL:"
 msgstr "Dirección de tu página:"
 
-#: mod/profiles.php:739
+#: mod/profiles.php:731
 msgid "Religious Views:"
 msgstr "Creencias religiosas:"
 
-#: mod/profiles.php:740
+#: mod/profiles.php:732
 msgid "Public Keywords:"
 msgstr "Palabras clave públicas:"
 
-#: mod/profiles.php:740
+#: mod/profiles.php:732
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Utilizadas para sugerir amigos potenciales, otros pueden verlo)"
 
-#: mod/profiles.php:741
+#: mod/profiles.php:733
 msgid "Private Keywords:"
 msgstr "Palabras clave privadas:"
 
-#: mod/profiles.php:741
+#: mod/profiles.php:733
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Utilizadas para buscar perfiles, nunca se muestra a otros)"
 
-#: mod/profiles.php:744
+#: mod/profiles.php:736
 msgid "Musical interests"
 msgstr "Gustos musicales"
 
-#: mod/profiles.php:745
+#: mod/profiles.php:737
 msgid "Books, literature"
 msgstr "Libros, literatura"
 
-#: mod/profiles.php:746
+#: mod/profiles.php:738
 msgid "Television"
 msgstr "Televisión"
 
-#: mod/profiles.php:747
+#: mod/profiles.php:739
 msgid "Film/dance/culture/entertainment"
 msgstr "Películas/baile/cultura/entretenimiento"
 
-#: mod/profiles.php:748
+#: mod/profiles.php:740
 msgid "Hobbies/Interests"
 msgstr "Aficiones/Intereses"
 
-#: mod/profiles.php:749
+#: mod/profiles.php:741
 msgid "Love/romance"
 msgstr "Amor/Romance"
 
-#: mod/profiles.php:750
+#: mod/profiles.php:742
 msgid "Work/employment"
 msgstr "Trabajo/ocupación"
 
-#: mod/profiles.php:751
+#: mod/profiles.php:743
 msgid "School/education"
 msgstr "Escuela/estudios"
 
-#: mod/profiles.php:752
+#: mod/profiles.php:744
 msgid "Contact information and Social Networks"
 msgstr "Informacioń de contacto y Redes sociales"
 
-#: mod/profiles.php:794
+#: mod/profiles.php:788
 msgid "Edit/Manage Profiles"
 msgstr "Editar/Administrar perfiles"
 
-#: mod/allfriends.php:43
-msgid "No friends to display."
-msgstr "No hay amigos para mostrar."
+#: mod/profperm.php:26 mod/profperm.php:57
+msgid "Invalid profile identifier."
+msgstr "Identificador de perfil no válido."
 
-#: mod/cal.php:149 mod/display.php:328 mod/profile.php:155
-msgid "Access to this profile has been restricted."
-msgstr "El acceso a este perfil ha sido restringido."
+#: mod/profperm.php:103
+msgid "Profile Visibility Editor"
+msgstr "Editor de visibilidad del perfil"
 
-#: mod/cal.php:276 mod/events.php:380
-msgid "View"
-msgstr "Vista"
+#: mod/profperm.php:116
+msgid "Visible To"
+msgstr "Visible para"
 
-#: mod/cal.php:277 mod/events.php:382
-msgid "Previous"
-msgstr "Previo"
-
-#: mod/cal.php:278 mod/events.php:383 mod/install.php:231
-msgid "Next"
-msgstr "Siguiente"
-
-#: mod/cal.php:287 mod/events.php:392
-msgid "list"
-msgstr "lista"
-
-#: mod/cal.php:297
-msgid "User not found"
-msgstr "Usuario no encontrado"
-
-#: mod/cal.php:313
-msgid "This calendar format is not supported"
-msgstr "Este formato de calendario no se soporta"
-
-#: mod/cal.php:315
-msgid "No exportable data found"
-msgstr "No se ha encontrado información exportable"
-
-#: mod/cal.php:330
-msgid "calendar"
-msgstr "calendario"
-
-#: mod/common.php:86
-msgid "No contacts in common."
-msgstr "Sin contactos en común."
-
-#: mod/common.php:134 mod/contacts.php:863
-msgid "Common Friends"
-msgstr "Amigos comunes"
-
-#: mod/community.php:27
-msgid "Not available."
-msgstr "No disponible"
-
-#: mod/directory.php:197 view/theme/vier/theme.php:201
-msgid "Global Directory"
-msgstr "Directorio global"
-
-#: mod/directory.php:199
-msgid "Find on this site"
-msgstr "Buscar en este sitio"
-
-#: mod/directory.php:201
-msgid "Results for:"
-msgstr "Resultados para:"
-
-#: mod/directory.php:203
-msgid "Site Directory"
-msgstr "Directorio del sitio"
-
-#: mod/directory.php:210
-msgid "No entries (some entries may be hidden)."
-msgstr "Sin entradas (algunas pueden que estén ocultas)."
-
-#: mod/dirfind.php:36
-#, php-format
-msgid "People Search - %s"
-msgstr "Buscar perfiles - %s"
-
-#: mod/dirfind.php:47
-#, php-format
-msgid "Forum Search - %s"
-msgstr "Búsqueda de foro - %s"
-
-#: mod/dirfind.php:240 mod/match.php:107
-msgid "No matches"
-msgstr "Sin conincidencias"
-
-#: mod/display.php:473
-msgid "Item has been removed."
-msgstr "El elemento ha sido eliminado."
-
-#: mod/events.php:95 mod/events.php:97
-msgid "Event can not end before it has started."
-msgstr "Un evento no puede terminar antes de su comienzo."
-
-#: mod/events.php:104 mod/events.php:106
-msgid "Event title and start time are required."
-msgstr "Título del evento y hora de inicio requeridas."
-
-#: mod/events.php:381
-msgid "Create New Event"
-msgstr "Crea un evento nuevo"
-
-#: mod/events.php:482
-msgid "Event details"
-msgstr "Detalles del evento"
-
-#: mod/events.php:483
-msgid "Starting date and Title are required."
-msgstr "Se requiere fecha de comienzo y titulo"
-
-#: mod/events.php:484 mod/events.php:485
-msgid "Event Starts:"
-msgstr "Inicio del evento:"
-
-#: mod/events.php:486 mod/events.php:502
-msgid "Finish date/time is not known or not relevant"
-msgstr "La fecha/hora de finalización no es conocida o es irrelevante."
-
-#: mod/events.php:488 mod/events.php:489
-msgid "Event Finishes:"
-msgstr "Finalización del evento:"
-
-#: mod/events.php:490 mod/events.php:503
-msgid "Adjust for viewer timezone"
-msgstr "Ajuste de zona horaria"
-
-#: mod/events.php:492
-msgid "Description:"
-msgstr "Descripción:"
-
-#: mod/events.php:496 mod/events.php:498
-msgid "Title:"
-msgstr "Título:"
-
-#: mod/events.php:499 mod/events.php:500
-msgid "Share this event"
-msgstr "Comparte este evento"
-
-#: mod/maintenance.php:9
-msgid "System down for maintenance"
-msgstr "Servicio suspendido por mantenimiento"
-
-#: mod/match.php:33
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado."
-
-#: mod/match.php:86
-msgid "is interested in:"
-msgstr "estás interesado en:"
-
-#: mod/match.php:100
-msgid "Profile Match"
-msgstr "Coincidencias de Perfil"
-
-#: mod/profile.php:179
-msgid "Tips for New Members"
-msgstr "Consejos para nuevos miembros"
-
-#: mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr "¿Estás seguro de que quieres borrar esta sugerencia?"
-
-#: mod/suggest.php:71
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas."
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "Ignorar/Ocultar"
-
-#: mod/update_community.php:19 mod/update_display.php:23
-#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
-msgid "[Embedded content - reload page to view]"
-msgstr "[Contenido incrustado - recarga la página para verlo]"
-
-#: mod/photos.php:88 mod/photos.php:1856
-msgid "Recent Photos"
-msgstr "Fotos recientes"
-
-#: mod/photos.php:91 mod/photos.php:1283 mod/photos.php:1858
-msgid "Upload New Photos"
-msgstr "Subir nuevas fotos"
-
-#: mod/photos.php:105 mod/settings.php:36
-msgid "everybody"
-msgstr "todos"
-
-#: mod/photos.php:169
-msgid "Contact information unavailable"
-msgstr "Información del contacto no disponible"
-
-#: mod/photos.php:190
-msgid "Album not found."
-msgstr "Álbum no encontrado."
-
-#: mod/photos.php:220 mod/photos.php:232 mod/photos.php:1227
-msgid "Delete Album"
-msgstr "Eliminar álbum"
-
-#: mod/photos.php:230
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "¿Estás seguro de quieres borrar este álbum y todas sus fotos?"
-
-#: mod/photos.php:308 mod/photos.php:319 mod/photos.php:1540
-msgid "Delete Photo"
-msgstr "Eliminar foto"
-
-#: mod/photos.php:317
-msgid "Do you really want to delete this photo?"
-msgstr "¿Estás seguro de que quieres borrar esta foto?"
-
-#: mod/photos.php:688
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$s fue etiquetado en %2$s por %3$s"
-
-#: mod/photos.php:688
-msgid "a photo"
-msgstr "una foto"
-
-#: mod/photos.php:794
-msgid "Image file is empty."
-msgstr "El archivo de imagen está vacío."
-
-#: mod/photos.php:954
-msgid "No photos selected"
-msgstr "Ninguna foto seleccionada"
-
-#: mod/photos.php:1054 mod/videos.php:305
-msgid "Access to this item is restricted."
-msgstr "El acceso a este elemento está restringido."
-
-#: mod/photos.php:1114
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
-msgstr "Has usado %1$.2f MB de %2$.2f MB de tu álbum de fotos."
-
-#: mod/photos.php:1148
-msgid "Upload Photos"
-msgstr "Subir fotos"
-
-#: mod/photos.php:1152 mod/photos.php:1222
-msgid "New album name: "
-msgstr "Nombre del nuevo álbum: "
-
-#: mod/photos.php:1153
-msgid "or existing album name: "
-msgstr "o nombre de un álbum existente: "
-
-#: mod/photos.php:1154
-msgid "Do not show a status post for this upload"
-msgstr "No actualizar tu estado con este envío"
-
-#: mod/photos.php:1165 mod/photos.php:1544 mod/settings.php:1300
-msgid "Show to Groups"
-msgstr "Mostrar a los Grupos"
-
-#: mod/photos.php:1166 mod/photos.php:1545 mod/settings.php:1301
-msgid "Show to Contacts"
-msgstr "Mostrar a los Contactos"
-
-#: mod/photos.php:1167
-msgid "Private Photo"
-msgstr "Foto Privada"
-
-#: mod/photos.php:1168
-msgid "Public Photo"
-msgstr "Foto Pública"
-
-#: mod/photos.php:1234
-msgid "Edit Album"
-msgstr "Modificar álbum"
-
-#: mod/photos.php:1240
-msgid "Show Newest First"
-msgstr "Mostrar más nuevos primero"
-
-#: mod/photos.php:1242
-msgid "Show Oldest First"
-msgstr "Mostrar más antiguos primero"
-
-#: mod/photos.php:1269 mod/photos.php:1841
-msgid "View Photo"
-msgstr "Ver foto"
-
-#: mod/photos.php:1315
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
-
-#: mod/photos.php:1317
-msgid "Photo not available"
-msgstr "Foto no disponible"
-
-#: mod/photos.php:1372
-msgid "View photo"
-msgstr "Ver foto"
-
-#: mod/photos.php:1372
-msgid "Edit photo"
-msgstr "Modificar foto"
-
-#: mod/photos.php:1373
-msgid "Use as profile photo"
-msgstr "Usar como foto del perfil"
-
-#: mod/photos.php:1398
-msgid "View Full Size"
-msgstr "Ver a tamaño completo"
-
-#: mod/photos.php:1484
-msgid "Tags: "
-msgstr "Etiquetas: "
-
-#: mod/photos.php:1487
-msgid "[Remove any tag]"
-msgstr "[Borrar todas las etiquetas]"
-
-#: mod/photos.php:1526
-msgid "New album name"
-msgstr "Nuevo nombre del álbum"
-
-#: mod/photos.php:1527
-msgid "Caption"
-msgstr "Título"
-
-#: mod/photos.php:1528
-msgid "Add a Tag"
-msgstr "Añadir una etiqueta"
-
-#: mod/photos.php:1528
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Ejemplo: @juan, @Barbara_Ruiz, @julia@example.com, #California, #camping"
-
-#: mod/photos.php:1529
-msgid "Do not rotate"
-msgstr "No rotar"
-
-#: mod/photos.php:1530
-msgid "Rotate CW (right)"
-msgstr "Girar a la derecha"
-
-#: mod/photos.php:1531
-msgid "Rotate CCW (left)"
-msgstr "Girar a la izquierda"
-
-#: mod/photos.php:1546
-msgid "Private photo"
-msgstr "Foto privada"
-
-#: mod/photos.php:1547
-msgid "Public photo"
-msgstr "Foto pública"
-
-#: mod/photos.php:1770
-msgid "Map"
-msgstr "Mapa"
-
-#: mod/photos.php:1847 mod/videos.php:387
-msgid "View Album"
-msgstr "Ver Álbum"
+#: mod/profperm.php:132
+msgid "All Contacts (with secure profile access)"
+msgstr "Todos los contactos (con perfil de acceso seguro)"
 
 #: mod/register.php:93
 msgid ""
@@ -5398,6 +7684,12 @@ msgstr "Tu registro no se puede procesar."
 msgid "Your registration is pending approval by the site owner."
 msgstr "Tu registro está pendiente de aprobación por el propietario del sitio."
 
+#: mod/register.php:198 mod/uimport.php:51
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor."
+
 #: mod/register.php:226
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
@@ -5434,10 +7726,6 @@ msgstr "Sitio solo accesible mediante invitación."
 msgid "Your invitation ID: "
 msgstr "ID de tu invitación: "
 
-#: mod/register.php:272 mod/admin.php:956
-msgid "Registration"
-msgstr "Registro"
-
 #: mod/register.php:280
 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr "Nombre completo (ej. Joe Smith, real o real aparente):"
@@ -5446,7 +7734,7 @@ msgstr "Nombre completo (ej. Joe Smith, real o real aparente):"
 msgid "Your Email Address: "
 msgstr "Tu dirección de correo: "
 
-#: mod/register.php:283 mod/settings.php:1271
+#: mod/register.php:283 mod/settings.php:1278
 msgid "New Password:"
 msgstr "Contraseña nueva:"
 
@@ -5454,7 +7742,7 @@ msgstr "Contraseña nueva:"
 msgid "Leave empty for an auto generated password."
 msgstr "Dejar vacío para autogenerar una contraseña"
 
-#: mod/register.php:284 mod/settings.php:1272
+#: mod/register.php:284 mod/settings.php:1279
 msgid "Confirm:"
 msgstr "Confirmar:"
 
@@ -5469,775 +7757,896 @@ msgstr "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en
 msgid "Choose a nickname: "
 msgstr "Escoge un apodo: "
 
+#: mod/register.php:295 mod/uimport.php:66
+msgid "Import"
+msgstr "Importar"
+
 #: mod/register.php:296
 msgid "Import your profile to this friendica instance"
 msgstr "Importar tu perfil a esta instancia de friendica"
 
-#: mod/settings.php:43 mod/admin.php:1396
-msgid "Account"
-msgstr "Cuenta"
+#: mod/regmod.php:58
+msgid "Account approved."
+msgstr "Cuenta aprobada."
 
-#: mod/settings.php:52 mod/admin.php:160
-msgid "Additional features"
-msgstr "Características adicionales"
+#: mod/regmod.php:95
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registro anulado para %s"
+
+#: mod/regmod.php:107
+msgid "Please login."
+msgstr "Por favor accede."
+
+#: mod/removeme.php:52 mod/removeme.php:55
+msgid "Remove My Account"
+msgstr "Eliminar mi cuenta"
+
+#: mod/removeme.php:53
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Esto eliminará por completo tu cuenta. Una vez hecho no se puede deshacer."
+
+#: mod/removeme.php:54
+msgid "Please enter your password for verification:"
+msgstr "Por favor, introduce tu contraseña para la verificación:"
+
+#: mod/repair_ostatus.php:14
+msgid "Resubscribing to OStatus contacts"
+msgstr "Resubscribir a contactos de OStatus"
+
+#: mod/repair_ostatus.php:30
+msgid "Error"
+msgstr "error"
+
+#: mod/search.php:100
+msgid "Only logged in users are permitted to perform a search."
+msgstr "Solo usuarios activos tienen permiso para ejecutar búsquedas."
+
+#: mod/search.php:124
+msgid "Too Many Requests"
+msgstr "Demasiadas consultas"
+
+#: mod/search.php:125
+msgid "Only one search per minute is permitted for not logged in users."
+msgstr "Se permite solo una búsqueda por minuto para usuarios no identificados."
+
+#: mod/search.php:230
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Objetos taggeado con: %s"
 
 #: mod/settings.php:60
 msgid "Display"
 msgstr "Interfaz del usuario"
 
-#: mod/settings.php:67 mod/settings.php:886
+#: mod/settings.php:67 mod/settings.php:890
 msgid "Social Networks"
 msgstr "Redes sociales"
 
-#: mod/settings.php:74 mod/admin.php:158 mod/admin.php:1522 mod/admin.php:1582
-msgid "Plugins"
-msgstr "Módulos"
-
 #: mod/settings.php:88
 msgid "Connected apps"
 msgstr "Aplicaciones conectadas"
 
+#: mod/settings.php:95 mod/uexport.php:45
+msgid "Export personal data"
+msgstr "Exportación de datos personales"
+
 #: mod/settings.php:102
 msgid "Remove account"
 msgstr "Eliminar cuenta"
 
-#: mod/settings.php:155
+#: mod/settings.php:157
 msgid "Missing some important data!"
 msgstr "¡Faltan algunos datos importantes!"
 
-#: mod/settings.php:158 mod/settings.php:704 mod/contacts.php:804
-msgid "Update"
-msgstr "Actualizar"
-
-#: mod/settings.php:269
+#: mod/settings.php:271
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Error al conectar con la cuenta de correo mediante la configuración suministrada."
 
-#: mod/settings.php:274
+#: mod/settings.php:276
 msgid "Email settings updated."
 msgstr "Configuración de correo actualizada."
 
-#: mod/settings.php:289
+#: mod/settings.php:291
 msgid "Features updated"
 msgstr "Actualizaciones"
 
-#: mod/settings.php:359
+#: mod/settings.php:361
 msgid "Relocate message has been send to your contacts"
 msgstr "Mensaje de reubicación ha sido enviado a sus contactos."
 
-#: mod/settings.php:378
+#: mod/settings.php:380
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "No se permiten contraseñas vacías. La contraseña no ha sido modificada."
 
-#: mod/settings.php:386
+#: mod/settings.php:388
 msgid "Wrong password."
 msgstr "Contraseña incorrecta"
 
-#: mod/settings.php:397
+#: mod/settings.php:399
 msgid "Password changed."
 msgstr "Contraseña modificada."
 
-#: mod/settings.php:399
+#: mod/settings.php:401
 msgid "Password update failed. Please try again."
 msgstr "La actualización de la contraseña ha fallado. Por favor, prueba otra vez."
 
-#: mod/settings.php:479
+#: mod/settings.php:481
 msgid " Please use a shorter name."
 msgstr " Usa un nombre más corto."
 
-#: mod/settings.php:481
+#: mod/settings.php:483
 msgid " Name too short."
 msgstr " Nombre demasiado corto."
 
-#: mod/settings.php:490
+#: mod/settings.php:492
 msgid "Wrong Password"
 msgstr "Contraseña incorrecta"
 
-#: mod/settings.php:495
+#: mod/settings.php:497
 msgid " Not valid email."
 msgstr " Correo no válido."
 
-#: mod/settings.php:501
+#: mod/settings.php:503
 msgid " Cannot change to that email."
 msgstr " No se puede usar ese correo."
 
-#: mod/settings.php:557
+#: mod/settings.php:559
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "El foro privado no tiene permisos de privacidad. Usando el grupo de privacidad por defecto."
 
-#: mod/settings.php:561
+#: mod/settings.php:563
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad."
 
-#: mod/settings.php:601
+#: mod/settings.php:603
 msgid "Settings updated."
 msgstr "Configuración actualizada."
 
-#: mod/settings.php:677 mod/settings.php:703 mod/settings.php:739
+#: mod/settings.php:680 mod/settings.php:706 mod/settings.php:742
 msgid "Add application"
 msgstr "Agregar aplicación"
 
-#: mod/settings.php:678 mod/settings.php:788 mod/settings.php:835
-#: mod/settings.php:904 mod/settings.php:996 mod/settings.php:1264
-#: mod/admin.php:955 mod/admin.php:1583 mod/admin.php:1831 mod/admin.php:1905
-#: mod/admin.php:2055
-msgid "Save Settings"
-msgstr "Guardar configuración"
-
-#: mod/settings.php:681 mod/settings.php:707
+#: mod/settings.php:684 mod/settings.php:710
 msgid "Consumer Key"
 msgstr "Clave del consumidor"
 
-#: mod/settings.php:682 mod/settings.php:708
+#: mod/settings.php:685 mod/settings.php:711
 msgid "Consumer Secret"
 msgstr "Secreto del consumidor"
 
-#: mod/settings.php:683 mod/settings.php:709
+#: mod/settings.php:686 mod/settings.php:712
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: mod/settings.php:684 mod/settings.php:710
+#: mod/settings.php:687 mod/settings.php:713
 msgid "Icon url"
 msgstr "Dirección del ícono"
 
-#: mod/settings.php:695
+#: mod/settings.php:698
 msgid "You can't edit this application."
 msgstr "No puedes editar esta aplicación."
 
-#: mod/settings.php:738
+#: mod/settings.php:741
 msgid "Connected Apps"
 msgstr "Aplicaciones conectadas"
 
-#: mod/settings.php:742
+#: mod/settings.php:745
 msgid "Client key starts with"
 msgstr "Clave de cliente comienza por"
 
-#: mod/settings.php:743
+#: mod/settings.php:746
 msgid "No name"
 msgstr "Sin nombre"
 
-#: mod/settings.php:744
+#: mod/settings.php:747
 msgid "Remove authorization"
 msgstr "Suprimir la autorización"
 
-#: mod/settings.php:756
+#: mod/settings.php:759
 msgid "No Plugin settings configured"
 msgstr "No se ha configurado ningún módulo"
 
-#: mod/settings.php:764
+#: mod/settings.php:768
 msgid "Plugin Settings"
 msgstr "Configuración de los módulos"
 
-#: mod/settings.php:778 mod/admin.php:2044 mod/admin.php:2045
-msgid "Off"
-msgstr "Apagado"
-
-#: mod/settings.php:778 mod/admin.php:2044 mod/admin.php:2045
-msgid "On"
-msgstr "Encendido"
-
-#: mod/settings.php:786
+#: mod/settings.php:790
 msgid "Additional Features"
 msgstr "Características adicionales"
 
-#: mod/settings.php:796 mod/settings.php:800
+#: mod/settings.php:800 mod/settings.php:804
 msgid "General Social Media Settings"
 msgstr "Configuración general de social media "
 
-#: mod/settings.php:806
+#: mod/settings.php:810
 msgid "Disable intelligent shortening"
 msgstr "Deshabilitar recorte inteligente de URL"
 
-#: mod/settings.php:808
+#: mod/settings.php:812
 msgid ""
 "Normally the system tries to find the best link to add to shortened posts. "
 "If this option is enabled then every shortened post will always point to the"
 " original friendica post."
 msgstr "Normalemente el sistema intenta de encontrara el mejor enlace para agregar a envíos recortados (twitter, OStatus). Si esta opción se encuentra habilitado, todo envío recortado apuntara siempre al tema original en friendica."
 
-#: mod/settings.php:814
+#: mod/settings.php:818
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr "Automáticamente seguir cualquier GNUsocial (OStatus) seguidores o menciones "
 
-#: mod/settings.php:816
+#: mod/settings.php:820
 msgid ""
 "If you receive a message from an unknown OStatus user, this option decides "
 "what to do. If it is checked, a new contact will be created for every "
 "unknown user."
 msgstr "Cuando se recibe un mensaje de un perfil desconocido de OStatus, esta opción define que hacer.\nSi es habilitado, un nuevo contacto sera creado para cada usuario."
 
-#: mod/settings.php:822
+#: mod/settings.php:826
 msgid "Default group for OStatus contacts"
 msgstr "Grupo por defecto para contactos OStatus"
 
-#: mod/settings.php:828
+#: mod/settings.php:834
 msgid "Your legacy GNU Social account"
 msgstr "Tu cuenta GNU social conectada"
 
-#: mod/settings.php:830
+#: mod/settings.php:836
 msgid ""
 "If you enter your old GNU Social/Statusnet account name here (in the format "
 "user@domain.tld), your contacts will be added automatically. The field will "
 "be emptied when done."
 msgstr "Si agrega su viejo nombre de perfil  GNUsocial/Statusnet aqui (en el formato de usuario@dominio.tld), sus contactos serán añadidos automáticamente.\nEl campo sera vaciado cuando termine el proceso. "
 
-#: mod/settings.php:833
+#: mod/settings.php:839
 msgid "Repair OStatus subscriptions"
 msgstr "Reparar subscripciones de OStatus"
 
-#: mod/settings.php:842 mod/settings.php:843
+#: mod/settings.php:848 mod/settings.php:849
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "El soporte integrado de conexión con %s está %s"
 
-#: mod/settings.php:842 mod/settings.php:843
+#: mod/settings.php:848 mod/settings.php:849
 msgid "enabled"
 msgstr "habilitado"
 
-#: mod/settings.php:842 mod/settings.php:843
+#: mod/settings.php:848 mod/settings.php:849
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: mod/settings.php:843
+#: mod/settings.php:849
 msgid "GNU Social (OStatus)"
 msgstr "GNUsocial (OStatus)"
 
-#: mod/settings.php:879
+#: mod/settings.php:883
 msgid "Email access is disabled on this site."
 msgstr "El acceso por correo está deshabilitado en esta web."
 
-#: mod/settings.php:891
+#: mod/settings.php:895
 msgid "Email/Mailbox Setup"
 msgstr "Configuración del correo/buzón"
 
-#: mod/settings.php:892
+#: mod/settings.php:896
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón."
 
-#: mod/settings.php:893
+#: mod/settings.php:897
 msgid "Last successful email check:"
 msgstr "Última comprobación del correo con éxito:"
 
-#: mod/settings.php:895
+#: mod/settings.php:899
 msgid "IMAP server name:"
 msgstr "Nombre del servidor IMAP:"
 
-#: mod/settings.php:896
+#: mod/settings.php:900
 msgid "IMAP port:"
 msgstr "Puerto IMAP:"
 
-#: mod/settings.php:897
+#: mod/settings.php:901
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: mod/settings.php:897 mod/settings.php:902
+#: mod/settings.php:901 mod/settings.php:906
 msgid "None"
 msgstr "Ninguna"
 
-#: mod/settings.php:898
+#: mod/settings.php:902
 msgid "Email login name:"
 msgstr "Nombre de usuario:"
 
-#: mod/settings.php:899
+#: mod/settings.php:903
 msgid "Email password:"
 msgstr "Contraseña:"
 
-#: mod/settings.php:900
+#: mod/settings.php:904
 msgid "Reply-to address:"
 msgstr "Dirección de respuesta:"
 
-#: mod/settings.php:901
+#: mod/settings.php:905
 msgid "Send public posts to all email contacts:"
 msgstr "Enviar publicaciones públicas a todos los contactos de correo:"
 
-#: mod/settings.php:902
+#: mod/settings.php:906
 msgid "Action after import:"
 msgstr "Acción después de importar:"
 
-#: mod/settings.php:902
+#: mod/settings.php:906
 msgid "Move to folder"
 msgstr "Mover a un directorio"
 
-#: mod/settings.php:903
+#: mod/settings.php:907
 msgid "Move to folder:"
 msgstr "Mover al directorio:"
 
-#: mod/settings.php:934 mod/admin.php:862
-msgid "No special theme for mobile devices"
-msgstr "No hay tema especial para dispositivos móviles"
-
-#: mod/settings.php:994
+#: mod/settings.php:1003
 msgid "Display Settings"
 msgstr "Configuración Tema/Visualización"
 
-#: mod/settings.php:1000 mod/settings.php:1023
+#: mod/settings.php:1009 mod/settings.php:1032
 msgid "Display Theme:"
 msgstr "Utilizar tema:"
 
-#: mod/settings.php:1001
+#: mod/settings.php:1010
 msgid "Mobile Theme:"
 msgstr "Tema móvil:"
 
-#: mod/settings.php:1002
+#: mod/settings.php:1011
 msgid "Suppress warning of insecure networks"
 msgstr "Suprimir el aviso de redes inseguras"
 
-#: mod/settings.php:1002
+#: mod/settings.php:1011
 msgid ""
 "Should the system suppress the warning that the current group contains "
 "members of networks that can't receive non public postings."
 msgstr "Debería el sistema suprimir el aviso de que el grupo actual contiene miembros de redes que no pueden recibir publicaciones públicas."
 
-#: mod/settings.php:1003
+#: mod/settings.php:1012
 msgid "Update browser every xx seconds"
 msgstr "Actualizar navegador cada xx segundos"
 
-#: mod/settings.php:1003
+#: mod/settings.php:1012
 msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr "Minimo 10 segundos. Ingrese -1 para deshabilitar."
 
-#: mod/settings.php:1004
+#: mod/settings.php:1013
 msgid "Number of items to display per page:"
 msgstr "Número de elementos a mostrar por página:"
 
-#: mod/settings.php:1004 mod/settings.php:1005
+#: mod/settings.php:1013 mod/settings.php:1014
 msgid "Maximum of 100 items"
 msgstr "Máximo 100 elementos"
 
-#: mod/settings.php:1005
+#: mod/settings.php:1014
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr "Cantidad de objetos a visualizar cuando se usa un movil"
 
-#: mod/settings.php:1006
+#: mod/settings.php:1015
 msgid "Don't show emoticons"
 msgstr "No mostrar emoticones"
 
-#: mod/settings.php:1007
+#: mod/settings.php:1016
 msgid "Calendar"
 msgstr "Calendario"
 
-#: mod/settings.php:1008
+#: mod/settings.php:1017
 msgid "Beginning of week:"
 msgstr "Principio de la semana:"
 
-#: mod/settings.php:1009
+#: mod/settings.php:1018
 msgid "Don't show notices"
 msgstr "No mostrara avisos"
 
-#: mod/settings.php:1010
+#: mod/settings.php:1019
 msgid "Infinite scroll"
 msgstr "pagina infinita (sroll)"
 
-#: mod/settings.php:1011
+#: mod/settings.php:1020
 msgid "Automatic updates only at the top of the network page"
 msgstr "Actualizaciones automaticas solo estando al principio de la pagina"
 
-#: mod/settings.php:1012
+#: mod/settings.php:1021
 msgid "Bandwith Saver Mode"
 msgstr "Modo de guardado de ancho de banda"
 
-#: mod/settings.php:1012
+#: mod/settings.php:1021
 msgid ""
 "When enabled, embedded content is not displayed on automatic updates, they "
 "only show on page reload."
 msgstr "Cuando está habilitado, el contenido incrustado no se muestra en las actualizaciones automáticas, sólo en las páginas recargadas."
 
-#: mod/settings.php:1014
+#: mod/settings.php:1023
 msgid "General Theme Settings"
 msgstr "Ajustes generales de tema"
 
-#: mod/settings.php:1015
+#: mod/settings.php:1024
 msgid "Custom Theme Settings"
 msgstr "Ajustes personalizados de tema"
 
-#: mod/settings.php:1016
+#: mod/settings.php:1025
 msgid "Content Settings"
 msgstr "Ajustes de contenido"
 
-#: mod/settings.php:1017 view/theme/frio/config.php:61
-#: view/theme/quattro/config.php:66 view/theme/vier/config.php:109
-#: view/theme/duepuntozero/config.php:61
+#: mod/settings.php:1026 view/theme/duepuntozero/config.php:63
+#: view/theme/frio/config.php:66 view/theme/quattro/config.php:69
+#: view/theme/vier/config.php:114
 msgid "Theme settings"
 msgstr "Configuración del Tema"
 
-#: mod/settings.php:1099
+#: mod/settings.php:1110
 msgid "Account Types"
 msgstr "Tipos de cuenta"
 
-#: mod/settings.php:1100
+#: mod/settings.php:1111
 msgid "Personal Page Subtypes"
 msgstr "Subtipos de página personal"
 
-#: mod/settings.php:1101
+#: mod/settings.php:1112
 msgid "Community Forum Subtypes"
 msgstr "Subtipos de foro de comunidad"
 
-#: mod/settings.php:1108
+#: mod/settings.php:1119
 msgid "Personal Page"
 msgstr "Página personal"
 
-#: mod/settings.php:1109
+#: mod/settings.php:1120
 msgid "This account is a regular personal profile"
 msgstr "Esta cuenta es un perfil personal corriente"
 
-#: mod/settings.php:1112
+#: mod/settings.php:1123
 msgid "Organisation Page"
 msgstr "Página de organización"
 
-#: mod/settings.php:1113
+#: mod/settings.php:1124
 msgid "This account is a profile for an organisation"
 msgstr "Esta cuenta es un perfil de una organización"
 
-#: mod/settings.php:1116
+#: mod/settings.php:1127
 msgid "News Page"
 msgstr "Página de noticias"
 
-#: mod/settings.php:1117
+#: mod/settings.php:1128
 msgid "This account is a news account/reflector"
 msgstr "Esta cuenta es una cuenta de noticias/reflectora"
 
-#: mod/settings.php:1120
+#: mod/settings.php:1131
 msgid "Community Forum"
 msgstr "Foro de la comunidad"
 
-#: mod/settings.php:1121
+#: mod/settings.php:1132
 msgid ""
 "This account is a community forum where people can discuss with each other"
 msgstr "Esta cuenta es un foro de comunidad donde la gente puede debatir con otros"
 
-#: mod/settings.php:1124
+#: mod/settings.php:1135
 msgid "Normal Account Page"
 msgstr "Página de cuenta normal"
 
-#: mod/settings.php:1125
+#: mod/settings.php:1136
 msgid "This account is a normal personal profile"
 msgstr "Esta cuenta es el perfil personal normal"
 
-#: mod/settings.php:1128
+#: mod/settings.php:1139
 msgid "Soapbox Page"
 msgstr "Página de tribuna"
 
-#: mod/settings.php:1129
+#: mod/settings.php:1140
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Acepta automáticamente todas las peticiones de conexión/amistad como seguidores de solo-lectura"
 
-#: mod/settings.php:1132
+#: mod/settings.php:1143
 msgid "Public Forum"
 msgstr "Foro público"
 
-#: mod/settings.php:1133
+#: mod/settings.php:1144
 msgid "Automatically approve all contact requests"
 msgstr "Aprovar autimáticamente todas las solicitudes de contacto"
 
-#: mod/settings.php:1136
+#: mod/settings.php:1147
 msgid "Automatic Friend Page"
 msgstr "Página de Amistad autómatica"
 
-#: mod/settings.php:1137
+#: mod/settings.php:1148
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Aceptar automáticamente todas las solicitudes de conexión/amistad como amigos"
 
-#: mod/settings.php:1140
+#: mod/settings.php:1151
 msgid "Private Forum [Experimental]"
 msgstr "Foro privado [Experimental]"
 
-#: mod/settings.php:1141
+#: mod/settings.php:1152
 msgid "Private forum - approved members only"
 msgstr "Foro privado - solo miembros"
 
-#: mod/settings.php:1153
+#: mod/settings.php:1163
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: mod/settings.php:1153
+#: mod/settings.php:1163
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Opcional) Permitir a este OpenID acceder a esta cuenta."
 
-#: mod/settings.php:1163
+#: mod/settings.php:1171
 msgid "Publish your default profile in your local site directory?"
 msgstr "¿Quieres publicar tu perfil predeterminado en el directorio local del sitio?"
 
-#: mod/settings.php:1169
+#: mod/settings.php:1177
 msgid "Publish your default profile in the global social directory?"
 msgstr "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?"
 
-#: mod/settings.php:1177
+#: mod/settings.php:1184
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?"
 
-#: mod/settings.php:1181
+#: mod/settings.php:1188
 msgid ""
 "If enabled, posting public messages to Diaspora and other networks isn't "
 "possible."
 msgstr "Si habilitado, enviar temas públicos a  a Diaspora* y otras redes no es posible. "
 
-#: mod/settings.php:1186
+#: mod/settings.php:1193
 msgid "Allow friends to post to your profile page?"
 msgstr "¿Permites que tus amigos publiquen en tu página de perfil?"
 
-#: mod/settings.php:1192
+#: mod/settings.php:1198
 msgid "Allow friends to tag your posts?"
 msgstr "¿Permites a los amigos etiquetar tus publicaciones?"
 
-#: mod/settings.php:1198
+#: mod/settings.php:1203
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "¿Nos permite recomendarte como amigo potencial a los nuevos miembros?"
 
-#: mod/settings.php:1204
+#: mod/settings.php:1208
 msgid "Permit unknown people to send you private mail?"
 msgstr "¿Permites que desconocidos te manden correos privados?"
 
-#: mod/settings.php:1212
+#: mod/settings.php:1216
 msgid "Profile is not published."
 msgstr "El perfil no está publicado."
 
-#: mod/settings.php:1220
+#: mod/settings.php:1224
 #, php-format
 msgid "Your Identity Address is '%s' or '%s'."
 msgstr "Su dirección de identidad es '%s' o '%s'."
 
-#: mod/settings.php:1227
+#: mod/settings.php:1231
 msgid "Automatically expire posts after this many days:"
 msgstr "Las publicaciones expirarán automáticamente después de estos días:"
 
-#: mod/settings.php:1227
+#: mod/settings.php:1231
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán"
 
-#: mod/settings.php:1228
+#: mod/settings.php:1232
 msgid "Advanced expiration settings"
 msgstr "Configuración avanzada de expiración"
 
-#: mod/settings.php:1229
+#: mod/settings.php:1233
 msgid "Advanced Expiration"
 msgstr "Expiración avanzada"
 
-#: mod/settings.php:1230
+#: mod/settings.php:1234
 msgid "Expire posts:"
 msgstr "¿Expiran las publicaciones?"
 
-#: mod/settings.php:1231
+#: mod/settings.php:1235
 msgid "Expire personal notes:"
 msgstr "¿Expiran las notas personales?"
 
-#: mod/settings.php:1232
+#: mod/settings.php:1236
 msgid "Expire starred posts:"
 msgstr "¿Expiran los favoritos?"
 
-#: mod/settings.php:1233
+#: mod/settings.php:1237
 msgid "Expire photos:"
 msgstr "¿Expiran las fotografías?"
 
-#: mod/settings.php:1234
+#: mod/settings.php:1238
 msgid "Only expire posts by others:"
 msgstr "Solo expiran los mensajes de los demás:"
 
-#: mod/settings.php:1262
+#: mod/settings.php:1269
 msgid "Account Settings"
 msgstr "Configuración de la cuenta"
 
-#: mod/settings.php:1270
+#: mod/settings.php:1277
 msgid "Password Settings"
 msgstr "Configuración de la contraseña"
 
-#: mod/settings.php:1272
+#: mod/settings.php:1279
 msgid "Leave password fields blank unless changing"
 msgstr "Deja la contraseña en blanco si no quieres cambiarla"
 
-#: mod/settings.php:1273
+#: mod/settings.php:1280
 msgid "Current Password:"
 msgstr "Contraseña actual:"
 
-#: mod/settings.php:1273 mod/settings.php:1274
+#: mod/settings.php:1280 mod/settings.php:1281
 msgid "Your current password to confirm the changes"
 msgstr "Su contraseña actual para confirmar los cambios."
 
-#: mod/settings.php:1274
+#: mod/settings.php:1281
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: mod/settings.php:1278
+#: mod/settings.php:1285
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: mod/settings.php:1280
+#: mod/settings.php:1287
 msgid "Email Address:"
 msgstr "Dirección de correo:"
 
-#: mod/settings.php:1281
+#: mod/settings.php:1288
 msgid "Your Timezone:"
 msgstr "Zona horaria:"
 
-#: mod/settings.php:1282
+#: mod/settings.php:1289
 msgid "Your Language:"
 msgstr "Tu idioma:"
 
-#: mod/settings.php:1282
+#: mod/settings.php:1289
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr "Selecciona el idioma que se usara para la interfaz del usuario y para el envío de correo."
 
-#: mod/settings.php:1283
+#: mod/settings.php:1290
 msgid "Default Post Location:"
 msgstr "Localización predeterminada:"
 
-#: mod/settings.php:1284
+#: mod/settings.php:1291
 msgid "Use Browser Location:"
 msgstr "Usar localización del navegador:"
 
-#: mod/settings.php:1287
+#: mod/settings.php:1294
 msgid "Security and Privacy Settings"
 msgstr "Configuración de seguridad y privacidad"
 
-#: mod/settings.php:1289
+#: mod/settings.php:1296
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo número de peticiones de amistad por día:"
 
-#: mod/settings.php:1289 mod/settings.php:1319
+#: mod/settings.php:1296 mod/settings.php:1326
 msgid "(to prevent spam abuse)"
 msgstr "(para prevenir el abuso de spam)"
 
-#: mod/settings.php:1290
+#: mod/settings.php:1297
 msgid "Default Post Permissions"
 msgstr "Permisos por defecto para las publicaciones"
 
-#: mod/settings.php:1291
+#: mod/settings.php:1298
 msgid "(click to open/close)"
 msgstr "(pulsa para abrir/cerrar)"
 
-#: mod/settings.php:1302
+#: mod/settings.php:1309
 msgid "Default Private Post"
 msgstr "Publicación Privada por defecto"
 
-#: mod/settings.php:1303
+#: mod/settings.php:1310
 msgid "Default Public Post"
 msgstr "Publicación Pública por defecto"
 
-#: mod/settings.php:1307
+#: mod/settings.php:1314
 msgid "Default Permissions for New Posts"
 msgstr "Permisos por defecto para nuevas publicaciones"
 
-#: mod/settings.php:1319
+#: mod/settings.php:1326
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Número máximo de mensajes diarios para desconocidos:"
 
-#: mod/settings.php:1322
+#: mod/settings.php:1329
 msgid "Notification Settings"
 msgstr "Configuración de notificaciones"
 
-#: mod/settings.php:1323
+#: mod/settings.php:1330
 msgid "By default post a status message when:"
 msgstr "Publicar en tu estado cuando:"
 
-#: mod/settings.php:1324
+#: mod/settings.php:1331
 msgid "accepting a friend request"
 msgstr "aceptes una solicitud de amistad"
 
-#: mod/settings.php:1325
+#: mod/settings.php:1332
 msgid "joining a forum/community"
 msgstr "te unas a un foro/comunidad"
 
-#: mod/settings.php:1326
+#: mod/settings.php:1333
 msgid "making an interesting profile change"
 msgstr "hagas un cambio interesante en tu perfil"
 
-#: mod/settings.php:1327
+#: mod/settings.php:1334
 msgid "Send a notification email when:"
 msgstr "Enviar notificación por correo cuando:"
 
-#: mod/settings.php:1328
+#: mod/settings.php:1335
 msgid "You receive an introduction"
 msgstr "Recibas una presentación"
 
-#: mod/settings.php:1329
+#: mod/settings.php:1336
 msgid "Your introductions are confirmed"
 msgstr "Tu presentación sea confirmada"
 
-#: mod/settings.php:1330
+#: mod/settings.php:1337
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en el muro de mi perfil"
 
-#: mod/settings.php:1331
+#: mod/settings.php:1338
 msgid "Someone writes a followup comment"
 msgstr "Algien escriba en un comentario que sigo"
 
-#: mod/settings.php:1332
+#: mod/settings.php:1339
 msgid "You receive a private message"
 msgstr "Recibas un mensaje privado"
 
-#: mod/settings.php:1333
+#: mod/settings.php:1340
 msgid "You receive a friend suggestion"
 msgstr "Recibas una sugerencia de amistad"
 
-#: mod/settings.php:1334
+#: mod/settings.php:1341
 msgid "You are tagged in a post"
 msgstr "Seas etiquetado en una publicación"
 
-#: mod/settings.php:1335
+#: mod/settings.php:1342
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Te han tocado/empujado/etc. en una publicación"
 
-#: mod/settings.php:1337
+#: mod/settings.php:1344
 msgid "Activate desktop notifications"
 msgstr "Activar notificaciones en pantalla."
 
-#: mod/settings.php:1337
+#: mod/settings.php:1344
 msgid "Show desktop popup on new notifications"
 msgstr "Mostrar notificaciones emergentes en caso de nuevos eventos."
 
-#: mod/settings.php:1339
+#: mod/settings.php:1346
 msgid "Text-only notification emails"
 msgstr "Notificaciones e-mail de solo texto"
 
-#: mod/settings.php:1341
+#: mod/settings.php:1348
 msgid "Send text only notification emails, without the html part"
 msgstr "Enviar las notificaciones por correo con formato de solo texto sin html."
 
-#: mod/settings.php:1343
+#: mod/settings.php:1350
 msgid "Advanced Account/Page Type Settings"
 msgstr "Configuración avanzada de tipo de Cuenta/Página"
 
-#: mod/settings.php:1344
+#: mod/settings.php:1351
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambiar el comportamiento de esta cuenta para situaciones especiales"
 
-#: mod/settings.php:1347
+#: mod/settings.php:1354
 msgid "Relocate"
 msgstr "Relocalizar"
 
-#: mod/settings.php:1348
+#: mod/settings.php:1355
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente  recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)"
 
-#: mod/settings.php:1349
+#: mod/settings.php:1356
 msgid "Resend relocate message to contacts"
 msgstr "Reenviar mensaje de relocalización a los contactos"
 
-#: mod/videos.php:120
+#: mod/subthread.php:104
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s está siguiendo las %3$s de %2$s"
+
+#: mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr "¿Estás seguro de que quieres borrar esta sugerencia?"
+
+#: mod/suggest.php:71
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas."
+
+#: mod/suggest.php:84 mod/suggest.php:104
+msgid "Ignore/Hide"
+msgstr "Ignorar/Ocultar"
+
+#: mod/tagrm.php:43
+msgid "Tag removed"
+msgstr "Etiqueta eliminada"
+
+#: mod/tagrm.php:82
+msgid "Remove Item Tag"
+msgstr "Eliminar etiqueta"
+
+#: mod/tagrm.php:84
+msgid "Select a tag to remove: "
+msgstr "Selecciona una etiqueta para eliminar: "
+
+#: mod/uexport.php:37
+msgid "Export account"
+msgstr "Exportar cuenta"
+
+#: mod/uexport.php:37
+msgid ""
+"Export your account info and contacts. Use this to make a backup of your "
+"account and/or to move it to another server."
+msgstr "Exporta la información de tu cuenta y tus contactos. Úsalo para guardar una copia de seguridad de tu cuenta y/o moverla a otro servidor."
+
+#: mod/uexport.php:38
+msgid "Export all"
+msgstr "Exportar todo"
+
+#: mod/uexport.php:38
+msgid ""
+"Export your accout info, contacts and all your items as json. Could be a "
+"very big file, and could take a lot of time. Use this to make a full backup "
+"of your account (photos are not exported)"
+msgstr "Exporta la información de tu cuenta, contactos y lo demás en JSON. Puede ser un archivo bastante grande, por lo que llevará tiempo. Úsalo para hacer una copia de seguridad completa de tu cuenta (las fotos no se exportarán)"
+
+#: mod/uimport.php:68
+msgid "Move account"
+msgstr "Mover cuenta"
+
+#: mod/uimport.php:69
+msgid "You can import an account from another Friendica server."
+msgstr "Puedes importar una cuenta desde otro servidor de Friendica."
+
+#: mod/uimport.php:70
+msgid ""
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also"
+" to inform your friends that you moved here."
+msgstr "Necesitas exportar tu cuenta del antiguo servidor y subirla aquí. Volveremos a crear tu antigua cuenta con todos tus contactos aquí. También intentaremos de informar a tus amigos de que te has mudado."
+
+#: mod/uimport.php:71
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
+msgstr "Esta característica es experimental. No podemos importar contactos desde la red OStatus (statusnet/identi.ca) o desde Diaspora*"
+
+#: mod/uimport.php:72
+msgid "Account file"
+msgstr "Archivo de la cuenta"
+
+#: mod/uimport.php:72
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr "Para exportar el perfil vaya a \"Configuracion -> Exportar sus datos personales\" y seleccione \"Exportar cuenta\""
+
+#: mod/update_community.php:19 mod/update_display.php:23
+#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
+msgid "[Embedded content - reload page to view]"
+msgstr "[Contenido incrustado - recarga la página para verlo]"
+
+#: mod/videos.php:124
 msgid "Do you really want to delete this video?"
 msgstr "Realmente quieres eliminar este vídeo?"
 
-#: mod/videos.php:125
+#: mod/videos.php:129
 msgid "Delete Video"
 msgstr "Borrar vídeo"
 
-#: mod/videos.php:204
+#: mod/videos.php:208
 msgid "No videos selected"
 msgstr "Ningún vídeo seleccionado"
 
-#: mod/videos.php:396
+#: mod/videos.php:400
 msgid "Recent Videos"
 msgstr "Vídeos recientes"
 
-#: mod/videos.php:398
+#: mod/videos.php:402
 msgid "Upload New Videos"
 msgstr "Subir nuevos vídeos"
 
+#: mod/viewcontacts.php:75
+msgid "No contacts."
+msgstr "Ningún contacto."
+
+#: mod/viewsrc.php:7
+msgid "Access denied."
+msgstr "Acceso denegado."
+
 #: mod/wall_attach.php:17 mod/wall_attach.php:25 mod/wall_attach.php:76
 #: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
 #: mod/wall_upload.php:122 mod/wall_upload.php:125
@@ -6257,2450 +8666,102 @@ msgstr "Si no - intento de subir un archivo vacío?"
 msgid "File exceeds size limit of %s"
 msgstr "El archivo excede el limite de tamaño de %s"
 
-#: mod/wall_attach.php:156 mod/wall_attach.php:172
+#: mod/wall_attach.php:158 mod/wall_attach.php:174
 msgid "File upload failed."
 msgstr "Ha fallado la subida del archivo."
 
-#: mod/admin.php:92
-msgid "Theme settings updated."
-msgstr "Configuración de la apariencia actualizada."
-
-#: mod/admin.php:156 mod/admin.php:954
-msgid "Site"
-msgstr "Sitio"
-
-#: mod/admin.php:157 mod/admin.php:898 mod/admin.php:1404 mod/admin.php:1420
-msgid "Users"
-msgstr "Usuarios"
-
-#: mod/admin.php:159 mod/admin.php:1780 mod/admin.php:1830
-msgid "Themes"
-msgstr "Temas"
-
-#: mod/admin.php:161
-msgid "DB updates"
-msgstr "Actualizaciones de la Base de Datos"
-
-#: mod/admin.php:162 mod/admin.php:406
-msgid "Inspect Queue"
-msgstr "Inspeccionar cola"
-
-#: mod/admin.php:163 mod/admin.php:372
-msgid "Federation Statistics"
-msgstr "Estadísticas de federación"
-
-#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1904
-msgid "Logs"
-msgstr "Registros"
-
-#: mod/admin.php:178 mod/admin.php:1972
-msgid "View Logs"
-msgstr "Ver registro de depuración"
-
-#: mod/admin.php:179
-msgid "probe address"
-msgstr "probar direccion"
-
-#: mod/admin.php:180
-msgid "check webfinger"
-msgstr "Verificar webfinger"
-
-#: mod/admin.php:187
-msgid "Plugin Features"
-msgstr "Características del módulo"
-
-#: mod/admin.php:189
-msgid "diagnostics"
-msgstr "diagnosticos"
-
-#: mod/admin.php:190
-msgid "User registrations waiting for confirmation"
-msgstr "Registro de usuarios esperando la confirmación"
-
-#: mod/admin.php:306
-msgid "unknown"
-msgstr "desconocido"
-
-#: mod/admin.php:365
-msgid ""
-"This page offers you some numbers to the known part of the federated social "
-"network your Friendica node is part of. These numbers are not complete but "
-"only reflect the part of the network your node is aware of."
-msgstr "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. "
-
-#: mod/admin.php:366
-msgid ""
-"The Auto Discovered Contact Directory feature is not enabled, it "
-"will improve the data displayed here."
-msgstr "El modulo directorio de contactos encontrados no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí."
-
-#: mod/admin.php:371 mod/admin.php:405 mod/admin.php:484 mod/admin.php:953
-#: mod/admin.php:1403 mod/admin.php:1521 mod/admin.php:1581 mod/admin.php:1779
-#: mod/admin.php:1829 mod/admin.php:1903 mod/admin.php:1971
-msgid "Administration"
-msgstr "Administración"
-
-#: mod/admin.php:378
+#: mod/wallmessage.php:42 mod/wallmessage.php:106
 #, php-format
-msgid "Currently this node is aware of %d nodes from the following platforms:"
-msgstr "Actualmente este nodo reconoce %d nodos de las siguientes plataformas:"
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Excedido el número máximo de mensajes para %s. El mensaje no se ha enviado."
 
-#: mod/admin.php:408
-msgid "ID"
-msgstr "ID"
+#: mod/wallmessage.php:53
+msgid "Unable to check your home location."
+msgstr "Imposible comprobar tu servidor de inicio."
 
-#: mod/admin.php:409
-msgid "Recipient Name"
-msgstr "Nombre del recipiente"
+#: mod/wallmessage.php:80 mod/wallmessage.php:89
+msgid "No recipient."
+msgstr "Sin receptor."
 
-#: mod/admin.php:410
-msgid "Recipient Profile"
-msgstr "Perfil del recipiente"
-
-#: mod/admin.php:412
-msgid "Created"
-msgstr "Creado"
-
-#: mod/admin.php:413
-msgid "Last Tried"
-msgstr "Ultimo intento"
-
-#: mod/admin.php:414
-msgid ""
-"This page lists the content of the queue for outgoing postings. These are "
-"postings the initial delivery failed for. They will be resend later and "
-"eventually deleted if the delivery fails permanently."
-msgstr "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. "
-
-#: mod/admin.php:439
+#: mod/wallmessage.php:127
 #, php-format
 msgid ""
-"Your DB still runs with MyISAM tables. You should change the engine type to "
-"InnoDB. As Friendica will use InnoDB only features in the future, you should"
-" change this! See here for a guide that may be helpful "
-"converting the table engines. You may also use the "
-"convert_innodb.sql in the /util directory of your "
-"Friendica installation.
    "
-msgstr "Su DB aún funciona con las tablas MyISAM. Debería cambiar el tipo de motror a InnoDB. ¡Como Friendica sólo usará las características de InnoDB en el futuro, debería cambiar esto! Vea aquí para una guía que puede ayudar a convertir las tablas de motor. También puede usar convert_innodb.sql en el directorio /util de su instalación de Friendica.
    "
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "Si quieres que %s te responda, asegúrate de que la configuración de privacidad permite enviar correo privado a desconocidos."
 
-#: mod/admin.php:444
-msgid ""
-"You are using a MySQL version which does not support all features that "
-"Friendica uses. You should consider switching to MariaDB."
-msgstr "Está usando una versión de MySQL que no soporta todas las características de Friendica. Debería considerar cambiar a MariaDB."
-
-#: mod/admin.php:448 mod/admin.php:1352
-msgid "Normal Account"
-msgstr "Cuenta normal"
-
-#: mod/admin.php:449 mod/admin.php:1353
-msgid "Soapbox Account"
-msgstr "Cuenta tribuna"
-
-#: mod/admin.php:450 mod/admin.php:1354
-msgid "Community/Celebrity Account"
-msgstr "Cuenta de Comunidad/Celebridad"
-
-#: mod/admin.php:451 mod/admin.php:1355
-msgid "Automatic Friend Account"
-msgstr "Cuenta de amistad automática"
-
-#: mod/admin.php:452
-msgid "Blog Account"
-msgstr "Cuenta de blog"
-
-#: mod/admin.php:453
-msgid "Private Forum"
-msgstr "Foro privado"
-
-#: mod/admin.php:479
-msgid "Message queues"
-msgstr "Cola de mensajes"
-
-#: mod/admin.php:485
-msgid "Summary"
-msgstr "Resumen"
-
-#: mod/admin.php:488
-msgid "Registered users"
-msgstr "Usuarios registrados"
-
-#: mod/admin.php:490
-msgid "Pending registrations"
-msgstr "Pendientes de registro"
-
-#: mod/admin.php:491
-msgid "Version"
-msgstr "Versión"
-
-#: mod/admin.php:496
-msgid "Active plugins"
-msgstr "Módulos activos"
-
-#: mod/admin.php:521
-msgid "Can not parse base url. Must have at least ://"
-msgstr "No se puede resolver la direccion URL base.\nDeberá tener al menos ://"
-
-#: mod/admin.php:826
-msgid "RINO2 needs mcrypt php extension to work."
-msgstr "RINO2 precisa la extensión mcrypt para funcionar.  "
-
-#: mod/admin.php:834
-msgid "Site settings updated."
-msgstr "Configuración de actualización."
-
-#: mod/admin.php:881
-msgid "No community page"
-msgstr "No hay pagina de comunidad"
-
-#: mod/admin.php:882
-msgid "Public postings from users of this site"
-msgstr "Temas públicos de perfiles de este sitio."
-
-#: mod/admin.php:883
-msgid "Global community page"
-msgstr "Pagina global de comunidad"
-
-#: mod/admin.php:888 mod/contacts.php:530
-msgid "Never"
-msgstr "Nunca"
-
-#: mod/admin.php:889
-msgid "At post arrival"
-msgstr "A la llegada de una publicación"
-
-#: mod/admin.php:897 mod/contacts.php:557
-msgid "Disabled"
-msgstr "Deshabilitado"
-
-#: mod/admin.php:899
-msgid "Users, Global Contacts"
-msgstr "Perfiles, contactos globales"
-
-#: mod/admin.php:900
-msgid "Users, Global Contacts/fallback"
-msgstr "Perfiles, contactos globales/fallback"
-
-#: mod/admin.php:904
-msgid "One month"
-msgstr "Un mes"
-
-#: mod/admin.php:905
-msgid "Three months"
-msgstr "Tres meses"
-
-#: mod/admin.php:906
-msgid "Half a year"
-msgstr "Medio año"
-
-#: mod/admin.php:907
-msgid "One year"
-msgstr "Un año"
-
-#: mod/admin.php:912
-msgid "Multi user instance"
-msgstr "Sesión multi usuario"
-
-#: mod/admin.php:935
-msgid "Closed"
-msgstr "Cerrado"
-
-#: mod/admin.php:936
-msgid "Requires approval"
-msgstr "Requiere aprobación"
-
-#: mod/admin.php:937
-msgid "Open"
-msgstr "Abierto"
-
-#: mod/admin.php:941
-msgid "No SSL policy, links will track page SSL state"
-msgstr "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página"
-
-#: mod/admin.php:942
-msgid "Force all links to use SSL"
-msgstr "Forzar todos los enlaces a utilizar SSL"
-
-#: mod/admin.php:943
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr "Certificación personal, usa SSL solo para enlaces locales (no recomendado)"
-
-#: mod/admin.php:957
-msgid "File upload"
-msgstr "Subida de archivo"
-
-#: mod/admin.php:958
-msgid "Policies"
-msgstr "Políticas"
-
-#: mod/admin.php:960
-msgid "Auto Discovered Contact Directory"
-msgstr "Directorio de contactos descubierto automáticamente"
-
-#: mod/admin.php:961
-msgid "Performance"
-msgstr "Rendimiento"
-
-#: mod/admin.php:962
-msgid "Worker"
-msgstr "Trabajador (??)"
-
-#: mod/admin.php:963
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr "Reubicación - ADVERTENCIA: función avanzada. Puede hacer a este servidor inaccesible. "
-
-#: mod/admin.php:966
-msgid "Site name"
-msgstr "Nombre del sitio"
-
-#: mod/admin.php:967
-msgid "Host name"
-msgstr "Nombre de dominio"
-
-#: mod/admin.php:968
-msgid "Sender Email"
-msgstr "Dirección de origen de correo electrónico"
-
-#: mod/admin.php:968
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr "La dirección de correo electrónico que el servidor debería usar como dirección de envío."
-
-#: mod/admin.php:969
-msgid "Banner/Logo"
-msgstr "Imagen/Logotipo"
-
-#: mod/admin.php:970
-msgid "Shortcut icon"
-msgstr "Icono de atajo"
-
-#: mod/admin.php:970
-msgid "Link to an icon that will be used for browsers."
-msgstr "Enlace hacia un icono que sera usado para el navegador."
-
-#: mod/admin.php:971
-msgid "Touch icon"
-msgstr "Icono touch"
-
-#: mod/admin.php:971
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr "Enlace para un icono que sera usado para tablets y moviles."
-
-#: mod/admin.php:972
-msgid "Additional Info"
-msgstr "Información adicional"
-
-#: mod/admin.php:972
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
-msgstr "Para servidores públicos: información adicional  que sera publicado en %s/siteinfo."
-
-#: mod/admin.php:973
-msgid "System language"
-msgstr "Idioma"
-
-#: mod/admin.php:974
-msgid "System theme"
-msgstr "Tema"
-
-#: mod/admin.php:974
-msgid ""
-"Default system theme - may be over-ridden by user profiles - change theme settings"
-msgstr "Tema por defecto del sistema, los usuarios podrán elegir el suyo propio en su configuración cambiar configuración del tema"
-
-#: mod/admin.php:975
-msgid "Mobile system theme"
-msgstr "Tema de sistema móvil"
-
-#: mod/admin.php:975
-msgid "Theme for mobile devices"
-msgstr "Tema para dispositivos móviles"
-
-#: mod/admin.php:976
-msgid "SSL link policy"
-msgstr "Política de enlaces SSL"
-
-#: mod/admin.php:976
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr "Determina si los enlaces generados deben ser forzados a utilizar SSL"
-
-#: mod/admin.php:977
-msgid "Force SSL"
-msgstr "Forzar SSL"
-
-#: mod/admin.php:977
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
-" to endless loops."
-msgstr "Forzar todos las consultas No-SSL a SSL. - ATENCIÓN: en algunos sistemas esto puede generar comportamiento recursivo interminable."
-
-#: mod/admin.php:978
-msgid "Old style 'Share'"
-msgstr "Viejo estilo de 'reenviar'"
-
-#: mod/admin.php:978
-msgid "Deactivates the bbcode element 'share' for repeating items."
-msgstr "Desactiva el elemento bbcode 'reenviar' para objetos repetidos."
-
-#: mod/admin.php:979
-msgid "Hide help entry from navigation menu"
-msgstr "Ocultar la ayuda en el menú de navegación"
-
-#: mod/admin.php:979
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr "Oculta la entrada de las páginas de Ayuda en el menú de navegación. Todavía se puede acceder escribiendo /ayuda directamente."
-
-#: mod/admin.php:980
-msgid "Single user instance"
-msgstr "Sesión de usuario único"
-
-#: mod/admin.php:980
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr "Haz esta sesión multi-usuario o usuario único para el usuario"
-
-#: mod/admin.php:981
-msgid "Maximum image size"
-msgstr "Tamaño máximo de la imagen"
-
-#: mod/admin.php:981
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Tamaño máximo en bytes de las imágenes a subir. Por defecto es 0, que quiere decir que no hay límite."
-
-#: mod/admin.php:982
-msgid "Maximum image length"
-msgstr "Largo máximo de imagen"
-
-#: mod/admin.php:982
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr "Longitud máxima en píxeles del lado más largo de las imágenes subidas. Por defecto es -1, que significa que no hay límites."
-
-#: mod/admin.php:983
-msgid "JPEG image quality"
-msgstr "Calidad de imagen JPEG"
-
-#: mod/admin.php:983
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr "Los archivos JPEG subidos se guardarán con este ajuste de calidad [0-100]. Por defecto es 100, que es calidad máxima."
-
-#: mod/admin.php:985
-msgid "Register policy"
-msgstr "Política de registros"
-
-#: mod/admin.php:986
-msgid "Maximum Daily Registrations"
-msgstr "Registros Máximos Diarios"
-
-#: mod/admin.php:986
-msgid ""
-"If registration is permitted above, this sets the maximum number of new user"
-" registrations to accept per day.  If register is set to closed, this "
-"setting has no effect."
-msgstr "Si anteriormente se ha permitido el registro, esto establece el número máximo de registro de nuevos usuarios aceptados por día. Si el registro se establece como cerrado, esta opción no tiene efecto."
-
-#: mod/admin.php:987
-msgid "Register text"
-msgstr "Términos"
-
-#: mod/admin.php:987
-msgid "Will be displayed prominently on the registration page."
-msgstr "Se mostrará en un lugar destacado en la página de registro."
-
-#: mod/admin.php:988
-msgid "Accounts abandoned after x days"
-msgstr "Cuentas abandonadas después de x días"
-
-#: mod/admin.php:988
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "No gastará recursos del sistema creando sondeos a sitios externos para cuentas abandonadas. Introduce 0 para ningún límite temporal."
-
-#: mod/admin.php:989
-msgid "Allowed friend domains"
-msgstr "Dominios amigos permitidos"
-
-#: mod/admin.php:989
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Lista separada por comas de los dominios que están autorizados para establecer conexiones con este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
-
-#: mod/admin.php:990
-msgid "Allowed email domains"
-msgstr "Dominios de correo permitidos"
-
-#: mod/admin.php:990
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr "Lista separada por comas de los dominios que están autorizados en las direcciones de correo para registrarse en este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
-
-#: mod/admin.php:991
-msgid "Block public"
-msgstr "Bloqueo público"
-
-#: mod/admin.php:991
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr "Marca para bloquear el acceso público a todas las páginas personales, aún siendo públicas, hasta que no hayas iniciado tu sesión."
-
-#: mod/admin.php:992
-msgid "Force publish"
-msgstr "Forzar publicación"
-
-#: mod/admin.php:992
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Marca para forzar que todos los perfiles de este sitio sean listados en el directorio del sitio."
-
-#: mod/admin.php:993
-msgid "Global directory URL"
-msgstr "URL del directorio global."
-
-#: mod/admin.php:993
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr "URL del directorio global. Si se deja este campo vacío, el directorio global sera completamente inaccesible para la instancia."
-
-#: mod/admin.php:994
-msgid "Allow threaded items"
-msgstr "Permitir elementos en hilo"
-
-#: mod/admin.php:994
-msgid "Allow infinite level threading for items on this site."
-msgstr "Permitir infinitos niveles de hilo para los elementos de este sitio."
-
-#: mod/admin.php:995
-msgid "Private posts by default for new users"
-msgstr "Publicaciones privadas por defecto para usuarios nuevos"
-
-#: mod/admin.php:995
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr "Ajusta los permisos de publicación por defecto a los miembros nuevos al grupo privado por defecto en vez del público."
-
-#: mod/admin.php:996
-msgid "Don't include post content in email notifications"
-msgstr "No incluir el contenido del post en las notificaciones de correo electrónico"
-
-#: mod/admin.php:996
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
-msgstr "No incluye el contenido de un mensaje/comentario/mensaje privado/etc. en las notificaciones de correo electrónico que se envían desde este sitio, como una medida de privacidad."
-
-#: mod/admin.php:997
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr "Deshabilitar acceso a addons listados en el menú de aplicaciones."
-
-#: mod/admin.php:997
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr "Habilitando esta opción restringe el acceso a addons en el menú de aplicaciones a usuarios identificados."
-
-#: mod/admin.php:998
-msgid "Don't embed private images in posts"
-msgstr "No agregar imágenes privados en las publicaciones"
-
-#: mod/admin.php:998
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a "
-"while."
-msgstr "No reemplazar imágenes privadas guardadas localmente en el servidor con imágenes integrados en los envíos. Esto significa que contactos que reciben publicaciones tendrán que autenticarse y cargar cada imagen, lo que puede demorar."
-
-#: mod/admin.php:999
-msgid "Allow Users to set remote_self"
-msgstr "Permitir a los usuarios de definir perfiles_remotos"
-
-#: mod/admin.php:999
-msgid ""
-"With checking this, every user is allowed to mark every contact as a "
-"remote_self in the repair contact dialog. Setting this flag on a contact "
-"causes mirroring every posting of that contact in the users stream."
-msgstr "Al habilitar esta opción, cada perfil tiene el permiso de marcar cualquiera de sus contactos como un perfil_remoto. Habilitar la opción perfil_remoto para un contacto genera que todas las publicaciones  de este contacto seran re-publicado  en el muro del perfil."
-
-#: mod/admin.php:1000
-msgid "Block multiple registrations"
-msgstr "Bloquear registros multiples"
-
-#: mod/admin.php:1000
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr "Impedir que los usuarios registren cuentas adicionales para su uso como páginas."
-
-#: mod/admin.php:1001
-msgid "OpenID support"
-msgstr "Soporte OpenID"
-
-#: mod/admin.php:1001
-msgid "OpenID support for registration and logins."
-msgstr "Soporte OpenID para registros y accesos."
-
-#: mod/admin.php:1002
-msgid "Fullname check"
-msgstr "Comprobar Nombre completo"
-
-#: mod/admin.php:1002
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr "Fuerza a los usuarios a registrarse con un espacio entre su nombre y su apellido en el campo Nombre completo como medida anti-spam"
-
-#: mod/admin.php:1003
-msgid "UTF-8 Regular expressions"
-msgstr "Expresiones regulares UTF-8"
-
-#: mod/admin.php:1003
-msgid "Use PHP UTF8 regular expressions"
-msgstr "Usar expresiones regulares de UTF8 en PHP"
-
-#: mod/admin.php:1004
-msgid "Community Page Style"
-msgstr "Estilo de pagina de comunidad"
-
-#: mod/admin.php:1004
-msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
-msgstr "Tipo de pagina de comunidad a visualizar. 'Comunidad global' muestra todas las publicaciones publicas de la red abierta federada que llega a este servidor."
-
-#: mod/admin.php:1005
-msgid "Posts per user on community page"
-msgstr "Publicaciones por usuario en la pagina de comunidad"
-
-#: mod/admin.php:1005
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr "El numero máximo de publicaciones por usuario que aparecerán en la pagina de comunidad. (No valido para 'comunidad global')"
-
-#: mod/admin.php:1006
-msgid "Enable OStatus support"
-msgstr "Permitir soporte OStatus"
-
-#: mod/admin.php:1006
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr "Proporcionar OStatus compatibilidad integrada (StatusNet, GNU Social, Quitter etc.). Todas las comunicaciones en OStatus son publicas así que eventuales advertencias serán ocasionalmente desplegadas."
-
-#: mod/admin.php:1007
-msgid "OStatus conversation completion interval"
-msgstr "Intervalo de actualización de conversaciones OStatus"
-
-#: mod/admin.php:1007
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
-msgstr "Cuan seguido el recolector deberá buscar nuevas entradas en OStatus? Esto puede ser un trabajo de mucha carga para los recursos del servidor."
-
-#: mod/admin.php:1008
-msgid "Only import OStatus threads from our contacts"
-msgstr "Solo importar OStatus temas de nuestros (?) contactos."
-
-#: mod/admin.php:1008
-msgid ""
-"Normally we import every content from our OStatus contacts. With this option"
-" we only store threads that are started by a contact that is known on our "
-"system."
-msgstr "Normalmente importamos todo el contenido de los contactos de OStatus. Con esta opción solamente se guardan temas que fueron iniciados por contactos que son conocidos de la instancia.\n(nota de traducción, no se entiende muy bien la función en base al texto original)"
-
-#: mod/admin.php:1009
-msgid "OStatus support can only be enabled if threading is enabled."
-msgstr "Solo se puede habilitar el soporte OStatus  si threading (comentarios en fila) se encuentra habilitado."
-
-#: mod/admin.php:1011
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub"
-" directory."
-msgstr "El soporte para Diaspora* no se puede habilitar porque friendica se instalo en un directorio subalterno (sub directory)."
-
-#: mod/admin.php:1012
-msgid "Enable Diaspora support"
-msgstr "Habilitar el soporte para Diaspora*"
-
-#: mod/admin.php:1012
-msgid "Provide built-in Diaspora network compatibility."
-msgstr "Provee una compatibilidad con la red de Diaspora."
-
-#: mod/admin.php:1013
-msgid "Only allow Friendica contacts"
-msgstr "Permitir solo contactos de Friendica"
-
-#: mod/admin.php:1013
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr "Todos los contactos deben usar protocolos de Friendica. El resto de protocolos serán desactivados."
-
-#: mod/admin.php:1014
-msgid "Verify SSL"
-msgstr "Verificar SSL"
-
-#: mod/admin.php:1014
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you"
-" cannot connect (at all) to self-signed SSL sites."
-msgstr "Si quieres puedes activar la comprobación estricta de certificados. Esto significa que serás incapaz de conectar con ningún sitio que use certificados SSL autofirmados."
-
-#: mod/admin.php:1015
-msgid "Proxy user"
-msgstr "Usuario proxy"
-
-#: mod/admin.php:1016
-msgid "Proxy URL"
-msgstr "Dirección proxy"
-
-#: mod/admin.php:1017
-msgid "Network timeout"
-msgstr "Tiempo de espera de red"
-
-#: mod/admin.php:1017
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Valor en segundos. Usar 0 para dejarlo sin límites (no se recomienda)."
-
-#: mod/admin.php:1018
-msgid "Delivery interval"
-msgstr "Intervalo de actualización"
-
-#: mod/admin.php:1018
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr "Retrasar la entrega de procesos en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendamos: 4-5 para los servidores compartidos, 2-3 para servidores privados virtuales, 0-1 para los grandes servidores dedicados."
-
-#: mod/admin.php:1019
-msgid "Poll interval"
-msgstr "Intervalo de sondeo"
-
-#: mod/admin.php:1019
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Retrasar los procesos en segundo plano de sondeo en esta cantidad de segundos para reducir la carga del sistema. Si es 0, se usará el intervalo de entrega."
-
-#: mod/admin.php:1020
-msgid "Maximum Load Average"
-msgstr "Promedio de carga máxima"
-
-#: mod/admin.php:1020
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Carga máxima del sistema antes de que la entrega y los procesos de sondeo sean retrasados - por defecto 50."
-
-#: mod/admin.php:1021
-msgid "Maximum Load Average (Frontend)"
-msgstr "Carga máxima promedio (frontend)"
-
-#: mod/admin.php:1021
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr "Carga máxima del sistema antes de que el frontend cancele el servicio - por defecto 50."
-
-#: mod/admin.php:1022
-msgid "Maximum table size for optimization"
-msgstr "Tamaño máximo de las tablas para la optimización."
-
-#: mod/admin.php:1022
-msgid ""
-"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
-"Enter -1 to disable it."
-msgstr "Tamaño máximo de tablas (en MB) para la optimización automática - por defecto 100MB. Ingrese -1 para deshabilitar."
-
-#: mod/admin.php:1023
-msgid "Minimum level of fragmentation"
-msgstr "Nivel mínimo de fragmentación "
-
-#: mod/admin.php:1023
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
-msgstr "Nivel mínimo de fragmentación para para comenzar la optimización - valor por defecto es 30%. "
-
-#: mod/admin.php:1025
-msgid "Periodical check of global contacts"
-msgstr "Verificación periódica de los contactos globales."
-
-#: mod/admin.php:1025
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
-msgstr "Habilitado los contactos globales son verificado periódicamente  por datos faltantes o datos obsoletos como también por la vitalidad de los contactos y servidores."
-
-#: mod/admin.php:1026
-msgid "Days between requery"
-msgstr "Días entre búsquedas"
-
-#: mod/admin.php:1026
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr "Cantidad de días hasta que un servidor es consultado por sus contactos."
-
-#: mod/admin.php:1027
-msgid "Discover contacts from other servers"
-msgstr "Descubrir contactos de otros servidores"
-
-#: mod/admin.php:1027
-msgid ""
-"Periodically query other servers for contacts. You can choose between "
-"'users': the users on the remote system, 'Global Contacts': active contacts "
-"that are known on the system. The fallback is meant for Redmatrix servers "
-"and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
-"Global Contacts'."
-msgstr "Recoger periódicamente información sobre perfiles en otros servidores. Puede elegir entre 'usuarios': perfiles de un sistema remoto, 'contactos globales': contactos activos que son conocidos por el servidor. El fallback es para servidors redmatrix y instalaciones viejas de friendica en las que los contactos no estaban a disposición. El fallback aumenta la carga del servidor, asi que la configuración recomendada es 'usuarios, contactos globales'"
-
-#: mod/admin.php:1028
-msgid "Timeframe for fetching global contacts"
-msgstr "Intervalos de tiempo para revisar contactos globales."
-
-#: mod/admin.php:1028
-msgid ""
-"When the discovery is activated, this value defines the timeframe for the "
-"activity of the global contacts that are fetched from other servers."
-msgstr "Cuando la revisacion es activada, este valor define el intervalo de tiempo de la actividad de los contactos globales que son recolectados de los servidores. (?)"
-
-#: mod/admin.php:1029
-msgid "Search the local directory"
-msgstr "Buscar el directorio local"
-
-#: mod/admin.php:1029
-msgid ""
-"Search the local directory instead of the global directory. When searching "
-"locally, every search will be executed on the global directory in the "
-"background. This improves the search results when the search is repeated."
-msgstr "Buscar en el directorio local en vez del directorio global. Cuando se busca localmente, cada busqueda sera efectuada en el directorio global en el background. Esto mejora los resultados de la busqueda cuando la misma es repetida."
-
-#: mod/admin.php:1031
-msgid "Publish server information"
-msgstr "Publicar información del servidor"
-
-#: mod/admin.php:1031
-msgid ""
-"If enabled, general server and usage data will be published. The data "
-"contains the name and version of the server, number of users with public "
-"profiles, number of posts and the activated protocols and connectors. See the-federation.info for details."
-msgstr "Si habilitado, datos generales del servidor y estadisticas de uso serán publicados. Los datos contienen el nombre y la versión del servidor, numero de usuarios con perfiles públicos, cantidad de temas publicados y los protocolos y conectores activados. Vea the-federation.info por detalles."
-
-#: mod/admin.php:1033
-msgid "Use MySQL full text engine"
-msgstr "Usar motor MySQL de texto completo"
-
-#: mod/admin.php:1033
-msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
-msgstr "Activa el motor de texto completo. Agiliza las búsquedas, pero solo busca cuatro o más caracteres."
-
-#: mod/admin.php:1034
-msgid "Suppress Language"
-msgstr "Suprimir idiomas"
-
-#: mod/admin.php:1034
-msgid "Suppress language information in meta information about a posting."
-msgstr "Suprimir la información de datos meta sobre informaciones de idiomas en las publicaciones."
-
-#: mod/admin.php:1035
-msgid "Suppress Tags"
-msgstr "Suprimir tags"
-
-#: mod/admin.php:1035
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr "Suprimir la lista de tags al final de una publicación."
-
-#: mod/admin.php:1036
-msgid "Path to item cache"
-msgstr "Ruta a la caché del objeto"
-
-#: mod/admin.php:1036
-msgid "The item caches buffers generated bbcode and external images."
-msgstr "El buffer de cache de items generado para bbcodes e imágenes externas. "
-
-#: mod/admin.php:1037
-msgid "Cache duration in seconds"
-msgstr "Duración de la caché en segundos"
-
-#: mod/admin.php:1037
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One"
-" day). To disable the item cache, set the value to -1."
-msgstr "¿Por cuanto tiempo deberían los archives ser almacenados en el cache? Valor por defecto 86400 segundos (un día). Para deshabilita el item cache, ajuste el valor a -1."
-
-#: mod/admin.php:1038
-msgid "Maximum numbers of comments per post"
-msgstr "Numero máximo de respuestas por tema"
-
-#: mod/admin.php:1038
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr "¿Cuantos comentarios deberían ser mostrados por tema? Valor por defecto es 100."
-
-#: mod/admin.php:1039
-msgid "Path for lock file"
-msgstr "Ruta al archivo protegido"
-
-#: mod/admin.php:1039
-msgid ""
-"The lock file is used to avoid multiple pollers at one time. Only define a "
-"folder here."
-msgstr "El archivo lock es usado para evitar multiples pooler (recolectores de información) a la vez. Defina solo una carpeta aquí."
-
-#: mod/admin.php:1040
-msgid "Temp path"
-msgstr "Ruta a los temporales"
-
-#: mod/admin.php:1040
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
-msgstr "Si tiene un sistema restringido en donde el servidor web no puede acceder la dirección del sistema temp, ingrese una dirección alternativa aquí. "
-
-#: mod/admin.php:1041
-msgid "Base path to installation"
-msgstr "Ruta base para la instalación"
-
-#: mod/admin.php:1041
-msgid ""
-"If the system cannot detect the correct path to your installation, enter the"
-" correct path here. This setting should only be set if you are using a "
-"restricted system and symbolic links to your webroot."
-msgstr "Si el sistema no puede detectar el acceso correcto a la instalación, ingrese la dirección correcta aquí. Esta configuración solo debería utilizarse si si usa un sistema restringido y enlaces simbolicos a su webroot."
-
-#: mod/admin.php:1042
-msgid "Disable picture proxy"
-msgstr "Deshabilitar proxy de imagen"
-
-#: mod/admin.php:1042
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
-msgstr "El proxy de imagen mejora el performance y privacidad. No debería ser usado en sistemas con poco ancho de banda."
-
-#: mod/admin.php:1043
-msgid "Enable old style pager"
-msgstr "Habilitar paginación estilo viejo"
-
-#: mod/admin.php:1043
-msgid ""
-"The old style pager has page numbers but slows down massively the page "
-"speed."
-msgstr "La paginación al estilo viejo tiene números de paginas pero enlentece masivamente la velocidad de la pagina."
-
-#: mod/admin.php:1044
-msgid "Only search in tags"
-msgstr "Solo buscar en tags"
-
-#: mod/admin.php:1044
-msgid "On large systems the text search can slow down the system extremely."
-msgstr "En sistemas grandes, la búsqueda de texto puede enlentecer el sistema gravemente."
-
-#: mod/admin.php:1046
-msgid "New base url"
-msgstr "Nueva URLbase"
-
-#: mod/admin.php:1046
-msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts"
-" of all users."
-msgstr "Cambiar base URL para este servidor. Envía mensajes de relocalisación a todos los contactos DFRN."
-
-#: mod/admin.php:1048
-msgid "RINO Encryption"
-msgstr "Encryptado RINO"
-
-#: mod/admin.php:1048
-msgid "Encryption layer between nodes."
-msgstr "Capa de encryptación entre nodos."
-
-#: mod/admin.php:1049
-msgid "Embedly API key"
-msgstr "Embedly llave de API (API key) "
-
-#: mod/admin.php:1049
-msgid ""
-"Embedly is used to fetch additional data for "
-"web pages. This is an optional parameter."
-msgstr "Embedly es usado para recolectar datos adicionales para paginas web. Esto es un parámetro opcional."
-
-#: mod/admin.php:1051
-msgid "Enable 'worker' background processing"
-msgstr "Habilitar procesos de fondo del \"trabajador\""
-
-#: mod/admin.php:1051
-msgid ""
-"The worker background processing limits the number of parallel background "
-"jobs to a maximum number and respects the system load."
-msgstr "Limita los procesos del trabajo de fondo del numero paralelo de trabajos a un numero máximo que respeta la carga del sistema."
-
-#: mod/admin.php:1052
-msgid "Maximum number of parallel workers"
-msgstr "Numero máximo de trabajos paralelos de fondo."
-
-#: mod/admin.php:1052
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
-msgstr "Ajustar a 2 en un servidor compartido (shared hosting).\nEn sistemas grandes valores como 10 son excelentes.\nValor por defecto es 4."
-
-#: mod/admin.php:1053
-msgid "Don't use 'proc_open' with the worker"
-msgstr "No use 'proc_open' junto al \"trabajador\"!"
-
-#: mod/admin.php:1053
-msgid ""
-"Enable this if your system doesn't allow the use of 'proc_open'. This can "
-"happen on shared hosters. If this is enabled you should increase the "
-"frequency of poller calls in your crontab."
-msgstr "Habilite esta función si el sistema no permite el uso de 'proc_open'. Esto suelo suceder en servidores compartidos (shared hosting). Si esta función se habilita se debería incrementar la frecuencia de llamadas del poller (poller calls) en la pestaña de trabajos cron. (¡en el hosting?)"
-
-#: mod/admin.php:1054
-msgid "Enable fastlane"
-msgstr "Habilitar ascenso rápido"
-
-#: mod/admin.php:1054
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes"
-" with higher priority are blocked by processes of lower priority."
-msgstr "Cuando está habilitado, el mecanismo ascenso rápido inicia un trabajador adicional si los procesos de mayor prioridad son bloqueados por prcesos de menor prioridad."
-
-#: mod/admin.php:1055
-msgid "Enable frontend worker"
-msgstr "Habilitar trabajador de interfaz"
-
-#: mod/admin.php:1055
-msgid ""
-"When enabled the Worker process is triggered when backend access is "
-"performed (e.g. messages being delivered). On smaller sites you might want "
-"to call yourdomain.tld/worker on a regular basis via an external cron job. "
-"You should only enable this option if you cannot utilize cron/scheduled jobs"
-" on your server. The worker background process needs to be activated for "
-"this."
-msgstr "Cuando está habilitado, el proceso de Trabajador se activa cuando se ejecuta el acceso de respaldo (ej. mensajes siendo entregados). En páginas más pequeñas usted puede querer llamar a yourdomain.tld/worker en una base regular mediante un trabajo cron externo. Sólo debería habilitar esta opción si no puede utilizar trabajos cron/scheduled en su servidor. El proceso de trabajador en segundo plano necesita ser activado para eso."
-
-#: mod/admin.php:1084
-msgid "Update has been marked successful"
-msgstr "La actualización se ha completado con éxito"
-
-#: mod/admin.php:1092
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr "Actualización de base de datos %s fue aplicada con éxito."
-
-#: mod/admin.php:1095
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr "El paso de actualización de la estructura de la base de datos %s fallo con el mensaje de error: %s"
-
-#: mod/admin.php:1107
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr "Paso %s fallo con el error: %s"
-
-#: mod/admin.php:1110
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Actualización %s aplicada con éxito."
-
-#: mod/admin.php:1114
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "La actualización %s no ha informado, se desconoce el estado."
-
-#: mod/admin.php:1116
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr "No había función adicional de actualización %s que necesitaba ser requerida."
-
-#: mod/admin.php:1135
-msgid "No failed updates."
-msgstr "Actualizaciones sin fallos."
-
-#: mod/admin.php:1136
-msgid "Check database structure"
-msgstr "Revisar estructura de la base de datos"
-
-#: mod/admin.php:1141
-msgid "Failed Updates"
-msgstr "Actualizaciones fallidas"
-
-#: mod/admin.php:1142
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr "No se incluyen las anteriores a la 1139, que no indicaban su estado."
-
-#: mod/admin.php:1143
-msgid "Mark success (if update was manually applied)"
-msgstr "Marcar como correcta (si actualizaste manualmente)"
-
-#: mod/admin.php:1144
-msgid "Attempt to execute this update step automatically"
-msgstr "Intentando ejecutar este paso automáticamente"
-
-#: mod/admin.php:1178
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr "\n\t\t\tEstimado %1$s,\n\t\t\t\tel administrador de %2$s ha creado una cuenta para usted."
-
-#: mod/admin.php:1181
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t\t%2$s\n"
-"\t\t\tPassword:\t\t%3$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tThank you and welcome to %4$s."
-msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%1$s\n\t\t\tNombre de la cuenta:\t\t%2$s\n\t\t\tContraseña:\t\t%3$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %4$s."
-
-#: mod/admin.php:1225
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s usuario bloqueado/desbloqueado"
-msgstr[1] "%s usuarios bloqueados/desbloqueados"
-
-#: mod/admin.php:1232
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s usuario eliminado"
-msgstr[1] "%s usuarios eliminados"
-
-#: mod/admin.php:1279
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Usuario '%s' eliminado"
-
-#: mod/admin.php:1287
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Usuario '%s' desbloqueado"
-
-#: mod/admin.php:1287
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Usuario '%s' bloqueado'"
-
-#: mod/admin.php:1396 mod/admin.php:1422
-msgid "Register date"
-msgstr "Fecha de registro"
-
-#: mod/admin.php:1396 mod/admin.php:1422
-msgid "Last login"
-msgstr "Último acceso"
-
-#: mod/admin.php:1396 mod/admin.php:1422
-msgid "Last item"
-msgstr "Último elemento"
-
-#: mod/admin.php:1405
-msgid "Add User"
-msgstr "Agregar usuario"
-
-#: mod/admin.php:1406
-msgid "select all"
-msgstr "seleccionar todo"
-
-#: mod/admin.php:1407
-msgid "User registrations waiting for confirm"
-msgstr "Registro de usuarios esperando confirmación"
-
-#: mod/admin.php:1408
-msgid "User waiting for permanent deletion"
-msgstr "Usuario esperando anulación permanente."
-
-#: mod/admin.php:1409
-msgid "Request date"
-msgstr "Solicitud de fecha"
-
-#: mod/admin.php:1410
-msgid "No registrations."
-msgstr "Sin registros."
-
-#: mod/admin.php:1411
-msgid "Note from the user"
-msgstr "Nota para el usuario"
-
-#: mod/admin.php:1413
-msgid "Deny"
-msgstr "Denegado"
-
-#: mod/admin.php:1415 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:983
-msgid "Block"
-msgstr "Bloquear"
-
-#: mod/admin.php:1416 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:983
-msgid "Unblock"
-msgstr "Desbloquear"
-
-#: mod/admin.php:1417
-msgid "Site admin"
-msgstr "Administrador de la web"
-
-#: mod/admin.php:1418
-msgid "Account expired"
-msgstr "Cuenta caducada"
-
-#: mod/admin.php:1421
-msgid "New User"
-msgstr "Nuevo usuario"
-
-#: mod/admin.php:1422
-msgid "Deleted since"
-msgstr "Borrado desde"
-
-#: mod/admin.php:1427
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
-
-#: mod/admin.php:1428
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
-
-#: mod/admin.php:1438
-msgid "Name of the new user."
-msgstr "Nombre del nuevo usuario"
-
-#: mod/admin.php:1439
-msgid "Nickname"
-msgstr "Apodo"
-
-#: mod/admin.php:1439
-msgid "Nickname of the new user."
-msgstr "Apodo del nuevo perfil."
-
-#: mod/admin.php:1440
-msgid "Email address of the new user."
-msgstr "Dirección de correo del nuevo perfil."
-
-#: mod/admin.php:1483
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Módulo %s deshabilitado."
-
-#: mod/admin.php:1487
-#, php-format
-msgid "Plugin %s enabled."
-msgstr "Módulo %s habilitado."
-
-#: mod/admin.php:1498 mod/admin.php:1734
-msgid "Disable"
-msgstr "Desactivado"
-
-#: mod/admin.php:1500 mod/admin.php:1736
-msgid "Enable"
-msgstr "Activado"
-
-#: mod/admin.php:1523 mod/admin.php:1781
-msgid "Toggle"
-msgstr "Activar"
-
-#: mod/admin.php:1531 mod/admin.php:1790
-msgid "Author: "
-msgstr "Autor:"
-
-#: mod/admin.php:1532 mod/admin.php:1791
-msgid "Maintainer: "
-msgstr "Mantenedor: "
-
-#: mod/admin.php:1584
-msgid "Reload active plugins"
-msgstr "Recargar plugins activos"
-
-#: mod/admin.php:1589
-#, php-format
-msgid ""
-"There are currently no plugins available on your node. You can find the "
-"official plugin repository at %1$s and might find other interesting plugins "
-"in the open plugin registry at %2$s"
-msgstr "No ay plugins habilitados en este nodo. Encontrara los repositorios oficiales de plugins en %1$s y posiblemente encontrara mas plugins interesantes en el registro abierto de plugins aquí %2$s ."
-
-#: mod/admin.php:1694
-msgid "No themes found."
-msgstr "No se encontraron temas."
-
-#: mod/admin.php:1772
-msgid "Screenshot"
-msgstr "Captura de pantalla"
-
-#: mod/admin.php:1832
-msgid "Reload active themes"
-msgstr "Recargar interfaces de usuario activos"
-
-#: mod/admin.php:1837
-#, php-format
-msgid "No themes found on the system. They should be paced in %1$s"
-msgstr "No se encuentran interfaces en el sistema. Deberían estar localizados (paced) en  %1$s"
-
-#: mod/admin.php:1838
-msgid "[Experimental]"
-msgstr "[Experimental]"
-
-#: mod/admin.php:1839
-msgid "[Unsupported]"
-msgstr "[Sin soporte]"
-
-#: mod/admin.php:1863
-msgid "Log settings updated."
-msgstr "Configuración de registro actualizada."
-
-#: mod/admin.php:1895
-msgid "PHP log currently enabled."
-msgstr "Registro PHP actualmente disponible."
-
-#: mod/admin.php:1897
-msgid "PHP log currently disabled."
-msgstr "Registro PHP actualmente deshabilitado."
-
-#: mod/admin.php:1906
-msgid "Clear"
-msgstr "Limpiar"
-
-#: mod/admin.php:1911
-msgid "Enable Debugging"
-msgstr "Habilitar debugging"
-
-#: mod/admin.php:1912
-msgid "Log file"
-msgstr "Archivo de registro"
-
-#: mod/admin.php:1912
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica."
-
-#: mod/admin.php:1913
-msgid "Log level"
-msgstr "Nivel de registro"
-
-#: mod/admin.php:1916
-msgid "PHP logging"
-msgstr "PHP logging"
-
-#: mod/admin.php:1917
-msgid ""
-"To enable logging of PHP errors and warnings you can add the following to "
-"the .htconfig.php file of your installation. The filename set in the "
-"'error_log' line is relative to the friendica top-level directory and must "
-"be writeable by the web server. The option '1' for 'log_errors' and "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr "Para habilitar la documentación de los errores PHP y las advertencias se puede agregar lo siguiente al archivo .htconfig.php de la instalación (ftp). La dirección definido en el 'error_log' es relativo al directorio friendica principal (top-level directory) y debe de ser habilitado para la escritura por el servidor web. La opción '1' para 'log_errors' y 'display_errors' es para habilitar estas opciones, '0' para deshabilitarlo."
-
-#: mod/admin.php:2045
-#, php-format
-msgid "Lock feature %s"
-msgstr "Trancar opción %s "
-
-#: mod/admin.php:2053
-msgid "Manage Additional Features"
-msgstr "Administrar opciones adicionales"
-
-#: mod/contacts.php:128
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] "%d contacto editado."
-msgstr[1] "%d contacts edited."
-
-#: mod/contacts.php:159 mod/contacts.php:368
-msgid "Could not access contact record."
-msgstr "No se pudo acceder a los datos del contacto."
-
-#: mod/contacts.php:173
-msgid "Could not locate selected profile."
-msgstr "No se pudo encontrar el perfil seleccionado."
-
-#: mod/contacts.php:206
-msgid "Contact updated."
-msgstr "Contacto actualizado."
-
-#: mod/contacts.php:208 mod/dfrn_request.php:583
-msgid "Failed to update contact record."
-msgstr "Error al actualizar el contacto."
-
-#: mod/contacts.php:389
-msgid "Contact has been blocked"
-msgstr "El contacto ha sido bloqueado"
-
-#: mod/contacts.php:389
-msgid "Contact has been unblocked"
-msgstr "El contacto ha sido desbloqueado"
-
-#: mod/contacts.php:400
-msgid "Contact has been ignored"
-msgstr "El contacto ha sido ignorado"
-
-#: mod/contacts.php:400
-msgid "Contact has been unignored"
-msgstr "El contacto ya no está ignorado"
-
-#: mod/contacts.php:412
-msgid "Contact has been archived"
-msgstr "El contacto ha sido archivado"
-
-#: mod/contacts.php:412
-msgid "Contact has been unarchived"
-msgstr "El contacto ya no está archivado"
-
-#: mod/contacts.php:437
-msgid "Drop contact"
-msgstr "Eliminar contacto"
-
-#: mod/contacts.php:440 mod/contacts.php:801
-msgid "Do you really want to delete this contact?"
-msgstr "¿Estás seguro de que quieres eliminar este contacto?"
-
-#: mod/contacts.php:457
-msgid "Contact has been removed."
-msgstr "El contacto ha sido eliminado"
-
-#: mod/contacts.php:498
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Ahora tienes una amistad mutua con %s"
-
-#: mod/contacts.php:502
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Estás compartiendo con %s"
-
-#: mod/contacts.php:507
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s está compartiendo contigo"
-
-#: mod/contacts.php:527
-msgid "Private communications are not available for this contact."
-msgstr "Las comunicaciones privadas no está disponibles para este contacto."
-
-#: mod/contacts.php:534
-msgid "(Update was successful)"
-msgstr "(La actualización se ha completado)"
-
-#: mod/contacts.php:534
-msgid "(Update was not successful)"
-msgstr "(La actualización no se ha completado)"
-
-#: mod/contacts.php:536 mod/contacts.php:964
-msgid "Suggest friends"
-msgstr "Sugerir amigos"
-
-#: mod/contacts.php:540
-#, php-format
-msgid "Network type: %s"
-msgstr "Tipo de red: %s"
-
-#: mod/contacts.php:553
-msgid "Communications lost with this contact!"
-msgstr "¡Se ha perdido la comunicación con este contacto!"
-
-#: mod/contacts.php:556
-msgid "Fetch further information for feeds"
-msgstr "Recaudar informacion complementaria de los feeds"
-
-#: mod/contacts.php:557
-msgid "Fetch information"
-msgstr "Recaudar informacion"
-
-#: mod/contacts.php:557
-msgid "Fetch information and keywords"
-msgstr "Recaudar informacion y palabras claves"
-
-#: mod/contacts.php:575
-msgid "Contact"
-msgstr "Contacto"
-
-#: mod/contacts.php:578
-msgid "Profile Visibility"
-msgstr "Visibilidad del Perfil"
-
-#: mod/contacts.php:579
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura."
-
-#: mod/contacts.php:580
-msgid "Contact Information / Notes"
-msgstr "Información del Contacto / Notas"
-
-#: mod/contacts.php:581
-msgid "Edit contact notes"
-msgstr "Editar notas del contacto"
-
-#: mod/contacts.php:587
-msgid "Block/Unblock contact"
-msgstr "Boquear/Desbloquear contacto"
-
-#: mod/contacts.php:588
-msgid "Ignore contact"
-msgstr "Ignorar contacto"
-
-#: mod/contacts.php:589
-msgid "Repair URL settings"
-msgstr "Configuración de reparación de la dirección"
-
-#: mod/contacts.php:590
-msgid "View conversations"
-msgstr "Ver conversaciones"
-
-#: mod/contacts.php:596
-msgid "Last update:"
-msgstr "Última actualización:"
-
-#: mod/contacts.php:598
-msgid "Update public posts"
-msgstr "Actualizar publicaciones públicas"
-
-#: mod/contacts.php:600 mod/contacts.php:974
-msgid "Update now"
-msgstr "Actualizar ahora"
-
-#: mod/contacts.php:606 mod/contacts.php:806 mod/contacts.php:991
-msgid "Unignore"
-msgstr "Quitar de Ignorados"
-
-#: mod/contacts.php:610
-msgid "Currently blocked"
-msgstr "Bloqueados"
-
-#: mod/contacts.php:611
-msgid "Currently ignored"
-msgstr "Ignorados"
-
-#: mod/contacts.php:612
-msgid "Currently archived"
-msgstr "Archivados"
-
-#: mod/contacts.php:613
-msgid ""
-"Replies/likes to your public posts may still be visible"
-msgstr "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía pueden ser visibles."
-
-#: mod/contacts.php:614
-msgid "Notification for new posts"
-msgstr "Notificacion de nuevos temas."
-
-#: mod/contacts.php:614
-msgid "Send a notification of every new post of this contact"
-msgstr "Enviar una notificacion por nuevos temas de este contacto."
-
-#: mod/contacts.php:617
-msgid "Blacklisted keywords"
-msgstr "Lista negra de palabras"
-
-#: mod/contacts.php:617
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
-msgstr "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado"
-
-#: mod/contacts.php:635
-msgid "Actions"
-msgstr "Acciones"
-
-#: mod/contacts.php:638
-msgid "Contact Settings"
-msgstr "Ajustes del contacto"
-
-#: mod/contacts.php:684
-msgid "Suggestions"
-msgstr "Sugerencias"
-
-#: mod/contacts.php:687
-msgid "Suggest potential friends"
-msgstr "Amistades potenciales sugeridas"
-
-#: mod/contacts.php:695
-msgid "Show all contacts"
-msgstr "Mostrar todos los contactos"
-
-#: mod/contacts.php:700
-msgid "Unblocked"
-msgstr "Desbloqueados"
-
-#: mod/contacts.php:703
-msgid "Only show unblocked contacts"
-msgstr "Mostrar solo contactos sin bloquear"
-
-#: mod/contacts.php:709
-msgid "Blocked"
-msgstr "Bloqueados"
-
-#: mod/contacts.php:712
-msgid "Only show blocked contacts"
-msgstr "Mostrar solo contactos bloqueados"
-
-#: mod/contacts.php:718
-msgid "Ignored"
-msgstr "Ignorados"
-
-#: mod/contacts.php:721
-msgid "Only show ignored contacts"
-msgstr "Mostrar solo contactos ignorados"
-
-#: mod/contacts.php:727
-msgid "Archived"
-msgstr "Archivados"
-
-#: mod/contacts.php:730
-msgid "Only show archived contacts"
-msgstr "Mostrar solo contactos archivados"
-
-#: mod/contacts.php:736
-msgid "Hidden"
-msgstr "Ocultos"
-
-#: mod/contacts.php:739
-msgid "Only show hidden contacts"
-msgstr "Mostrar solo contactos ocultos"
-
-#: mod/contacts.php:796
-msgid "Search your contacts"
-msgstr "Buscar en tus contactos"
-
-#: mod/contacts.php:807 mod/contacts.php:999
-msgid "Archive"
-msgstr "Archivo"
-
-#: mod/contacts.php:807 mod/contacts.php:999
-msgid "Unarchive"
-msgstr "Sin archivar"
-
-#: mod/contacts.php:810
-msgid "Batch Actions"
-msgstr "Accones en lote"
-
-#: mod/contacts.php:856
-msgid "View all contacts"
-msgstr "Ver todos los contactos"
-
-#: mod/contacts.php:866
-msgid "View all common friends"
-msgstr "Ver todos los conocidos en común "
-
-#: mod/contacts.php:873
-msgid "Advanced Contact Settings"
-msgstr "Configuración avanzada"
-
-#: mod/contacts.php:907
-msgid "Mutual Friendship"
-msgstr "Amistad recíproca"
-
-#: mod/contacts.php:911
-msgid "is a fan of yours"
-msgstr "es tu fan"
-
-#: mod/contacts.php:915
-msgid "you are a fan of"
-msgstr "eres fan de"
-
-#: mod/contacts.php:985
-msgid "Toggle Blocked status"
-msgstr "Cambiar bloqueados"
-
-#: mod/contacts.php:993
-msgid "Toggle Ignored status"
-msgstr "Cambiar ignorados"
-
-#: mod/contacts.php:1001
-msgid "Toggle Archive status"
-msgstr "Cambiar archivados"
-
-#: mod/contacts.php:1009
-msgid "Delete contact"
-msgstr "Eliminar contacto"
-
-#: mod/dfrn_confirm.php:127
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "Esto puede ocurrir a veces si la conexión fue solicitada por ambas personas y ya hubiera sido aprobada."
-
-#: mod/dfrn_confirm.php:246
-msgid "Response from remote site was not understood."
-msgstr "La respuesta desde el sitio remoto no ha sido entendida."
-
-#: mod/dfrn_confirm.php:255 mod/dfrn_confirm.php:260
-msgid "Unexpected response from remote site: "
-msgstr "Respuesta inesperada desde el sitio remoto: "
-
-#: mod/dfrn_confirm.php:269
-msgid "Confirmation completed successfully."
-msgstr "Confirmación completada con éxito."
-
-#: mod/dfrn_confirm.php:271 mod/dfrn_confirm.php:285 mod/dfrn_confirm.php:292
-msgid "Remote site reported: "
-msgstr "El sito remoto informó: "
-
-#: mod/dfrn_confirm.php:283
-msgid "Temporary failure. Please wait and try again."
-msgstr "Error temporal. Por favor, espere y vuelva a intentarlo."
-
-#: mod/dfrn_confirm.php:290
-msgid "Introduction failed or was revoked."
-msgstr "La presentación ha fallado o ha sido anulada."
-
-#: mod/dfrn_confirm.php:419
-msgid "Unable to set contact photo."
-msgstr "Imposible establecer la foto del contacto."
-
-#: mod/dfrn_confirm.php:557
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "No se ha encontrado a ningún '%s' "
-
-#: mod/dfrn_confirm.php:567
-msgid "Our site encryption key is apparently messed up."
-msgstr "Nuestra clave de cifrado del sitio es aparentemente un lío."
-
-#: mod/dfrn_confirm.php:578
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "Se ha proporcionado una dirección vacía o no hemos podido descifrarla."
-
-#: mod/dfrn_confirm.php:599
-msgid "Contact record was not found for you on our site."
-msgstr "El contacto no se ha encontrado en nuestra base de datos."
-
-#: mod/dfrn_confirm.php:613
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr "La clave pública del sitio no está disponible en los datos del contacto para %s."
-
-#: mod/dfrn_confirm.php:633
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr "La identificación proporcionada por el sistema es un duplicado de nuestro sistema. Debería funcionar si lo intentas de nuevo."
-
-#: mod/dfrn_confirm.php:644
-msgid "Unable to set your contact credentials on our system."
-msgstr "No se puede establecer las credenciales de tu contacto en nuestro sistema."
-
-#: mod/dfrn_confirm.php:703
-msgid "Unable to update your contact profile details on our system"
-msgstr "No se puede actualizar los datos de tu perfil de contacto en nuestro sistema"
-
-#: mod/dfrn_confirm.php:775
-#, php-format
-msgid "%1$s has joined %2$s"
-msgstr "%1$s se ha unido a %2$s"
-
-#: mod/dfrn_request.php:101
-msgid "This introduction has already been accepted."
-msgstr "Esta presentación ya ha sido aceptada."
-
-#: mod/dfrn_request.php:124 mod/dfrn_request.php:520
-msgid "Profile location is not valid or does not contain profile information."
-msgstr "La dirección del perfil no es válida o no contiene información del perfil."
-
-#: mod/dfrn_request.php:129 mod/dfrn_request.php:525
-msgid "Warning: profile location has no identifiable owner name."
-msgstr "Aviso: La dirección del perfil no tiene un nombre de propietario identificable."
-
-#: mod/dfrn_request.php:131 mod/dfrn_request.php:527
-msgid "Warning: profile location has no profile photo."
-msgstr "Aviso: la dirección del perfil no tiene foto de perfil."
-
-#: mod/dfrn_request.php:134 mod/dfrn_request.php:530
-#, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] "no se encontró %d parámetro requerido en el lugar determinado"
-msgstr[1] "no se encontraron %d parámetros requeridos en el lugar determinado"
-
-#: mod/dfrn_request.php:180
-msgid "Introduction complete."
-msgstr "Presentación completa."
-
-#: mod/dfrn_request.php:222
-msgid "Unrecoverable protocol error."
-msgstr "Error de protocolo irrecuperable."
-
-#: mod/dfrn_request.php:250
-msgid "Profile unavailable."
-msgstr "Perfil no disponible."
-
-#: mod/dfrn_request.php:277
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s ha recibido demasiadas solicitudes de conexión hoy."
-
-#: mod/dfrn_request.php:278
-msgid "Spam protection measures have been invoked."
-msgstr "Han sido activadas las medidas de protección contra spam."
-
-#: mod/dfrn_request.php:279
-msgid "Friends are advised to please try again in 24 hours."
-msgstr "Tus amigos serán avisados para que lo intenten de nuevo pasadas 24 horas."
-
-#: mod/dfrn_request.php:341
-msgid "Invalid locator"
-msgstr "Localizador no válido"
-
-#: mod/dfrn_request.php:350
-msgid "Invalid email address."
-msgstr "Dirección de correo incorrecta"
-
-#: mod/dfrn_request.php:375
-msgid "This account has not been configured for email. Request failed."
-msgstr "Esta cuenta no ha sido configurada para el correo. Fallo de solicitud."
-
-#: mod/dfrn_request.php:478
-msgid "You have already introduced yourself here."
-msgstr "Ya te has presentado aquí."
-
-#: mod/dfrn_request.php:482
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "Al parecer, ya eres amigo de %s."
-
-#: mod/dfrn_request.php:503
-msgid "Invalid profile URL."
-msgstr "Dirección de perfil no válida."
-
-#: mod/dfrn_request.php:604
-msgid "Your introduction has been sent."
-msgstr "Tu presentación ha sido enviada."
-
-#: mod/dfrn_request.php:644
-msgid ""
-"Remote subscription can't be done for your network. Please subscribe "
-"directly on your system."
-msgstr "La subscripción remota no se podrá hacer para tu red. Por favor contacta directamente desde tu sistema."
-
-#: mod/dfrn_request.php:664
-msgid "Please login to confirm introduction."
-msgstr "Inicia sesión para confirmar la presentación."
-
-#: mod/dfrn_request.php:674
-msgid ""
-"Incorrect identity currently logged in. Please login to "
-"this profile."
-msgstr "Sesión iniciada con la identificación incorrecta. Entra en este perfil."
-
-#: mod/dfrn_request.php:688 mod/dfrn_request.php:705
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: mod/dfrn_request.php:700
-msgid "Hide this contact"
-msgstr "Ocultar este contacto"
-
-#: mod/dfrn_request.php:703
-#, php-format
-msgid "Welcome home %s."
-msgstr "Bienvenido a casa %s"
-
-#: mod/dfrn_request.php:704
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "Por favor, confirma tu solicitud de presentación/conexión con %s."
-
-#: mod/dfrn_request.php:833
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr "Por favor introduce tu dirección ID de una de las siguientes redes sociales soportadas:"
-
-#: mod/dfrn_request.php:854
-#, php-format
-msgid ""
-"If you are not yet a member of the free social web, follow this link to find a public Friendica site and "
-"join us today."
-msgstr "Si aun no eres miembro de la red social libre  seguí este enlace para encontrara un sitio disponible de friendica y acompañanos hoy mismo"
-
-#: mod/dfrn_request.php:859
-msgid "Friend/Connection Request"
-msgstr "Solicitud de Amistad/Conexión"
-
-#: mod/dfrn_request.php:860
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-msgstr "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
-
-#: mod/dfrn_request.php:861 mod/follow.php:109
-msgid "Please answer the following:"
-msgstr "Por favor responde lo siguiente:"
-
-#: mod/dfrn_request.php:862 mod/follow.php:110
-#, php-format
-msgid "Does %s know you?"
-msgstr "¿%s te conoce?"
-
-#: mod/dfrn_request.php:866 mod/follow.php:111
-msgid "Add a personal note:"
-msgstr "Añade una nota personal:"
-
-#: mod/dfrn_request.php:869
-msgid "StatusNet/Federated Social Web"
-msgstr "StatusNet/Web Social Federada"
-
-#: mod/dfrn_request.php:871
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search"
-" bar."
-msgstr "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora."
-
-#: mod/dfrn_request.php:872 mod/follow.php:117
-msgid "Your Identity Address:"
-msgstr "Dirección de tu perfil:"
-
-#: mod/dfrn_request.php:875 mod/follow.php:19
-msgid "Submit Request"
-msgstr "Enviar solicitud"
-
-#: mod/follow.php:30
-msgid "You already added this contact."
-msgstr "Ya has añadido este contacto."
-
-#: mod/follow.php:39
-msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr "El soporte de Diaspora* no esta habilitado, el contacto no puede ser agregado."
-
-#: mod/follow.php:46
-msgid "OStatus support is disabled. Contact can't be added."
-msgstr "El soporte de OStatus no esta habilitado, el contacto no puede ser agregado."
-
-#: mod/follow.php:53
-msgid "The network type couldn't be detected. Contact can't be added."
-msgstr "No se pudo detectar el tipo de red. Contacto no puede ser agregado."
-
-#: mod/follow.php:180
-msgid "Contact added"
-msgstr "Contacto añadido"
-
-#: mod/install.php:139
-msgid "Friendica Communications Server - Setup"
-msgstr "Servidor de comunicación Friendica - Configuración"
-
-#: mod/install.php:145
-msgid "Could not connect to database."
-msgstr "No es posible la conexión con la base de datos."
-
-#: mod/install.php:149
-msgid "Could not create table."
-msgstr "No se puede crear la tabla."
-
-#: mod/install.php:155
-msgid "Your Friendica site database has been installed."
-msgstr "La base de datos de su sitio web de Friendica ha sido instalada."
-
-#: mod/install.php:160
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql."
-
-#: mod/install.php:161 mod/install.php:230 mod/install.php:607
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Por favor, consulta el archivo \"INSTALL.txt\"."
-
-#: mod/install.php:173
-msgid "Database already in use."
-msgstr "Base de datos ya se encuentra en uso"
-
-#: mod/install.php:227
-msgid "System check"
-msgstr "Verificación del sistema"
-
-#: mod/install.php:232
-msgid "Check again"
-msgstr "Compruebalo de nuevo"
-
-#: mod/install.php:251
-msgid "Database connection"
-msgstr "Conexión con la base de datos"
-
-#: mod/install.php:252
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos."
-
-#: mod/install.php:253
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones."
-
-#: mod/install.php:254
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar."
-
-#: mod/install.php:258
-msgid "Database Server Name"
-msgstr "Nombre del servidor de la base de datos"
-
-#: mod/install.php:259
-msgid "Database Login Name"
-msgstr "Usuario de la base de datos"
-
-#: mod/install.php:260
-msgid "Database Login Password"
-msgstr "Contraseña de la base de datos"
-
-#: mod/install.php:261
-msgid "Database Name"
-msgstr "Nombre de la base de datos"
-
-#: mod/install.php:262 mod/install.php:303
-msgid "Site administrator email address"
-msgstr "Dirección de correo del administrador de la web"
-
-#: mod/install.php:262 mod/install.php:303
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web."
-
-#: mod/install.php:266 mod/install.php:306
-msgid "Please select a default timezone for your website"
-msgstr "Por favor, selecciona la zona horaria predeterminada para tu web"
-
-#: mod/install.php:293
-msgid "Site settings"
-msgstr "Configuración de la página web"
-
-#: mod/install.php:307
-msgid "System Language:"
-msgstr "Sistema de idioma:"
-
-#: mod/install.php:307
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr "Seleccione el idioma por defecto para su interfaz de instalación de Friendica y para enviar emails."
-
-#: mod/install.php:347
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "No se pudo encontrar una versión de la línea de comandos de PHP en la ruta del servidor web."
-
-#: mod/install.php:348
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron. See 'Setup the poller'"
-msgstr "Si no tienes una versión de command line de php installado en el servidor, no sera posible de efectuar polling como trabajo de fondo a traves de cron. Vea 'Setup the poller'"
-
-#: mod/install.php:352
-msgid "PHP executable path"
-msgstr "Dirección al ejecutable PHP"
-
-#: mod/install.php:352
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación."
-
-#: mod/install.php:357
-msgid "Command line PHP"
-msgstr "Línea de comandos PHP"
-
-#: mod/install.php:366
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr "El ejecutable PHP no es e lphp cli binary (podria ser versión cgi-fgci)"
-
-#: mod/install.php:367
-msgid "Found PHP version: "
-msgstr "Versión PHP encontrada:"
-
-#: mod/install.php:369
-msgid "PHP cli binary"
-msgstr "PHP cli binario"
-
-#: mod/install.php:380
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado."
-
-#: mod/install.php:381
-msgid "This is required for message delivery to work."
-msgstr "Esto es necesario para que funcione la entrega de mensajes."
-
-#: mod/install.php:383
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: mod/install.php:404
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado"
-
-#: mod/install.php:405
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: mod/install.php:407
-msgid "Generate encryption keys"
-msgstr "Generar claves de encriptación"
-
-#: mod/install.php:414
-msgid "libCurl PHP module"
-msgstr "Módulo PHP libCurl"
-
-#: mod/install.php:415
-msgid "GD graphics PHP module"
-msgstr "Módulo PHP gráficos GD"
-
-#: mod/install.php:416
-msgid "OpenSSL PHP module"
-msgstr "Módulo PHP OpenSSL"
-
-#: mod/install.php:417
-msgid "mysqli PHP module"
-msgstr "Módulo PHP mysqli"
-
-#: mod/install.php:418
-msgid "mb_string PHP module"
-msgstr "Módulo PHP mb_string"
-
-#: mod/install.php:419
-msgid "mcrypt PHP module"
-msgstr "modulo mycrypt PHP"
-
-#: mod/install.php:420
-msgid "XML PHP module"
-msgstr "Módulo XML PHP"
-
-#: mod/install.php:421
-msgid "iconv module"
-msgstr "Módulo iconv"
-
-#: mod/install.php:425 mod/install.php:427
-msgid "Apache mod_rewrite module"
-msgstr "Módulo mod_rewrite de Apache"
-
-#: mod/install.php:425
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado."
-
-#: mod/install.php:433
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Error: El módulo de PHP libcurl es necesario, pero no está instalado."
-
-#: mod/install.php:437
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado."
-
-#: mod/install.php:441
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Error: El módulo de PHP openssl es necesario, pero  no está instalado."
-
-#: mod/install.php:445
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Error: El módulo de PHP mysqli es necesario, pero no está instalado."
-
-#: mod/install.php:449
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Error: El módulo de PHP mb_string es necesario, pero no está instalado."
-
-#: mod/install.php:453
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Error: modulo mycrypt PHP requerido pero no instalado."
-
-#: mod/install.php:457
-msgid "Error: iconv PHP module required but not installed."
-msgstr "Error: módulo iconv PHP requerido pero no instalado."
-
-#: mod/install.php:466
-msgid ""
-"If you are using php_cli, please make sure that mcrypt module is enabled in "
-"its config file"
-msgstr "Si está utilizando php_cli, por favor asegúrese de que el módulo mcrypt está habilitado en este archivo de configuración"
-
-#: mod/install.php:469
-msgid ""
-"Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 "
-"encryption layer."
-msgstr "Función mycrypt_create_iv() no esta definido. Esto es preciso para habilitar RINO2 encryption layer."
-
-#: mod/install.php:471
-msgid "mcrypt_create_iv() function"
-msgstr "mcrypt_create_iv() función"
-
-#: mod/install.php:479
-msgid "Error, XML PHP module required but not installed."
-msgstr "Error, módulo XML PHP requerido pero no instalado."
-
-#: mod/install.php:494
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo."
-
-#: mod/install.php:495
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas."
-
-#: mod/install.php:496
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Friendica top folder."
-msgstr "Al final obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica."
-
-#: mod/install.php:497
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"INSTALL.txt\" for instructions."
-msgstr "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones."
-
-#: mod/install.php:500
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php tiene permiso de escritura"
-
-#: mod/install.php:510
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Friendica usa el motor de templates Smarty3 para renderizar su visualisacion web. Smarty3 compila templates hacia PHP para acelerar la velocidad del renderizar."
-
-#: mod/install.php:511
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/smarty3/ under the Friendica top level "
-"folder."
-msgstr "Para poder guardar estos templates compilados, el servidor web necesita acceso de escritura en el directorio /view/smarty3/ en el árbol de raíz de la instalación friendica."
-
-#: mod/install.php:512
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Por favor asegure que el usuario que utiliza el servidor web (ejemplo: www-data) tiene permisos de escritura en esta carpeta."
-
-#: mod/install.php:513
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Nota: como medida de seguridad deberia dar acceso de escritura solo a /view/smarty3 / → no al los archivos template (.tpl) que contiene."
-
-#: mod/install.php:516
-msgid "view/smarty3 is writable"
-msgstr "Se puede escribir en /view/smarty3"
-
-#: mod/install.php:532
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración."
-
-#: mod/install.php:534
-msgid "Url rewrite is working"
-msgstr "Reescribiendo la dirección..."
-
-#: mod/install.php:552
-msgid "ImageMagick PHP extension is not installed"
-msgstr "No está instalada la extensión ImageMagick PHP"
-
-#: mod/install.php:555
-msgid "ImageMagick PHP extension is installed"
-msgstr "ImageMagick PHP extension is installed"
-
-#: mod/install.php:557
-msgid "ImageMagick supports GIF"
-msgstr "ImageMagick supporta GIF"
-
-#: mod/install.php:566
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web."
-
-#: mod/install.php:605
-msgid "
    What next
    "
-msgstr "
    ¿Ahora qué?
    "
-
-#: mod/install.php:606
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo"
-
-#: mod/item.php:116
-msgid "Unable to locate original post."
-msgstr "No se puede encontrar la publicación original."
-
-#: mod/item.php:341
-msgid "Empty post discarded."
-msgstr "Publicación vacía descartada."
-
-#: mod/item.php:902
-msgid "System error. Post not saved."
-msgstr "Error del sistema. Mensaje no guardado."
-
-#: mod/item.php:992
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social "
-"network."
-msgstr "Este mensaje te lo ha enviado %s, miembro de la red social Friendica."
-
-#: mod/item.php:994
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "Los puedes visitar en línea en %s"
-
-#: mod/item.php:995
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes."
-
-#: mod/item.php:999
-#, php-format
-msgid "%s posted an update."
-msgstr "%s ha publicado una actualización."
-
-#: mod/network.php:398
-#, php-format
-msgid ""
-"Warning: This group contains %s member from a network that doesn't allow non"
-" public messages."
-msgid_plural ""
-"Warning: This group contains %s members from a network that doesn't allow "
-"non public messages."
-msgstr[0] "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos."
-msgstr[1] "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos."
-
-#: mod/network.php:401
-msgid "Messages in this group won't be send to these receivers."
-msgstr "Los mensajes de este grupo no se enviarán a estos receptores."
-
-#: mod/network.php:529
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente."
-
-#: mod/network.php:534
-msgid "Invalid contact."
-msgstr "Contacto erróneo."
-
-#: mod/network.php:826
-msgid "Commented Order"
-msgstr "Orden de comentarios"
-
-#: mod/network.php:829
-msgid "Sort by Comment Date"
-msgstr "Ordenar por fecha de comentarios"
-
-#: mod/network.php:834
-msgid "Posted Order"
-msgstr "Orden de publicación"
-
-#: mod/network.php:837
-msgid "Sort by Post Date"
-msgstr "Ordenar por fecha de publicación"
-
-#: mod/network.php:848
-msgid "Posts that mention or involve you"
-msgstr "Publicaciones que te mencionan o involucran"
-
-#: mod/network.php:856
-msgid "New"
-msgstr "Nuevo"
-
-#: mod/network.php:859
-msgid "Activity Stream - by date"
-msgstr "Corriente de actividad por fecha"
-
-#: mod/network.php:867
-msgid "Shared Links"
-msgstr "Enlaces compartidos"
-
-#: mod/network.php:870
-msgid "Interesting Links"
-msgstr "Enlaces interesantes"
-
-#: mod/network.php:878
-msgid "Starred"
-msgstr "Favoritos"
-
-#: mod/network.php:881
-msgid "Favourite Posts"
-msgstr "Publicaciones favoritas"
-
-#: mod/ping.php:261
-msgid "{0} wants to be your friend"
-msgstr "{0} quiere ser tu amigo"
-
-#: mod/ping.php:276
-msgid "{0} sent you a message"
-msgstr "{0} te ha enviado un mensaje"
-
-#: mod/ping.php:291
-msgid "{0} requested registration"
-msgstr "{0} solicitudes de registro"
-
-#: mod/viewcontacts.php:72
-msgid "No contacts."
-msgstr "Ningún contacto."
-
-#: object/Item.php:370
+#: object/Item.php:359
 msgid "via"
 msgstr "vía"
 
+#: view/theme/duepuntozero/config.php:44
+msgid "greenzero"
+msgstr "greenzero"
+
+#: view/theme/duepuntozero/config.php:45
+msgid "purplezero"
+msgstr "purplezero"
+
+#: view/theme/duepuntozero/config.php:46
+msgid "easterbunny"
+msgstr "easterbunny"
+
+#: view/theme/duepuntozero/config.php:47
+msgid "darkzero"
+msgstr "darkzero"
+
+#: view/theme/duepuntozero/config.php:48
+msgid "comix"
+msgstr "comix"
+
+#: view/theme/duepuntozero/config.php:49
+msgid "slackr"
+msgstr "slackr"
+
+#: view/theme/duepuntozero/config.php:64
+msgid "Variations"
+msgstr "Variaciones"
+
+#: view/theme/frio/config.php:47
+msgid "Default"
+msgstr "Por defecto"
+
+#: view/theme/frio/config.php:59
+msgid "Note: "
+msgstr "Nota:"
+
+#: view/theme/frio/config.php:59
+msgid "Check image permissions if all users are allowed to visit the image"
+msgstr "Compruebe los permisos de imagen si se les permite a todos los usuarios visitar la imagen"
+
+#: view/theme/frio/config.php:67
+msgid "Select scheme"
+msgstr "Seleccionar plan"
+
+#: view/theme/frio/config.php:68
+msgid "Navigation bar background color"
+msgstr "Color de fondo de la barra de navegación"
+
+#: view/theme/frio/config.php:69
+msgid "Navigation bar icon color "
+msgstr "Color de icono de la barra de navegación"
+
+#: view/theme/frio/config.php:70
+msgid "Link color"
+msgstr "Color de enlace"
+
+#: view/theme/frio/config.php:71
+msgid "Set the background color"
+msgstr "Seleccionar el color de fondo"
+
+#: view/theme/frio/config.php:72
+msgid "Content background transparency"
+msgstr "Transparencia de contenido de fondo"
+
+#: view/theme/frio/config.php:73
+msgid "Set the background image"
+msgstr "Seleccionar la imagen de fondo"
+
 #: view/theme/frio/php/Image.php:23
 msgid "Repeat the image"
 msgstr "Repetir la imagen"
@@ -8733,195 +8794,74 @@ msgstr "Reajustar al mejor tamaño"
 msgid "Resize to best fit and retain aspect ratio."
 msgstr "Reajustar al mejor tamaño y conservar proporción"
 
-#: view/theme/frio/config.php:42
-msgid "Default"
-msgstr "Por defecto"
-
-#: view/theme/frio/config.php:54
-msgid "Note: "
-msgstr "Nota:"
-
-#: view/theme/frio/config.php:54
-msgid "Check image permissions if all users are allowed to visit the image"
-msgstr "Compruebe los permisos de imagen si se les permite a todos los usuarios visitar la imagen"
-
-#: view/theme/frio/config.php:62
-msgid "Select scheme"
-msgstr "Seleccionar plan"
-
-#: view/theme/frio/config.php:63
-msgid "Navigation bar background color"
-msgstr "Color de fondo de la barra de navegación"
-
-#: view/theme/frio/config.php:64
-msgid "Navigation bar icon color "
-msgstr "Color de icono de la barra de navegación"
-
-#: view/theme/frio/config.php:65
-msgid "Link color"
-msgstr "Color de enlace"
-
-#: view/theme/frio/config.php:66
-msgid "Set the background color"
-msgstr "Seleccionar el color de fondo"
-
-#: view/theme/frio/config.php:67
-msgid "Content background transparency"
-msgstr "Transparencia de contenido de fondo"
-
-#: view/theme/frio/config.php:68
-msgid "Set the background image"
-msgstr "Seleccionar la imagen de fondo"
-
-#: view/theme/frio/theme.php:229
+#: view/theme/frio/theme.php:226
 msgid "Guest"
 msgstr "Invitado"
 
-#: view/theme/frio/theme.php:235
+#: view/theme/frio/theme.php:232
 msgid "Visitor"
 msgstr "Visitante"
 
-#: view/theme/quattro/config.php:67
+#: view/theme/quattro/config.php:70
 msgid "Alignment"
 msgstr "Alineación"
 
-#: view/theme/quattro/config.php:67
+#: view/theme/quattro/config.php:70
 msgid "Left"
 msgstr "Izquierda"
 
-#: view/theme/quattro/config.php:67
+#: view/theme/quattro/config.php:70
 msgid "Center"
 msgstr "Centrado"
 
-#: view/theme/quattro/config.php:68
+#: view/theme/quattro/config.php:71
 msgid "Color scheme"
 msgstr "Esquema de color"
 
-#: view/theme/quattro/config.php:69
+#: view/theme/quattro/config.php:72
 msgid "Posts font size"
 msgstr "Tamaño de letra del titulo de las publicaciones"
 
-#: view/theme/quattro/config.php:70
+#: view/theme/quattro/config.php:73
 msgid "Textareas font size"
 msgstr "Tamaño de letra del área de texto"
 
-#: view/theme/vier/theme.php:152 view/theme/vier/config.php:112
-msgid "Community Profiles"
-msgstr "Perfiles de la Comunidad"
-
-#: view/theme/vier/theme.php:181 view/theme/vier/config.php:116
-msgid "Last users"
-msgstr "Últimos usuarios"
-
-#: view/theme/vier/theme.php:199 view/theme/vier/config.php:115
-msgid "Find Friends"
-msgstr "Buscar amigos"
-
-#: view/theme/vier/theme.php:200
-msgid "Local Directory"
-msgstr "Directorio local"
-
-#: view/theme/vier/theme.php:291
-msgid "Quick Start"
-msgstr "Inicio rápido"
-
-#: view/theme/vier/theme.php:373 view/theme/vier/config.php:114
-msgid "Connect Services"
-msgstr "Servicios conectados"
-
-#: view/theme/vier/config.php:64
+#: view/theme/vier/config.php:69
 msgid "Comma separated list of helper forums"
 msgstr "Lista separada por comas de foros de ayuda."
 
-#: view/theme/vier/config.php:110
+#: view/theme/vier/config.php:115
 msgid "Set style"
 msgstr "Definir estilo"
 
-#: view/theme/vier/config.php:111
+#: view/theme/vier/config.php:116
 msgid "Community Pages"
 msgstr "Páginas de Comunidad"
 
-#: view/theme/vier/config.php:113
+#: view/theme/vier/config.php:117 view/theme/vier/theme.php:146
+msgid "Community Profiles"
+msgstr "Perfiles de la Comunidad"
+
+#: view/theme/vier/config.php:118
 msgid "Help or @NewHere ?"
 msgstr "¿Ayuda o @NuevoAquí?"
 
-#: view/theme/duepuntozero/config.php:45
-msgid "greenzero"
-msgstr "greenzero"
+#: view/theme/vier/config.php:119 view/theme/vier/theme.php:385
+msgid "Connect Services"
+msgstr "Servicios conectados"
 
-#: view/theme/duepuntozero/config.php:46
-msgid "purplezero"
-msgstr "purplezero"
+#: view/theme/vier/config.php:120 view/theme/vier/theme.php:194
+msgid "Find Friends"
+msgstr "Buscar amigos"
 
-#: view/theme/duepuntozero/config.php:47
-msgid "easterbunny"
-msgstr "easterbunny"
+#: view/theme/vier/config.php:121 view/theme/vier/theme.php:176
+msgid "Last users"
+msgstr "Últimos usuarios"
 
-#: view/theme/duepuntozero/config.php:48
-msgid "darkzero"
-msgstr "darkzero"
+#: view/theme/vier/theme.php:195
+msgid "Local Directory"
+msgstr "Directorio local"
 
-#: view/theme/duepuntozero/config.php:49
-msgid "comix"
-msgstr "comix"
-
-#: view/theme/duepuntozero/config.php:50
-msgid "slackr"
-msgstr "slackr"
-
-#: view/theme/duepuntozero/config.php:62
-msgid "Variations"
-msgstr "Variaciones"
-
-#: boot.php:970
-msgid "Delete this item?"
-msgstr "¿Eliminar este elemento?"
-
-#: boot.php:973
-msgid "show fewer"
-msgstr "ver menos"
-
-#: boot.php:1655
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Falló la actualización de %s. Mira los registros de errores."
-
-#: boot.php:1767
-msgid "Create a New Account"
-msgstr "Crear una nueva cuenta"
-
-#: boot.php:1796
-msgid "Password: "
-msgstr "Contraseña: "
-
-#: boot.php:1797
-msgid "Remember me"
-msgstr "Recordarme"
-
-#: boot.php:1800
-msgid "Or login using OpenID: "
-msgstr "O inicia sesión usando OpenID: "
-
-#: boot.php:1806
-msgid "Forgot your password?"
-msgstr "¿Olvidaste la contraseña?"
-
-#: boot.php:1809
-msgid "Website Terms of Service"
-msgstr "Términos de uso del sitio"
-
-#: boot.php:1810
-msgid "terms of service"
-msgstr "Términos de uso"
-
-#: boot.php:1812
-msgid "Website Privacy Policy"
-msgstr "Política de privacidad del sitio"
-
-#: boot.php:1813
-msgid "privacy policy"
-msgstr "Política de privacidad"
-
-#: index.php:451
-msgid "toggle mobile"
-msgstr "Cambiar a versión móvil"
+#: view/theme/vier/theme.php:286
+msgid "Quick Start"
+msgstr "Inicio rápido"
diff --git a/view/lang/es/strings.php b/view/lang/es/strings.php
index d8c0e84fd..a7365bb19 100644
--- a/view/lang/es/strings.php
+++ b/view/lang/es/strings.php
@@ -5,112 +5,82 @@ function string_plural_select_es($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Add New Contact"] = "Añadir nuevo contacto";
-$a->strings["Enter address or web location"] = "Escribe la dirección o página web";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: miguel@ejemplo.com, http://ejemplo.com/miguel";
-$a->strings["Connect"] = "Conectar";
-$a->strings["%d invitation available"] = array(
-	0 => "%d invitación disponible",
-	1 => "%d invitaviones disponibles",
-);
-$a->strings["Find People"] = "Buscar personas";
-$a->strings["Enter name or interest"] = "Introduzce nombre o intereses";
-$a->strings["Connect/Follow"] = "Conectar/Seguir";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: Robert Morgenstein, Pesca";
-$a->strings["Find"] = "Buscar";
-$a->strings["Friend Suggestions"] = "Sugerencias de amigos";
-$a->strings["Similar Interests"] = "Intereses similares";
-$a->strings["Random Profile"] = "Perfil aleatorio";
-$a->strings["Invite Friends"] = "Invitar amigos";
-$a->strings["Networks"] = "Redes";
-$a->strings["All Networks"] = "Todas las redes";
-$a->strings["Saved Folders"] = "Directorios guardados";
-$a->strings["Everything"] = "Todo";
-$a->strings["Categories"] = "Categorías";
-$a->strings["%d contact in common"] = array(
-	0 => "%d contacto en común",
-	1 => "%d contactos en común",
-);
+$a->strings["Delete this item?"] = "¿Eliminar este elemento?";
 $a->strings["show more"] = "ver más";
+$a->strings["show fewer"] = "ver menos";
+$a->strings["Update %s failed. See error logs."] = "Falló la actualización de %s. Mira los registros de errores.";
+$a->strings["Create a New Account"] = "Crear una nueva cuenta";
+$a->strings["Register"] = "Registrarse";
+$a->strings["Logout"] = "Salir";
+$a->strings["Login"] = "Acceder";
+$a->strings["Nickname or Email: "] = "Apodo o Correo electrónico: ";
+$a->strings["Password: "] = "Contraseña: ";
+$a->strings["Remember me"] = "Recordarme";
+$a->strings["Or login using OpenID: "] = "O inicia sesión usando OpenID: ";
+$a->strings["Forgot your password?"] = "¿Olvidaste la contraseña?";
+$a->strings["Password Reset"] = "Restablecer la contraseña";
+$a->strings["Website Terms of Service"] = "Términos de uso del sitio";
+$a->strings["terms of service"] = "Términos de uso";
+$a->strings["Website Privacy Policy"] = "Política de privacidad del sitio";
+$a->strings["privacy policy"] = "Política de privacidad";
+$a->strings["View Profile"] = "Ver perfil";
+$a->strings["Connect/Follow"] = "Conectar/Seguir";
+$a->strings["View Status"] = "Ver estado";
+$a->strings["View Photos"] = "Ver fotos";
+$a->strings["Network Posts"] = "Publicaciones en la red";
+$a->strings["View Contact"] = "Ver contacto";
+$a->strings["Drop Contact"] = "Eliminar contacto";
+$a->strings["Send PM"] = "Enviar mensaje privado";
+$a->strings["Poke"] = "Toque";
+$a->strings["Organisation"] = "Organización";
+$a->strings["News"] = "Noticias";
+$a->strings["Forum"] = "Foro";
 $a->strings["Forums"] = "Foros";
 $a->strings["External link to forum"] = "Enlace externo al foro";
-$a->strings["Male"] = "Hombre";
-$a->strings["Female"] = "Mujer";
-$a->strings["Currently Male"] = "Actualmente Hombre";
-$a->strings["Currently Female"] = "Actualmente Mujer";
-$a->strings["Mostly Male"] = "Mayormente Hombre";
-$a->strings["Mostly Female"] = "Mayormente Mujer";
-$a->strings["Transgender"] = "Transgenérico";
-$a->strings["Intersex"] = "Bisexual";
-$a->strings["Transsexual"] = "Transexual";
-$a->strings["Hermaphrodite"] = "Hermafrodita";
-$a->strings["Neuter"] = "Neutro";
-$a->strings["Non-specific"] = "Sin especificar";
-$a->strings["Other"] = "Otro";
-$a->strings["Undecided"] = array(
-	0 => "Indeciso",
-	1 => "Indeciso",
-);
-$a->strings["Males"] = "Hombres";
-$a->strings["Females"] = "Mujeres";
-$a->strings["Gay"] = "Gay";
-$a->strings["Lesbian"] = "Lesbiana";
-$a->strings["No Preference"] = "Sin preferencias";
-$a->strings["Bisexual"] = "Bisexual";
-$a->strings["Autosexual"] = "Autosexual";
-$a->strings["Abstinent"] = "Célibe";
-$a->strings["Virgin"] = "Virgen";
-$a->strings["Deviant"] = "Desviado";
-$a->strings["Fetish"] = "Fetichista";
-$a->strings["Oodles"] = "Orgiástico";
-$a->strings["Nonsexual"] = "Asexual";
-$a->strings["Single"] = "Soltero";
-$a->strings["Lonely"] = "Solitario";
-$a->strings["Available"] = "Disponible";
-$a->strings["Unavailable"] = "No disponible";
-$a->strings["Has crush"] = "Enamorado";
-$a->strings["Infatuated"] = "Loco/a por alguien";
-$a->strings["Dating"] = "De citas";
-$a->strings["Unfaithful"] = "Infiel";
-$a->strings["Sex Addict"] = "Adicto al sexo";
-$a->strings["Friends"] = "Amigos";
-$a->strings["Friends/Benefits"] = "Amigos con beneficios";
-$a->strings["Casual"] = "Casual";
-$a->strings["Engaged"] = "Comprometido/a";
-$a->strings["Married"] = "Casado/a";
-$a->strings["Imaginarily married"] = "Casado imaginario";
-$a->strings["Partners"] = "Socios";
-$a->strings["Cohabiting"] = "Cohabitando";
-$a->strings["Common law"] = "Pareja de hecho";
-$a->strings["Happy"] = "Feliz";
-$a->strings["Not looking"] = "No busca relación";
-$a->strings["Swinger"] = "Swinger";
-$a->strings["Betrayed"] = "Traicionado/a";
-$a->strings["Separated"] = "Separado/a";
-$a->strings["Unstable"] = "Inestable";
-$a->strings["Divorced"] = "Divorciado/a";
-$a->strings["Imaginarily divorced"] = "Divorciado imaginario";
-$a->strings["Widowed"] = "Viudo/a";
-$a->strings["Uncertain"] = "Incierto";
-$a->strings["It's complicated"] = "Es complicado";
-$a->strings["Don't care"] = "No te importa";
-$a->strings["Ask me"] = "Pregúntame";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "No se puede encontrar información DNS para la base de datos del servidor '%s'";
+$a->strings["System"] = "Sistema";
+$a->strings["Network"] = "Red";
+$a->strings["Personal"] = "Personal";
+$a->strings["Home"] = "Inicio";
+$a->strings["Introductions"] = "Presentaciones";
+$a->strings["%s commented on %s's post"] = "%s comentó la publicación de %s";
+$a->strings["%s created a new post"] = "%s creó una nueva publicación";
+$a->strings["%s liked %s's post"] = "A %s le gusta la publicación de %s";
+$a->strings["%s disliked %s's post"] = "A %s no le gusta la publicación de %s";
+$a->strings["%s is attending %s's event"] = "%s está asistiendo al evento %s's";
+$a->strings["%s is not attending %s's event"] = "%s no está asistiendo al evento %s's";
+$a->strings["%s may attend %s's event"] = "%s podría asistir al evento %s's";
+$a->strings["%s is now friends with %s"] = "%s es ahora es amigo de %s";
+$a->strings["Friend Suggestion"] = "Propuestas de amistad";
+$a->strings["Friend/Connect Request"] = "Solicitud de Amistad/Conexión";
+$a->strings["New Follower"] = "Nuevo seguidor";
+$a->strings["Wall Photos"] = "Foto del Muro";
+$a->strings["Post to Email"] = "Publicar mediante correo electrónico";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Conectores deshabilitados, ya que \"%s\" es habilitado.";
+$a->strings["Hide your profile details from unknown viewers?"] = "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?";
+$a->strings["Visible to everybody"] = "Visible para cualquiera";
+$a->strings["show"] = "mostrar";
+$a->strings["don't show"] = "no mostrar";
+$a->strings["CC: email addresses"] = "CC: dirección de correo electrónico";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com";
+$a->strings["Permissions"] = "Permisos";
+$a->strings["Close"] = "Cerrado";
+$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada.";
+$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada.";
+$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada.";
 $a->strings["Logged out."] = "Sesión finalizada";
 $a->strings["Login failed."] = "Accesso fallido.";
 $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Se ha encontrado un problema para acceder con el OpenID que has escrito. Verifica que lo hayas escrito correctamente.";
 $a->strings["The error message was:"] = "El mensaje del error fue:";
-$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo eliminado con este nombre fue restablecido. Los permisos existentes pueden aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente.";
-$a->strings["Default privacy group for new contacts"] = "Grupo por defecto para nuevos contactos";
-$a->strings["Everybody"] = "Todo el mundo";
-$a->strings["edit"] = "editar";
-$a->strings["Groups"] = "Grupos";
-$a->strings["Edit groups"] = "Editar grupo";
-$a->strings["Edit group"] = "Editar grupo";
-$a->strings["Create a new group"] = "Crear un nuevo grupo";
-$a->strings["Group Name: "] = "Nombre del grupo: ";
-$a->strings["Contacts not in any group"] = "Contactos sin grupo";
-$a->strings["add"] = "añadir";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Starts:"] = "Inicio:";
+$a->strings["Finishes:"] = "Final:";
+$a->strings["Location:"] = "Localización:";
+$a->strings["Image/photo"] = "Imagen/Foto";
+$a->strings["%2\$s %3\$s"] = "%2\$s %3\$s";
+$a->strings["$1 wrote:"] = "$1 escribió:";
+$a->strings["Encrypted content"] = "Contenido cifrado";
+$a->strings["Invalid source protocol"] = "Protocolo de fuente inválido";
+$a->strings["Invalid link protocol"] = "Protocolo de enlace inválido";
 $a->strings["Unknown | Not categorised"] = "Desconocido | No clasificado";
 $a->strings["Block immediately"] = "Bloquear inmediatamente";
 $a->strings["Shady, spammer, self-marketer"] = "Sospechoso, spammer, auto-publicidad";
@@ -138,289 +108,39 @@ $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
 $a->strings["Diaspora Connector"] = "Conector Diaspora";
 $a->strings["GNU Social"] = "GNUsocial (OStatus)";
+$a->strings["pnut"] = "pnut";
 $a->strings["App.net"] = "App.net";
 $a->strings["Hubzilla/Redmatrix"] = "Hubzilla/Redmatrix";
-$a->strings["Post to Email"] = "Publicar mediante correo electrónico";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Conectores deshabilitados, ya que \"%s\" es habilitado.";
-$a->strings["Hide your profile details from unknown viewers?"] = "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?";
-$a->strings["Visible to everybody"] = "Visible para cualquiera";
-$a->strings["show"] = "mostrar";
-$a->strings["don't show"] = "no mostrar";
-$a->strings["CC: email addresses"] = "CC: dirección de correo electrónico";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com";
-$a->strings["Permissions"] = "Permisos";
-$a->strings["Close"] = "Cerrado";
-$a->strings["photo"] = "foto";
-$a->strings["status"] = "estado";
+$a->strings["Add New Contact"] = "Añadir nuevo contacto";
+$a->strings["Enter address or web location"] = "Escribe la dirección o página web";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: miguel@ejemplo.com, http://ejemplo.com/miguel";
+$a->strings["Connect"] = "Conectar";
+$a->strings["%d invitation available"] = array(
+	0 => "%d invitación disponible",
+	1 => "%d invitaviones disponibles",
+);
+$a->strings["Find People"] = "Buscar personas";
+$a->strings["Enter name or interest"] = "Introduzce nombre o intereses";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: Robert Morgenstein, Pesca";
+$a->strings["Find"] = "Buscar";
+$a->strings["Friend Suggestions"] = "Sugerencias de amigos";
+$a->strings["Similar Interests"] = "Intereses similares";
+$a->strings["Random Profile"] = "Perfil aleatorio";
+$a->strings["Invite Friends"] = "Invitar amigos";
+$a->strings["Networks"] = "Redes";
+$a->strings["All Networks"] = "Todas las redes";
+$a->strings["Saved Folders"] = "Directorios guardados";
+$a->strings["Everything"] = "Todo";
+$a->strings["Categories"] = "Categorías";
+$a->strings["%d contact in common"] = array(
+	0 => "%d contacto en común",
+	1 => "%d contactos en común",
+);
 $a->strings["event"] = "evento";
+$a->strings["status"] = "estado";
+$a->strings["photo"] = "foto";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s atenderá %2\$s's %3\$s";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no atenderá %2\$s's %3\$s";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s puede que atienda %2\$s's %3\$s";
-$a->strings["[no subject]"] = "[sin asunto]";
-$a->strings["Wall Photos"] = "Foto del Muro";
-$a->strings["Click here to upgrade."] = "Pulsa aquí para actualizar.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción excede los límites permitidos por tu subscripción.";
-$a->strings["This action is not available under your subscription plan."] = "Esta acción no está permitida para tu subscripción.";
-$a->strings["Error decoding account file"] = "Error decodificando el archivo de cuenta";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Error! No hay datos de versión en el archivo! ¿Es esto de una cuenta friendica? ";
-$a->strings["Error! Cannot check nickname"] = "Error! No puedo consultar el apodo";
-$a->strings["User '%s' already exists on this server!"] = "La cuenta '%s' ya existe en este servidor!";
-$a->strings["User creation error"] = "Error al crear la cuenta";
-$a->strings["User profile creation error"] = "Error de creación del perfil de la cuenta";
-$a->strings["%d contact not imported"] = array(
-	0 => "%d contactos no encontrado",
-	1 => "%d contactos no importado",
-);
-$a->strings["Done. You can now login with your username and password"] = "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña.";
-$a->strings["Miscellaneous"] = "Varios";
-$a->strings["Birthday:"] = "Fecha de nacimiento:";
-$a->strings["Age: "] = "Edad: ";
-$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD o MM-DD";
-$a->strings["never"] = "nunca";
-$a->strings["less than a second ago"] = "hace menos de un segundo";
-$a->strings["year"] = "año";
-$a->strings["years"] = "años";
-$a->strings["month"] = "mes";
-$a->strings["months"] = "meses";
-$a->strings["week"] = "semana";
-$a->strings["weeks"] = "semanas";
-$a->strings["day"] = "día";
-$a->strings["days"] = "días";
-$a->strings["hour"] = "hora";
-$a->strings["hours"] = "horas";
-$a->strings["minute"] = "minuto";
-$a->strings["minutes"] = "minutos";
-$a->strings["second"] = "segundo";
-$a->strings["seconds"] = "segundos";
-$a->strings["%1\$d %2\$s ago"] = "hace %1\$d %2\$s";
-$a->strings["%s's birthday"] = "Cumpleaños de %s";
-$a->strings["Happy Birthday %s"] = "Feliz cumpleaños %s";
-$a->strings["Friendica Notification"] = "Notificación de Friendica";
-$a->strings["Thank You,"] = "Gracias,";
-$a->strings["%s Administrator"] = "%s Administrador";
-$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrador";
-$a->strings["noreply"] = "no responder";
-$a->strings["%s "] = "%s ";
-$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notificación] Nuevo correo recibido de %s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s te ha enviado un mensaje privado desde %2\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s te ha enviado %2\$s.";
-$a->strings["a private message"] = "un mensaje privado";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor, visita %s para ver y/o responder a tus mensajes privados.";
-$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s comentó en [url=%2\$s]a %3\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s comentó en [url=%2\$s] %4\$s de %3\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s comentó en [url=%2\$s] tu %3\$s[/url]";
-$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notificación] Comentario en la conversación de #%1\$d por %2\$s";
-$a->strings["%s commented on an item/conversation you have been following."] = "%s ha comentado en una conversación/elemento que sigues.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Por favor, visita %s para ver y/o responder a la conversación.";
-$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notificación] %s publicó en tu muro";
-$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s publicó en tu perfil de %2\$s";
-$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s publicó en [url=%2\$s]tu muro[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notificación] %s te ha nombrado";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s te ha nombrado en %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]te nombró[/url].";
-$a->strings["[Friendica:Notify] %s shared a new post"] = "[Notificacion Friendica] %s compartio una nueva publicacion";
-$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s compartió un nuevo tema en %2\$s";
-$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]compartió una publicación[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify] %1\$s te dio un toque";
-$a->strings["%1\$s poked you at %2\$s"] = "%1\$s te dio un toque en %2\$s";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]te dio un toque[/url].";
-$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notificación] %s ha etiquetado tu publicación";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha etiquetado tu publicación en %2\$s";
-$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s ha etiquetado [url=%2\$s]tu publicación[/url]";
-$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notificación] Presentación recibida";
-$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Has recibido una presentación de '%1\$s' en %2\$s";
-$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Has recibido [url=%1\$s]una presentación[/url] de %2\$s.";
-$a->strings["You may visit their profile at %s"] = "Puedes visitar su perfil en %s";
-$a->strings["Please visit %s to approve or reject the introduction."] = "Visita %s para aceptar o rechazar la presentación por favor.";
-$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Notificación:Friendica] Un nuevo contacto comparte contigo";
-$a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s comparte con tigo en %2\$s";
-$a->strings["[Friendica:Notify] You have a new follower"] = "[Notificación:Friendica] Tienes un nuevo seguidor";
-$a->strings["You have a new follower at %2\$s : %1\$s"] = "Tienes un nuevo seguidor en %2\$s : %1\$s";
-$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notificación] Sugerencia de amigo recibida";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Has recibido una sugerencia de amigo de '%1\$s' en %2\$s";
-$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Has recibido [url=%1\$s]una sugerencia de amigo[/url] en %2\$s de %3\$s.";
-$a->strings["Name:"] = "Nombre: ";
-$a->strings["Photo:"] = "Foto: ";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s para aceptar o rechazar la sugerencia por favor.";
-$a->strings["[Friendica:Notify] Connection accepted"] = "[Notificación:Friendica] Conexión aceptada";
-$a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' acepto tu consulta de conexión %2\$s";
-$a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s hacepto tu [url=%1\$s]consulta de conexión[/url].";
-$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Ahora tiene amigos en común y puede intercambiar actualizaciones de estado, fotos y email sin restricción.";
-$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Por favor visite %s si desea hacer algún cambio a su relación.";
-$a->strings["'%1\$s' has chosen to accept you a \"fan\", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically."] = "'%1\$s' eligió de aceptarte como fan/hincha lo que restringe algunas formas de comunicación - tales como mensajes privados y algunas interacciones de los perfiles. Si esto es una pagina de celebridad o comunidad, estas configuraciones se adoptaron automáticamente.";
-$a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' puede elegir extender esto en una relación más permisiva o ambidireccional en el futuro.";
-$a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Por favor visita %s si es preciso de hacer algún cambio a la relación con este contacto.";
-$a->strings["[Friendica System:Notify] registration request"] = "[Notificacion:Friendica] consulta de registro";
-$a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Recibiste una consulta de registro de '%1\$s' en %2\$s";
-$a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Recibiste una [url=%1\$s]consulta de registro[/url] from %2\$s.";
-$a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Nombre completo:\t%1\$s\\nUbicación del sitio:\t%2\$s\\nLogin Nombre:\t%3\$s (%4\$s)";
-$a->strings["Please visit %s to approve or reject the request."] = "Por favor visita %s para aprobar o negar la solicitud.";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Starts:"] = "Inicio:";
-$a->strings["Finishes:"] = "Final:";
-$a->strings["Location:"] = "Localización:";
-$a->strings["Sun"] = "Dom";
-$a->strings["Mon"] = "Lun";
-$a->strings["Tue"] = "Mar";
-$a->strings["Wed"] = "Mie";
-$a->strings["Thu"] = "Jue";
-$a->strings["Fri"] = "Vie";
-$a->strings["Sat"] = "Sab";
-$a->strings["Sunday"] = "Domingo";
-$a->strings["Monday"] = "Lunes";
-$a->strings["Tuesday"] = "Martes";
-$a->strings["Wednesday"] = "Miércoles";
-$a->strings["Thursday"] = "Jueves";
-$a->strings["Friday"] = "Viernes";
-$a->strings["Saturday"] = "Sábado";
-$a->strings["Jan"] = "Ene";
-$a->strings["Feb"] = "Feb";
-$a->strings["Mar"] = "Mar";
-$a->strings["Apr"] = "Abr";
-$a->strings["May"] = "Mayo";
-$a->strings["Jun"] = "Jun";
-$a->strings["Jul"] = "Jul";
-$a->strings["Aug"] = "Ago";
-$a->strings["Sept"] = "Sept";
-$a->strings["Oct"] = "Oct";
-$a->strings["Nov"] = "Nov";
-$a->strings["Dec"] = "Dec";
-$a->strings["January"] = "Enero";
-$a->strings["February"] = "Febrero";
-$a->strings["March"] = "Marzo";
-$a->strings["April"] = "Abril";
-$a->strings["June"] = "Junio";
-$a->strings["July"] = "Julio";
-$a->strings["August"] = "Agosto";
-$a->strings["September"] = "Septiembre";
-$a->strings["October"] = "Octubre";
-$a->strings["November"] = "Noviembre";
-$a->strings["December"] = "Diciembre";
-$a->strings["today"] = "hoy";
-$a->strings["all-day"] = "todo el día";
-$a->strings["No events to display"] = "No hay eventos a mostrar";
-$a->strings["l, F j"] = "l, F j";
-$a->strings["Edit event"] = "Editar evento";
-$a->strings["link to source"] = "Enlace al original";
-$a->strings["Export"] = "Exportar";
-$a->strings["Export calendar as ical"] = "Exportar calendario como ical";
-$a->strings["Export calendar as csv"] = "Exportar calendario como csv";
-$a->strings["Nothing new here"] = "Nada nuevo por aquí";
-$a->strings["Clear notifications"] = "Limpiar notificaciones";
-$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, contenido";
-$a->strings["Logout"] = "Salir";
-$a->strings["End this session"] = "Cerrar la sesión";
-$a->strings["Status"] = "Estado";
-$a->strings["Your posts and conversations"] = "Tus publicaciones y conversaciones";
-$a->strings["Profile"] = "Perfil";
-$a->strings["Your profile page"] = "Tu página de perfil";
-$a->strings["Photos"] = "Fotografías";
-$a->strings["Your photos"] = "Tus fotos";
-$a->strings["Videos"] = "Videos";
-$a->strings["Your videos"] = "Tus videos";
-$a->strings["Events"] = "Eventos";
-$a->strings["Your events"] = "Tus eventos";
-$a->strings["Personal notes"] = "Notas personales";
-$a->strings["Your personal notes"] = "Tus notas personales";
-$a->strings["Login"] = "Acceder";
-$a->strings["Sign in"] = "Date de alta";
-$a->strings["Home"] = "Inicio";
-$a->strings["Home Page"] = "Página de inicio";
-$a->strings["Register"] = "Registrarse";
-$a->strings["Create an account"] = "Crea una cuenta";
-$a->strings["Help"] = "Ayuda";
-$a->strings["Help and documentation"] = "Ayuda y documentación";
-$a->strings["Apps"] = "Aplicaciones";
-$a->strings["Addon applications, utilities, games"] = "Aplicaciones, utilidades, juegos";
-$a->strings["Search"] = "Buscar";
-$a->strings["Search site content"] = " Busca contenido en la página";
-$a->strings["Full Text"] = "Texto completo";
-$a->strings["Tags"] = "Tags";
-$a->strings["Contacts"] = "Contactos";
-$a->strings["Community"] = "Comunidad";
-$a->strings["Conversations on this site"] = "Conversaciones en este sitio";
-$a->strings["Conversations on the network"] = "Conversaciones en la red";
-$a->strings["Events and Calendar"] = "Eventos y Calendario";
-$a->strings["Directory"] = "Directorio";
-$a->strings["People directory"] = "Directorio de usuarios";
-$a->strings["Information"] = "Información";
-$a->strings["Information about this friendica instance"] = "Información sobre esta instancia de friendica";
-$a->strings["Network"] = "Red";
-$a->strings["Conversations from your friends"] = "Conversaciones de tus amigos";
-$a->strings["Network Reset"] = "Reseteo de la red";
-$a->strings["Load Network page with no filters"] = "Cargar pagina de redes sin filtros";
-$a->strings["Introductions"] = "Presentaciones";
-$a->strings["Friend Requests"] = "Solicitudes de amistad";
-$a->strings["Notifications"] = "Notificaciones";
-$a->strings["See all notifications"] = "Ver todas las notificaciones";
-$a->strings["Mark as seen"] = "Marcar como leído";
-$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
-$a->strings["Messages"] = "Mensajes";
-$a->strings["Private mail"] = "Correo privado";
-$a->strings["Inbox"] = "Entrada";
-$a->strings["Outbox"] = "Enviados";
-$a->strings["New Message"] = "Nuevo mensaje";
-$a->strings["Manage"] = "Administrar";
-$a->strings["Manage other pages"] = "Administrar otras páginas";
-$a->strings["Delegations"] = "Delegaciones";
-$a->strings["Delegate Page Management"] = "Delegar la administración de la página";
-$a->strings["Settings"] = "Configuración";
-$a->strings["Account settings"] = "Configuración de tu cuenta";
-$a->strings["Profiles"] = "Perfiles";
-$a->strings["Manage/Edit Profiles"] = "Manejar/editar Perfiles";
-$a->strings["Manage/edit friends and contacts"] = "Administrar/editar amigos y contactos";
-$a->strings["Admin"] = "Admin";
-$a->strings["Site setup and configuration"] = "Opciones y configuración del sitio";
-$a->strings["Navigation"] = "Navegación";
-$a->strings["Site map"] = "Mapa del sitio";
-$a->strings["Contact Photos"] = "Foto del contacto";
-$a->strings["Welcome "] = "Bienvenido ";
-$a->strings["Please upload a profile photo."] = "Por favor sube una foto para tu perfil.";
-$a->strings["Welcome back "] = "Bienvenido de nuevo ";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo.";
-$a->strings["System"] = "Sistema";
-$a->strings["Personal"] = "Personal";
-$a->strings["%s commented on %s's post"] = "%s comentó la publicación de %s";
-$a->strings["%s created a new post"] = "%s creó una nueva publicación";
-$a->strings["%s liked %s's post"] = "A %s le gusta la publicación de %s";
-$a->strings["%s disliked %s's post"] = "A %s no le gusta la publicación de %s";
-$a->strings["%s is attending %s's event"] = "%s está asistiendo al evento %s's";
-$a->strings["%s is not attending %s's event"] = "%s no está asistiendo al evento %s's";
-$a->strings["%s may attend %s's event"] = "%s podría asistir al evento %s's";
-$a->strings["%s is now friends with %s"] = "%s es ahora es amigo de %s";
-$a->strings["Friend Suggestion"] = "Propuestas de amistad";
-$a->strings["Friend/Connect Request"] = "Solicitud de Amistad/Conexión";
-$a->strings["New Follower"] = "Nuevo seguidor";
-$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tLos desarolladores de friendica publicaron una actualización  %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido.";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "El mensaje de error es\n[pre]%s[/pre]";
-$a->strings["Errors encountered creating database tables."] = "Se han encontrados errores creando las tablas de la base de datos.";
-$a->strings["Errors encountered performing database changes."] = "Errores encontrados al ejecutar cambios en la base de datos.";
-$a->strings["(no subject)"] = "(sin asunto)";
-$a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*";
-$a->strings["Attachments:"] = "Archivos adjuntos:";
-$a->strings["view full size"] = "Ver a tamaño completo";
-$a->strings["View Profile"] = "Ver perfil";
-$a->strings["View Status"] = "Ver estado";
-$a->strings["View Photos"] = "Ver fotos";
-$a->strings["Network Posts"] = "Publicaciones en la red";
-$a->strings["View Contact"] = "Ver contacto";
-$a->strings["Drop Contact"] = "Eliminar contacto";
-$a->strings["Send PM"] = "Enviar mensaje privado";
-$a->strings["Poke"] = "Toque";
-$a->strings["Organisation"] = "Organización";
-$a->strings["News"] = "Noticias";
-$a->strings["Forum"] = "Foro";
-$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada.";
-$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada.";
-$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada.";
-$a->strings["Image/photo"] = "Imagen/Foto";
-$a->strings["%2\$s %3\$s"] = "%2\$s %3\$s";
-$a->strings["$1 wrote:"] = "$1 escribió:";
-$a->strings["Encrypted content"] = "Contenido cifrado";
-$a->strings["Invalid source protocol"] = "Protocolo de fuente inválido";
-$a->strings["Invalid link protocol"] = "Protocolo de enlace inválido";
 $a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s atenderá %2\$s's %3\$s";
 $a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s no atenderá %2\$s's %3\$s";
 $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s atenderá quizás %2\$s's %3\$s";
@@ -514,7 +234,148 @@ $a->strings["Not Attending"] = array(
 	0 => "No atendiendo",
 	1 => "No atendiendo",
 );
+$a->strings["Undecided"] = array(
+	0 => "Indeciso",
+	1 => "Indeciso",
+);
+$a->strings["Miscellaneous"] = "Varios";
+$a->strings["Birthday:"] = "Fecha de nacimiento:";
+$a->strings["Age: "] = "Edad: ";
+$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD o MM-DD";
+$a->strings["never"] = "nunca";
+$a->strings["less than a second ago"] = "hace menos de un segundo";
+$a->strings["year"] = "año";
+$a->strings["years"] = "años";
+$a->strings["month"] = "mes";
+$a->strings["months"] = "meses";
+$a->strings["week"] = "semana";
+$a->strings["weeks"] = "semanas";
+$a->strings["day"] = "día";
+$a->strings["days"] = "días";
+$a->strings["hour"] = "hora";
+$a->strings["hours"] = "horas";
+$a->strings["minute"] = "minuto";
+$a->strings["minutes"] = "minutos";
+$a->strings["second"] = "segundo";
+$a->strings["seconds"] = "segundos";
+$a->strings["%1\$d %2\$s ago"] = "hace %1\$d %2\$s";
+$a->strings["%s's birthday"] = "Cumpleaños de %s";
+$a->strings["Happy Birthday %s"] = "Feliz cumpleaños %s";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "No se puede encontrar información DNS para la base de datos del servidor '%s'";
+$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tLos desarolladores de friendica publicaron una actualización  %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido.";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "El mensaje de error es\n[pre]%s[/pre]";
+$a->strings["Errors encountered creating database tables."] = "Se han encontrados errores creando las tablas de la base de datos.";
+$a->strings["Errors encountered performing database changes."] = "Errores encontrados al ejecutar cambios en la base de datos.";
+$a->strings["(no subject)"] = "(sin asunto)";
+$a->strings["noreply"] = "no responder";
 $a->strings["%s\\'s birthday"] = "%s\\'s cumpleaños";
+$a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*";
+$a->strings["Attachments:"] = "Archivos adjuntos:";
+$a->strings["Friendica Notification"] = "Notificación de Friendica";
+$a->strings["Thank You,"] = "Gracias,";
+$a->strings["%s Administrator"] = "%s Administrador";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrador";
+$a->strings["%s "] = "%s ";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notificación] Nuevo correo recibido de %s";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s te ha enviado un mensaje privado desde %2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s te ha enviado %2\$s.";
+$a->strings["a private message"] = "un mensaje privado";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor, visita %s para ver y/o responder a tus mensajes privados.";
+$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s comentó en [url=%2\$s]a %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s comentó en [url=%2\$s] %4\$s de %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s comentó en [url=%2\$s] tu %3\$s[/url]";
+$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notificación] Comentario en la conversación de #%1\$d por %2\$s";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s ha comentado en una conversación/elemento que sigues.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Por favor, visita %s para ver y/o responder a la conversación.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notificación] %s publicó en tu muro";
+$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s publicó en tu perfil de %2\$s";
+$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s publicó en [url=%2\$s]tu muro[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notificación] %s te ha nombrado";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s te ha nombrado en %2\$s";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]te nombró[/url].";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "[Notificacion Friendica] %s compartio una nueva publicacion";
+$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s compartió un nuevo tema en %2\$s";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]compartió una publicación[/url].";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify] %1\$s te dio un toque";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s te dio un toque en %2\$s";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]te dio un toque[/url].";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notificación] %s ha etiquetado tu publicación";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha etiquetado tu publicación en %2\$s";
+$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s ha etiquetado [url=%2\$s]tu publicación[/url]";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notificación] Presentación recibida";
+$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Has recibido una presentación de '%1\$s' en %2\$s";
+$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Has recibido [url=%1\$s]una presentación[/url] de %2\$s.";
+$a->strings["You may visit their profile at %s"] = "Puedes visitar su perfil en %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Visita %s para aceptar o rechazar la presentación por favor.";
+$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Notificación:Friendica] Un nuevo contacto comparte contigo";
+$a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s comparte con tigo en %2\$s";
+$a->strings["[Friendica:Notify] You have a new follower"] = "[Notificación:Friendica] Tienes un nuevo seguidor";
+$a->strings["You have a new follower at %2\$s : %1\$s"] = "Tienes un nuevo seguidor en %2\$s : %1\$s";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notificación] Sugerencia de amigo recibida";
+$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Has recibido una sugerencia de amigo de '%1\$s' en %2\$s";
+$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Has recibido [url=%1\$s]una sugerencia de amigo[/url] en %2\$s de %3\$s.";
+$a->strings["Name:"] = "Nombre: ";
+$a->strings["Photo:"] = "Foto: ";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s para aceptar o rechazar la sugerencia por favor.";
+$a->strings["[Friendica:Notify] Connection accepted"] = "[Notificación:Friendica] Conexión aceptada";
+$a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' acepto tu consulta de conexión %2\$s";
+$a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s hacepto tu [url=%1\$s]consulta de conexión[/url].";
+$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Ahora tiene amigos en común y puede intercambiar actualizaciones de estado, fotos y email sin restricción.";
+$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Por favor visite %s si desea hacer algún cambio a su relación.";
+$a->strings["'%1\$s' has chosen to accept you a \"fan\", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically."] = "'%1\$s' eligió de aceptarte como fan/hincha lo que restringe algunas formas de comunicación - tales como mensajes privados y algunas interacciones de los perfiles. Si esto es una pagina de celebridad o comunidad, estas configuraciones se adoptaron automáticamente.";
+$a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' puede elegir extender esto en una relación más permisiva o ambidireccional en el futuro.";
+$a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Por favor visita %s si es preciso de hacer algún cambio a la relación con este contacto.";
+$a->strings["[Friendica System:Notify] registration request"] = "[Notificacion:Friendica] consulta de registro";
+$a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Recibiste una consulta de registro de '%1\$s' en %2\$s";
+$a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Recibiste una [url=%1\$s]consulta de registro[/url] from %2\$s.";
+$a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Nombre completo:\t%1\$s\\nUbicación del sitio:\t%2\$s\\nLogin Nombre:\t%3\$s (%4\$s)";
+$a->strings["Please visit %s to approve or reject the request."] = "Por favor visita %s para aprobar o negar la solicitud.";
+$a->strings["Sun"] = "Dom";
+$a->strings["Mon"] = "Lun";
+$a->strings["Tue"] = "Mar";
+$a->strings["Wed"] = "Mie";
+$a->strings["Thu"] = "Jue";
+$a->strings["Fri"] = "Vie";
+$a->strings["Sat"] = "Sab";
+$a->strings["Sunday"] = "Domingo";
+$a->strings["Monday"] = "Lunes";
+$a->strings["Tuesday"] = "Martes";
+$a->strings["Wednesday"] = "Miércoles";
+$a->strings["Thursday"] = "Jueves";
+$a->strings["Friday"] = "Viernes";
+$a->strings["Saturday"] = "Sábado";
+$a->strings["Jan"] = "Ene";
+$a->strings["Feb"] = "Feb";
+$a->strings["Mar"] = "Mar";
+$a->strings["Apr"] = "Abr";
+$a->strings["May"] = "Mayo";
+$a->strings["Jun"] = "Jun";
+$a->strings["Jul"] = "Jul";
+$a->strings["Aug"] = "Ago";
+$a->strings["Sept"] = "Sept";
+$a->strings["Oct"] = "Oct";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Dec";
+$a->strings["January"] = "Enero";
+$a->strings["February"] = "Febrero";
+$a->strings["March"] = "Marzo";
+$a->strings["April"] = "Abril";
+$a->strings["June"] = "Junio";
+$a->strings["July"] = "Julio";
+$a->strings["August"] = "Agosto";
+$a->strings["September"] = "Septiembre";
+$a->strings["October"] = "Octubre";
+$a->strings["November"] = "Noviembre";
+$a->strings["December"] = "Diciembre";
+$a->strings["today"] = "hoy";
+$a->strings["all-day"] = "todo el día";
+$a->strings["No events to display"] = "No hay eventos a mostrar";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Editar evento";
+$a->strings["link to source"] = "Enlace al original";
+$a->strings["Export"] = "Exportar";
+$a->strings["Export calendar as ical"] = "Exportar calendario como ical";
+$a->strings["Export calendar as csv"] = "Exportar calendario como csv";
 $a->strings["General Features"] = "Opciones generales";
 $a->strings["Multiple Profiles"] = "Perfiles multiples";
 $a->strings["Ability to create multiple profiles"] = "Capacidad de crear perfiles multiples. Cada pagina/perfil/usuario puede tener diferentes perfiles/apariencias. Las mismas pueden ser visibles para determinados contactos seleccionados dentro de la red friendica.";
@@ -523,8 +384,6 @@ $a->strings["Photo metadata is normally stripped. This extracts the location (if
 $a->strings["Export Public Calendar"] = "Exportar Calendario Público";
 $a->strings["Ability for visitors to download the public calendar"] = "Posibilidad de los visitantes de descargar el calendario público";
 $a->strings["Post Composition Features"] = "Opciones de edición de publicaciones.";
-$a->strings["Richtext Editor"] = "Editor de texto sofisticado (richt text editor)";
-$a->strings["Enable richtext editor"] = "Habilitar editor de textos sofisticado";
 $a->strings["Post Preview"] = "Previsualizar publicaciones";
 $a->strings["Allow previewing posts and comments before publishing them"] = "Permitir la previsualización de publicaciones antes de publicar las mismas.";
 $a->strings["Auto-mention Forums"] = "Auto-mencionar foros";
@@ -577,10 +436,22 @@ $a->strings["Use mailto: in front of address to force email check."] = "Escribe
 $a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio.";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas.";
 $a->strings["Unable to retrieve contact information."] = "No ha sido posible recibir la información del contacto.";
+$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo eliminado con este nombre fue restablecido. Los permisos existentes pueden aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente.";
+$a->strings["Default privacy group for new contacts"] = "Grupo por defecto para nuevos contactos";
+$a->strings["Everybody"] = "Todo el mundo";
+$a->strings["edit"] = "editar";
+$a->strings["Groups"] = "Grupos";
+$a->strings["Edit groups"] = "Editar grupo";
+$a->strings["Edit group"] = "Editar grupo";
+$a->strings["Create a new group"] = "Crear un nuevo grupo";
+$a->strings["Group Name: "] = "Nombre del grupo: ";
+$a->strings["Contacts not in any group"] = "Contactos sin grupo";
+$a->strings["add"] = "añadir";
 $a->strings["Requested account is not available."] = "La cuenta solicitada no está disponible.";
 $a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
 $a->strings["Edit profile"] = "Editar perfil";
 $a->strings["Atom feed"] = "Atom feed";
+$a->strings["Profiles"] = "Perfiles";
 $a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
 $a->strings["Change profile photo"] = "Cambiar foto del perfil";
 $a->strings["Create New Profile"] = "Crear nuevo perfil";
@@ -601,6 +472,7 @@ $a->strings["Birthdays this week:"] = "Cumpleaños esta semana:";
 $a->strings["[No description]"] = "[Sin descripción]";
 $a->strings["Event Reminders"] = "Recordatorios de eventos";
 $a->strings["Events this week:"] = "Eventos de esta semana:";
+$a->strings["Profile"] = "Perfil";
 $a->strings["Full Name:"] = "Nombre completo:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@@ -625,29 +497,159 @@ $a->strings["School/education:"] = "Escuela/estudios:";
 $a->strings["Forums:"] = "Foros:";
 $a->strings["Basic"] = "Basic";
 $a->strings["Advanced"] = "Avanzado";
+$a->strings["Status"] = "Estado";
 $a->strings["Status Messages and Posts"] = "Mensajes de Estado y Publicaciones";
 $a->strings["Profile Details"] = "Detalles del Perfil";
+$a->strings["Photos"] = "Fotografías";
 $a->strings["Photo Albums"] = "Álbum de Fotos";
+$a->strings["Videos"] = "Videos";
+$a->strings["Events"] = "Eventos";
+$a->strings["Events and Calendar"] = "Eventos y Calendario";
 $a->strings["Personal Notes"] = "Notas personales";
 $a->strings["Only You Can See This"] = "Únicamente tú puedes ver esto";
+$a->strings["Contacts"] = "Contactos";
 $a->strings["[Name Withheld]"] = "[Nombre oculto]";
 $a->strings["Item not found."] = "Elemento no encontrado.";
 $a->strings["Do you really want to delete this item?"] = "¿Realmente quieres borrar este objeto?";
 $a->strings["Yes"] = "Sí";
 $a->strings["Permission denied."] = "Permiso denegado.";
 $a->strings["Archives"] = "Archivos";
+$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s atenderá %2\$s's %3\$s";
+$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no atenderá %2\$s's %3\$s";
+$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s puede que atienda %2\$s's %3\$s";
+$a->strings["[no subject]"] = "[sin asunto]";
+$a->strings["Nothing new here"] = "Nada nuevo por aquí";
+$a->strings["Clear notifications"] = "Limpiar notificaciones";
+$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, contenido";
+$a->strings["End this session"] = "Cerrar la sesión";
+$a->strings["Your posts and conversations"] = "Tus publicaciones y conversaciones";
+$a->strings["Your profile page"] = "Tu página de perfil";
+$a->strings["Your photos"] = "Tus fotos";
+$a->strings["Your videos"] = "Tus videos";
+$a->strings["Your events"] = "Tus eventos";
+$a->strings["Personal notes"] = "Notas personales";
+$a->strings["Your personal notes"] = "Tus notas personales";
+$a->strings["Sign in"] = "Date de alta";
+$a->strings["Home Page"] = "Página de inicio";
+$a->strings["Create an account"] = "Crea una cuenta";
+$a->strings["Help"] = "Ayuda";
+$a->strings["Help and documentation"] = "Ayuda y documentación";
+$a->strings["Apps"] = "Aplicaciones";
+$a->strings["Addon applications, utilities, games"] = "Aplicaciones, utilidades, juegos";
+$a->strings["Search"] = "Buscar";
+$a->strings["Search site content"] = " Busca contenido en la página";
+$a->strings["Full Text"] = "Texto completo";
+$a->strings["Tags"] = "Tags";
+$a->strings["Community"] = "Comunidad";
+$a->strings["Conversations on this site"] = "Conversaciones en este sitio";
+$a->strings["Conversations on the network"] = "Conversaciones en la red";
+$a->strings["Directory"] = "Directorio";
+$a->strings["People directory"] = "Directorio de usuarios";
+$a->strings["Information"] = "Información";
+$a->strings["Information about this friendica instance"] = "Información sobre esta instancia de friendica";
+$a->strings["Conversations from your friends"] = "Conversaciones de tus amigos";
+$a->strings["Network Reset"] = "Reseteo de la red";
+$a->strings["Load Network page with no filters"] = "Cargar pagina de redes sin filtros";
+$a->strings["Friend Requests"] = "Solicitudes de amistad";
+$a->strings["Notifications"] = "Notificaciones";
+$a->strings["See all notifications"] = "Ver todas las notificaciones";
+$a->strings["Mark as seen"] = "Marcar como leído";
+$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
+$a->strings["Messages"] = "Mensajes";
+$a->strings["Private mail"] = "Correo privado";
+$a->strings["Inbox"] = "Entrada";
+$a->strings["Outbox"] = "Enviados";
+$a->strings["New Message"] = "Nuevo mensaje";
+$a->strings["Manage"] = "Administrar";
+$a->strings["Manage other pages"] = "Administrar otras páginas";
+$a->strings["Delegations"] = "Delegaciones";
+$a->strings["Delegate Page Management"] = "Delegar la administración de la página";
+$a->strings["Settings"] = "Configuración";
+$a->strings["Account settings"] = "Configuración de tu cuenta";
+$a->strings["Manage/Edit Profiles"] = "Manejar/editar Perfiles";
+$a->strings["Manage/edit friends and contacts"] = "Administrar/editar amigos y contactos";
+$a->strings["Admin"] = "Admin";
+$a->strings["Site setup and configuration"] = "Opciones y configuración del sitio";
+$a->strings["Navigation"] = "Navegación";
+$a->strings["Site map"] = "Mapa del sitio";
+$a->strings["view full size"] = "Ver a tamaño completo";
 $a->strings["Embedded content"] = "Contenido integrado";
 $a->strings["Embedding disabled"] = "Contenido incrustrado desabilitado";
 $a->strings["%s is now following %s."] = "%s sigue ahora a %s.";
 $a->strings["following"] = "siguiendo";
 $a->strings["%s stopped following %s."] = "%s dejó de seguir a %s.";
 $a->strings["stopped following"] = "dejó de seguir";
+$a->strings["Contact Photos"] = "Foto del contacto";
+$a->strings["Click here to upgrade."] = "Pulsa aquí para actualizar.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción excede los límites permitidos por tu subscripción.";
+$a->strings["This action is not available under your subscription plan."] = "Esta acción no está permitida para tu subscripción.";
+$a->strings["Male"] = "Hombre";
+$a->strings["Female"] = "Mujer";
+$a->strings["Currently Male"] = "Actualmente Hombre";
+$a->strings["Currently Female"] = "Actualmente Mujer";
+$a->strings["Mostly Male"] = "Mayormente Hombre";
+$a->strings["Mostly Female"] = "Mayormente Mujer";
+$a->strings["Transgender"] = "Transgenérico";
+$a->strings["Intersex"] = "Bisexual";
+$a->strings["Transsexual"] = "Transexual";
+$a->strings["Hermaphrodite"] = "Hermafrodita";
+$a->strings["Neuter"] = "Neutro";
+$a->strings["Non-specific"] = "Sin especificar";
+$a->strings["Other"] = "Otro";
+$a->strings["Males"] = "Hombres";
+$a->strings["Females"] = "Mujeres";
+$a->strings["Gay"] = "Gay";
+$a->strings["Lesbian"] = "Lesbiana";
+$a->strings["No Preference"] = "Sin preferencias";
+$a->strings["Bisexual"] = "Bisexual";
+$a->strings["Autosexual"] = "Autosexual";
+$a->strings["Abstinent"] = "Célibe";
+$a->strings["Virgin"] = "Virgen";
+$a->strings["Deviant"] = "Desviado";
+$a->strings["Fetish"] = "Fetichista";
+$a->strings["Oodles"] = "Orgiástico";
+$a->strings["Nonsexual"] = "Asexual";
+$a->strings["Single"] = "Soltero";
+$a->strings["Lonely"] = "Solitario";
+$a->strings["Available"] = "Disponible";
+$a->strings["Unavailable"] = "No disponible";
+$a->strings["Has crush"] = "Enamorado";
+$a->strings["Infatuated"] = "Loco/a por alguien";
+$a->strings["Dating"] = "De citas";
+$a->strings["Unfaithful"] = "Infiel";
+$a->strings["Sex Addict"] = "Adicto al sexo";
+$a->strings["Friends"] = "Amigos";
+$a->strings["Friends/Benefits"] = "Amigos con beneficios";
+$a->strings["Casual"] = "Casual";
+$a->strings["Engaged"] = "Comprometido/a";
+$a->strings["Married"] = "Casado/a";
+$a->strings["Imaginarily married"] = "Casado imaginario";
+$a->strings["Partners"] = "Socios";
+$a->strings["Cohabiting"] = "Cohabitando";
+$a->strings["Common law"] = "Pareja de hecho";
+$a->strings["Happy"] = "Feliz";
+$a->strings["Not looking"] = "No busca relación";
+$a->strings["Swinger"] = "Swinger";
+$a->strings["Betrayed"] = "Traicionado/a";
+$a->strings["Separated"] = "Separado/a";
+$a->strings["Unstable"] = "Inestable";
+$a->strings["Divorced"] = "Divorciado/a";
+$a->strings["Imaginarily divorced"] = "Divorciado imaginario";
+$a->strings["Widowed"] = "Viudo/a";
+$a->strings["Uncertain"] = "Incierto";
+$a->strings["It's complicated"] = "Es complicado";
+$a->strings["Don't care"] = "No te importa";
+$a->strings["Ask me"] = "Pregúntame";
+$a->strings["Welcome "] = "Bienvenido ";
+$a->strings["Please upload a profile photo."] = "Por favor sube una foto para tu perfil.";
+$a->strings["Welcome back "] = "Bienvenido de nuevo ";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo.";
 $a->strings["newer"] = "más nuevo";
 $a->strings["older"] = "más antiguo";
-$a->strings["prev"] = "ant.";
 $a->strings["first"] = "primera";
-$a->strings["last"] = "última";
+$a->strings["prev"] = "ant.";
 $a->strings["next"] = "sig.";
+$a->strings["last"] = "última";
 $a->strings["Loading more entries..."] = "Cargar mas entradas ..";
 $a->strings["The end"] = "El fin";
 $a->strings["No contacts"] = "Sin contactos";
@@ -701,6 +703,17 @@ $a->strings["comment"] = array(
 );
 $a->strings["post"] = "Publicación";
 $a->strings["Item filed"] = "Elemento archivado";
+$a->strings["Error decoding account file"] = "Error decodificando el archivo de cuenta";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Error! No hay datos de versión en el archivo! ¿Es esto de una cuenta friendica? ";
+$a->strings["Error! Cannot check nickname"] = "Error! No puedo consultar el apodo";
+$a->strings["User '%s' already exists on this server!"] = "La cuenta '%s' ya existe en este servidor!";
+$a->strings["User creation error"] = "Error al crear la cuenta";
+$a->strings["User profile creation error"] = "Error de creación del perfil de la cuenta";
+$a->strings["%d contact not imported"] = array(
+	0 => "%d contactos no encontrado",
+	1 => "%d contactos no importado",
+);
+$a->strings["Done. You can now login with your username and password"] = "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña.";
 $a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no ha sido modificada.";
 $a->strings["An invitation is required."] = "Se necesita invitación.";
 $a->strings["Invitation could not be verified."] = "No se puede verificar la invitación.";
@@ -725,196 +738,315 @@ $a->strings["Registration at %s"] = "Registro en %s";
 $a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tEstimado %1\$s,\n\t\t\tGracias por registrar en %2\$s. Su cuenta ha sido creada.\n\t";
 $a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3\$s\n\t\t\tNombre de la cuenta:\t\t%1\$s\n\t\t\tContraseña:\t\t%5\$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %2\$s.";
 $a->strings["Registration details for %s"] = "Detalles de registro para %s";
-$a->strings["Post successful."] = "¡Publicado!";
-$a->strings["Access denied."] = "Acceso denegado.";
-$a->strings["Welcome to %s"] = "Bienvenido a %s";
-$a->strings["No more system notifications."] = "No hay más notificaciones del sistema.";
-$a->strings["System Notifications"] = "Notificaciones del sistema";
-$a->strings["Remove term"] = "Eliminar término";
-$a->strings["Public access denied."] = "Acceso público denegado.";
-$a->strings["Only logged in users are permitted to perform a search."] = "Solo usuarios activos tienen permiso para ejecutar búsquedas.";
-$a->strings["Too Many Requests"] = "Demasiadas consultas";
-$a->strings["Only one search per minute is permitted for not logged in users."] = "Se permite solo una búsqueda por minuto para usuarios no identificados.";
-$a->strings["No results."] = "Sin resultados.";
-$a->strings["Items tagged with: %s"] = "Objetos taggeado con: %s";
-$a->strings["Results for: %s"] = "Resultados para: %s";
-$a->strings["This is Friendica, version"] = "Esto es Friendica, versión";
-$a->strings["running at web location"] = "ejecutándose en la dirección web";
-$a->strings["Please visit Friendica.com to learn more about the Friendica project."] = "Por favor, visita Friendica.com para saber más sobre el proyecto Friendica.";
-$a->strings["Bug reports and issues: please visit"] = "Reporte de fallos y problemas: por favor visita";
-$a->strings["the bugtracker at github"] = "aviso de fallas (bugs) en github";
-$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Sugerencias, elogios, donaciones, etc. por favor manda un correo a Info arroba Friendica punto com";
-$a->strings["Installed plugins/addons/apps:"] = "Módulos/extensiones/aplicaciones instalados:";
-$a->strings["No installed plugins/addons/apps"] = "Módulos/extensiones/aplicaciones no instalados";
-$a->strings["No valid account found."] = "No se ha encontrado ninguna cuenta válida";
-$a->strings["Password reset request issued. Check your email."] = "Solicitud de restablecimiento de contraseña enviada. Revisa tu correo.";
-$a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s\" to reset your account\n\t\tpassword. In order to confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided and ignore and/or delete this email.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "\n\t\tEstimado %1\$s,\n\t\t\tUna consulta llego recientemente a \"%2\$s\" para renovar su\n\t\tcontraseña. Para confirmar esta solicitud por favor seleccione el enlace de verificación mas \n\t\tabajo o copie a pegue el mismo en la barra de dirección de su navegador.\n\n\t\tSi NO ha solicitado este cambio por favor NO SIGA este enlace\n\t\tproporcionado y ignore o borre este mail.\n\n\t\tSu contraseña no sera cambiada hasta que podamos verificar que usted haza\n\t\tsolicitado este cambio..";
-$a->strings["\n\t\tFollow this link to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\n\t\tSiga este enlace para verificar su identidad:\n\n\t\t%1\$s\n\n\t\tA continuación recibirá un mensaje consecutivo conteniendo la nueva contraseña.\n\t\tPodrá cambiar la contraseña después de haber accedido a la cuenta.\n\n\t\tLos detalles del acceso son las siguientes:\n\n\t\tDirección del sitio:\t%2\$s\n\t\tNombre de la cuenta:\t%3\$s";
-$a->strings["Password reset requested at %s"] = "Contraseña restablecida enviada a %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña.";
-$a->strings["Password Reset"] = "Restablecer la contraseña";
-$a->strings["Your password has been reset as requested."] = "Tu contraseña ha sido restablecida como solicitaste.";
-$a->strings["Your new password is"] = "Tu nueva contraseña es";
-$a->strings["Save or copy your new password - and then"] = "Guarda o copia tu nueva contraseña y luego";
-$a->strings["click here to login"] = "pulsa aquí para acceder";
-$a->strings["Your password may be changed from the Settings page after successful login."] = "Puedes cambiar tu contraseña desde la página de Configuración después de acceder con éxito.";
-$a->strings["\n\t\t\t\tDear %1\$s,\n\t\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\t\tinformation for your records (or change your password immediately to\n\t\t\t\tsomething that you will remember).\n\t\t\t"] = "\n\t\t\t\tEstimado %1\$s,\n\t\t\t\t\tSu contraseña ha cambiado como solicitado. Por favor guarde esta\n\t\t\t\tinformación para sus documentación (o cambie su contraseña inmediatamente a\n\t\t\t\talgo que pueda recordar).\n\t\t";
-$a->strings["\n\t\t\t\tYour login details are as follows:\n\n\t\t\t\tSite Location:\t%1\$s\n\t\t\t\tLogin Name:\t%2\$s\n\t\t\t\tPassword:\t%3\$s\n\n\t\t\t\tYou may change that password from your account settings page after logging in.\n\t\t\t"] = "\n\t\t\t\tSus datos de acceso son las siguientes:\n\n\t\t\t\tDirección del sitio:\t%1\$s\n\t\t\t\tNombre de cuenta:\t%2\$s\n\t\t\t\tContraseña:\t%3\$s\n\n\t\t\t\tPodrá cambiar esta contraseña después de ingresar al sitio en su pagina de configuración.\n\t\t\t";
-$a->strings["Your password has been changed at %s"] = "Tu contraseña se ha cambiado por %s";
-$a->strings["Forgot your Password?"] = "¿Olvidaste tu contraseña?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduce tu correo para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales.";
-$a->strings["Nickname or Email: "] = "Apodo o Correo electrónico: ";
-$a->strings["Reset"] = "Restablecer";
-$a->strings["No profile"] = "Nigún perfil";
-$a->strings["Help:"] = "Ayuda:";
+$a->strings["You must be logged in to use addons. "] = "Tienes que estar registrado para tener acceso a los accesorios.";
 $a->strings["Not Found"] = "No se ha encontrado";
 $a->strings["Page not found."] = "Página no encontrada.";
-$a->strings["Remote privacy information not available."] = "Privacidad de la información remota no disponible.";
-$a->strings["Visible to:"] = "Visible para:";
-$a->strings["OpenID protocol error. No ID returned."] = "Error de protocolo OpenID. ID no devuelta.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Cuenta no encontrada y el registro OpenID no está permitido en ese sitio.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor.";
-$a->strings["Import"] = "Importar";
-$a->strings["Move account"] = "Mover cuenta";
-$a->strings["You can import an account from another Friendica server."] = "Puedes importar una cuenta desde otro servidor de Friendica.";
-$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Necesitas exportar tu cuenta del antiguo servidor y subirla aquí. Volveremos a crear tu antigua cuenta con todos tus contactos aquí. También intentaremos de informar a tus amigos de que te has mudado.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Esta característica es experimental. No podemos importar contactos desde la red OStatus (statusnet/identi.ca) o desde Diaspora*";
-$a->strings["Account file"] = "Archivo de la cuenta";
-$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Para exportar el perfil vaya a \"Configuracion -> Exportar sus datos personales\" y seleccione \"Exportar cuenta\"";
-$a->strings["Visit %s's profile [%s]"] = "Ver el perfil de %s [%s]";
-$a->strings["Edit contact"] = "Modificar contacto";
-$a->strings["Contacts who are not members of a group"] = "Contactos sin grupo";
-$a->strings["Export account"] = "Exportar cuenta";
-$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exporta la información de tu cuenta y tus contactos. Úsalo para guardar una copia de seguridad de tu cuenta y/o moverla a otro servidor.";
-$a->strings["Export all"] = "Exportar todo";
-$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exporta la información de tu cuenta, contactos y lo demás en JSON. Puede ser un archivo bastante grande, por lo que llevará tiempo. Úsalo para hacer una copia de seguridad completa de tu cuenta (las fotos no se exportarán)";
-$a->strings["Export personal data"] = "Exportación de datos personales";
-$a->strings["Total invitation limit exceeded."] = "Límite total de invitaciones excedido.";
-$a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo válida.";
-$a->strings["Please join us on Friendica"] = "Únete a nosotros en Friendica";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Límite de invitaciones sobrepasado. Contacta con el administrador del sitio.";
-$a->strings["%s : Message delivery failed."] = "%s : Ha fallado la entrega del mensaje.";
-$a->strings["%d message sent."] = array(
-	0 => "%d mensaje enviado.",
-	1 => "%d mensajes enviados.",
-);
-$a->strings["You have no more invitations available"] = "No tienes más invitaciones disponibles";
-$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Visita %s para ver una lista de servidores públicos donde puedes darte de alta. Los miembros de otros servidores de Friendica pueden conectarse entre ellos, así como con miembros de otras redes sociales diferentes.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Para aceptar la invitación visita y regístrate en %s o en cualquier otro servidor público de Friendica.";
-$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Los servidores de Friendica están interconectados para crear una enorme red social centrada en la privacidad y controlada por sus miembros. También se puede conectar con muchas redes sociales tradicionales. Mira en %s para poder ver un listado de servidores alternativos de Friendica donde puedes darte de alta.";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Discúlpanos. Este sistema no está configurado actualmente para conectar con otros servidores públicos o invitar nuevos miembros.";
-$a->strings["Send invitations"] = "Enviar invitaciones";
-$a->strings["Enter email addresses, one per line:"] = "Introduce las direcciones de correo, una por línea:";
-$a->strings["Your message:"] = "Tu mensaje:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Estás cordialmente invitado a unirte a mi y a otros amigos en Friendica, creemos juntos una red social mejor.";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Tienes que proporcionar el siguiente código: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Una vez registrado, por favor contacta conmigo a través de mi página de perfil en:";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Para más información sobre el Proyecto Friendica y sobre por qué pensamos que es algo importante, visita http://friendica.com";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Files"] = "Archivos";
 $a->strings["Permission denied"] = "Permiso denegado";
-$a->strings["Invalid profile identifier."] = "Identificador de perfil no válido.";
-$a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
-$a->strings["Click on a contact to add or remove."] = "Pulsa en un contacto para añadirlo o eliminarlo.";
-$a->strings["Visible To"] = "Visible para";
-$a->strings["All Contacts (with secure profile access)"] = "Todos los contactos (con perfil de acceso seguro)";
-$a->strings["Tag removed"] = "Etiqueta eliminada";
-$a->strings["Remove Item Tag"] = "Eliminar etiqueta";
-$a->strings["Select a tag to remove: "] = "Selecciona una etiqueta para eliminar: ";
-$a->strings["Remove"] = "Eliminar";
-$a->strings["Resubscribing to OStatus contacts"] = "Resubscribir a contactos de OStatus";
-$a->strings["Error"] = "error";
-$a->strings["Done"] = "hecho!";
-$a->strings["Keep this window open until done."] = "Mantén esta ventana abierta hasta que el proceso ha terminado.";
-$a->strings["No potential page delegates located."] = "No se han localizado delegados potenciales de la página.";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Los delegados tienen la capacidad de gestionar todos los aspectos de esta cuenta/página, excepto los ajustes básicos de la cuenta. Por favor, no delegues tu cuenta personal a nadie en quien no confíes completamente.";
-$a->strings["Existing Page Managers"] = "Administradores actuales de la página";
-$a->strings["Existing Page Delegates"] = "Delegados actuales de la página";
-$a->strings["Potential Delegates"] = "Delegados potenciales";
-$a->strings["Add"] = "Añadir";
-$a->strings["No entries."] = "Sin entradas.";
-$a->strings["Credits"] = "Creditos";
-$a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica es un proyecto comunitario, que no seria posible sin la ayuda de mucha gente. Aquí una lista de de aquellos que aportaron al código o la traducción de friendica.\nGracias a todos! ";
-$a->strings["- select -"] = "- seleccionar -";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo las %3\$s de %2\$s";
-$a->strings["Item not available."] = "Elemento no disponible.";
-$a->strings["Item was not found."] = "Elemento no encontrado.";
-$a->strings["You must be logged in to use addons. "] = "Tienes que estar registrado para tener acceso a los accesorios.";
-$a->strings["Applications"] = "Aplicaciones";
-$a->strings["No installed applications."] = "Sin aplicaciones";
-$a->strings["Not Extended"] = "No extendido";
-$a->strings["Welcome to Friendica"] = "Bienvenido a Friendica ";
-$a->strings["New Member Checklist"] = "Listado de nuevos miembros";
-$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Nos gustaría ofrecerte algunos consejos y enlaces para ayudar a hacer tu experiencia más amena. Pulsa en cualquier elemento para visitar la página correspondiente. Un enlace a esta página será visible desde tu página de inicio durante las dos semanas siguientes a tu inscripción y luego desaparecerá.";
-$a->strings["Getting Started"] = "Empezando";
-$a->strings["Friendica Walk-Through"] = "Visita guiada a Friendica";
-$a->strings["On your Quick Start page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "En tu página de Inicio Rápido - busca una introducción breve para tus pestañas de perfil y red, haz algunas conexiones nuevas, y busca algunos grupos a los que unirte.";
-$a->strings["Go to Your Settings"] = "Ir a tus ajustes";
-$a->strings["On your Settings page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "En la página de Configuración puedes cambiar tu contraseña inicial. También aparece tu ID (Identity Address). Es parecida a una dirección de correo y te servirá para conectar con gente de redes sociales libres.";
-$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Revisa las otras configuraciones, especialmente la configuración de privacidad. Un listado de directorio sin publicar es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan cómo ponerse en contacto contigo.";
-$a->strings["Upload Profile Photo"] = "Subir foto del Perfil";
-$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Sube una foto para tu perfil si no lo has hecho aún. Los estudios han demostrado que la gente que usa fotos suyas reales tienen diez veces más éxito a la hora de entablar amistad que las que no.";
-$a->strings["Edit Your Profile"] = "Editar tu perfil";
-$a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Edita tu perfil predeterminado como quieras. Revisa la configuración para ocultar tu lista de amigos o tu perfil a los visitantes desconocidos.";
-$a->strings["Profile Keywords"] = "Palabras clave del perfil";
-$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Define en tu perfil público algunas palabras que describan tus intereses. Así podremos buscar otras personas con los mismos gustos y sugerirte posibles amigos.";
-$a->strings["Connecting"] = "Conectando";
-$a->strings["Importing Emails"] = "Importando correos electrónicos";
-$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Introduce la información para acceder a tu correo en la página de Configuración del conector si quieres importar e interactuar con amigos o listas de correos del buzón de entrada de tu correo electrónico.";
-$a->strings["Go to Your Contacts Page"] = "Ir a tu página de contactos";
-$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog."] = "Tu página de Contactos es el portal desde donde podrás manejar tus amistades y conectarte con amigos de otras redes. Normalmente introduces su dirección o la dirección de su sitio web en el recuadro \"Añadir contacto nuevo\".";
-$a->strings["Go to Your Site's Directory"] = "Ir al directorio de tu sitio";
-$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = "El Directorio te permite encontrar otras personas en esta red o en cualquier otro sitio federado. Busca algún enlace de Conectar o Seguir en su perfil. Proporciona tu direción personal si es necesario.";
-$a->strings["Finding New People"] = "Encontrando nueva gente";
-$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "En el panel lateral de la página de Contactos existen varias herramientas para encontrar nuevos amigos. Podemos filtrar personas por sus intereses, buscar personas por nombre o por sus intereses, y ofrecerte sugerencias basadas en sus relaciones de la red. En un sitio nuevo, las sugerencias de amigos por lo general comienzan pasadas las 24 horas.";
-$a->strings["Group Your Contacts"] = "Agrupa tus contactos";
-$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Una vez que tengas algunos amigos, puedes organizarlos en grupos privados de conversación mediante el memnú en tu página de Contactos y luego puedes interactuar con cada grupo por separado desde tu página de Red.";
-$a->strings["Why Aren't My Posts Public?"] = "¿Por qué mis publicaciones no son públicas?";
-$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respeta tu privacidad. Por defecto, tus publicaciones solo se mostrarán a personas que hayas añadido como amistades. Para más información, mira la sección de ayuda en el enlace de más arriba.";
-$a->strings["Getting Help"] = "Consiguiendo ayuda";
-$a->strings["Go to the Help Section"] = "Ir a la sección de ayuda";
-$a->strings["Our help pages may be consulted for detail on other program features and resources."] = "Puedes consultar nuestra página de Ayuda para más información y recursos de ayuda.";
-$a->strings["Remove My Account"] = "Eliminar mi cuenta";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Esto eliminará por completo tu cuenta. Una vez hecho no se puede deshacer.";
-$a->strings["Please enter your password for verification:"] = "Por favor, introduce tu contraseña para la verificación:";
-$a->strings["Item not found"] = "Elemento no encontrado";
-$a->strings["Edit post"] = "Editar publicación";
-$a->strings["Time Conversion"] = "Conversión horária";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otros servidores de la red friendica y amigos en zonas de horarios desconocidos.";
-$a->strings["UTC time: %s"] = "Tiempo UTC: %s";
-$a->strings["Current timezone: %s"] = "Zona horaria actual: %s";
-$a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s";
-$a->strings["Please select your timezone:"] = "Por favor, selecciona tu zona horaria:";
-$a->strings["The post was created"] = "La publicación fue creada";
-$a->strings["Group created."] = "Grupo creado.";
-$a->strings["Could not create group."] = "Imposible crear el grupo.";
-$a->strings["Group not found."] = "Grupo no encontrado.";
-$a->strings["Group name changed."] = "El nombre del grupo ha cambiado.";
-$a->strings["Save Group"] = "Guardar grupo";
-$a->strings["Create a group of contacts/friends."] = "Crea un grupo de contactos/amigos.";
-$a->strings["Group removed."] = "Grupo eliminado.";
-$a->strings["Unable to remove group."] = "No se puede eliminar el grupo.";
-$a->strings["Group Editor"] = "Editor de grupos";
-$a->strings["Members"] = "Miembros";
-$a->strings["All Contacts"] = "Todos los contactos";
-$a->strings["Group is empty"] = "El grupo está vacío";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Excedido el número máximo de mensajes para %s. El mensaje no se ha enviado.";
-$a->strings["No recipient selected."] = "Ningún destinatario seleccionado";
-$a->strings["Unable to check your home location."] = "Imposible comprobar tu servidor de inicio.";
-$a->strings["Message could not be sent."] = "El mensaje no ha podido ser enviado.";
-$a->strings["Message collection failure."] = "Fallo en la recolección de mensajes.";
-$a->strings["Message sent."] = "Mensaje enviado.";
-$a->strings["No recipient."] = "Sin receptor.";
-$a->strings["Send Private Message"] = "Enviar mensaje privado";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Si quieres que %s te responda, asegúrate de que la configuración de privacidad permite enviar correo privado a desconocidos.";
-$a->strings["To:"] = "Para:";
-$a->strings["Subject:"] = "Asunto:";
-$a->strings["link"] = "enlace";
+$a->strings["toggle mobile"] = "Cambiar a versión móvil";
+$a->strings["Theme settings updated."] = "Configuración de la apariencia actualizada.";
+$a->strings["Site"] = "Sitio";
+$a->strings["Users"] = "Usuarios";
+$a->strings["Plugins"] = "Módulos";
+$a->strings["Themes"] = "Temas";
+$a->strings["Additional features"] = "Características adicionales";
+$a->strings["DB updates"] = "Actualizaciones de la Base de Datos";
+$a->strings["Inspect Queue"] = "Inspeccionar cola";
+$a->strings["Federation Statistics"] = "Estadísticas de federación";
+$a->strings["Logs"] = "Registros";
+$a->strings["View Logs"] = "Ver registro de depuración";
+$a->strings["probe address"] = "probar direccion";
+$a->strings["check webfinger"] = "Verificar webfinger";
+$a->strings["Plugin Features"] = "Características del módulo";
+$a->strings["diagnostics"] = "diagnosticos";
+$a->strings["User registrations waiting for confirmation"] = "Registro de usuarios esperando la confirmación";
+$a->strings["unknown"] = "desconocido";
+$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. ";
+$a->strings["The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here."] = "El modulo directorio de contactos encontrados no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí.";
+$a->strings["Administration"] = "Administración";
+$a->strings["Currently this node is aware of %d nodes from the following platforms:"] = "Actualmente este nodo reconoce %d nodos de las siguientes plataformas:";
+$a->strings["ID"] = "ID";
+$a->strings["Recipient Name"] = "Nombre del recipiente";
+$a->strings["Recipient Profile"] = "Perfil del recipiente";
+$a->strings["Created"] = "Creado";
+$a->strings["Last Tried"] = "Ultimo intento";
+$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. ";
+$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation.
    "] = "Su DB aún funciona con las tablas MyISAM. Debería cambiar el tipo de motror a InnoDB. ¡Como Friendica sólo usará las características de InnoDB en el futuro, debería cambiar esto! Vea aquí para una guía que puede ayudar a convertir las tablas de motor. También puede usar convert_innodb.sql en el directorio /util de su instalación de Friendica.
    ";
+$a->strings["You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB."] = "Está usando una versión de MySQL que no soporta todas las características de Friendica. Debería considerar cambiar a MariaDB.";
+$a->strings["Normal Account"] = "Cuenta normal";
+$a->strings["Soapbox Account"] = "Cuenta tribuna";
+$a->strings["Community/Celebrity Account"] = "Cuenta de Comunidad/Celebridad";
+$a->strings["Automatic Friend Account"] = "Cuenta de amistad automática";
+$a->strings["Blog Account"] = "Cuenta de blog";
+$a->strings["Private Forum"] = "Foro privado";
+$a->strings["Message queues"] = "Cola de mensajes";
+$a->strings["Summary"] = "Resumen";
+$a->strings["Registered users"] = "Usuarios registrados";
+$a->strings["Pending registrations"] = "Pendientes de registro";
+$a->strings["Version"] = "Versión";
+$a->strings["Active plugins"] = "Módulos activos";
+$a->strings["Can not parse base url. Must have at least ://"] = "No se puede resolver la direccion URL base.\nDeberá tener al menos ://";
+$a->strings["RINO2 needs mcrypt php extension to work."] = "RINO2 precisa la extensión mcrypt para funcionar.  ";
+$a->strings["Site settings updated."] = "Configuración de actualización.";
+$a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles";
+$a->strings["No community page"] = "No hay pagina de comunidad";
+$a->strings["Public postings from users of this site"] = "Temas públicos de perfiles de este sitio.";
+$a->strings["Global community page"] = "Pagina global de comunidad";
+$a->strings["Never"] = "Nunca";
+$a->strings["At post arrival"] = "A la llegada de una publicación";
+$a->strings["Disabled"] = "Deshabilitado";
+$a->strings["Users, Global Contacts"] = "Perfiles, contactos globales";
+$a->strings["Users, Global Contacts/fallback"] = "Perfiles, contactos globales/fallback";
+$a->strings["One month"] = "Un mes";
+$a->strings["Three months"] = "Tres meses";
+$a->strings["Half a year"] = "Medio año";
+$a->strings["One year"] = "Un año";
+$a->strings["Multi user instance"] = "Sesión multi usuario";
+$a->strings["Closed"] = "Cerrado";
+$a->strings["Requires approval"] = "Requiere aprobación";
+$a->strings["Open"] = "Abierto";
+$a->strings["No SSL policy, links will track page SSL state"] = "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página";
+$a->strings["Force all links to use SSL"] = "Forzar todos los enlaces a utilizar SSL";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Certificación personal, usa SSL solo para enlaces locales (no recomendado)";
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["Registration"] = "Registro";
+$a->strings["File upload"] = "Subida de archivo";
+$a->strings["Policies"] = "Políticas";
+$a->strings["Auto Discovered Contact Directory"] = "Directorio de contactos descubierto automáticamente";
+$a->strings["Performance"] = "Rendimiento";
+$a->strings["Worker"] = "Trabajador (??)";
+$a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "Reubicación - ADVERTENCIA: función avanzada. Puede hacer a este servidor inaccesible. ";
+$a->strings["Site name"] = "Nombre del sitio";
+$a->strings["Host name"] = "Nombre de dominio";
+$a->strings["Sender Email"] = "Dirección de origen de correo electrónico";
+$a->strings["The email address your server shall use to send notification emails from."] = "La dirección de correo electrónico que el servidor debería usar como dirección de envío.";
+$a->strings["Banner/Logo"] = "Imagen/Logotipo";
+$a->strings["Shortcut icon"] = "Icono de atajo";
+$a->strings["Link to an icon that will be used for browsers."] = "Enlace hacia un icono que sera usado para el navegador.";
+$a->strings["Touch icon"] = "Icono touch";
+$a->strings["Link to an icon that will be used for tablets and mobiles."] = "Enlace para un icono que sera usado para tablets y moviles.";
+$a->strings["Additional Info"] = "Información adicional";
+$a->strings["For public servers: you can add additional information here that will be listed at %s/siteinfo."] = "Para servidores públicos: información adicional  que sera publicado en %s/siteinfo.";
+$a->strings["System language"] = "Idioma";
+$a->strings["System theme"] = "Tema";
+$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Tema por defecto del sistema, los usuarios podrán elegir el suyo propio en su configuración cambiar configuración del tema";
+$a->strings["Mobile system theme"] = "Tema de sistema móvil";
+$a->strings["Theme for mobile devices"] = "Tema para dispositivos móviles";
+$a->strings["SSL link policy"] = "Política de enlaces SSL";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Determina si los enlaces generados deben ser forzados a utilizar SSL";
+$a->strings["Force SSL"] = "Forzar SSL";
+$a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "Forzar todos las consultas No-SSL a SSL. - ATENCIÓN: en algunos sistemas esto puede generar comportamiento recursivo interminable.";
+$a->strings["Hide help entry from navigation menu"] = "Ocultar la ayuda en el menú de navegación";
+$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Oculta la entrada de las páginas de Ayuda en el menú de navegación. Todavía se puede acceder escribiendo /ayuda directamente.";
+$a->strings["Single user instance"] = "Sesión de usuario único";
+$a->strings["Make this instance multi-user or single-user for the named user"] = "Haz esta sesión multi-usuario o usuario único para el usuario";
+$a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Tamaño máximo en bytes de las imágenes a subir. Por defecto es 0, que quiere decir que no hay límite.";
+$a->strings["Maximum image length"] = "Largo máximo de imagen";
+$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Longitud máxima en píxeles del lado más largo de las imágenes subidas. Por defecto es -1, que significa que no hay límites.";
+$a->strings["JPEG image quality"] = "Calidad de imagen JPEG";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Los archivos JPEG subidos se guardarán con este ajuste de calidad [0-100]. Por defecto es 100, que es calidad máxima.";
+$a->strings["Register policy"] = "Política de registros";
+$a->strings["Maximum Daily Registrations"] = "Registros Máximos Diarios";
+$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "Si anteriormente se ha permitido el registro, esto establece el número máximo de registro de nuevos usuarios aceptados por día. Si el registro se establece como cerrado, esta opción no tiene efecto.";
+$a->strings["Register text"] = "Términos";
+$a->strings["Will be displayed prominently on the registration page."] = "Se mostrará en un lugar destacado en la página de registro.";
+$a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando sondeos a sitios externos para cuentas abandonadas. Introduce 0 para ningún límite temporal.";
+$a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Lista separada por comas de los dominios que están autorizados para establecer conexiones con este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio";
+$a->strings["Allowed email domains"] = "Dominios de correo permitidos";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Lista separada por comas de los dominios que están autorizados en las direcciones de correo para registrarse en este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio";
+$a->strings["Block public"] = "Bloqueo público";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Marca para bloquear el acceso público a todas las páginas personales, aún siendo públicas, hasta que no hayas iniciado tu sesión.";
+$a->strings["Force publish"] = "Forzar publicación";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Marca para forzar que todos los perfiles de este sitio sean listados en el directorio del sitio.";
+$a->strings["Global directory URL"] = "URL del directorio global.";
+$a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL del directorio global. Si se deja este campo vacío, el directorio global sera completamente inaccesible para la instancia.";
+$a->strings["Allow threaded items"] = "Permitir elementos en hilo";
+$a->strings["Allow infinite level threading for items on this site."] = "Permitir infinitos niveles de hilo para los elementos de este sitio.";
+$a->strings["Private posts by default for new users"] = "Publicaciones privadas por defecto para usuarios nuevos";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Ajusta los permisos de publicación por defecto a los miembros nuevos al grupo privado por defecto en vez del público.";
+$a->strings["Don't include post content in email notifications"] = "No incluir el contenido del post en las notificaciones de correo electrónico";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "No incluye el contenido de un mensaje/comentario/mensaje privado/etc. en las notificaciones de correo electrónico que se envían desde este sitio, como una medida de privacidad.";
+$a->strings["Disallow public access to addons listed in the apps menu."] = "Deshabilitar acceso a addons listados en el menú de aplicaciones.";
+$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Habilitando esta opción restringe el acceso a addons en el menú de aplicaciones a usuarios identificados.";
+$a->strings["Don't embed private images in posts"] = "No agregar imágenes privados en las publicaciones";
+$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "No reemplazar imágenes privadas guardadas localmente en el servidor con imágenes integrados en los envíos. Esto significa que contactos que reciben publicaciones tendrán que autenticarse y cargar cada imagen, lo que puede demorar.";
+$a->strings["Allow Users to set remote_self"] = "Permitir a los usuarios de definir perfiles_remotos";
+$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Al habilitar esta opción, cada perfil tiene el permiso de marcar cualquiera de sus contactos como un perfil_remoto. Habilitar la opción perfil_remoto para un contacto genera que todas las publicaciones  de este contacto seran re-publicado  en el muro del perfil.";
+$a->strings["Block multiple registrations"] = "Bloquear registros multiples";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Impedir que los usuarios registren cuentas adicionales para su uso como páginas.";
+$a->strings["OpenID support"] = "Soporte OpenID";
+$a->strings["OpenID support for registration and logins."] = "Soporte OpenID para registros y accesos.";
+$a->strings["Fullname check"] = "Comprobar Nombre completo";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Fuerza a los usuarios a registrarse con un espacio entre su nombre y su apellido en el campo Nombre completo como medida anti-spam";
+$a->strings["UTF-8 Regular expressions"] = "Expresiones regulares UTF-8";
+$a->strings["Use PHP UTF8 regular expressions"] = "Usar expresiones regulares de UTF8 en PHP";
+$a->strings["Community Page Style"] = "Estilo de pagina de comunidad";
+$a->strings["Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."] = "Tipo de pagina de comunidad a visualizar. 'Comunidad global' muestra todas las publicaciones publicas de la red abierta federada que llega a este servidor.";
+$a->strings["Posts per user on community page"] = "Publicaciones por usuario en la pagina de comunidad";
+$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "El numero máximo de publicaciones por usuario que aparecerán en la pagina de comunidad. (No valido para 'comunidad global')";
+$a->strings["Enable OStatus support"] = "Permitir soporte OStatus";
+$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Proporcionar OStatus compatibilidad integrada (StatusNet, GNU Social, Quitter etc.). Todas las comunicaciones en OStatus son publicas así que eventuales advertencias serán ocasionalmente desplegadas.";
+$a->strings["OStatus conversation completion interval"] = "Intervalo de actualización de conversaciones OStatus";
+$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "Cuan seguido el recolector deberá buscar nuevas entradas en OStatus? Esto puede ser un trabajo de mucha carga para los recursos del servidor.";
+$a->strings["Only import OStatus threads from our contacts"] = "Solo importar OStatus temas de nuestros (?) contactos.";
+$a->strings["Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normalmente importamos todo el contenido de los contactos de OStatus. Con esta opción solamente se guardan temas que fueron iniciados por contactos que son conocidos de la instancia.\n(nota de traducción, no se entiende muy bien la función en base al texto original)";
+$a->strings["OStatus support can only be enabled if threading is enabled."] = "Solo se puede habilitar el soporte OStatus  si threading (comentarios en fila) se encuentra habilitado.";
+$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "El soporte para Diaspora* no se puede habilitar porque friendica se instalo en un directorio subalterno (sub directory).";
+$a->strings["Enable Diaspora support"] = "Habilitar el soporte para Diaspora*";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Provee una compatibilidad con la red de Diaspora.";
+$a->strings["Only allow Friendica contacts"] = "Permitir solo contactos de Friendica";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Todos los contactos deben usar protocolos de Friendica. El resto de protocolos serán desactivados.";
+$a->strings["Verify SSL"] = "Verificar SSL";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Si quieres puedes activar la comprobación estricta de certificados. Esto significa que serás incapaz de conectar con ningún sitio que use certificados SSL autofirmados.";
+$a->strings["Proxy user"] = "Usuario proxy";
+$a->strings["Proxy URL"] = "Dirección proxy";
+$a->strings["Network timeout"] = "Tiempo de espera de red";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valor en segundos. Usar 0 para dejarlo sin límites (no se recomienda).";
+$a->strings["Maximum Load Average"] = "Promedio de carga máxima";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que la entrega y los procesos de sondeo sean retrasados - por defecto 50.";
+$a->strings["Maximum Load Average (Frontend)"] = "Carga máxima promedio (frontend)";
+$a->strings["Maximum system load before the frontend quits service - default 50."] = "Carga máxima del sistema antes de que el frontend cancele el servicio - por defecto 50.";
+$a->strings["Maximum table size for optimization"] = "Tamaño máximo de las tablas para la optimización.";
+$a->strings["Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it."] = "Tamaño máximo de tablas (en MB) para la optimización automática - por defecto 100MB. Ingrese -1 para deshabilitar.";
+$a->strings["Minimum level of fragmentation"] = "Nivel mínimo de fragmentación ";
+$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Nivel mínimo de fragmentación para para comenzar la optimización - valor por defecto es 30%. ";
+$a->strings["Periodical check of global contacts"] = "Verificación periódica de los contactos globales.";
+$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "Habilitado los contactos globales son verificado periódicamente  por datos faltantes o datos obsoletos como también por la vitalidad de los contactos y servidores.";
+$a->strings["Days between requery"] = "Días entre búsquedas";
+$a->strings["Number of days after which a server is requeried for his contacts."] = "Cantidad de días hasta que un servidor es consultado por sus contactos.";
+$a->strings["Discover contacts from other servers"] = "Descubrir contactos de otros servidores";
+$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "Recoger periódicamente información sobre perfiles en otros servidores. Puede elegir entre 'usuarios': perfiles de un sistema remoto, 'contactos globales': contactos activos que son conocidos por el servidor. El fallback es para servidors redmatrix y instalaciones viejas de friendica en las que los contactos no estaban a disposición. El fallback aumenta la carga del servidor, asi que la configuración recomendada es 'usuarios, contactos globales'";
+$a->strings["Timeframe for fetching global contacts"] = "Intervalos de tiempo para revisar contactos globales.";
+$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Cuando la revisacion es activada, este valor define el intervalo de tiempo de la actividad de los contactos globales que son recolectados de los servidores. (?)";
+$a->strings["Search the local directory"] = "Buscar el directorio local";
+$a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "Buscar en el directorio local en vez del directorio global. Cuando se busca localmente, cada busqueda sera efectuada en el directorio global en el background. Esto mejora los resultados de la busqueda cuando la misma es repetida.";
+$a->strings["Publish server information"] = "Publicar información del servidor";
+$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details."] = "Si habilitado, datos generales del servidor y estadisticas de uso serán publicados. Los datos contienen el nombre y la versión del servidor, numero de usuarios con perfiles públicos, cantidad de temas publicados y los protocolos y conectores activados. Vea the-federation.info por detalles.";
+$a->strings["Use MySQL full text engine"] = "Usar motor MySQL de texto completo";
+$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Activa el motor de texto completo. Agiliza las búsquedas, pero solo busca cuatro o más caracteres.";
+$a->strings["Suppress Tags"] = "Suprimir tags";
+$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Suprimir la lista de tags al final de una publicación.";
+$a->strings["Path to item cache"] = "Ruta a la caché del objeto";
+$a->strings["The item caches buffers generated bbcode and external images."] = "El buffer de cache de items generado para bbcodes e imágenes externas. ";
+$a->strings["Cache duration in seconds"] = "Duración de la caché en segundos";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "¿Por cuanto tiempo deberían los archives ser almacenados en el cache? Valor por defecto 86400 segundos (un día). Para deshabilita el item cache, ajuste el valor a -1.";
+$a->strings["Maximum numbers of comments per post"] = "Numero máximo de respuestas por tema";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "¿Cuantos comentarios deberían ser mostrados por tema? Valor por defecto es 100.";
+$a->strings["Temp path"] = "Ruta a los temporales";
+$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Si tiene un sistema restringido en donde el servidor web no puede acceder la dirección del sistema temp, ingrese una dirección alternativa aquí. ";
+$a->strings["Base path to installation"] = "Ruta base para la instalación";
+$a->strings["If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."] = "Si el sistema no puede detectar el acceso correcto a la instalación, ingrese la dirección correcta aquí. Esta configuración solo debería utilizarse si si usa un sistema restringido y enlaces simbolicos a su webroot.";
+$a->strings["Disable picture proxy"] = "Deshabilitar proxy de imagen";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "El proxy de imagen mejora el performance y privacidad. No debería ser usado en sistemas con poco ancho de banda.";
+$a->strings["Only search in tags"] = "Solo buscar en tags";
+$a->strings["On large systems the text search can slow down the system extremely."] = "En sistemas grandes, la búsqueda de texto puede enlentecer el sistema gravemente.";
+$a->strings["New base url"] = "Nueva URLbase";
+$a->strings["Change base url for this server. Sends relocate message to all DFRN contacts of all users."] = "Cambiar base URL para este servidor. Envía mensajes de relocalisación a todos los contactos DFRN.";
+$a->strings["RINO Encryption"] = "Encryptado RINO";
+$a->strings["Encryption layer between nodes."] = "Capa de encryptación entre nodos.";
+$a->strings["Embedly API key"] = "Embedly llave de API (API key) ";
+$a->strings["Embedly is used to fetch additional data for web pages. This is an optional parameter."] = "Embedly es usado para recolectar datos adicionales para paginas web. Esto es un parámetro opcional.";
+$a->strings["Maximum number of parallel workers"] = "Numero máximo de trabajos paralelos de fondo.";
+$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "Ajustar a 2 en un servidor compartido (shared hosting).\nEn sistemas grandes valores como 10 son excelentes.\nValor por defecto es 4.";
+$a->strings["Don't use 'proc_open' with the worker"] = "No use 'proc_open' junto al \"trabajador\"!";
+$a->strings["Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab."] = "Habilite esta función si el sistema no permite el uso de 'proc_open'. Esto suelo suceder en servidores compartidos (shared hosting). Si esta función se habilita se debería incrementar la frecuencia de llamadas del poller (poller calls) en la pestaña de trabajos cron. (¡en el hosting?)";
+$a->strings["Enable fastlane"] = "Habilitar ascenso rápido";
+$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "Cuando está habilitado, el mecanismo ascenso rápido inicia un trabajador adicional si los procesos de mayor prioridad son bloqueados por prcesos de menor prioridad.";
+$a->strings["Enable frontend worker"] = "Habilitar trabajador de interfaz";
+$a->strings["When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server. The worker background process needs to be activated for this."] = "Cuando está habilitado, el proceso de Trabajador se activa cuando se ejecuta el acceso de respaldo (ej. mensajes siendo entregados). En páginas más pequeñas usted puede querer llamar a yourdomain.tld/worker en una base regular mediante un trabajo cron externo. Sólo debería habilitar esta opción si no puede utilizar trabajos cron/scheduled en su servidor. El proceso de trabajador en segundo plano necesita ser activado para eso.";
+$a->strings["Update has been marked successful"] = "La actualización se ha completado con éxito";
+$a->strings["Database structure update %s was successfully applied."] = "Actualización de base de datos %s fue aplicada con éxito.";
+$a->strings["Executing of database structure update %s failed with error: %s"] = "El paso de actualización de la estructura de la base de datos %s fallo con el mensaje de error: %s";
+$a->strings["Executing %s failed with error: %s"] = "Paso %s fallo con el error: %s";
+$a->strings["Update %s was successfully applied."] = "Actualización %s aplicada con éxito.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "La actualización %s no ha informado, se desconoce el estado.";
+$a->strings["There was no additional update function %s that needed to be called."] = "No había función adicional de actualización %s que necesitaba ser requerida.";
+$a->strings["No failed updates."] = "Actualizaciones sin fallos.";
+$a->strings["Check database structure"] = "Revisar estructura de la base de datos";
+$a->strings["Failed Updates"] = "Actualizaciones fallidas";
+$a->strings["This does not include updates prior to 1139, which did not return a status."] = "No se incluyen las anteriores a la 1139, que no indicaban su estado.";
+$a->strings["Mark success (if update was manually applied)"] = "Marcar como correcta (si actualizaste manualmente)";
+$a->strings["Attempt to execute this update step automatically"] = "Intentando ejecutar este paso automáticamente";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\n\t\t\tEstimado %1\$s,\n\t\t\t\tel administrador de %2\$s ha creado una cuenta para usted.";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tThank you and welcome to %4\$s."] = "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%1\$s\n\t\t\tNombre de la cuenta:\t\t%2\$s\n\t\t\tContraseña:\t\t%3\$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %4\$s.";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "%s usuario bloqueado/desbloqueado",
+	1 => "%s usuarios bloqueados/desbloqueados",
+);
+$a->strings["%s user deleted"] = array(
+	0 => "%s usuario eliminado",
+	1 => "%s usuarios eliminados",
+);
+$a->strings["User '%s' deleted"] = "Usuario '%s' eliminado";
+$a->strings["User '%s' unblocked"] = "Usuario '%s' desbloqueado";
+$a->strings["User '%s' blocked"] = "Usuario '%s' bloqueado'";
+$a->strings["Name"] = "Nombre";
+$a->strings["Register date"] = "Fecha de registro";
+$a->strings["Last login"] = "Último acceso";
+$a->strings["Last item"] = "Último elemento";
+$a->strings["Account"] = "Cuenta";
+$a->strings["Add User"] = "Agregar usuario";
+$a->strings["select all"] = "seleccionar todo";
+$a->strings["User registrations waiting for confirm"] = "Registro de usuarios esperando confirmación";
+$a->strings["User waiting for permanent deletion"] = "Usuario esperando anulación permanente.";
+$a->strings["Request date"] = "Solicitud de fecha";
+$a->strings["No registrations."] = "Sin registros.";
+$a->strings["Note from the user"] = "Nota para el usuario";
+$a->strings["Approve"] = "Aprobar";
+$a->strings["Deny"] = "Denegado";
+$a->strings["Block"] = "Bloquear";
+$a->strings["Unblock"] = "Desbloquear";
+$a->strings["Site admin"] = "Administrador de la web";
+$a->strings["Account expired"] = "Cuenta caducada";
+$a->strings["New User"] = "Nuevo usuario";
+$a->strings["Deleted since"] = "Borrado desde";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?";
+$a->strings["Name of the new user."] = "Nombre del nuevo usuario";
+$a->strings["Nickname"] = "Apodo";
+$a->strings["Nickname of the new user."] = "Apodo del nuevo perfil.";
+$a->strings["Email address of the new user."] = "Dirección de correo del nuevo perfil.";
+$a->strings["Plugin %s disabled."] = "Módulo %s deshabilitado.";
+$a->strings["Plugin %s enabled."] = "Módulo %s habilitado.";
+$a->strings["Disable"] = "Desactivado";
+$a->strings["Enable"] = "Activado";
+$a->strings["Toggle"] = "Activar";
+$a->strings["Author: "] = "Autor:";
+$a->strings["Maintainer: "] = "Mantenedor: ";
+$a->strings["Reload active plugins"] = "Recargar plugins activos";
+$a->strings["There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"] = "No ay plugins habilitados en este nodo. Encontrara los repositorios oficiales de plugins en %1\$s y posiblemente encontrara mas plugins interesantes en el registro abierto de plugins aquí %2\$s .";
+$a->strings["No themes found."] = "No se encontraron temas.";
+$a->strings["Screenshot"] = "Captura de pantalla";
+$a->strings["Reload active themes"] = "Recargar interfaces de usuario activos";
+$a->strings["No themes found on the system. They should be paced in %1\$s"] = "No se encuentran interfaces en el sistema. Deberían estar localizados (paced) en  %1\$s";
+$a->strings["[Experimental]"] = "[Experimental]";
+$a->strings["[Unsupported]"] = "[Sin soporte]";
+$a->strings["Log settings updated."] = "Configuración de registro actualizada.";
+$a->strings["PHP log currently enabled."] = "Registro PHP actualmente disponible.";
+$a->strings["PHP log currently disabled."] = "Registro PHP actualmente deshabilitado.";
+$a->strings["Clear"] = "Limpiar";
+$a->strings["Enable Debugging"] = "Habilitar debugging";
+$a->strings["Log file"] = "Archivo de registro";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica.";
+$a->strings["Log level"] = "Nivel de registro";
+$a->strings["PHP logging"] = "PHP logging";
+$a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "Para habilitar la documentación de los errores PHP y las advertencias se puede agregar lo siguiente al archivo .htconfig.php de la instalación (ftp). La dirección definido en el 'error_log' es relativo al directorio friendica principal (top-level directory) y debe de ser habilitado para la escritura por el servidor web. La opción '1' para 'log_errors' y 'display_errors' es para habilitar estas opciones, '0' para deshabilitarlo.";
+$a->strings["Off"] = "Apagado";
+$a->strings["On"] = "Encendido";
+$a->strings["Lock feature %s"] = "Trancar opción %s ";
+$a->strings["Manage Additional Features"] = "Administrar opciones adicionales";
+$a->strings["No friends to display."] = "No hay amigos para mostrar.";
 $a->strings["Authorize application connection"] = "Autorizar la conexión de la aplicación";
 $a->strings["Return to your app and insert this Securty Code:"] = "Regresa a tu aplicación e introduce este código de seguridad:";
 $a->strings["Please login to continue."] = "Inicia sesión para continuar.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Quieres autorizar a esta aplicación el acceso a tus mensajes y contactos, y/o crear nuevas publicaciones para ti?";
 $a->strings["No"] = "No";
+$a->strings["Applications"] = "Aplicaciones";
+$a->strings["No installed applications."] = "Sin aplicaciones";
+$a->strings["Item not available."] = "Elemento no disponible.";
+$a->strings["Item was not found."] = "Elemento no encontrado.";
 $a->strings["Source (bbcode) text:"] = "Texto fuente (bbcode):";
 $a->strings["Source (Diaspora) text to convert to BBcode:"] = "Fuente (Diaspora) para pasar a BBcode:";
 $a->strings["Source input: "] = "Entrada: ";
@@ -927,58 +1059,111 @@ $a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
 $a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
 $a->strings["Source input (Diaspora format): "] = "Fuente (formato Diaspora): ";
 $a->strings["diaspora2bb: "] = "diaspora2bb: ";
-$a->strings["Subscribing to OStatus contacts"] = "Subscribir a los contactos de OStatus";
-$a->strings["No contact provided."] = "Sin suministro de datos de contacto.";
-$a->strings["Couldn't fetch information for contact."] = "No se ha podido conseguir la información del contacto.";
-$a->strings["Couldn't fetch friends for contact."] = "No se ha podido conseguir datos de amigos para contactar.";
-$a->strings["success"] = "exito!";
-$a->strings["failed"] = "fallido!";
-$a->strings["ignored"] = "ignorado";
-$a->strings["%1\$s welcomes %2\$s"] = "%1\$s te da la bienvenida a %2\$s";
-$a->strings["Unable to locate contact information."] = "No se puede encontrar información del contacto.";
-$a->strings["Do you really want to delete this message?"] = "¿Estás seguro de que quieres borrar este mensaje?";
-$a->strings["Message deleted."] = "Mensaje eliminado.";
-$a->strings["Conversation removed."] = "Conversación eliminada.";
-$a->strings["No messages."] = "No hay mensajes.";
-$a->strings["Message not available."] = "Mensaje no disponibile.";
-$a->strings["Delete message"] = "Borrar mensaje";
-$a->strings["Delete conversation"] = "Eliminar conversación";
-$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "No hay comunicaciones seguras disponibles. Podrías responder desde la página de perfil del remitente. ";
-$a->strings["Send Reply"] = "Enviar respuesta";
-$a->strings["Unknown sender - %s"] = "Remitente desconocido - %s";
-$a->strings["You and %s"] = "Tú y %s";
-$a->strings["%s and You"] = "%s y Tú";
-$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
-$a->strings["%d message"] = array(
-	0 => "%d mensaje",
-	1 => "%d mensajes",
+$a->strings["The post was created"] = "La publicación fue creada";
+$a->strings["Access to this profile has been restricted."] = "El acceso a este perfil ha sido restringido.";
+$a->strings["View"] = "Vista";
+$a->strings["Previous"] = "Previo";
+$a->strings["Next"] = "Siguiente";
+$a->strings["list"] = "lista";
+$a->strings["User not found"] = "Usuario no encontrado";
+$a->strings["This calendar format is not supported"] = "Este formato de calendario no se soporta";
+$a->strings["No exportable data found"] = "No se ha encontrado información exportable";
+$a->strings["calendar"] = "calendario";
+$a->strings["No contacts in common."] = "Sin contactos en común.";
+$a->strings["Common Friends"] = "Amigos comunes";
+$a->strings["Public access denied."] = "Acceso público denegado.";
+$a->strings["Not available."] = "No disponible";
+$a->strings["No results."] = "Sin resultados.";
+$a->strings["%d contact edited."] = array(
+	0 => "%d contacto editado.",
+	1 => "%d contacts edited.",
 );
-$a->strings["Manage Identities and/or Pages"] = "Administrar identidades y/o páginas";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Cambia entre diferentes identidades o páginas de Comunidad/Grupos que comparten los detalles de tu cuenta o sobre los que tienes permisos para administrar";
-$a->strings["Select an identity to manage: "] = "Selecciona una identidad a gestionar:";
-$a->strings["Contact settings applied."] = "Contacto configurado con éxito.";
-$a->strings["Contact update failed."] = "Error al actualizar el Contacto.";
-$a->strings["Contact not found."] = "Contacto no encontrado.";
-$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ADVERTENCIA: Esto es muy avanzado y si se introduce información incorrecta tu conexión con este contacto puede dejar de funcionar.";
-$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Por favor usa el botón 'Atás' de tu navegador ahora si no tienes claro qué hacer en esta página.";
-$a->strings["No mirroring"] = "No espejar";
-$a->strings["Mirror as forwarded posting"] = "Espejar como reenvio";
-$a->strings["Mirror as my own posting"] = "Espejar como publicación propia";
-$a->strings["Return to contact editor"] = "Volver al editor de contactos";
-$a->strings["Refetch contact data"] = "Volver a solicitar datos del contacto.";
-$a->strings["Remote Self"] = "Perfil remoto";
-$a->strings["Mirror postings from this contact"] = "Espejar publicaciones de este contacto";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Marcar este contacto como perfil_remoto, esto generara que friendica reenvía nuevas publicaciones desde esta cuenta.";
-$a->strings["Name"] = "Nombre";
-$a->strings["Account Nickname"] = "Apodo de la cuenta";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Etiqueta - Sobrescribe el Nombre/Apodo";
-$a->strings["Account URL"] = "Dirección de la cuenta";
-$a->strings["Friend Request URL"] = "Dirección de la solicitud de amistad";
-$a->strings["Friend Confirm URL"] = "Dirección de confirmación de tu amigo ";
-$a->strings["Notification Endpoint URL"] = "Dirección URL de la notificación";
-$a->strings["Poll/Feed URL"] = "Dirección del Sondeo/Fuentes";
-$a->strings["New photo from this URL"] = "Nueva foto de esta dirección";
+$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto.";
+$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado.";
+$a->strings["Contact updated."] = "Contacto actualizado.";
+$a->strings["Failed to update contact record."] = "Error al actualizar el contacto.";
+$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado";
+$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado";
+$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado";
+$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado";
+$a->strings["Contact has been archived"] = "El contacto ha sido archivado";
+$a->strings["Contact has been unarchived"] = "El contacto ya no está archivado";
+$a->strings["Drop contact"] = "Eliminar contacto";
+$a->strings["Do you really want to delete this contact?"] = "¿Estás seguro de que quieres eliminar este contacto?";
+$a->strings["Contact has been removed."] = "El contacto ha sido eliminado";
+$a->strings["You are mutual friends with %s"] = "Ahora tienes una amistad mutua con %s";
+$a->strings["You are sharing with %s"] = "Estás compartiendo con %s";
+$a->strings["%s is sharing with you"] = "%s está compartiendo contigo";
+$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto.";
+$a->strings["(Update was successful)"] = "(La actualización se ha completado)";
+$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)";
+$a->strings["Suggest friends"] = "Sugerir amigos";
+$a->strings["Network type: %s"] = "Tipo de red: %s";
+$a->strings["Communications lost with this contact!"] = "¡Se ha perdido la comunicación con este contacto!";
+$a->strings["Fetch further information for feeds"] = "Recaudar informacion complementaria de los feeds";
+$a->strings["Fetch information"] = "Recaudar informacion";
+$a->strings["Fetch information and keywords"] = "Recaudar informacion y palabras claves";
+$a->strings["Contact"] = "Contacto";
+$a->strings["Submit"] = "Envíar";
+$a->strings["Profile Visibility"] = "Visibilidad del Perfil";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura.";
+$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas";
+$a->strings["Edit contact notes"] = "Editar notas del contacto";
+$a->strings["Visit %s's profile [%s]"] = "Ver el perfil de %s [%s]";
+$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto";
+$a->strings["Ignore contact"] = "Ignorar contacto";
+$a->strings["Repair URL settings"] = "Configuración de reparación de la dirección";
+$a->strings["View conversations"] = "Ver conversaciones";
+$a->strings["Last update:"] = "Última actualización:";
+$a->strings["Update public posts"] = "Actualizar publicaciones públicas";
+$a->strings["Update now"] = "Actualizar ahora";
+$a->strings["Unignore"] = "Quitar de Ignorados";
+$a->strings["Ignore"] = "Ignorar";
+$a->strings["Currently blocked"] = "Bloqueados";
+$a->strings["Currently ignored"] = "Ignorados";
+$a->strings["Currently archived"] = "Archivados";
+$a->strings["Hide this contact from others"] = "Ocultar este contacto a los demás.";
+$a->strings["Replies/likes to your public posts may still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía pueden ser visibles.";
+$a->strings["Notification for new posts"] = "Notificacion de nuevos temas.";
+$a->strings["Send a notification of every new post of this contact"] = "Enviar una notificacion por nuevos temas de este contacto.";
+$a->strings["Blacklisted keywords"] = "Lista negra de palabras";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado";
+$a->strings["Profile URL"] = "URL Perfil";
+$a->strings["Actions"] = "Acciones";
+$a->strings["Contact Settings"] = "Ajustes del contacto";
+$a->strings["Suggestions"] = "Sugerencias";
+$a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas";
+$a->strings["All Contacts"] = "Todos los contactos";
+$a->strings["Show all contacts"] = "Mostrar todos los contactos";
+$a->strings["Unblocked"] = "Desbloqueados";
+$a->strings["Only show unblocked contacts"] = "Mostrar solo contactos sin bloquear";
+$a->strings["Blocked"] = "Bloqueados";
+$a->strings["Only show blocked contacts"] = "Mostrar solo contactos bloqueados";
+$a->strings["Ignored"] = "Ignorados";
+$a->strings["Only show ignored contacts"] = "Mostrar solo contactos ignorados";
+$a->strings["Archived"] = "Archivados";
+$a->strings["Only show archived contacts"] = "Mostrar solo contactos archivados";
+$a->strings["Hidden"] = "Ocultos";
+$a->strings["Only show hidden contacts"] = "Mostrar solo contactos ocultos";
+$a->strings["Search your contacts"] = "Buscar en tus contactos";
+$a->strings["Results for: %s"] = "Resultados para: %s";
+$a->strings["Update"] = "Actualizar";
+$a->strings["Archive"] = "Archivo";
+$a->strings["Unarchive"] = "Sin archivar";
+$a->strings["Batch Actions"] = "Accones en lote";
+$a->strings["View all contacts"] = "Ver todos los contactos";
+$a->strings["View all common friends"] = "Ver todos los conocidos en común ";
+$a->strings["Advanced Contact Settings"] = "Configuración avanzada";
+$a->strings["Mutual Friendship"] = "Amistad recíproca";
+$a->strings["is a fan of yours"] = "es tu fan";
+$a->strings["you are a fan of"] = "eres fan de";
+$a->strings["Edit contact"] = "Modificar contacto";
+$a->strings["Toggle Blocked status"] = "Cambiar bloqueados";
+$a->strings["Toggle Ignored status"] = "Cambiar ignorados";
+$a->strings["Toggle Archive status"] = "Cambiar archivados";
+$a->strings["Delete contact"] = "Eliminar contacto";
 $a->strings["No such group"] = "Ningún grupo";
+$a->strings["Group is empty"] = "El grupo está vacío";
 $a->strings["Group: %s"] = "Grupo: %s";
 $a->strings["This entry was edited"] = "Esta entrada fue editada";
 $a->strings["%d comment"] = array(
@@ -1011,6 +1196,7 @@ $a->strings["add tag"] = "añadir etiqueta";
 $a->strings["ignore thread"] = "ignorar publicación";
 $a->strings["unignore thread"] = "revertir ignorar publicacion";
 $a->strings["toggle ignore status"] = "cambiar estatus de observación";
+$a->strings["ignored"] = "ignorado";
 $a->strings["save to folder"] = "grabado en directorio";
 $a->strings["I will attend"] = "Voy a estar presente";
 $a->strings["I will not attend"] = "No voy a estar presente";
@@ -1018,22 +1204,467 @@ $a->strings["I might attend"] = "Puede que voy a estar presente";
 $a->strings["to"] = "a";
 $a->strings["Wall-to-Wall"] = "Muro-A-Muro";
 $a->strings["via Wall-To-Wall:"] = "via Muro-A-Muro:";
+$a->strings["Credits"] = "Creditos";
+$a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica es un proyecto comunitario, que no seria posible sin la ayuda de mucha gente. Aquí una lista de de aquellos que aportaron al código o la traducción de friendica.\nGracias a todos! ";
+$a->strings["Contact settings applied."] = "Contacto configurado con éxito.";
+$a->strings["Contact update failed."] = "Error al actualizar el Contacto.";
+$a->strings["Contact not found."] = "Contacto no encontrado.";
+$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ADVERTENCIA: Esto es muy avanzado y si se introduce información incorrecta tu conexión con este contacto puede dejar de funcionar.";
+$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Por favor usa el botón 'Atás' de tu navegador ahora si no tienes claro qué hacer en esta página.";
+$a->strings["No mirroring"] = "No espejar";
+$a->strings["Mirror as forwarded posting"] = "Espejar como reenvio";
+$a->strings["Mirror as my own posting"] = "Espejar como publicación propia";
+$a->strings["Return to contact editor"] = "Volver al editor de contactos";
+$a->strings["Refetch contact data"] = "Volver a solicitar datos del contacto.";
+$a->strings["Remote Self"] = "Perfil remoto";
+$a->strings["Mirror postings from this contact"] = "Espejar publicaciones de este contacto";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Marcar este contacto como perfil_remoto, esto generara que friendica reenvía nuevas publicaciones desde esta cuenta.";
+$a->strings["Account Nickname"] = "Apodo de la cuenta";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Etiqueta - Sobrescribe el Nombre/Apodo";
+$a->strings["Account URL"] = "Dirección de la cuenta";
+$a->strings["Friend Request URL"] = "Dirección de la solicitud de amistad";
+$a->strings["Friend Confirm URL"] = "Dirección de confirmación de tu amigo ";
+$a->strings["Notification Endpoint URL"] = "Dirección URL de la notificación";
+$a->strings["Poll/Feed URL"] = "Dirección del Sondeo/Fuentes";
+$a->strings["New photo from this URL"] = "Nueva foto de esta dirección";
+$a->strings["No potential page delegates located."] = "No se han localizado delegados potenciales de la página.";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Los delegados tienen la capacidad de gestionar todos los aspectos de esta cuenta/página, excepto los ajustes básicos de la cuenta. Por favor, no delegues tu cuenta personal a nadie en quien no confíes completamente.";
+$a->strings["Existing Page Managers"] = "Administradores actuales de la página";
+$a->strings["Existing Page Delegates"] = "Delegados actuales de la página";
+$a->strings["Potential Delegates"] = "Delegados potenciales";
+$a->strings["Remove"] = "Eliminar";
+$a->strings["Add"] = "Añadir";
+$a->strings["No entries."] = "Sin entradas.";
+$a->strings["Profile not found."] = "Perfil no encontrado.";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Esto puede ocurrir a veces si la conexión fue solicitada por ambas personas y ya hubiera sido aprobada.";
+$a->strings["Response from remote site was not understood."] = "La respuesta desde el sitio remoto no ha sido entendida.";
+$a->strings["Unexpected response from remote site: "] = "Respuesta inesperada desde el sitio remoto: ";
+$a->strings["Confirmation completed successfully."] = "Confirmación completada con éxito.";
+$a->strings["Remote site reported: "] = "El sito remoto informó: ";
+$a->strings["Temporary failure. Please wait and try again."] = "Error temporal. Por favor, espere y vuelva a intentarlo.";
+$a->strings["Introduction failed or was revoked."] = "La presentación ha fallado o ha sido anulada.";
+$a->strings["Unable to set contact photo."] = "Imposible establecer la foto del contacto.";
+$a->strings["No user record found for '%s' "] = "No se ha encontrado a ningún '%s' ";
+$a->strings["Our site encryption key is apparently messed up."] = "Nuestra clave de cifrado del sitio es aparentemente un lío.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Se ha proporcionado una dirección vacía o no hemos podido descifrarla.";
+$a->strings["Contact record was not found for you on our site."] = "El contacto no se ha encontrado en nuestra base de datos.";
+$a->strings["Site public key not available in contact record for URL %s."] = "La clave pública del sitio no está disponible en los datos del contacto para %s.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "La identificación proporcionada por el sistema es un duplicado de nuestro sistema. Debería funcionar si lo intentas de nuevo.";
+$a->strings["Unable to set your contact credentials on our system."] = "No se puede establecer las credenciales de tu contacto en nuestro sistema.";
+$a->strings["Unable to update your contact profile details on our system"] = "No se puede actualizar los datos de tu perfil de contacto en nuestro sistema";
+$a->strings["%1\$s has joined %2\$s"] = "%1\$s se ha unido a %2\$s";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s te da la bienvenida a %2\$s";
+$a->strings["This introduction has already been accepted."] = "Esta presentación ya ha sido aceptada.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "La dirección del perfil no es válida o no contiene información del perfil.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Aviso: La dirección del perfil no tiene un nombre de propietario identificable.";
+$a->strings["Warning: profile location has no profile photo."] = "Aviso: la dirección del perfil no tiene foto de perfil.";
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "no se encontró %d parámetro requerido en el lugar determinado",
+	1 => "no se encontraron %d parámetros requeridos en el lugar determinado",
+);
+$a->strings["Introduction complete."] = "Presentación completa.";
+$a->strings["Unrecoverable protocol error."] = "Error de protocolo irrecuperable.";
+$a->strings["Profile unavailable."] = "Perfil no disponible.";
+$a->strings["%s has received too many connection requests today."] = "%s ha recibido demasiadas solicitudes de conexión hoy.";
+$a->strings["Spam protection measures have been invoked."] = "Han sido activadas las medidas de protección contra spam.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "Tus amigos serán avisados para que lo intenten de nuevo pasadas 24 horas.";
+$a->strings["Invalid locator"] = "Localizador no válido";
+$a->strings["Invalid email address."] = "Dirección de correo incorrecta";
+$a->strings["This account has not been configured for email. Request failed."] = "Esta cuenta no ha sido configurada para el correo. Fallo de solicitud.";
+$a->strings["You have already introduced yourself here."] = "Ya te has presentado aquí.";
+$a->strings["Apparently you are already friends with %s."] = "Al parecer, ya eres amigo de %s.";
+$a->strings["Invalid profile URL."] = "Dirección de perfil no válida.";
+$a->strings["Your introduction has been sent."] = "Tu presentación ha sido enviada.";
+$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "La subscripción remota no se podrá hacer para tu red. Por favor contacta directamente desde tu sistema.";
+$a->strings["Please login to confirm introduction."] = "Inicia sesión para confirmar la presentación.";
+$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Sesión iniciada con la identificación incorrecta. Entra en este perfil.";
+$a->strings["Confirm"] = "Confirmar";
+$a->strings["Hide this contact"] = "Ocultar este contacto";
+$a->strings["Welcome home %s."] = "Bienvenido a casa %s";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Por favor, confirma tu solicitud de presentación/conexión con %s.";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Por favor introduce tu dirección ID de una de las siguientes redes sociales soportadas:";
+$a->strings["If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."] = "Si aun no eres miembro de la red social libre  seguí este enlace para encontrara un sitio disponible de friendica y acompañanos hoy mismo";
+$a->strings["Friend/Connection Request"] = "Solicitud de Amistad/Conexión";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
+$a->strings["Please answer the following:"] = "Por favor responde lo siguiente:";
+$a->strings["Does %s know you?"] = "¿%s te conoce?";
+$a->strings["Add a personal note:"] = "Añade una nota personal:";
+$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Web Social Federada";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora.";
+$a->strings["Your Identity Address:"] = "Dirección de tu perfil:";
+$a->strings["Submit Request"] = "Enviar solicitud";
+$a->strings["Global Directory"] = "Directorio global";
+$a->strings["Find on this site"] = "Buscar en este sitio";
+$a->strings["Results for:"] = "Resultados para:";
+$a->strings["Site Directory"] = "Directorio del sitio";
+$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas).";
+$a->strings["People Search - %s"] = "Buscar perfiles - %s";
+$a->strings["Forum Search - %s"] = "Búsqueda de foro - %s";
+$a->strings["No matches"] = "Sin conincidencias";
+$a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
+$a->strings["Item not found"] = "Elemento no encontrado";
+$a->strings["Edit post"] = "Editar publicación";
+$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de su comienzo.";
+$a->strings["Event title and start time are required."] = "Título del evento y hora de inicio requeridas.";
+$a->strings["Create New Event"] = "Crea un evento nuevo";
+$a->strings["Event details"] = "Detalles del evento";
+$a->strings["Starting date and Title are required."] = "Se requiere fecha de comienzo y titulo";
+$a->strings["Event Starts:"] = "Inicio del evento:";
+$a->strings["Required"] = "Obligatorio";
+$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante.";
+$a->strings["Event Finishes:"] = "Finalización del evento:";
+$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria";
+$a->strings["Description:"] = "Descripción:";
+$a->strings["Title:"] = "Título:";
+$a->strings["Share this event"] = "Comparte este evento";
+$a->strings["Files"] = "Archivos";
+$a->strings["- select -"] = "- seleccionar -";
+$a->strings["You already added this contact."] = "Ya has añadido este contacto.";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "El soporte de Diaspora* no esta habilitado, el contacto no puede ser agregado.";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "El soporte de OStatus no esta habilitado, el contacto no puede ser agregado.";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "No se pudo detectar el tipo de red. Contacto no puede ser agregado.";
+$a->strings["Contact added"] = "Contacto añadido";
+$a->strings["This is Friendica, version"] = "Esto es Friendica, versión";
+$a->strings["running at web location"] = "ejecutándose en la dirección web";
+$a->strings["Please visit Friendica.com to learn more about the Friendica project."] = "Por favor, visita Friendica.com para saber más sobre el proyecto Friendica.";
+$a->strings["Bug reports and issues: please visit"] = "Reporte de fallos y problemas: por favor visita";
+$a->strings["the bugtracker at github"] = "aviso de fallas (bugs) en github";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Sugerencias, elogios, donaciones, etc. por favor manda un correo a Info arroba Friendica punto com";
+$a->strings["Installed plugins/addons/apps:"] = "Módulos/extensiones/aplicaciones instalados:";
+$a->strings["No installed plugins/addons/apps"] = "Módulos/extensiones/aplicaciones no instalados";
 $a->strings["Friend suggestion sent."] = "Solicitud de amistad enviada.";
 $a->strings["Suggest Friends"] = "Sugerencias de amistad";
 $a->strings["Suggest a friend for %s"] = "Recomienda un amigo a %s";
+$a->strings["Group created."] = "Grupo creado.";
+$a->strings["Could not create group."] = "Imposible crear el grupo.";
+$a->strings["Group not found."] = "Grupo no encontrado.";
+$a->strings["Group name changed."] = "El nombre del grupo ha cambiado.";
+$a->strings["Save Group"] = "Guardar grupo";
+$a->strings["Create a group of contacts/friends."] = "Crea un grupo de contactos/amigos.";
+$a->strings["Group removed."] = "Grupo eliminado.";
+$a->strings["Unable to remove group."] = "No se puede eliminar el grupo.";
+$a->strings["Group Editor"] = "Editor de grupos";
+$a->strings["Members"] = "Miembros";
+$a->strings["Click on a contact to add or remove."] = "Pulsa en un contacto para añadirlo o eliminarlo.";
+$a->strings["No profile"] = "Nigún perfil";
+$a->strings["Help:"] = "Ayuda:";
+$a->strings["Welcome to %s"] = "Bienvenido a %s";
+$a->strings["Friendica Communications Server - Setup"] = "Servidor de comunicación Friendica - Configuración";
+$a->strings["Could not connect to database."] = "No es posible la conexión con la base de datos.";
+$a->strings["Could not create table."] = "No se puede crear la tabla.";
+$a->strings["Your Friendica site database has been installed."] = "La base de datos de su sitio web de Friendica ha sido instalada.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Por favor, consulta el archivo \"INSTALL.txt\".";
+$a->strings["Database already in use."] = "Base de datos ya se encuentra en uso";
+$a->strings["System check"] = "Verificación del sistema";
+$a->strings["Check again"] = "Compruebalo de nuevo";
+$a->strings["Database connection"] = "Conexión con la base de datos";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar.";
+$a->strings["Database Server Name"] = "Nombre del servidor de la base de datos";
+$a->strings["Database Login Name"] = "Usuario de la base de datos";
+$a->strings["Database Login Password"] = "Contraseña de la base de datos";
+$a->strings["For security reasons the password must not be empty"] = "Por razones de seguridad la contraseña no debe estar vacía";
+$a->strings["Database Name"] = "Nombre de la base de datos";
+$a->strings["Site administrator email address"] = "Dirección de correo del administrador de la web";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web.";
+$a->strings["Please select a default timezone for your website"] = "Por favor, selecciona la zona horaria predeterminada para tu web";
+$a->strings["Site settings"] = "Configuración de la página web";
+$a->strings["System Language:"] = "Sistema de idioma:";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Seleccione el idioma por defecto para su interfaz de instalación de Friendica y para enviar emails.";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se pudo encontrar una versión de la línea de comandos de PHP en la ruta del servidor web.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See 'Setup the poller'"] = "Si no tienes una versión de command line de php installado en el servidor, no sera posible de efectuar polling como trabajo de fondo a traves de cron. Vea 'Setup the poller'";
+$a->strings["PHP executable path"] = "Dirección al ejecutable PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación.";
+$a->strings["Command line PHP"] = "Línea de comandos PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "El ejecutable PHP no es e lphp cli binary (podria ser versión cgi-fgci)";
+$a->strings["Found PHP version: "] = "Versión PHP encontrada:";
+$a->strings["PHP cli binary"] = "PHP cli binario";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado.";
+$a->strings["This is required for message delivery to work."] = "Esto es necesario para que funcione la entrega de mensajes.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generar claves de encriptación";
+$a->strings["libCurl PHP module"] = "Módulo PHP libCurl";
+$a->strings["GD graphics PHP module"] = "Módulo PHP gráficos GD";
+$a->strings["OpenSSL PHP module"] = "Módulo PHP OpenSSL";
+$a->strings["mysqli PHP module"] = "Módulo PHP mysqli";
+$a->strings["mb_string PHP module"] = "Módulo PHP mb_string";
+$a->strings["mcrypt PHP module"] = "modulo mycrypt PHP";
+$a->strings["XML PHP module"] = "Módulo XML PHP";
+$a->strings["iconv module"] = "Módulo iconv";
+$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite de Apache";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El módulo de PHP libcurl es necesario, pero no está instalado.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: El módulo de PHP openssl es necesario, pero  no está instalado.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El módulo de PHP mysqli es necesario, pero no está instalado.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: El módulo de PHP mb_string es necesario, pero no está instalado.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: modulo mycrypt PHP requerido pero no instalado.";
+$a->strings["Error: iconv PHP module required but not installed."] = "Error: módulo iconv PHP requerido pero no instalado.";
+$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Si está utilizando php_cli, por favor asegúrese de que el módulo mcrypt está habilitado en este archivo de configuración";
+$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Función mycrypt_create_iv() no esta definido. Esto es preciso para habilitar RINO2 encryption layer.";
+$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() función";
+$a->strings["Error, XML PHP module required but not installed."] = "Error, módulo XML PHP requerido pero no instalado.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Al final obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php tiene permiso de escritura";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica usa el motor de templates Smarty3 para renderizar su visualisacion web. Smarty3 compila templates hacia PHP para acelerar la velocidad del renderizar.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Para poder guardar estos templates compilados, el servidor web necesita acceso de escritura en el directorio /view/smarty3/ en el árbol de raíz de la instalación friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor asegure que el usuario que utiliza el servidor web (ejemplo: www-data) tiene permisos de escritura en esta carpeta.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad deberia dar acceso de escritura solo a /view/smarty3 / → no al los archivos template (.tpl) que contiene.";
+$a->strings["view/smarty3 is writable"] = "Se puede escribir en /view/smarty3";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración.";
+$a->strings["Url rewrite is working"] = "Reescribiendo la dirección...";
+$a->strings["ImageMagick PHP extension is not installed"] = "No está instalada la extensión ImageMagick PHP";
+$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP extension is installed";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick supporta GIF";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web.";
+$a->strings["
    What next
    "] = "
    ¿Ahora qué?
    ";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
+$a->strings["Total invitation limit exceeded."] = "Límite total de invitaciones excedido.";
+$a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo válida.";
+$a->strings["Please join us on Friendica"] = "Únete a nosotros en Friendica";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Límite de invitaciones sobrepasado. Contacta con el administrador del sitio.";
+$a->strings["%s : Message delivery failed."] = "%s : Ha fallado la entrega del mensaje.";
+$a->strings["%d message sent."] = array(
+	0 => "%d mensaje enviado.",
+	1 => "%d mensajes enviados.",
+);
+$a->strings["You have no more invitations available"] = "No tienes más invitaciones disponibles";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Visita %s para ver una lista de servidores públicos donde puedes darte de alta. Los miembros de otros servidores de Friendica pueden conectarse entre ellos, así como con miembros de otras redes sociales diferentes.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Para aceptar la invitación visita y regístrate en %s o en cualquier otro servidor público de Friendica.";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Los servidores de Friendica están interconectados para crear una enorme red social centrada en la privacidad y controlada por sus miembros. También se puede conectar con muchas redes sociales tradicionales. Mira en %s para poder ver un listado de servidores alternativos de Friendica donde puedes darte de alta.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Discúlpanos. Este sistema no está configurado actualmente para conectar con otros servidores públicos o invitar nuevos miembros.";
+$a->strings["Send invitations"] = "Enviar invitaciones";
+$a->strings["Enter email addresses, one per line:"] = "Introduce las direcciones de correo, una por línea:";
+$a->strings["Your message:"] = "Tu mensaje:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Estás cordialmente invitado a unirte a mi y a otros amigos en Friendica, creemos juntos una red social mejor.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Tienes que proporcionar el siguiente código: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Una vez registrado, por favor contacta conmigo a través de mi página de perfil en:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Para más información sobre el Proyecto Friendica y sobre por qué pensamos que es algo importante, visita http://friendica.com";
+$a->strings["Unable to locate original post."] = "No se puede encontrar la publicación original.";
+$a->strings["Empty post discarded."] = "Publicación vacía descartada.";
+$a->strings["System error. Post not saved."] = "Error del sistema. Mensaje no guardado.";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Este mensaje te lo ha enviado %s, miembro de la red social Friendica.";
+$a->strings["You may visit them online at %s"] = "Los puedes visitar en línea en %s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes.";
+$a->strings["%s posted an update."] = "%s ha publicado una actualización.";
+$a->strings["Time Conversion"] = "Conversión horária";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otros servidores de la red friendica y amigos en zonas de horarios desconocidos.";
+$a->strings["UTC time: %s"] = "Tiempo UTC: %s";
+$a->strings["Current timezone: %s"] = "Zona horaria actual: %s";
+$a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s";
+$a->strings["Please select your timezone:"] = "Por favor, selecciona tu zona horaria:";
+$a->strings["Remote privacy information not available."] = "Privacidad de la información remota no disponible.";
+$a->strings["Visible to:"] = "Visible para:";
+$a->strings["No valid account found."] = "No se ha encontrado ninguna cuenta válida";
+$a->strings["Password reset request issued. Check your email."] = "Solicitud de restablecimiento de contraseña enviada. Revisa tu correo.";
+$a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s\" to reset your account\n\t\tpassword. In order to confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided and ignore and/or delete this email.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "\n\t\tEstimado %1\$s,\n\t\t\tUna consulta llego recientemente a \"%2\$s\" para renovar su\n\t\tcontraseña. Para confirmar esta solicitud por favor seleccione el enlace de verificación mas \n\t\tabajo o copie a pegue el mismo en la barra de dirección de su navegador.\n\n\t\tSi NO ha solicitado este cambio por favor NO SIGA este enlace\n\t\tproporcionado y ignore o borre este mail.\n\n\t\tSu contraseña no sera cambiada hasta que podamos verificar que usted haza\n\t\tsolicitado este cambio..";
+$a->strings["\n\t\tFollow this link to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\n\t\tSiga este enlace para verificar su identidad:\n\n\t\t%1\$s\n\n\t\tA continuación recibirá un mensaje consecutivo conteniendo la nueva contraseña.\n\t\tPodrá cambiar la contraseña después de haber accedido a la cuenta.\n\n\t\tLos detalles del acceso son las siguientes:\n\n\t\tDirección del sitio:\t%2\$s\n\t\tNombre de la cuenta:\t%3\$s";
+$a->strings["Password reset requested at %s"] = "Contraseña restablecida enviada a %s";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña.";
+$a->strings["Your password has been reset as requested."] = "Tu contraseña ha sido restablecida como solicitaste.";
+$a->strings["Your new password is"] = "Tu nueva contraseña es";
+$a->strings["Save or copy your new password - and then"] = "Guarda o copia tu nueva contraseña y luego";
+$a->strings["click here to login"] = "pulsa aquí para acceder";
+$a->strings["Your password may be changed from the Settings page after successful login."] = "Puedes cambiar tu contraseña desde la página de Configuración después de acceder con éxito.";
+$a->strings["\n\t\t\t\tDear %1\$s,\n\t\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\t\tinformation for your records (or change your password immediately to\n\t\t\t\tsomething that you will remember).\n\t\t\t"] = "\n\t\t\t\tEstimado %1\$s,\n\t\t\t\t\tSu contraseña ha cambiado como solicitado. Por favor guarde esta\n\t\t\t\tinformación para sus documentación (o cambie su contraseña inmediatamente a\n\t\t\t\talgo que pueda recordar).\n\t\t";
+$a->strings["\n\t\t\t\tYour login details are as follows:\n\n\t\t\t\tSite Location:\t%1\$s\n\t\t\t\tLogin Name:\t%2\$s\n\t\t\t\tPassword:\t%3\$s\n\n\t\t\t\tYou may change that password from your account settings page after logging in.\n\t\t\t"] = "\n\t\t\t\tSus datos de acceso son las siguientes:\n\n\t\t\t\tDirección del sitio:\t%1\$s\n\t\t\t\tNombre de cuenta:\t%2\$s\n\t\t\t\tContraseña:\t%3\$s\n\n\t\t\t\tPodrá cambiar esta contraseña después de ingresar al sitio en su pagina de configuración.\n\t\t\t";
+$a->strings["Your password has been changed at %s"] = "Tu contraseña se ha cambiado por %s";
+$a->strings["Forgot your Password?"] = "¿Olvidaste tu contraseña?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduce tu correo para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales.";
+$a->strings["Reset"] = "Restablecer";
+$a->strings["System down for maintenance"] = "Servicio suspendido por mantenimiento";
+$a->strings["Manage Identities and/or Pages"] = "Administrar identidades y/o páginas";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Cambia entre diferentes identidades o páginas de Comunidad/Grupos que comparten los detalles de tu cuenta o sobre los que tienes permisos para administrar";
+$a->strings["Select an identity to manage: "] = "Selecciona una identidad a gestionar:";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado.";
+$a->strings["is interested in:"] = "estás interesado en:";
+$a->strings["Profile Match"] = "Coincidencias de Perfil";
+$a->strings["No recipient selected."] = "Ningún destinatario seleccionado";
+$a->strings["Unable to locate contact information."] = "No se puede encontrar información del contacto.";
+$a->strings["Message could not be sent."] = "El mensaje no ha podido ser enviado.";
+$a->strings["Message collection failure."] = "Fallo en la recolección de mensajes.";
+$a->strings["Message sent."] = "Mensaje enviado.";
+$a->strings["Do you really want to delete this message?"] = "¿Estás seguro de que quieres borrar este mensaje?";
+$a->strings["Message deleted."] = "Mensaje eliminado.";
+$a->strings["Conversation removed."] = "Conversación eliminada.";
+$a->strings["Send Private Message"] = "Enviar mensaje privado";
+$a->strings["To:"] = "Para:";
+$a->strings["Subject:"] = "Asunto:";
+$a->strings["No messages."] = "No hay mensajes.";
+$a->strings["Message not available."] = "Mensaje no disponibile.";
+$a->strings["Delete message"] = "Borrar mensaje";
+$a->strings["Delete conversation"] = "Eliminar conversación";
+$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "No hay comunicaciones seguras disponibles. Podrías responder desde la página de perfil del remitente. ";
+$a->strings["Send Reply"] = "Enviar respuesta";
+$a->strings["Unknown sender - %s"] = "Remitente desconocido - %s";
+$a->strings["You and %s"] = "Tú y %s";
+$a->strings["%s and You"] = "%s y Tú";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["%d message"] = array(
+	0 => "%d mensaje",
+	1 => "%d mensajes",
+);
 $a->strings["Mood"] = "Ánimo";
 $a->strings["Set your current mood and tell your friends"] = "Coloca tu ánimo actual y cuéntaselo a tus amigos";
+$a->strings["Remove term"] = "Eliminar término";
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array(
+	0 => "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos.",
+	1 => "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos.",
+);
+$a->strings["Messages in this group won't be send to these receivers."] = "Los mensajes de este grupo no se enviarán a estos receptores.";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente.";
+$a->strings["Invalid contact."] = "Contacto erróneo.";
+$a->strings["Commented Order"] = "Orden de comentarios";
+$a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentarios";
+$a->strings["Posted Order"] = "Orden de publicación";
+$a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
+$a->strings["Posts that mention or involve you"] = "Publicaciones que te mencionan o involucran";
+$a->strings["New"] = "Nuevo";
+$a->strings["Activity Stream - by date"] = "Corriente de actividad por fecha";
+$a->strings["Shared Links"] = "Enlaces compartidos";
+$a->strings["Interesting Links"] = "Enlaces interesantes";
+$a->strings["Starred"] = "Favoritos";
+$a->strings["Favourite Posts"] = "Publicaciones favoritas";
+$a->strings["Welcome to Friendica"] = "Bienvenido a Friendica ";
+$a->strings["New Member Checklist"] = "Listado de nuevos miembros";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Nos gustaría ofrecerte algunos consejos y enlaces para ayudar a hacer tu experiencia más amena. Pulsa en cualquier elemento para visitar la página correspondiente. Un enlace a esta página será visible desde tu página de inicio durante las dos semanas siguientes a tu inscripción y luego desaparecerá.";
+$a->strings["Getting Started"] = "Empezando";
+$a->strings["Friendica Walk-Through"] = "Visita guiada a Friendica";
+$a->strings["On your Quick Start page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "En tu página de Inicio Rápido - busca una introducción breve para tus pestañas de perfil y red, haz algunas conexiones nuevas, y busca algunos grupos a los que unirte.";
+$a->strings["Go to Your Settings"] = "Ir a tus ajustes";
+$a->strings["On your Settings page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "En la página de Configuración puedes cambiar tu contraseña inicial. También aparece tu ID (Identity Address). Es parecida a una dirección de correo y te servirá para conectar con gente de redes sociales libres.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Revisa las otras configuraciones, especialmente la configuración de privacidad. Un listado de directorio sin publicar es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan cómo ponerse en contacto contigo.";
+$a->strings["Upload Profile Photo"] = "Subir foto del Perfil";
+$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Sube una foto para tu perfil si no lo has hecho aún. Los estudios han demostrado que la gente que usa fotos suyas reales tienen diez veces más éxito a la hora de entablar amistad que las que no.";
+$a->strings["Edit Your Profile"] = "Editar tu perfil";
+$a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Edita tu perfil predeterminado como quieras. Revisa la configuración para ocultar tu lista de amigos o tu perfil a los visitantes desconocidos.";
+$a->strings["Profile Keywords"] = "Palabras clave del perfil";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Define en tu perfil público algunas palabras que describan tus intereses. Así podremos buscar otras personas con los mismos gustos y sugerirte posibles amigos.";
+$a->strings["Connecting"] = "Conectando";
+$a->strings["Importing Emails"] = "Importando correos electrónicos";
+$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Introduce la información para acceder a tu correo en la página de Configuración del conector si quieres importar e interactuar con amigos o listas de correos del buzón de entrada de tu correo electrónico.";
+$a->strings["Go to Your Contacts Page"] = "Ir a tu página de contactos";
+$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog."] = "Tu página de Contactos es el portal desde donde podrás manejar tus amistades y conectarte con amigos de otras redes. Normalmente introduces su dirección o la dirección de su sitio web en el recuadro \"Añadir contacto nuevo\".";
+$a->strings["Go to Your Site's Directory"] = "Ir al directorio de tu sitio";
+$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = "El Directorio te permite encontrar otras personas en esta red o en cualquier otro sitio federado. Busca algún enlace de Conectar o Seguir en su perfil. Proporciona tu direción personal si es necesario.";
+$a->strings["Finding New People"] = "Encontrando nueva gente";
+$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "En el panel lateral de la página de Contactos existen varias herramientas para encontrar nuevos amigos. Podemos filtrar personas por sus intereses, buscar personas por nombre o por sus intereses, y ofrecerte sugerencias basadas en sus relaciones de la red. En un sitio nuevo, las sugerencias de amigos por lo general comienzan pasadas las 24 horas.";
+$a->strings["Group Your Contacts"] = "Agrupa tus contactos";
+$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Una vez que tengas algunos amigos, puedes organizarlos en grupos privados de conversación mediante el memnú en tu página de Contactos y luego puedes interactuar con cada grupo por separado desde tu página de Red.";
+$a->strings["Why Aren't My Posts Public?"] = "¿Por qué mis publicaciones no son públicas?";
+$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respeta tu privacidad. Por defecto, tus publicaciones solo se mostrarán a personas que hayas añadido como amistades. Para más información, mira la sección de ayuda en el enlace de más arriba.";
+$a->strings["Getting Help"] = "Consiguiendo ayuda";
+$a->strings["Go to the Help Section"] = "Ir a la sección de ayuda";
+$a->strings["Our help pages may be consulted for detail on other program features and resources."] = "Puedes consultar nuestra página de Ayuda para más información y recursos de ayuda.";
+$a->strings["Contacts who are not members of a group"] = "Contactos sin grupo";
+$a->strings["Invalid request identifier."] = "Solicitud de identificación no válida.";
+$a->strings["Discard"] = "Descartar";
+$a->strings["Network Notifications"] = "Notificaciones de Red";
+$a->strings["System Notifications"] = "Notificaciones del sistema";
+$a->strings["Personal Notifications"] = "Notificaciones personales";
+$a->strings["Home Notifications"] = "Notificaciones de Inicio";
+$a->strings["Show Ignored Requests"] = "Mostrar peticiones ignoradas";
+$a->strings["Hide Ignored Requests"] = "Ocultar peticiones ignoradas";
+$a->strings["Notification type: "] = "Tipo de notificación: ";
+$a->strings["suggested by %s"] = "sugerido por %s";
+$a->strings["Post a new friend activity"] = "Publica tu nueva amistad";
+$a->strings["if applicable"] = "Si corresponde";
+$a->strings["Claims to be known to you: "] = "Dice conocerte: ";
+$a->strings["yes"] = "sí";
+$a->strings["no"] = "no";
+$a->strings["Shall your connection be bidirectional or not?"] = "¿Su conexión debe ser bidireccional o no?";
+$a->strings["Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed."] = "Aceptar a %s como amigo le permite a %s suscribirse a sus publicaciones, y usted también recibirá actualizaciones de ellos en sus noticias.";
+$a->strings["Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Aceptar a %s como suscriptor les permite suscribirse a sus publicaciones, pero usted no recibirá actualizaciones de ellos en sus noticias.";
+$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Aceptar a %s como participante les permite suscribirse a sus publicaciones, pero usted no recibirá actualizaciones de ellos en sus noticias.";
+$a->strings["Friend"] = "Amigo";
+$a->strings["Sharer"] = "Lector";
+$a->strings["Subscriber"] = "Suscriptor";
+$a->strings["No introductions."] = "Sin presentaciones.";
+$a->strings["Show unread"] = "Mostrar no leído";
+$a->strings["Show all"] = "Mostrar todo";
+$a->strings["No more %s notifications."] = "No más notificaciones de %s.";
+$a->strings["No more system notifications."] = "No hay más notificaciones del sistema.";
+$a->strings["Post successful."] = "¡Publicado!";
+$a->strings["OpenID protocol error. No ID returned."] = "Error de protocolo OpenID. ID no devuelta.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Cuenta no encontrada y el registro OpenID no está permitido en ese sitio.";
+$a->strings["Subscribing to OStatus contacts"] = "Subscribir a los contactos de OStatus";
+$a->strings["No contact provided."] = "Sin suministro de datos de contacto.";
+$a->strings["Couldn't fetch information for contact."] = "No se ha podido conseguir la información del contacto.";
+$a->strings["Couldn't fetch friends for contact."] = "No se ha podido conseguir datos de amigos para contactar.";
+$a->strings["Done"] = "hecho!";
+$a->strings["success"] = "exito!";
+$a->strings["failed"] = "fallido!";
+$a->strings["Keep this window open until done."] = "Mantén esta ventana abierta hasta que el proceso ha terminado.";
+$a->strings["Not Extended"] = "No extendido";
+$a->strings["Recent Photos"] = "Fotos recientes";
+$a->strings["Upload New Photos"] = "Subir nuevas fotos";
+$a->strings["everybody"] = "todos";
+$a->strings["Contact information unavailable"] = "Información del contacto no disponible";
+$a->strings["Album not found."] = "Álbum no encontrado.";
+$a->strings["Delete Album"] = "Eliminar álbum";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "¿Estás seguro de quieres borrar este álbum y todas sus fotos?";
+$a->strings["Delete Photo"] = "Eliminar foto";
+$a->strings["Do you really want to delete this photo?"] = "¿Estás seguro de que quieres borrar esta foto?";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s fue etiquetado en %2\$s por %3\$s";
+$a->strings["a photo"] = "una foto";
+$a->strings["Image exceeds size limit of %s"] = "La imagen excede el limite de %s";
+$a->strings["Image file is empty."] = "El archivo de imagen está vacío.";
+$a->strings["Unable to process image."] = "Imposible procesar la imagen.";
+$a->strings["Image upload failed."] = "Error al subir la imagen.";
+$a->strings["No photos selected"] = "Ninguna foto seleccionada";
+$a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Has usado %1$.2f MB de %2$.2f MB de tu álbum de fotos.";
+$a->strings["Upload Photos"] = "Subir fotos";
+$a->strings["New album name: "] = "Nombre del nuevo álbum: ";
+$a->strings["or existing album name: "] = "o nombre de un álbum existente: ";
+$a->strings["Do not show a status post for this upload"] = "No actualizar tu estado con este envío";
+$a->strings["Show to Groups"] = "Mostrar a los Grupos";
+$a->strings["Show to Contacts"] = "Mostrar a los Contactos";
+$a->strings["Private Photo"] = "Foto Privada";
+$a->strings["Public Photo"] = "Foto Pública";
+$a->strings["Edit Album"] = "Modificar álbum";
+$a->strings["Show Newest First"] = "Mostrar más nuevos primero";
+$a->strings["Show Oldest First"] = "Mostrar más antiguos primero";
+$a->strings["View Photo"] = "Ver foto";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
+$a->strings["Photo not available"] = "Foto no disponible";
+$a->strings["View photo"] = "Ver foto";
+$a->strings["Edit photo"] = "Modificar foto";
+$a->strings["Use as profile photo"] = "Usar como foto del perfil";
+$a->strings["View Full Size"] = "Ver a tamaño completo";
+$a->strings["Tags: "] = "Etiquetas: ";
+$a->strings["[Remove any tag]"] = "[Borrar todas las etiquetas]";
+$a->strings["New album name"] = "Nuevo nombre del álbum";
+$a->strings["Caption"] = "Título";
+$a->strings["Add a Tag"] = "Añadir una etiqueta";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Ejemplo: @juan, @Barbara_Ruiz, @julia@example.com, #California, #camping";
+$a->strings["Do not rotate"] = "No rotar";
+$a->strings["Rotate CW (right)"] = "Girar a la derecha";
+$a->strings["Rotate CCW (left)"] = "Girar a la izquierda";
+$a->strings["Private photo"] = "Foto privada";
+$a->strings["Public photo"] = "Foto pública";
+$a->strings["Map"] = "Mapa";
+$a->strings["View Album"] = "Ver Álbum";
+$a->strings["{0} wants to be your friend"] = "{0} quiere ser tu amigo";
+$a->strings["{0} sent you a message"] = "{0} te ha enviado un mensaje";
+$a->strings["{0} requested registration"] = "{0} solicitudes de registro";
 $a->strings["Poke/Prod"] = "Toque/Empujón";
 $a->strings["poke, prod or do other things to somebody"] = "da un toque, empujón o similar a alguien";
 $a->strings["Recipient"] = "Receptor";
 $a->strings["Choose what you wish to do to recipient"] = "Elige qué desea hacer con el receptor";
 $a->strings["Make this post private"] = "Hacer esta publicación privada";
+$a->strings["Tips for New Members"] = "Consejos para nuevos miembros";
 $a->strings["Image uploaded but image cropping failed."] = "Imagen recibida, pero ha fallado al recortarla.";
 $a->strings["Image size reduction [%s] failed."] = "Ha fallado la reducción de las dimensiones de la imagen [%s].";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente.";
 $a->strings["Unable to process image"] = "Imposible procesar la imagen";
-$a->strings["Image exceeds size limit of %s"] = "La imagen excede el limite de %s";
-$a->strings["Unable to process image."] = "Imposible procesar la imagen.";
 $a->strings["Upload File:"] = "Subir archivo:";
 $a->strings["Select a profile:"] = "Elige un perfil:";
 $a->strings["Upload"] = "Subir";
@@ -1044,38 +1675,6 @@ $a->strings["Crop Image"] = "Recortar imagen";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "Por favor, ajusta el recorte de la imagen para optimizarla.";
 $a->strings["Done Editing"] = "Editado";
 $a->strings["Image uploaded successfully."] = "Imagen subida con éxito.";
-$a->strings["Image upload failed."] = "Error al subir la imagen.";
-$a->strings["Account approved."] = "Cuenta aprobada.";
-$a->strings["Registration revoked for %s"] = "Registro anulado para %s";
-$a->strings["Please login."] = "Por favor accede.";
-$a->strings["Invalid request identifier."] = "Solicitud de identificación no válida.";
-$a->strings["Discard"] = "Descartar";
-$a->strings["Ignore"] = "Ignorar";
-$a->strings["Network Notifications"] = "Notificaciones de Red";
-$a->strings["Personal Notifications"] = "Notificaciones personales";
-$a->strings["Home Notifications"] = "Notificaciones de Inicio";
-$a->strings["Show Ignored Requests"] = "Mostrar peticiones ignoradas";
-$a->strings["Hide Ignored Requests"] = "Ocultar peticiones ignoradas";
-$a->strings["Notification type: "] = "Tipo de notificación: ";
-$a->strings["suggested by %s"] = "sugerido por %s";
-$a->strings["Hide this contact from others"] = "Ocultar este contacto a los demás.";
-$a->strings["Post a new friend activity"] = "Publica tu nueva amistad";
-$a->strings["if applicable"] = "Si corresponde";
-$a->strings["Approve"] = "Aprobar";
-$a->strings["Claims to be known to you: "] = "Dice conocerte: ";
-$a->strings["yes"] = "sí";
-$a->strings["no"] = "no";
-$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "¿Deberá la coneccion ser bidireccional?\n\"Amigo\" implica que permitas la lectura y subscribas a las publicaciones del contacto.\n\"Admirador\" significa que permitas la lectura de tus publicaciones pero que no quieras ver sus publicaciones.\n\nAprobar como:";
-$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "¿Deberá la coneccion ser bidireccional?\n\"Amigo\" implica que permitas la lectura y subscribas a las publicaciones del contacto.\n\"Sharer\" significa que permitas la lectura de tus publicaciones pero que no quieras ver sus publicaciones.\n\nAprobar como:";
-$a->strings["Friend"] = "Amigo";
-$a->strings["Sharer"] = "Lector";
-$a->strings["Fan/Admirer"] = "Fan/Admirador";
-$a->strings["Profile URL"] = "URL Perfil";
-$a->strings["No introductions."] = "Sin presentaciones.";
-$a->strings["Show unread"] = "Mostrar no leído";
-$a->strings["Show all"] = "Mostrar todo";
-$a->strings["No more %s notifications."] = "No más notificaciones de %s.";
-$a->strings["Profile not found."] = "Perfil no encontrado.";
 $a->strings["Profile deleted."] = "Perfil eliminado.";
 $a->strings["Profile-"] = "Perfil-";
 $a->strings["New profile created."] = "Nuevo perfil creado.";
@@ -1119,7 +1718,6 @@ $a->strings["Your Gender:"] = "Género:";
 $a->strings["♥ Marital Status:"] = " Estado civil:";
 $a->strings["Example: fishing photography software"] = "Ejemplo: pesca fotografía software";
 $a->strings["Profile Name:"] = "Nombres del perfil:";
-$a->strings["Required"] = "Obligatorio";
 $a->strings["This is your public profile.
    It may be visible to anybody using the internet."] = "Éste es tu perfil público.
    Puede ser visto por cualquier usuario de internet.";
 $a->strings["Your Full Name:"] = "Tu nombre completo:";
 $a->strings["Title/Description:"] = "Título/Descrición:";
@@ -1150,100 +1748,16 @@ $a->strings["Work/employment"] = "Trabajo/ocupación";
 $a->strings["School/education"] = "Escuela/estudios";
 $a->strings["Contact information and Social Networks"] = "Informacioń de contacto y Redes sociales";
 $a->strings["Edit/Manage Profiles"] = "Editar/Administrar perfiles";
-$a->strings["No friends to display."] = "No hay amigos para mostrar.";
-$a->strings["Access to this profile has been restricted."] = "El acceso a este perfil ha sido restringido.";
-$a->strings["View"] = "Vista";
-$a->strings["Previous"] = "Previo";
-$a->strings["Next"] = "Siguiente";
-$a->strings["list"] = "lista";
-$a->strings["User not found"] = "Usuario no encontrado";
-$a->strings["This calendar format is not supported"] = "Este formato de calendario no se soporta";
-$a->strings["No exportable data found"] = "No se ha encontrado información exportable";
-$a->strings["calendar"] = "calendario";
-$a->strings["No contacts in common."] = "Sin contactos en común.";
-$a->strings["Common Friends"] = "Amigos comunes";
-$a->strings["Not available."] = "No disponible";
-$a->strings["Global Directory"] = "Directorio global";
-$a->strings["Find on this site"] = "Buscar en este sitio";
-$a->strings["Results for:"] = "Resultados para:";
-$a->strings["Site Directory"] = "Directorio del sitio";
-$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas).";
-$a->strings["People Search - %s"] = "Buscar perfiles - %s";
-$a->strings["Forum Search - %s"] = "Búsqueda de foro - %s";
-$a->strings["No matches"] = "Sin conincidencias";
-$a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
-$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de su comienzo.";
-$a->strings["Event title and start time are required."] = "Título del evento y hora de inicio requeridas.";
-$a->strings["Create New Event"] = "Crea un evento nuevo";
-$a->strings["Event details"] = "Detalles del evento";
-$a->strings["Starting date and Title are required."] = "Se requiere fecha de comienzo y titulo";
-$a->strings["Event Starts:"] = "Inicio del evento:";
-$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante.";
-$a->strings["Event Finishes:"] = "Finalización del evento:";
-$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria";
-$a->strings["Description:"] = "Descripción:";
-$a->strings["Title:"] = "Título:";
-$a->strings["Share this event"] = "Comparte este evento";
-$a->strings["System down for maintenance"] = "Servicio suspendido por mantenimiento";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado.";
-$a->strings["is interested in:"] = "estás interesado en:";
-$a->strings["Profile Match"] = "Coincidencias de Perfil";
-$a->strings["Tips for New Members"] = "Consejos para nuevos miembros";
-$a->strings["Do you really want to delete this suggestion?"] = "¿Estás seguro de que quieres borrar esta sugerencia?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas.";
-$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
-$a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]";
-$a->strings["Recent Photos"] = "Fotos recientes";
-$a->strings["Upload New Photos"] = "Subir nuevas fotos";
-$a->strings["everybody"] = "todos";
-$a->strings["Contact information unavailable"] = "Información del contacto no disponible";
-$a->strings["Album not found."] = "Álbum no encontrado.";
-$a->strings["Delete Album"] = "Eliminar álbum";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "¿Estás seguro de quieres borrar este álbum y todas sus fotos?";
-$a->strings["Delete Photo"] = "Eliminar foto";
-$a->strings["Do you really want to delete this photo?"] = "¿Estás seguro de que quieres borrar esta foto?";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s fue etiquetado en %2\$s por %3\$s";
-$a->strings["a photo"] = "una foto";
-$a->strings["Image file is empty."] = "El archivo de imagen está vacío.";
-$a->strings["No photos selected"] = "Ninguna foto seleccionada";
-$a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
-$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Has usado %1$.2f MB de %2$.2f MB de tu álbum de fotos.";
-$a->strings["Upload Photos"] = "Subir fotos";
-$a->strings["New album name: "] = "Nombre del nuevo álbum: ";
-$a->strings["or existing album name: "] = "o nombre de un álbum existente: ";
-$a->strings["Do not show a status post for this upload"] = "No actualizar tu estado con este envío";
-$a->strings["Show to Groups"] = "Mostrar a los Grupos";
-$a->strings["Show to Contacts"] = "Mostrar a los Contactos";
-$a->strings["Private Photo"] = "Foto Privada";
-$a->strings["Public Photo"] = "Foto Pública";
-$a->strings["Edit Album"] = "Modificar álbum";
-$a->strings["Show Newest First"] = "Mostrar más nuevos primero";
-$a->strings["Show Oldest First"] = "Mostrar más antiguos primero";
-$a->strings["View Photo"] = "Ver foto";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
-$a->strings["Photo not available"] = "Foto no disponible";
-$a->strings["View photo"] = "Ver foto";
-$a->strings["Edit photo"] = "Modificar foto";
-$a->strings["Use as profile photo"] = "Usar como foto del perfil";
-$a->strings["View Full Size"] = "Ver a tamaño completo";
-$a->strings["Tags: "] = "Etiquetas: ";
-$a->strings["[Remove any tag]"] = "[Borrar todas las etiquetas]";
-$a->strings["New album name"] = "Nuevo nombre del álbum";
-$a->strings["Caption"] = "Título";
-$a->strings["Add a Tag"] = "Añadir una etiqueta";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Ejemplo: @juan, @Barbara_Ruiz, @julia@example.com, #California, #camping";
-$a->strings["Do not rotate"] = "No rotar";
-$a->strings["Rotate CW (right)"] = "Girar a la derecha";
-$a->strings["Rotate CCW (left)"] = "Girar a la izquierda";
-$a->strings["Private photo"] = "Foto privada";
-$a->strings["Public photo"] = "Foto pública";
-$a->strings["Map"] = "Mapa";
-$a->strings["View Album"] = "Ver Álbum";
+$a->strings["Invalid profile identifier."] = "Identificador de perfil no válido.";
+$a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
+$a->strings["Visible To"] = "Visible para";
+$a->strings["All Contacts (with secure profile access)"] = "Todos los contactos (con perfil de acceso seguro)";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Te has registrado con éxito. Por favor, consulta tu correo para más información.";
 $a->strings["Failed to send email message. Here your accout details:
     login: %s
     password: %s

    You can change your password after login."] = "Error al intentar de enviar mensaje de correo. Aquí los detalles de su cuenta: 
     login: %s
     contraseña: %s

    Puede cambiar su contraseña después de ingresar al sitio.";
 $a->strings["Registration successful."] = "Registro exitoso.";
 $a->strings["Your registration can not be processed."] = "Tu registro no se puede procesar.";
 $a->strings["Your registration is pending approval by the site owner."] = "Tu registro está pendiente de aprobación por el propietario del sitio.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor.";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puedes (opcionalmente) rellenar este formulario a través de OpenID escribiendo tu OpenID y pulsando en \"Registrar\".";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos.";
 $a->strings["Your OpenID (optional): "] = "Tu OpenID (opcional):";
@@ -1252,7 +1766,6 @@ $a->strings["Note for the admin"] = "Nota para el administrador";
 $a->strings["Leave a message for the admin, why you want to join this node"] = "Deje un mensaje para el administrador sobre por qué quiere unirse a este nodo";
 $a->strings["Membership on this site is by invitation only."] = "Sitio solo accesible mediante invitación.";
 $a->strings["Your invitation ID: "] = "ID de tu invitación: ";
-$a->strings["Registration"] = "Registro";
 $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Nombre completo (ej. Joe Smith, real o real aparente):";
 $a->strings["Your Email Address: "] = "Tu dirección de correo: ";
 $a->strings["New Password:"] = "Contraseña nueva:";
@@ -1260,16 +1773,26 @@ $a->strings["Leave empty for an auto generated password."] = "Dejar vacío para
 $a->strings["Confirm:"] = "Confirmar:";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@\$sitename'."] = "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"apodo@\$nombredelsitio\".";
 $a->strings["Choose a nickname: "] = "Escoge un apodo: ";
+$a->strings["Import"] = "Importar";
 $a->strings["Import your profile to this friendica instance"] = "Importar tu perfil a esta instancia de friendica";
-$a->strings["Account"] = "Cuenta";
-$a->strings["Additional features"] = "Características adicionales";
+$a->strings["Account approved."] = "Cuenta aprobada.";
+$a->strings["Registration revoked for %s"] = "Registro anulado para %s";
+$a->strings["Please login."] = "Por favor accede.";
+$a->strings["Remove My Account"] = "Eliminar mi cuenta";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Esto eliminará por completo tu cuenta. Una vez hecho no se puede deshacer.";
+$a->strings["Please enter your password for verification:"] = "Por favor, introduce tu contraseña para la verificación:";
+$a->strings["Resubscribing to OStatus contacts"] = "Resubscribir a contactos de OStatus";
+$a->strings["Error"] = "error";
+$a->strings["Only logged in users are permitted to perform a search."] = "Solo usuarios activos tienen permiso para ejecutar búsquedas.";
+$a->strings["Too Many Requests"] = "Demasiadas consultas";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "Se permite solo una búsqueda por minuto para usuarios no identificados.";
+$a->strings["Items tagged with: %s"] = "Objetos taggeado con: %s";
 $a->strings["Display"] = "Interfaz del usuario";
 $a->strings["Social Networks"] = "Redes sociales";
-$a->strings["Plugins"] = "Módulos";
 $a->strings["Connected apps"] = "Aplicaciones conectadas";
+$a->strings["Export personal data"] = "Exportación de datos personales";
 $a->strings["Remove account"] = "Eliminar cuenta";
 $a->strings["Missing some important data!"] = "¡Faltan algunos datos importantes!";
-$a->strings["Update"] = "Actualizar";
 $a->strings["Failed to connect with email account using the settings provided."] = "Error al conectar con la cuenta de correo mediante la configuración suministrada.";
 $a->strings["Email settings updated."] = "Configuración de correo actualizada.";
 $a->strings["Features updated"] = "Actualizaciones";
@@ -1287,7 +1810,6 @@ $a->strings["Private forum has no privacy permissions. Using default privacy gro
 $a->strings["Private forum has no privacy permissions and no default privacy group."] = "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad.";
 $a->strings["Settings updated."] = "Configuración actualizada.";
 $a->strings["Add application"] = "Agregar aplicación";
-$a->strings["Save Settings"] = "Guardar configuración";
 $a->strings["Consumer Key"] = "Clave del consumidor";
 $a->strings["Consumer Secret"] = "Secreto del consumidor";
 $a->strings["Redirect"] = "Redirigir";
@@ -1299,8 +1821,6 @@ $a->strings["No name"] = "Sin nombre";
 $a->strings["Remove authorization"] = "Suprimir la autorización";
 $a->strings["No Plugin settings configured"] = "No se ha configurado ningún módulo";
 $a->strings["Plugin Settings"] = "Configuración de los módulos";
-$a->strings["Off"] = "Apagado";
-$a->strings["On"] = "Encendido";
 $a->strings["Additional Features"] = "Características adicionales";
 $a->strings["General Social Media Settings"] = "Configuración general de social media ";
 $a->strings["Disable intelligent shortening"] = "Deshabilitar recorte inteligente de URL";
@@ -1330,7 +1850,6 @@ $a->strings["Send public posts to all email contacts:"] = "Enviar publicaciones
 $a->strings["Action after import:"] = "Acción después de importar:";
 $a->strings["Move to folder"] = "Mover a un directorio";
 $a->strings["Move to folder:"] = "Mover al directorio:";
-$a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles";
 $a->strings["Display Settings"] = "Configuración Tema/Visualización";
 $a->strings["Display Theme:"] = "Utilizar tema:";
 $a->strings["Mobile Theme:"] = "Tema móvil:";
@@ -1440,568 +1959,48 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ca
 $a->strings["Relocate"] = "Relocalizar";
 $a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente  recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)";
 $a->strings["Resend relocate message to contacts"] = "Reenviar mensaje de relocalización a los contactos";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo las %3\$s de %2\$s";
+$a->strings["Do you really want to delete this suggestion?"] = "¿Estás seguro de que quieres borrar esta sugerencia?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas.";
+$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
+$a->strings["Tag removed"] = "Etiqueta eliminada";
+$a->strings["Remove Item Tag"] = "Eliminar etiqueta";
+$a->strings["Select a tag to remove: "] = "Selecciona una etiqueta para eliminar: ";
+$a->strings["Export account"] = "Exportar cuenta";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exporta la información de tu cuenta y tus contactos. Úsalo para guardar una copia de seguridad de tu cuenta y/o moverla a otro servidor.";
+$a->strings["Export all"] = "Exportar todo";
+$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exporta la información de tu cuenta, contactos y lo demás en JSON. Puede ser un archivo bastante grande, por lo que llevará tiempo. Úsalo para hacer una copia de seguridad completa de tu cuenta (las fotos no se exportarán)";
+$a->strings["Move account"] = "Mover cuenta";
+$a->strings["You can import an account from another Friendica server."] = "Puedes importar una cuenta desde otro servidor de Friendica.";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Necesitas exportar tu cuenta del antiguo servidor y subirla aquí. Volveremos a crear tu antigua cuenta con todos tus contactos aquí. También intentaremos de informar a tus amigos de que te has mudado.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Esta característica es experimental. No podemos importar contactos desde la red OStatus (statusnet/identi.ca) o desde Diaspora*";
+$a->strings["Account file"] = "Archivo de la cuenta";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Para exportar el perfil vaya a \"Configuracion -> Exportar sus datos personales\" y seleccione \"Exportar cuenta\"";
+$a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]";
 $a->strings["Do you really want to delete this video?"] = "Realmente quieres eliminar este vídeo?";
 $a->strings["Delete Video"] = "Borrar vídeo";
 $a->strings["No videos selected"] = "Ningún vídeo seleccionado";
 $a->strings["Recent Videos"] = "Vídeos recientes";
 $a->strings["Upload New Videos"] = "Subir nuevos vídeos";
+$a->strings["No contacts."] = "Ningún contacto.";
+$a->strings["Access denied."] = "Acceso denegado.";
 $a->strings["Invalid request."] = "Consulta invalida";
 $a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Disculpa, posiblemente el archivo subido es mas grande que la PHP configuración permite.";
 $a->strings["Or - did you try to upload an empty file?"] = "Si no - intento de subir un archivo vacío?";
 $a->strings["File exceeds size limit of %s"] = "El archivo excede el limite de tamaño de %s";
 $a->strings["File upload failed."] = "Ha fallado la subida del archivo.";
-$a->strings["Theme settings updated."] = "Configuración de la apariencia actualizada.";
-$a->strings["Site"] = "Sitio";
-$a->strings["Users"] = "Usuarios";
-$a->strings["Themes"] = "Temas";
-$a->strings["DB updates"] = "Actualizaciones de la Base de Datos";
-$a->strings["Inspect Queue"] = "Inspeccionar cola";
-$a->strings["Federation Statistics"] = "Estadísticas de federación";
-$a->strings["Logs"] = "Registros";
-$a->strings["View Logs"] = "Ver registro de depuración";
-$a->strings["probe address"] = "probar direccion";
-$a->strings["check webfinger"] = "Verificar webfinger";
-$a->strings["Plugin Features"] = "Características del módulo";
-$a->strings["diagnostics"] = "diagnosticos";
-$a->strings["User registrations waiting for confirmation"] = "Registro de usuarios esperando la confirmación";
-$a->strings["unknown"] = "desconocido";
-$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. ";
-$a->strings["The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here."] = "El modulo directorio de contactos encontrados no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí.";
-$a->strings["Administration"] = "Administración";
-$a->strings["Currently this node is aware of %d nodes from the following platforms:"] = "Actualmente este nodo reconoce %d nodos de las siguientes plataformas:";
-$a->strings["ID"] = "ID";
-$a->strings["Recipient Name"] = "Nombre del recipiente";
-$a->strings["Recipient Profile"] = "Perfil del recipiente";
-$a->strings["Created"] = "Creado";
-$a->strings["Last Tried"] = "Ultimo intento";
-$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. ";
-$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation.
    "] = "Su DB aún funciona con las tablas MyISAM. Debería cambiar el tipo de motror a InnoDB. ¡Como Friendica sólo usará las características de InnoDB en el futuro, debería cambiar esto! Vea aquí para una guía que puede ayudar a convertir las tablas de motor. También puede usar convert_innodb.sql en el directorio /util de su instalación de Friendica.
    ";
-$a->strings["You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB."] = "Está usando una versión de MySQL que no soporta todas las características de Friendica. Debería considerar cambiar a MariaDB.";
-$a->strings["Normal Account"] = "Cuenta normal";
-$a->strings["Soapbox Account"] = "Cuenta tribuna";
-$a->strings["Community/Celebrity Account"] = "Cuenta de Comunidad/Celebridad";
-$a->strings["Automatic Friend Account"] = "Cuenta de amistad automática";
-$a->strings["Blog Account"] = "Cuenta de blog";
-$a->strings["Private Forum"] = "Foro privado";
-$a->strings["Message queues"] = "Cola de mensajes";
-$a->strings["Summary"] = "Resumen";
-$a->strings["Registered users"] = "Usuarios registrados";
-$a->strings["Pending registrations"] = "Pendientes de registro";
-$a->strings["Version"] = "Versión";
-$a->strings["Active plugins"] = "Módulos activos";
-$a->strings["Can not parse base url. Must have at least ://"] = "No se puede resolver la direccion URL base.\nDeberá tener al menos ://";
-$a->strings["RINO2 needs mcrypt php extension to work."] = "RINO2 precisa la extensión mcrypt para funcionar.  ";
-$a->strings["Site settings updated."] = "Configuración de actualización.";
-$a->strings["No community page"] = "No hay pagina de comunidad";
-$a->strings["Public postings from users of this site"] = "Temas públicos de perfiles de este sitio.";
-$a->strings["Global community page"] = "Pagina global de comunidad";
-$a->strings["Never"] = "Nunca";
-$a->strings["At post arrival"] = "A la llegada de una publicación";
-$a->strings["Disabled"] = "Deshabilitado";
-$a->strings["Users, Global Contacts"] = "Perfiles, contactos globales";
-$a->strings["Users, Global Contacts/fallback"] = "Perfiles, contactos globales/fallback";
-$a->strings["One month"] = "Un mes";
-$a->strings["Three months"] = "Tres meses";
-$a->strings["Half a year"] = "Medio año";
-$a->strings["One year"] = "Un año";
-$a->strings["Multi user instance"] = "Sesión multi usuario";
-$a->strings["Closed"] = "Cerrado";
-$a->strings["Requires approval"] = "Requiere aprobación";
-$a->strings["Open"] = "Abierto";
-$a->strings["No SSL policy, links will track page SSL state"] = "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página";
-$a->strings["Force all links to use SSL"] = "Forzar todos los enlaces a utilizar SSL";
-$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Certificación personal, usa SSL solo para enlaces locales (no recomendado)";
-$a->strings["File upload"] = "Subida de archivo";
-$a->strings["Policies"] = "Políticas";
-$a->strings["Auto Discovered Contact Directory"] = "Directorio de contactos descubierto automáticamente";
-$a->strings["Performance"] = "Rendimiento";
-$a->strings["Worker"] = "Trabajador (??)";
-$a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "Reubicación - ADVERTENCIA: función avanzada. Puede hacer a este servidor inaccesible. ";
-$a->strings["Site name"] = "Nombre del sitio";
-$a->strings["Host name"] = "Nombre de dominio";
-$a->strings["Sender Email"] = "Dirección de origen de correo electrónico";
-$a->strings["The email address your server shall use to send notification emails from."] = "La dirección de correo electrónico que el servidor debería usar como dirección de envío.";
-$a->strings["Banner/Logo"] = "Imagen/Logotipo";
-$a->strings["Shortcut icon"] = "Icono de atajo";
-$a->strings["Link to an icon that will be used for browsers."] = "Enlace hacia un icono que sera usado para el navegador.";
-$a->strings["Touch icon"] = "Icono touch";
-$a->strings["Link to an icon that will be used for tablets and mobiles."] = "Enlace para un icono que sera usado para tablets y moviles.";
-$a->strings["Additional Info"] = "Información adicional";
-$a->strings["For public servers: you can add additional information here that will be listed at %s/siteinfo."] = "Para servidores públicos: información adicional  que sera publicado en %s/siteinfo.";
-$a->strings["System language"] = "Idioma";
-$a->strings["System theme"] = "Tema";
-$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Tema por defecto del sistema, los usuarios podrán elegir el suyo propio en su configuración cambiar configuración del tema";
-$a->strings["Mobile system theme"] = "Tema de sistema móvil";
-$a->strings["Theme for mobile devices"] = "Tema para dispositivos móviles";
-$a->strings["SSL link policy"] = "Política de enlaces SSL";
-$a->strings["Determines whether generated links should be forced to use SSL"] = "Determina si los enlaces generados deben ser forzados a utilizar SSL";
-$a->strings["Force SSL"] = "Forzar SSL";
-$a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "Forzar todos las consultas No-SSL a SSL. - ATENCIÓN: en algunos sistemas esto puede generar comportamiento recursivo interminable.";
-$a->strings["Old style 'Share'"] = "Viejo estilo de 'reenviar'";
-$a->strings["Deactivates the bbcode element 'share' for repeating items."] = "Desactiva el elemento bbcode 'reenviar' para objetos repetidos.";
-$a->strings["Hide help entry from navigation menu"] = "Ocultar la ayuda en el menú de navegación";
-$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Oculta la entrada de las páginas de Ayuda en el menú de navegación. Todavía se puede acceder escribiendo /ayuda directamente.";
-$a->strings["Single user instance"] = "Sesión de usuario único";
-$a->strings["Make this instance multi-user or single-user for the named user"] = "Haz esta sesión multi-usuario o usuario único para el usuario";
-$a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
-$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Tamaño máximo en bytes de las imágenes a subir. Por defecto es 0, que quiere decir que no hay límite.";
-$a->strings["Maximum image length"] = "Largo máximo de imagen";
-$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Longitud máxima en píxeles del lado más largo de las imágenes subidas. Por defecto es -1, que significa que no hay límites.";
-$a->strings["JPEG image quality"] = "Calidad de imagen JPEG";
-$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Los archivos JPEG subidos se guardarán con este ajuste de calidad [0-100]. Por defecto es 100, que es calidad máxima.";
-$a->strings["Register policy"] = "Política de registros";
-$a->strings["Maximum Daily Registrations"] = "Registros Máximos Diarios";
-$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "Si anteriormente se ha permitido el registro, esto establece el número máximo de registro de nuevos usuarios aceptados por día. Si el registro se establece como cerrado, esta opción no tiene efecto.";
-$a->strings["Register text"] = "Términos";
-$a->strings["Will be displayed prominently on the registration page."] = "Se mostrará en un lugar destacado en la página de registro.";
-$a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando sondeos a sitios externos para cuentas abandonadas. Introduce 0 para ningún límite temporal.";
-$a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
-$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Lista separada por comas de los dominios que están autorizados para establecer conexiones con este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio";
-$a->strings["Allowed email domains"] = "Dominios de correo permitidos";
-$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Lista separada por comas de los dominios que están autorizados en las direcciones de correo para registrarse en este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio";
-$a->strings["Block public"] = "Bloqueo público";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Marca para bloquear el acceso público a todas las páginas personales, aún siendo públicas, hasta que no hayas iniciado tu sesión.";
-$a->strings["Force publish"] = "Forzar publicación";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Marca para forzar que todos los perfiles de este sitio sean listados en el directorio del sitio.";
-$a->strings["Global directory URL"] = "URL del directorio global.";
-$a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL del directorio global. Si se deja este campo vacío, el directorio global sera completamente inaccesible para la instancia.";
-$a->strings["Allow threaded items"] = "Permitir elementos en hilo";
-$a->strings["Allow infinite level threading for items on this site."] = "Permitir infinitos niveles de hilo para los elementos de este sitio.";
-$a->strings["Private posts by default for new users"] = "Publicaciones privadas por defecto para usuarios nuevos";
-$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Ajusta los permisos de publicación por defecto a los miembros nuevos al grupo privado por defecto en vez del público.";
-$a->strings["Don't include post content in email notifications"] = "No incluir el contenido del post en las notificaciones de correo electrónico";
-$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "No incluye el contenido de un mensaje/comentario/mensaje privado/etc. en las notificaciones de correo electrónico que se envían desde este sitio, como una medida de privacidad.";
-$a->strings["Disallow public access to addons listed in the apps menu."] = "Deshabilitar acceso a addons listados en el menú de aplicaciones.";
-$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Habilitando esta opción restringe el acceso a addons en el menú de aplicaciones a usuarios identificados.";
-$a->strings["Don't embed private images in posts"] = "No agregar imágenes privados en las publicaciones";
-$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "No reemplazar imágenes privadas guardadas localmente en el servidor con imágenes integrados en los envíos. Esto significa que contactos que reciben publicaciones tendrán que autenticarse y cargar cada imagen, lo que puede demorar.";
-$a->strings["Allow Users to set remote_self"] = "Permitir a los usuarios de definir perfiles_remotos";
-$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Al habilitar esta opción, cada perfil tiene el permiso de marcar cualquiera de sus contactos como un perfil_remoto. Habilitar la opción perfil_remoto para un contacto genera que todas las publicaciones  de este contacto seran re-publicado  en el muro del perfil.";
-$a->strings["Block multiple registrations"] = "Bloquear registros multiples";
-$a->strings["Disallow users to register additional accounts for use as pages."] = "Impedir que los usuarios registren cuentas adicionales para su uso como páginas.";
-$a->strings["OpenID support"] = "Soporte OpenID";
-$a->strings["OpenID support for registration and logins."] = "Soporte OpenID para registros y accesos.";
-$a->strings["Fullname check"] = "Comprobar Nombre completo";
-$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Fuerza a los usuarios a registrarse con un espacio entre su nombre y su apellido en el campo Nombre completo como medida anti-spam";
-$a->strings["UTF-8 Regular expressions"] = "Expresiones regulares UTF-8";
-$a->strings["Use PHP UTF8 regular expressions"] = "Usar expresiones regulares de UTF8 en PHP";
-$a->strings["Community Page Style"] = "Estilo de pagina de comunidad";
-$a->strings["Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."] = "Tipo de pagina de comunidad a visualizar. 'Comunidad global' muestra todas las publicaciones publicas de la red abierta federada que llega a este servidor.";
-$a->strings["Posts per user on community page"] = "Publicaciones por usuario en la pagina de comunidad";
-$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "El numero máximo de publicaciones por usuario que aparecerán en la pagina de comunidad. (No valido para 'comunidad global')";
-$a->strings["Enable OStatus support"] = "Permitir soporte OStatus";
-$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Proporcionar OStatus compatibilidad integrada (StatusNet, GNU Social, Quitter etc.). Todas las comunicaciones en OStatus son publicas así que eventuales advertencias serán ocasionalmente desplegadas.";
-$a->strings["OStatus conversation completion interval"] = "Intervalo de actualización de conversaciones OStatus";
-$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "Cuan seguido el recolector deberá buscar nuevas entradas en OStatus? Esto puede ser un trabajo de mucha carga para los recursos del servidor.";
-$a->strings["Only import OStatus threads from our contacts"] = "Solo importar OStatus temas de nuestros (?) contactos.";
-$a->strings["Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normalmente importamos todo el contenido de los contactos de OStatus. Con esta opción solamente se guardan temas que fueron iniciados por contactos que son conocidos de la instancia.\n(nota de traducción, no se entiende muy bien la función en base al texto original)";
-$a->strings["OStatus support can only be enabled if threading is enabled."] = "Solo se puede habilitar el soporte OStatus  si threading (comentarios en fila) se encuentra habilitado.";
-$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "El soporte para Diaspora* no se puede habilitar porque friendica se instalo en un directorio subalterno (sub directory).";
-$a->strings["Enable Diaspora support"] = "Habilitar el soporte para Diaspora*";
-$a->strings["Provide built-in Diaspora network compatibility."] = "Provee una compatibilidad con la red de Diaspora.";
-$a->strings["Only allow Friendica contacts"] = "Permitir solo contactos de Friendica";
-$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Todos los contactos deben usar protocolos de Friendica. El resto de protocolos serán desactivados.";
-$a->strings["Verify SSL"] = "Verificar SSL";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Si quieres puedes activar la comprobación estricta de certificados. Esto significa que serás incapaz de conectar con ningún sitio que use certificados SSL autofirmados.";
-$a->strings["Proxy user"] = "Usuario proxy";
-$a->strings["Proxy URL"] = "Dirección proxy";
-$a->strings["Network timeout"] = "Tiempo de espera de red";
-$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valor en segundos. Usar 0 para dejarlo sin límites (no se recomienda).";
-$a->strings["Delivery interval"] = "Intervalo de actualización";
-$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Retrasar la entrega de procesos en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendamos: 4-5 para los servidores compartidos, 2-3 para servidores privados virtuales, 0-1 para los grandes servidores dedicados.";
-$a->strings["Poll interval"] = "Intervalo de sondeo";
-$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar los procesos en segundo plano de sondeo en esta cantidad de segundos para reducir la carga del sistema. Si es 0, se usará el intervalo de entrega.";
-$a->strings["Maximum Load Average"] = "Promedio de carga máxima";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que la entrega y los procesos de sondeo sean retrasados - por defecto 50.";
-$a->strings["Maximum Load Average (Frontend)"] = "Carga máxima promedio (frontend)";
-$a->strings["Maximum system load before the frontend quits service - default 50."] = "Carga máxima del sistema antes de que el frontend cancele el servicio - por defecto 50.";
-$a->strings["Maximum table size for optimization"] = "Tamaño máximo de las tablas para la optimización.";
-$a->strings["Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it."] = "Tamaño máximo de tablas (en MB) para la optimización automática - por defecto 100MB. Ingrese -1 para deshabilitar.";
-$a->strings["Minimum level of fragmentation"] = "Nivel mínimo de fragmentación ";
-$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Nivel mínimo de fragmentación para para comenzar la optimización - valor por defecto es 30%. ";
-$a->strings["Periodical check of global contacts"] = "Verificación periódica de los contactos globales.";
-$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "Habilitado los contactos globales son verificado periódicamente  por datos faltantes o datos obsoletos como también por la vitalidad de los contactos y servidores.";
-$a->strings["Days between requery"] = "Días entre búsquedas";
-$a->strings["Number of days after which a server is requeried for his contacts."] = "Cantidad de días hasta que un servidor es consultado por sus contactos.";
-$a->strings["Discover contacts from other servers"] = "Descubrir contactos de otros servidores";
-$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "Recoger periódicamente información sobre perfiles en otros servidores. Puede elegir entre 'usuarios': perfiles de un sistema remoto, 'contactos globales': contactos activos que son conocidos por el servidor. El fallback es para servidors redmatrix y instalaciones viejas de friendica en las que los contactos no estaban a disposición. El fallback aumenta la carga del servidor, asi que la configuración recomendada es 'usuarios, contactos globales'";
-$a->strings["Timeframe for fetching global contacts"] = "Intervalos de tiempo para revisar contactos globales.";
-$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Cuando la revisacion es activada, este valor define el intervalo de tiempo de la actividad de los contactos globales que son recolectados de los servidores. (?)";
-$a->strings["Search the local directory"] = "Buscar el directorio local";
-$a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "Buscar en el directorio local en vez del directorio global. Cuando se busca localmente, cada busqueda sera efectuada en el directorio global en el background. Esto mejora los resultados de la busqueda cuando la misma es repetida.";
-$a->strings["Publish server information"] = "Publicar información del servidor";
-$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details."] = "Si habilitado, datos generales del servidor y estadisticas de uso serán publicados. Los datos contienen el nombre y la versión del servidor, numero de usuarios con perfiles públicos, cantidad de temas publicados y los protocolos y conectores activados. Vea the-federation.info por detalles.";
-$a->strings["Use MySQL full text engine"] = "Usar motor MySQL de texto completo";
-$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Activa el motor de texto completo. Agiliza las búsquedas, pero solo busca cuatro o más caracteres.";
-$a->strings["Suppress Language"] = "Suprimir idiomas";
-$a->strings["Suppress language information in meta information about a posting."] = "Suprimir la información de datos meta sobre informaciones de idiomas en las publicaciones.";
-$a->strings["Suppress Tags"] = "Suprimir tags";
-$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Suprimir la lista de tags al final de una publicación.";
-$a->strings["Path to item cache"] = "Ruta a la caché del objeto";
-$a->strings["The item caches buffers generated bbcode and external images."] = "El buffer de cache de items generado para bbcodes e imágenes externas. ";
-$a->strings["Cache duration in seconds"] = "Duración de la caché en segundos";
-$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "¿Por cuanto tiempo deberían los archives ser almacenados en el cache? Valor por defecto 86400 segundos (un día). Para deshabilita el item cache, ajuste el valor a -1.";
-$a->strings["Maximum numbers of comments per post"] = "Numero máximo de respuestas por tema";
-$a->strings["How much comments should be shown for each post? Default value is 100."] = "¿Cuantos comentarios deberían ser mostrados por tema? Valor por defecto es 100.";
-$a->strings["Path for lock file"] = "Ruta al archivo protegido";
-$a->strings["The lock file is used to avoid multiple pollers at one time. Only define a folder here."] = "El archivo lock es usado para evitar multiples pooler (recolectores de información) a la vez. Defina solo una carpeta aquí.";
-$a->strings["Temp path"] = "Ruta a los temporales";
-$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Si tiene un sistema restringido en donde el servidor web no puede acceder la dirección del sistema temp, ingrese una dirección alternativa aquí. ";
-$a->strings["Base path to installation"] = "Ruta base para la instalación";
-$a->strings["If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."] = "Si el sistema no puede detectar el acceso correcto a la instalación, ingrese la dirección correcta aquí. Esta configuración solo debería utilizarse si si usa un sistema restringido y enlaces simbolicos a su webroot.";
-$a->strings["Disable picture proxy"] = "Deshabilitar proxy de imagen";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "El proxy de imagen mejora el performance y privacidad. No debería ser usado en sistemas con poco ancho de banda.";
-$a->strings["Enable old style pager"] = "Habilitar paginación estilo viejo";
-$a->strings["The old style pager has page numbers but slows down massively the page speed."] = "La paginación al estilo viejo tiene números de paginas pero enlentece masivamente la velocidad de la pagina.";
-$a->strings["Only search in tags"] = "Solo buscar en tags";
-$a->strings["On large systems the text search can slow down the system extremely."] = "En sistemas grandes, la búsqueda de texto puede enlentecer el sistema gravemente.";
-$a->strings["New base url"] = "Nueva URLbase";
-$a->strings["Change base url for this server. Sends relocate message to all DFRN contacts of all users."] = "Cambiar base URL para este servidor. Envía mensajes de relocalisación a todos los contactos DFRN.";
-$a->strings["RINO Encryption"] = "Encryptado RINO";
-$a->strings["Encryption layer between nodes."] = "Capa de encryptación entre nodos.";
-$a->strings["Embedly API key"] = "Embedly llave de API (API key) ";
-$a->strings["Embedly is used to fetch additional data for web pages. This is an optional parameter."] = "Embedly es usado para recolectar datos adicionales para paginas web. Esto es un parámetro opcional.";
-$a->strings["Enable 'worker' background processing"] = "Habilitar procesos de fondo del \"trabajador\"";
-$a->strings["The worker background processing limits the number of parallel background jobs to a maximum number and respects the system load."] = "Limita los procesos del trabajo de fondo del numero paralelo de trabajos a un numero máximo que respeta la carga del sistema.";
-$a->strings["Maximum number of parallel workers"] = "Numero máximo de trabajos paralelos de fondo.";
-$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "Ajustar a 2 en un servidor compartido (shared hosting).\nEn sistemas grandes valores como 10 son excelentes.\nValor por defecto es 4.";
-$a->strings["Don't use 'proc_open' with the worker"] = "No use 'proc_open' junto al \"trabajador\"!";
-$a->strings["Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab."] = "Habilite esta función si el sistema no permite el uso de 'proc_open'. Esto suelo suceder en servidores compartidos (shared hosting). Si esta función se habilita se debería incrementar la frecuencia de llamadas del poller (poller calls) en la pestaña de trabajos cron. (¡en el hosting?)";
-$a->strings["Enable fastlane"] = "Habilitar ascenso rápido";
-$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "Cuando está habilitado, el mecanismo ascenso rápido inicia un trabajador adicional si los procesos de mayor prioridad son bloqueados por prcesos de menor prioridad.";
-$a->strings["Enable frontend worker"] = "Habilitar trabajador de interfaz";
-$a->strings["When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server. The worker background process needs to be activated for this."] = "Cuando está habilitado, el proceso de Trabajador se activa cuando se ejecuta el acceso de respaldo (ej. mensajes siendo entregados). En páginas más pequeñas usted puede querer llamar a yourdomain.tld/worker en una base regular mediante un trabajo cron externo. Sólo debería habilitar esta opción si no puede utilizar trabajos cron/scheduled en su servidor. El proceso de trabajador en segundo plano necesita ser activado para eso.";
-$a->strings["Update has been marked successful"] = "La actualización se ha completado con éxito";
-$a->strings["Database structure update %s was successfully applied."] = "Actualización de base de datos %s fue aplicada con éxito.";
-$a->strings["Executing of database structure update %s failed with error: %s"] = "El paso de actualización de la estructura de la base de datos %s fallo con el mensaje de error: %s";
-$a->strings["Executing %s failed with error: %s"] = "Paso %s fallo con el error: %s";
-$a->strings["Update %s was successfully applied."] = "Actualización %s aplicada con éxito.";
-$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "La actualización %s no ha informado, se desconoce el estado.";
-$a->strings["There was no additional update function %s that needed to be called."] = "No había función adicional de actualización %s que necesitaba ser requerida.";
-$a->strings["No failed updates."] = "Actualizaciones sin fallos.";
-$a->strings["Check database structure"] = "Revisar estructura de la base de datos";
-$a->strings["Failed Updates"] = "Actualizaciones fallidas";
-$a->strings["This does not include updates prior to 1139, which did not return a status."] = "No se incluyen las anteriores a la 1139, que no indicaban su estado.";
-$a->strings["Mark success (if update was manually applied)"] = "Marcar como correcta (si actualizaste manualmente)";
-$a->strings["Attempt to execute this update step automatically"] = "Intentando ejecutar este paso automáticamente";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\n\t\t\tEstimado %1\$s,\n\t\t\t\tel administrador de %2\$s ha creado una cuenta para usted.";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tThank you and welcome to %4\$s."] = "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%1\$s\n\t\t\tNombre de la cuenta:\t\t%2\$s\n\t\t\tContraseña:\t\t%3\$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %4\$s.";
-$a->strings["%s user blocked/unblocked"] = array(
-	0 => "%s usuario bloqueado/desbloqueado",
-	1 => "%s usuarios bloqueados/desbloqueados",
-);
-$a->strings["%s user deleted"] = array(
-	0 => "%s usuario eliminado",
-	1 => "%s usuarios eliminados",
-);
-$a->strings["User '%s' deleted"] = "Usuario '%s' eliminado";
-$a->strings["User '%s' unblocked"] = "Usuario '%s' desbloqueado";
-$a->strings["User '%s' blocked"] = "Usuario '%s' bloqueado'";
-$a->strings["Register date"] = "Fecha de registro";
-$a->strings["Last login"] = "Último acceso";
-$a->strings["Last item"] = "Último elemento";
-$a->strings["Add User"] = "Agregar usuario";
-$a->strings["select all"] = "seleccionar todo";
-$a->strings["User registrations waiting for confirm"] = "Registro de usuarios esperando confirmación";
-$a->strings["User waiting for permanent deletion"] = "Usuario esperando anulación permanente.";
-$a->strings["Request date"] = "Solicitud de fecha";
-$a->strings["No registrations."] = "Sin registros.";
-$a->strings["Note from the user"] = "Nota para el usuario";
-$a->strings["Deny"] = "Denegado";
-$a->strings["Block"] = "Bloquear";
-$a->strings["Unblock"] = "Desbloquear";
-$a->strings["Site admin"] = "Administrador de la web";
-$a->strings["Account expired"] = "Cuenta caducada";
-$a->strings["New User"] = "Nuevo usuario";
-$a->strings["Deleted since"] = "Borrado desde";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?";
-$a->strings["Name of the new user."] = "Nombre del nuevo usuario";
-$a->strings["Nickname"] = "Apodo";
-$a->strings["Nickname of the new user."] = "Apodo del nuevo perfil.";
-$a->strings["Email address of the new user."] = "Dirección de correo del nuevo perfil.";
-$a->strings["Plugin %s disabled."] = "Módulo %s deshabilitado.";
-$a->strings["Plugin %s enabled."] = "Módulo %s habilitado.";
-$a->strings["Disable"] = "Desactivado";
-$a->strings["Enable"] = "Activado";
-$a->strings["Toggle"] = "Activar";
-$a->strings["Author: "] = "Autor:";
-$a->strings["Maintainer: "] = "Mantenedor: ";
-$a->strings["Reload active plugins"] = "Recargar plugins activos";
-$a->strings["There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"] = "No ay plugins habilitados en este nodo. Encontrara los repositorios oficiales de plugins en %1\$s y posiblemente encontrara mas plugins interesantes en el registro abierto de plugins aquí %2\$s .";
-$a->strings["No themes found."] = "No se encontraron temas.";
-$a->strings["Screenshot"] = "Captura de pantalla";
-$a->strings["Reload active themes"] = "Recargar interfaces de usuario activos";
-$a->strings["No themes found on the system. They should be paced in %1\$s"] = "No se encuentran interfaces en el sistema. Deberían estar localizados (paced) en  %1\$s";
-$a->strings["[Experimental]"] = "[Experimental]";
-$a->strings["[Unsupported]"] = "[Sin soporte]";
-$a->strings["Log settings updated."] = "Configuración de registro actualizada.";
-$a->strings["PHP log currently enabled."] = "Registro PHP actualmente disponible.";
-$a->strings["PHP log currently disabled."] = "Registro PHP actualmente deshabilitado.";
-$a->strings["Clear"] = "Limpiar";
-$a->strings["Enable Debugging"] = "Habilitar debugging";
-$a->strings["Log file"] = "Archivo de registro";
-$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica.";
-$a->strings["Log level"] = "Nivel de registro";
-$a->strings["PHP logging"] = "PHP logging";
-$a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "Para habilitar la documentación de los errores PHP y las advertencias se puede agregar lo siguiente al archivo .htconfig.php de la instalación (ftp). La dirección definido en el 'error_log' es relativo al directorio friendica principal (top-level directory) y debe de ser habilitado para la escritura por el servidor web. La opción '1' para 'log_errors' y 'display_errors' es para habilitar estas opciones, '0' para deshabilitarlo.";
-$a->strings["Lock feature %s"] = "Trancar opción %s ";
-$a->strings["Manage Additional Features"] = "Administrar opciones adicionales";
-$a->strings["%d contact edited."] = array(
-	0 => "%d contacto editado.",
-	1 => "%d contacts edited.",
-);
-$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto.";
-$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado.";
-$a->strings["Contact updated."] = "Contacto actualizado.";
-$a->strings["Failed to update contact record."] = "Error al actualizar el contacto.";
-$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado";
-$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado";
-$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado";
-$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado";
-$a->strings["Contact has been archived"] = "El contacto ha sido archivado";
-$a->strings["Contact has been unarchived"] = "El contacto ya no está archivado";
-$a->strings["Drop contact"] = "Eliminar contacto";
-$a->strings["Do you really want to delete this contact?"] = "¿Estás seguro de que quieres eliminar este contacto?";
-$a->strings["Contact has been removed."] = "El contacto ha sido eliminado";
-$a->strings["You are mutual friends with %s"] = "Ahora tienes una amistad mutua con %s";
-$a->strings["You are sharing with %s"] = "Estás compartiendo con %s";
-$a->strings["%s is sharing with you"] = "%s está compartiendo contigo";
-$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto.";
-$a->strings["(Update was successful)"] = "(La actualización se ha completado)";
-$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)";
-$a->strings["Suggest friends"] = "Sugerir amigos";
-$a->strings["Network type: %s"] = "Tipo de red: %s";
-$a->strings["Communications lost with this contact!"] = "¡Se ha perdido la comunicación con este contacto!";
-$a->strings["Fetch further information for feeds"] = "Recaudar informacion complementaria de los feeds";
-$a->strings["Fetch information"] = "Recaudar informacion";
-$a->strings["Fetch information and keywords"] = "Recaudar informacion y palabras claves";
-$a->strings["Contact"] = "Contacto";
-$a->strings["Profile Visibility"] = "Visibilidad del Perfil";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura.";
-$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas";
-$a->strings["Edit contact notes"] = "Editar notas del contacto";
-$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto";
-$a->strings["Ignore contact"] = "Ignorar contacto";
-$a->strings["Repair URL settings"] = "Configuración de reparación de la dirección";
-$a->strings["View conversations"] = "Ver conversaciones";
-$a->strings["Last update:"] = "Última actualización:";
-$a->strings["Update public posts"] = "Actualizar publicaciones públicas";
-$a->strings["Update now"] = "Actualizar ahora";
-$a->strings["Unignore"] = "Quitar de Ignorados";
-$a->strings["Currently blocked"] = "Bloqueados";
-$a->strings["Currently ignored"] = "Ignorados";
-$a->strings["Currently archived"] = "Archivados";
-$a->strings["Replies/likes to your public posts may still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía pueden ser visibles.";
-$a->strings["Notification for new posts"] = "Notificacion de nuevos temas.";
-$a->strings["Send a notification of every new post of this contact"] = "Enviar una notificacion por nuevos temas de este contacto.";
-$a->strings["Blacklisted keywords"] = "Lista negra de palabras";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado";
-$a->strings["Actions"] = "Acciones";
-$a->strings["Contact Settings"] = "Ajustes del contacto";
-$a->strings["Suggestions"] = "Sugerencias";
-$a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas";
-$a->strings["Show all contacts"] = "Mostrar todos los contactos";
-$a->strings["Unblocked"] = "Desbloqueados";
-$a->strings["Only show unblocked contacts"] = "Mostrar solo contactos sin bloquear";
-$a->strings["Blocked"] = "Bloqueados";
-$a->strings["Only show blocked contacts"] = "Mostrar solo contactos bloqueados";
-$a->strings["Ignored"] = "Ignorados";
-$a->strings["Only show ignored contacts"] = "Mostrar solo contactos ignorados";
-$a->strings["Archived"] = "Archivados";
-$a->strings["Only show archived contacts"] = "Mostrar solo contactos archivados";
-$a->strings["Hidden"] = "Ocultos";
-$a->strings["Only show hidden contacts"] = "Mostrar solo contactos ocultos";
-$a->strings["Search your contacts"] = "Buscar en tus contactos";
-$a->strings["Archive"] = "Archivo";
-$a->strings["Unarchive"] = "Sin archivar";
-$a->strings["Batch Actions"] = "Accones en lote";
-$a->strings["View all contacts"] = "Ver todos los contactos";
-$a->strings["View all common friends"] = "Ver todos los conocidos en común ";
-$a->strings["Advanced Contact Settings"] = "Configuración avanzada";
-$a->strings["Mutual Friendship"] = "Amistad recíproca";
-$a->strings["is a fan of yours"] = "es tu fan";
-$a->strings["you are a fan of"] = "eres fan de";
-$a->strings["Toggle Blocked status"] = "Cambiar bloqueados";
-$a->strings["Toggle Ignored status"] = "Cambiar ignorados";
-$a->strings["Toggle Archive status"] = "Cambiar archivados";
-$a->strings["Delete contact"] = "Eliminar contacto";
-$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Esto puede ocurrir a veces si la conexión fue solicitada por ambas personas y ya hubiera sido aprobada.";
-$a->strings["Response from remote site was not understood."] = "La respuesta desde el sitio remoto no ha sido entendida.";
-$a->strings["Unexpected response from remote site: "] = "Respuesta inesperada desde el sitio remoto: ";
-$a->strings["Confirmation completed successfully."] = "Confirmación completada con éxito.";
-$a->strings["Remote site reported: "] = "El sito remoto informó: ";
-$a->strings["Temporary failure. Please wait and try again."] = "Error temporal. Por favor, espere y vuelva a intentarlo.";
-$a->strings["Introduction failed or was revoked."] = "La presentación ha fallado o ha sido anulada.";
-$a->strings["Unable to set contact photo."] = "Imposible establecer la foto del contacto.";
-$a->strings["No user record found for '%s' "] = "No se ha encontrado a ningún '%s' ";
-$a->strings["Our site encryption key is apparently messed up."] = "Nuestra clave de cifrado del sitio es aparentemente un lío.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Se ha proporcionado una dirección vacía o no hemos podido descifrarla.";
-$a->strings["Contact record was not found for you on our site."] = "El contacto no se ha encontrado en nuestra base de datos.";
-$a->strings["Site public key not available in contact record for URL %s."] = "La clave pública del sitio no está disponible en los datos del contacto para %s.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "La identificación proporcionada por el sistema es un duplicado de nuestro sistema. Debería funcionar si lo intentas de nuevo.";
-$a->strings["Unable to set your contact credentials on our system."] = "No se puede establecer las credenciales de tu contacto en nuestro sistema.";
-$a->strings["Unable to update your contact profile details on our system"] = "No se puede actualizar los datos de tu perfil de contacto en nuestro sistema";
-$a->strings["%1\$s has joined %2\$s"] = "%1\$s se ha unido a %2\$s";
-$a->strings["This introduction has already been accepted."] = "Esta presentación ya ha sido aceptada.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "La dirección del perfil no es válida o no contiene información del perfil.";
-$a->strings["Warning: profile location has no identifiable owner name."] = "Aviso: La dirección del perfil no tiene un nombre de propietario identificable.";
-$a->strings["Warning: profile location has no profile photo."] = "Aviso: la dirección del perfil no tiene foto de perfil.";
-$a->strings["%d required parameter was not found at the given location"] = array(
-	0 => "no se encontró %d parámetro requerido en el lugar determinado",
-	1 => "no se encontraron %d parámetros requeridos en el lugar determinado",
-);
-$a->strings["Introduction complete."] = "Presentación completa.";
-$a->strings["Unrecoverable protocol error."] = "Error de protocolo irrecuperable.";
-$a->strings["Profile unavailable."] = "Perfil no disponible.";
-$a->strings["%s has received too many connection requests today."] = "%s ha recibido demasiadas solicitudes de conexión hoy.";
-$a->strings["Spam protection measures have been invoked."] = "Han sido activadas las medidas de protección contra spam.";
-$a->strings["Friends are advised to please try again in 24 hours."] = "Tus amigos serán avisados para que lo intenten de nuevo pasadas 24 horas.";
-$a->strings["Invalid locator"] = "Localizador no válido";
-$a->strings["Invalid email address."] = "Dirección de correo incorrecta";
-$a->strings["This account has not been configured for email. Request failed."] = "Esta cuenta no ha sido configurada para el correo. Fallo de solicitud.";
-$a->strings["You have already introduced yourself here."] = "Ya te has presentado aquí.";
-$a->strings["Apparently you are already friends with %s."] = "Al parecer, ya eres amigo de %s.";
-$a->strings["Invalid profile URL."] = "Dirección de perfil no válida.";
-$a->strings["Your introduction has been sent."] = "Tu presentación ha sido enviada.";
-$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "La subscripción remota no se podrá hacer para tu red. Por favor contacta directamente desde tu sistema.";
-$a->strings["Please login to confirm introduction."] = "Inicia sesión para confirmar la presentación.";
-$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Sesión iniciada con la identificación incorrecta. Entra en este perfil.";
-$a->strings["Confirm"] = "Confirmar";
-$a->strings["Hide this contact"] = "Ocultar este contacto";
-$a->strings["Welcome home %s."] = "Bienvenido a casa %s";
-$a->strings["Please confirm your introduction/connection request to %s."] = "Por favor, confirma tu solicitud de presentación/conexión con %s.";
-$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Por favor introduce tu dirección ID de una de las siguientes redes sociales soportadas:";
-$a->strings["If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."] = "Si aun no eres miembro de la red social libre  seguí este enlace para encontrara un sitio disponible de friendica y acompañanos hoy mismo";
-$a->strings["Friend/Connection Request"] = "Solicitud de Amistad/Conexión";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Por favor responde lo siguiente:";
-$a->strings["Does %s know you?"] = "¿%s te conoce?";
-$a->strings["Add a personal note:"] = "Añade una nota personal:";
-$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Web Social Federada";
-$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora.";
-$a->strings["Your Identity Address:"] = "Dirección de tu perfil:";
-$a->strings["Submit Request"] = "Enviar solicitud";
-$a->strings["You already added this contact."] = "Ya has añadido este contacto.";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "El soporte de Diaspora* no esta habilitado, el contacto no puede ser agregado.";
-$a->strings["OStatus support is disabled. Contact can't be added."] = "El soporte de OStatus no esta habilitado, el contacto no puede ser agregado.";
-$a->strings["The network type couldn't be detected. Contact can't be added."] = "No se pudo detectar el tipo de red. Contacto no puede ser agregado.";
-$a->strings["Contact added"] = "Contacto añadido";
-$a->strings["Friendica Communications Server - Setup"] = "Servidor de comunicación Friendica - Configuración";
-$a->strings["Could not connect to database."] = "No es posible la conexión con la base de datos.";
-$a->strings["Could not create table."] = "No se puede crear la tabla.";
-$a->strings["Your Friendica site database has been installed."] = "La base de datos de su sitio web de Friendica ha sido instalada.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Por favor, consulta el archivo \"INSTALL.txt\".";
-$a->strings["Database already in use."] = "Base de datos ya se encuentra en uso";
-$a->strings["System check"] = "Verificación del sistema";
-$a->strings["Check again"] = "Compruebalo de nuevo";
-$a->strings["Database connection"] = "Conexión con la base de datos";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar.";
-$a->strings["Database Server Name"] = "Nombre del servidor de la base de datos";
-$a->strings["Database Login Name"] = "Usuario de la base de datos";
-$a->strings["Database Login Password"] = "Contraseña de la base de datos";
-$a->strings["Database Name"] = "Nombre de la base de datos";
-$a->strings["Site administrator email address"] = "Dirección de correo del administrador de la web";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web.";
-$a->strings["Please select a default timezone for your website"] = "Por favor, selecciona la zona horaria predeterminada para tu web";
-$a->strings["Site settings"] = "Configuración de la página web";
-$a->strings["System Language:"] = "Sistema de idioma:";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Seleccione el idioma por defecto para su interfaz de instalación de Friendica y para enviar emails.";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se pudo encontrar una versión de la línea de comandos de PHP en la ruta del servidor web.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See 'Setup the poller'"] = "Si no tienes una versión de command line de php installado en el servidor, no sera posible de efectuar polling como trabajo de fondo a traves de cron. Vea 'Setup the poller'";
-$a->strings["PHP executable path"] = "Dirección al ejecutable PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación.";
-$a->strings["Command line PHP"] = "Línea de comandos PHP";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "El ejecutable PHP no es e lphp cli binary (podria ser versión cgi-fgci)";
-$a->strings["Found PHP version: "] = "Versión PHP encontrada:";
-$a->strings["PHP cli binary"] = "PHP cli binario";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado.";
-$a->strings["This is required for message delivery to work."] = "Esto es necesario para que funcione la entrega de mensajes.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Generar claves de encriptación";
-$a->strings["libCurl PHP module"] = "Módulo PHP libCurl";
-$a->strings["GD graphics PHP module"] = "Módulo PHP gráficos GD";
-$a->strings["OpenSSL PHP module"] = "Módulo PHP OpenSSL";
-$a->strings["mysqli PHP module"] = "Módulo PHP mysqli";
-$a->strings["mb_string PHP module"] = "Módulo PHP mb_string";
-$a->strings["mcrypt PHP module"] = "modulo mycrypt PHP";
-$a->strings["XML PHP module"] = "Módulo XML PHP";
-$a->strings["iconv module"] = "Módulo iconv";
-$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite de Apache";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El módulo de PHP libcurl es necesario, pero no está instalado.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Error: El módulo de PHP openssl es necesario, pero  no está instalado.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El módulo de PHP mysqli es necesario, pero no está instalado.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Error: El módulo de PHP mb_string es necesario, pero no está instalado.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: modulo mycrypt PHP requerido pero no instalado.";
-$a->strings["Error: iconv PHP module required but not installed."] = "Error: módulo iconv PHP requerido pero no instalado.";
-$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Si está utilizando php_cli, por favor asegúrese de que el módulo mcrypt está habilitado en este archivo de configuración";
-$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Función mycrypt_create_iv() no esta definido. Esto es preciso para habilitar RINO2 encryption layer.";
-$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() función";
-$a->strings["Error, XML PHP module required but not installed."] = "Error, módulo XML PHP requerido pero no instalado.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Al final obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php tiene permiso de escritura";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica usa el motor de templates Smarty3 para renderizar su visualisacion web. Smarty3 compila templates hacia PHP para acelerar la velocidad del renderizar.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Para poder guardar estos templates compilados, el servidor web necesita acceso de escritura en el directorio /view/smarty3/ en el árbol de raíz de la instalación friendica.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor asegure que el usuario que utiliza el servidor web (ejemplo: www-data) tiene permisos de escritura en esta carpeta.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad deberia dar acceso de escritura solo a /view/smarty3 / → no al los archivos template (.tpl) que contiene.";
-$a->strings["view/smarty3 is writable"] = "Se puede escribir en /view/smarty3";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración.";
-$a->strings["Url rewrite is working"] = "Reescribiendo la dirección...";
-$a->strings["ImageMagick PHP extension is not installed"] = "No está instalada la extensión ImageMagick PHP";
-$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP extension is installed";
-$a->strings["ImageMagick supports GIF"] = "ImageMagick supporta GIF";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web.";
-$a->strings["
    What next
    "] = "
    ¿Ahora qué?
    ";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
-$a->strings["Unable to locate original post."] = "No se puede encontrar la publicación original.";
-$a->strings["Empty post discarded."] = "Publicación vacía descartada.";
-$a->strings["System error. Post not saved."] = "Error del sistema. Mensaje no guardado.";
-$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Este mensaje te lo ha enviado %s, miembro de la red social Friendica.";
-$a->strings["You may visit them online at %s"] = "Los puedes visitar en línea en %s";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes.";
-$a->strings["%s posted an update."] = "%s ha publicado una actualización.";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array(
-	0 => "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos.",
-	1 => "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos.",
-);
-$a->strings["Messages in this group won't be send to these receivers."] = "Los mensajes de este grupo no se enviarán a estos receptores.";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente.";
-$a->strings["Invalid contact."] = "Contacto erróneo.";
-$a->strings["Commented Order"] = "Orden de comentarios";
-$a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentarios";
-$a->strings["Posted Order"] = "Orden de publicación";
-$a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
-$a->strings["Posts that mention or involve you"] = "Publicaciones que te mencionan o involucran";
-$a->strings["New"] = "Nuevo";
-$a->strings["Activity Stream - by date"] = "Corriente de actividad por fecha";
-$a->strings["Shared Links"] = "Enlaces compartidos";
-$a->strings["Interesting Links"] = "Enlaces interesantes";
-$a->strings["Starred"] = "Favoritos";
-$a->strings["Favourite Posts"] = "Publicaciones favoritas";
-$a->strings["{0} wants to be your friend"] = "{0} quiere ser tu amigo";
-$a->strings["{0} sent you a message"] = "{0} te ha enviado un mensaje";
-$a->strings["{0} requested registration"] = "{0} solicitudes de registro";
-$a->strings["No contacts."] = "Ningún contacto.";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Excedido el número máximo de mensajes para %s. El mensaje no se ha enviado.";
+$a->strings["Unable to check your home location."] = "Imposible comprobar tu servidor de inicio.";
+$a->strings["No recipient."] = "Sin receptor.";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Si quieres que %s te responda, asegúrate de que la configuración de privacidad permite enviar correo privado a desconocidos.";
 $a->strings["via"] = "vía";
-$a->strings["Repeat the image"] = "Repetir la imagen";
-$a->strings["Will repeat your image to fill the background."] = "Repetirá su imagen para llenar el fondo";
-$a->strings["Stretch"] = "Estirar";
-$a->strings["Will stretch to width/height of the image."] = "Estirará la anchura/altura de la imagen.";
-$a->strings["Resize fill and-clip"] = "Reajustar llenado y clip";
-$a->strings["Resize to fill and retain aspect ratio."] = "Reajustar para llenar y conservar proporción";
-$a->strings["Resize best fit"] = "Reajustar al mejor tamaño";
-$a->strings["Resize to best fit and retain aspect ratio."] = "Reajustar al mejor tamaño y conservar proporción";
+$a->strings["greenzero"] = "greenzero";
+$a->strings["purplezero"] = "purplezero";
+$a->strings["easterbunny"] = "easterbunny";
+$a->strings["darkzero"] = "darkzero";
+$a->strings["comix"] = "comix";
+$a->strings["slackr"] = "slackr";
+$a->strings["Variations"] = "Variaciones";
 $a->strings["Default"] = "Por defecto";
 $a->strings["Note: "] = "Nota:";
 $a->strings["Check image permissions if all users are allowed to visit the image"] = "Compruebe los permisos de imagen si se les permite a todos los usuarios visitar la imagen";
@@ -2012,6 +2011,14 @@ $a->strings["Link color"] = "Color de enlace";
 $a->strings["Set the background color"] = "Seleccionar el color de fondo";
 $a->strings["Content background transparency"] = "Transparencia de contenido de fondo";
 $a->strings["Set the background image"] = "Seleccionar la imagen de fondo";
+$a->strings["Repeat the image"] = "Repetir la imagen";
+$a->strings["Will repeat your image to fill the background."] = "Repetirá su imagen para llenar el fondo";
+$a->strings["Stretch"] = "Estirar";
+$a->strings["Will stretch to width/height of the image."] = "Estirará la anchura/altura de la imagen.";
+$a->strings["Resize fill and-clip"] = "Reajustar llenado y clip";
+$a->strings["Resize to fill and retain aspect ratio."] = "Reajustar para llenar y conservar proporción";
+$a->strings["Resize best fit"] = "Reajustar al mejor tamaño";
+$a->strings["Resize to best fit and retain aspect ratio."] = "Reajustar al mejor tamaño y conservar proporción";
 $a->strings["Guest"] = "Invitado";
 $a->strings["Visitor"] = "Visitante";
 $a->strings["Alignment"] = "Alineación";
@@ -2020,33 +2027,13 @@ $a->strings["Center"] = "Centrado";
 $a->strings["Color scheme"] = "Esquema de color";
 $a->strings["Posts font size"] = "Tamaño de letra del titulo de las publicaciones";
 $a->strings["Textareas font size"] = "Tamaño de letra del área de texto";
-$a->strings["Community Profiles"] = "Perfiles de la Comunidad";
-$a->strings["Last users"] = "Últimos usuarios";
-$a->strings["Find Friends"] = "Buscar amigos";
-$a->strings["Local Directory"] = "Directorio local";
-$a->strings["Quick Start"] = "Inicio rápido";
-$a->strings["Connect Services"] = "Servicios conectados";
 $a->strings["Comma separated list of helper forums"] = "Lista separada por comas de foros de ayuda.";
 $a->strings["Set style"] = "Definir estilo";
 $a->strings["Community Pages"] = "Páginas de Comunidad";
+$a->strings["Community Profiles"] = "Perfiles de la Comunidad";
 $a->strings["Help or @NewHere ?"] = "¿Ayuda o @NuevoAquí?";
-$a->strings["greenzero"] = "greenzero";
-$a->strings["purplezero"] = "purplezero";
-$a->strings["easterbunny"] = "easterbunny";
-$a->strings["darkzero"] = "darkzero";
-$a->strings["comix"] = "comix";
-$a->strings["slackr"] = "slackr";
-$a->strings["Variations"] = "Variaciones";
-$a->strings["Delete this item?"] = "¿Eliminar este elemento?";
-$a->strings["show fewer"] = "ver menos";
-$a->strings["Update %s failed. See error logs."] = "Falló la actualización de %s. Mira los registros de errores.";
-$a->strings["Create a New Account"] = "Crear una nueva cuenta";
-$a->strings["Password: "] = "Contraseña: ";
-$a->strings["Remember me"] = "Recordarme";
-$a->strings["Or login using OpenID: "] = "O inicia sesión usando OpenID: ";
-$a->strings["Forgot your password?"] = "¿Olvidaste la contraseña?";
-$a->strings["Website Terms of Service"] = "Términos de uso del sitio";
-$a->strings["terms of service"] = "Términos de uso";
-$a->strings["Website Privacy Policy"] = "Política de privacidad del sitio";
-$a->strings["privacy policy"] = "Política de privacidad";
-$a->strings["toggle mobile"] = "Cambiar a versión móvil";
+$a->strings["Connect Services"] = "Servicios conectados";
+$a->strings["Find Friends"] = "Buscar amigos";
+$a->strings["Last users"] = "Últimos usuarios";
+$a->strings["Local Directory"] = "Directorio local";
+$a->strings["Quick Start"] = "Inicio rápido";
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index fdba195f1..86efb26a2 100644
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -1,6 +1,6 @@
 
 
    
 	
    {{$title}} - {{$page}}
    
-	
+
 	
    
     
 
@@ -59,7 +59,7 @@
 	{{include file="field_checkbox.tpl" field=$hide_help}}
 	{{include file="field_select.tpl" field=$singleuser}}
 	
    
-	
+
 	
    {{$registration}}
    
 	{{include file="field_input.tpl" field=$register_text}}
 	{{include file="field_select.tpl" field=$register_policy}}
@@ -74,7 +74,7 @@
 	{{include file="field_input.tpl" field=$maximagelength}}
 	{{include file="field_input.tpl" field=$jpegimagequality}}
 	
    
-	
+
 	
    {{$corporate}}
    
 	{{include file="field_input.tpl" field=$allowed_sites}}
 	{{include file="field_input.tpl" field=$allowed_email}}
@@ -107,14 +107,13 @@
 	{{include file="field_checkbox.tpl" field=$thread_allow}}
 	{{include file="field_checkbox.tpl" field=$newuser_private}}
 	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$private_addons}}
 	{{include file="field_checkbox.tpl" field=$disable_embedded}}
 	{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
 	
    
-	
+
 	
    {{$advanced}}
    
 	{{include file="field_select.tpl" field=$rino}}
-	{{include file="field_checkbox.tpl" field=$no_utf}}
 	{{include file="field_checkbox.tpl" field=$verifyssl}}
 	{{include file="field_input.tpl" field=$proxy}}
 	{{include file="field_input.tpl" field=$proxyuser}}
@@ -128,7 +127,6 @@
 	{{include file="field_input.tpl" field=$basepath}}
 	{{include file="field_checkbox.tpl" field=$suppress_tags}}
 	{{include file="field_checkbox.tpl" field=$nodeinfo}}
-	{{include file="field_input.tpl" field=$embedly}}
 	
    
 
 	
    {{$portable_contacts}}
    
@@ -156,7 +154,7 @@
 	
    
 
 	
-	
+
 	{{* separate form for relocate... *}}
 	
    
 	
@@ -165,5 +163,5 @@
 	
 	
    
 	
-	
+
 
    
diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 78a2e47df..f8a6bc1c9 100644
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -80,9 +80,8 @@ $a->config['system']['maximagesize'] = 800000;
 $a->config['system']['huburl'] = '[internal]';
 
 // Server-to-server private message encryption (RINO) is allowed by default.
-// Encryption will only be provided if this setting is set to a non zero
-// value and the PHP mcrypt extension is installed on both systems
-// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt
+// Encryption will only be provided if this setting is set to a non zero value
+// set to 0 to disable, 2 to enable, 1 is deprecated
 
 $a->config['system']['rino_encrypt'] = {{$rino}};
 
diff --git a/view/theme/frio/css/mod_events.css b/view/theme/frio/css/mod_events.css
index 5ca223001..293ffe06b 100644
--- a/view/theme/frio/css/mod_events.css
+++ b/view/theme/frio/css/mod_events.css
@@ -22,10 +22,13 @@
 #fc-header-right {
     margin-top: -4px;
 }
+#fc-header-right button {
+    color: inherit;
+}
 #event-calendar-title {
     vertical-align: middle;
 }
-a#event-calendar-views {
+#event-calendar-views {
     padding: 6px 9px;
     font-size: 14px
 }
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index ccde6ab68..f7659117d 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -51,10 +51,14 @@ body a[name]:not([href]) {
     visibility: hidden;
 }
 
-body a:hover, body a:focus, body a:active, body a.active, body .btn-link:hover{
+body a:hover, .btn-link:hover,
+body a:focus, .btn-link:focus,
+body a:active, .btn-link:active,
+body a.active, .btn-link.active {
     /*color: #59d6e4;*/
     color: $link_hover_color;
     text-decoration: none;
+    outline: none;
 }
 
 .wall-item-container a:hover {
@@ -90,6 +94,7 @@ blockquote {
 code {
     white-space: pre-wrap;
 }
+.help-content-wrapper code {display: inline}
 
 /*
 * standard page elements
@@ -153,6 +158,7 @@ a#item-delete-selected {
     font-size: 14px;
     font-weight: 600;
     padding: 8px 16px;
+    color: inherit;
 }
 
 .btn-default {
@@ -185,6 +191,7 @@ a#item-delete-selected {
     outline: 0;
     background: $btn_primary_hover_color !important;
 }
+
 .btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
 .btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
 .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
@@ -195,10 +202,10 @@ a#item-delete-selected {
 }
 
 .btn-link {
+    border: 0;
     color: $link_color;
-}
-.btn-link:focus, .btn-link:hover {
-    color: #23527c;
+    padding-left: 0;
+    padding-right: 0;
 }
 .btn-eventnav, btn-eventnav:hover {
     font-size: 16px;
@@ -394,7 +401,8 @@ header #banner #logo-img,
     top: 2px;
     right: 10px
 }
-.topbar .dropdown-header .dropdown-header-link a {
+.topbar .dropdown-header .dropdown-header-link a,
+.topbar .dropdown-header .dropdown-header-link .btn-link {
     /*color: #6fdbe8!important;*/
     color: $link_color !important;
     font-size: 12px;
@@ -547,9 +555,8 @@ nav.navbar .nav>li>a:focus{
 #topbar-first .dropdown-footer {
     margin: 10px 10px 5px
 }
-#topbar-first a,
-nav.navbar a {
-    /*color: #fff*/
+#topbar-first a, #topbar-first .btn-link,
+nav.navbar a, nav.navbar .btn-link {
     color: $nav_icon_color;
 }
 #topbar-first .caret {
@@ -643,10 +650,12 @@ nav.navbar a {
 #myNavmenu li.nav-sitename {
     font-weight: bold;
 }
-#topbar-first .dropdown.account>a,
-#topbar-first .dropdown.account.open>a,
-#topbar-first .dropdown.account>a:hover,
-#topbar-first .dropdown.account.open>a:hover {
+#topbar-first .dropdown.account > a,
+#topbar-first .dropdown.account.open > a,
+#topbar-first .dropdown.account > button,
+#topbar-first .dropdown.account.open > button,
+#topbar-first .dropdown.account > :hover,
+#topbar-first .dropdown.account.open > :hover {
     background-color: $nav_bg;
 }
 #topbar-first .dropdown.account li#nav-sitename {
@@ -695,7 +704,7 @@ nav.navbar a {
 @media screen and (max-width: 767px) {
     #topbar-second > .container,
     #topbar-second #navbar-button {
-	padding: 0;
+    padding: 0;
     }
 }
 #topbar-second .dropdown-menu {
@@ -814,6 +823,25 @@ nav.navbar a {
 }
 
 /* Dropdown Menus */
+.nav > li > .btn-link {
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+}
+.nav > li > .btn-link:focus,
+.nav > li > .btn-link:hover {
+    text-decoration: none;
+    background-color: #eee;
+}
+.nav .open > .btn-link,
+.nav .open > .btn-link:focus,
+.nav .open > .btn-link:hover {
+    background-color: #eee;
+    border-color: #337ab7;
+}
+.nav-pills > li > .btn-link {
+    border-radius: 4px;
+}
 .nav-pills .dropdown-menu,
 .nav-tabs .dropdown-menu,
 .account .dropdown-menu,
@@ -835,41 +863,43 @@ nav.navbar a {
 .contact-photo-wrapper .dropdown-menu li {
     border-left: 3px solid $nav_bg;
 }
-.nav-pills .dropdown-menu li a,
-.nav-tabs .dropdown-menu li a,
-.account .dropdown-menu li a,
-.contact-photo-wrapper .dropdown-menu li a {
+.nav-pills .dropdown-menu li a, .nav-pills .dropdown-menu li .btn-link,
+.nav-tabs .dropdown-menu li a, .nav-tabs .dropdown-menu li .btn-link,
+.account .dropdown-menu li a, .account .dropdown-menu li .btn-link,
+.contact-photo-wrapper .dropdown-menu li a, .contact-photo-wrapper .dropdown-menu li .btn-link {
     color: $nav_icon_color;
     font-weight: 400;
     font-size: 13px;
     padding: 4px 15px;
     text-transform: capitalize;
+    width: 100%;
+    text-align: left;
 }
-.nav-pills .dropdown-menu li a i,
-.nav-tabs .dropdown-menu li a i,
-.account .dropdown-menu li a i,
-.contact-photo-wrapper .dropdown-menu li a i {
+.nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li .btn-link i,
+.nav-tabs .dropdown-menu li a i, .nav-tabs .dropdown-menu li .btn-link i,
+.account .dropdown-menu li a i, .account .dropdown-menu li .btn-link i,
+.contact-photo-wrapper .dropdown-menu li a i, .contact-photo-wrapper .dropdown-menu li .btn-link i {
     margin-right: 5px;
     font-size: 14px;
     display: inline-block;
     width: 14px
 }
-.nav-pills .dropdown-menu li a:hover,
-.nav-tabs .dropdown-menu li a:hover,
-.account .dropdown-menu li a:hover,
-.contact-photo-wrapper .dropdown-menu li a:hover,
-.nav-pills .dropdown-menu li a:visited,
-.nav-tabs .dropdown-menu li a:visited,
-.account .dropdown-menu li a:visited,
-.contact-photo-wrapper .dropdown-menu li a:visited,
-.nav-pills .dropdown-menu li a:hover,
-.nav-tabs .dropdown-menu li a:hover,
-.account .dropdown-menu li a:hover,
-.contact-photo-wrapper .dropdown-menu li a:hover,
-.nav-pills .dropdown-menu li a:focus,
-.nav-tabs .dropdown-menu li a:focus,
-.account .dropdown-menu li a:focus,
-.contact-photo-wrapper .dropdown-menu li a:focus {
+.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
+.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
+.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
+.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
+.nav-pills .dropdown-menu li a:visited, .nav-pills .dropdown-menu li .btn-link:visited,
+.nav-tabs .dropdown-menu li a:visited, .nav-tabs .dropdown-menu li .btn-link:visited,
+.account .dropdown-menu li a:visited, .account .dropdown-menu li .btn-link:visited,
+.contact-photo-wrapper .dropdown-menu li a:visited, .contact-photo-wrapper .dropdown-menu li .btn-link:visited,
+.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
+.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
+.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
+.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
+.nav-pills .dropdown-menu li a:focus, .nav-pills .dropdown-menu li .btn-link:focus,
+.nav-tabs .dropdown-menu li a:focus, .nav-tabs .dropdown-menu li .btn-link:focus,
+.account .dropdown-menu li a:focus, .account .dropdown-menu li .btn-link:focus,
+.contact-photo-wrapper .dropdown-menu li a:focus, .contact-photo-wrapper .dropdown-menu li .btn-link:focus {
     background: 0 0
 }
 .nav-pills .dropdown-menu li:hover,
@@ -1170,8 +1200,8 @@ section #jotOpen {
 .jothidden {
     /*display: none;*/
 }
-#jot-modal .modal-header a,
-#profile-jot-submit-wrapper a {
+#jot-modal .modal-header a, #jot-modal .modal-header .btn-link,
+#profile-jot-submit-wrapper a, #profile-jot-submit-wrapper .btn-link {
     color: #555;
     text-transform: capitalize;
 }
@@ -1367,8 +1397,6 @@ section #jotOpen {
 .wall-item-container a,
 .wall-item-container .fakelink,
 .toplevel_item .fakelink,
-.toplevel_item .wall-item-container .btn-link,
-.wall-item-container .btn-link,
 .toplevel_item .wall-item-container .wall-item-responses a {
     color: #555;
     -webkit-transition: all 0.25s ease-in-out;
@@ -1379,7 +1407,6 @@ section #jotOpen {
 }
 
 .toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink,
-.toplevel_item:hover .wall-item-container:hover .btn-link,
 .toplevel_item:hover .wall-item-container:hover .wall-item-responses a,
 .toplevel_item:hover .wall-item-content a,
 .toplevel_item:hover .wall-item-name,
@@ -1549,8 +1576,8 @@ section #jotOpen {
 @media screen and (max-width: 767px) {
     .shared-wrapper,
     .vevent {
-	margin-left: 0px;
-	margin-right: 0px;
+    margin-left: 0px;
+    margin-right: 0px;
     }
 }
 .shared-wrapper:hover,
@@ -1595,19 +1622,18 @@ code > .hl-main {
 }
 
 /* item social action buttons */
-.wall-item-actions, .wall-item-actions a {
+.wall-item-actions {
+    margin-top: 15px;
+}
+.wall-item-actions, .wall-item-actions a, .wall-item-actions button {
     font-size: 13px;
     color: #555;
-    margin-top: 15px;
     margin-bottom: 0;
 }
-.wall-item-actions a.active {
+.wall-item-actions .active {
     font-weight: bold;
 }
-.wall-item-actions a:hover {
-    color: #555;
-}
-.wall-item-actions a.active:hover {
+.wall-item-actions .active:hover {
     color: $link_color;
 }
 .wall-item-actions-left {
@@ -1628,10 +1654,15 @@ code > .hl-main {
 .wall-item-actions .button-comments,
 .wall-item-actions .button-votes,
 .wall-item-actions .button-likes {
-    padding-left: 0px;
-    padding-right: 0px;
     text-transform: capitalize;
 }
+.wall-item-actions button:hover {
+    color: #555;
+    text-decoration: underline;
+}
+.wall-item-actions .separator {
+	margin: 0 .3em;
+}
 
 /* wall item hover effects */
 .wall-item-container .wall-item-links,
@@ -1714,8 +1745,8 @@ code > .hl-main {
     padding-top: 5px !important;
     padding-bottom: 5px !important;
 }
-.comment-icon-list a.icon,
-.comment-icon-list a.icon:hover {
+.comment-icon-list > li > .icon,
+.comment-icon-list > li > .icon:hover {
     color: #555;
     background-color: transparent;
 }
@@ -1845,12 +1876,14 @@ ul.dropdown-menu li:hover {
 
 
 /* Dropdown Menu */
-.dropdown-menu li a {
+.dropdown-menu li a,
+.dropdown-menu li .btn-link {
     font-size: 13px!important;
     font-weight: 600!important;
 }
-.dropdown-menu li a:hover, .dropdown-menu li a:visited,
-.dropdown-menu li a:hover, .dropdown-menu li a:focus {
+.dropdown-menu li > :hover,
+.dropdown-menu li > :visited,
+.dropdown-menu li > :focus {
     background: 0 0;
 }
 
@@ -2062,22 +2095,22 @@ ul.viewcontact_wrapper > li {
 .contact-wrapper .contact-actions {
     display: flex;
 }
-.contact-wrapper a.contact-action-link {
+.contact-wrapper .contact-action-link,
+.contact-wrapper .contact-action-link:hover,
+.textcomplete-item .contact-wrapper .contact-action-link {
+    padding: 0 5px;
+    color: #555;
+    border: 0;
+}
+.contact-wrapper .contact-action-link {
     opacity: 0.1;
     transition: all 0.25s ease-in-out;
 }
-.contact-wrapper a.contact-action-link,
-.contact-wrapper a.contact-action-link:hover,
-.textcomplete-item .contact-wrapper a.contact-action-link {
-    padding-right: 5px;
-    padding-left: 5px;
-    color: #555;
-}
-ul li:hover .contact-wrapper a.contact-action-link {
+ul li:hover .contact-wrapper .contact-action-link {
     opacity: 0.8;
     transition: all 0.25s ease-in-out;
 }
-ul li:hover .contact-wrapper a.contact-action-link:hover {
+ul li:hover .contact-wrapper .contact-action-link:hover {
     opacity: 1;
 }
 #contacts-search-wrapper,
diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js
index 8260dd547..1ca24966a 100644
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -91,7 +91,7 @@ var FileBrowser = {
 
 		FileBrowser.postLoad();
 
-		$(".error a.close").on("click", function(e) {
+		$(".error .close").on("click", function(e) {
 			e.preventDefault();
 			$(".error").addClass("hidden");
 		});
diff --git a/view/theme/frio/js/hovercard.js b/view/theme/frio/js/hovercard.js
index d9f942916..c3396b762 100644
--- a/view/theme/frio/js/hovercard.js
+++ b/view/theme/frio/js/hovercard.js
@@ -1,11 +1,11 @@
-/* 
+/*
  * The javascript for friendicas hovercard. Bootstraps popover is needed.
- * 
- * Much parts of the code are from Hannes Mannerheims  
+ *
+ * Much parts of the code are from Hannes Mannerheims 
  * qvitter code (https://github.com/hannesmannerheim/qvitter)
- * 
+ *
  * It is licensed under the GNU Affero General Public License 
- * 
+ *
  */
 $(document).ready(function(){
 	// Elements with the class "userinfo" will get a hover-card.
@@ -164,7 +164,7 @@ function getContactData(purl, url, actionOnSuccess) {
 			// The nurl will be the identifier in the object
 			if(data.nurl.length > 0) {
 				// Test if the contact is allready connected with the user (if url containing
-				// the expression ("redir/") We will store different cache keys 
+				// the expression ("redir/") We will store different cache keys
 				if((data.url.search("redir/")) >= 0 ) {
 					var key = data.url;
 				} else {
@@ -212,7 +212,7 @@ function getHoverCardContent(purl, url, callback) {
 	});
 
 // This is interisting. this pice of code ajax request are done asynchron.
-// To make it work getHOverCardTemplate() and getHOverCardData have to return it's 
+// To make it work getHOverCardTemplate() and getHOverCardData have to return it's
 // data (no succes handler for each of this). I leave it here, because it could be useful.
 // https://lostechies.com/joshuaflanagan/2011/10/20/coordinating-multiple-ajax-requests-with-jquery-when/
 //	$.when(
@@ -283,49 +283,3 @@ function getHoverCardVariables(object) {
 
 	return variables;
 }
-
-// This is the html template for the hover-card
-// Since we grab the original hovercard.tpl we don't
-// need it anymore
-function hovercard_template() {
-	var tempate = '\
-	
    \
-		
    \
-			
    \
-				
    \
-					\
-						\
-					\
-				
    \
-				
    \
-					
    \
-						
    {{$profile.name}}
    {{if $profile.account_type}}{{$profile.account_type}}{{/if}}\
-					
    \
-					
    \
-						{{$profile.addr}}\
-						{{if $profile.network}} ({{$profile.network}}){{/if}}\
-					
    \
-					{{*{{if $profile.about}}
    {{$profile.about}}
    {{/if}}*}}\
-\
-				
    \
-				
    \
-					{{* here are the differnt actions like privat message, poke, delete and so on *}}\
-					{{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}\
-					
    \
-						{{if $profile.actions.pm}}{{/if}}\
-						{{if $profile.actions.poke}}{{/if}}\
-					
    \
-					
    \
-						{{if $profile.actions.edit}}{{/if}}\
-						{{if $profile.actions.drop}}{{/if}}\
-						{{if $profile.actions.follow}}{{/if}}\
-					
    \
-				
    \
-			
    \
-\
-			
    \
-\
-		
    \
-	
    \
-	{{if $profile.tags}}
    {{$profile.tags}}
    {{/if}}';
-}
diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js
index f657ff5f2..b77f62161 100644
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -8,9 +8,11 @@ $(document).ready(function(){
 		$(this).removeData('bs.modal');
 		$("#modal-title").empty();
 		$('#modal-body').empty();
-		// remove the file browser from jot (else we would have problems
-		// with ajaxupload
+		// Remove the file browser from jot (else we would have problems
+		// with AjaxUpload
 		$(".fbrowser").remove();
+		// Remove the AjaxUpload element
+		$("[name=userfile]").parent().remove();
 	});
 
 	// Clear bs modal on close
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 09f96da36..8a3bd4110 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -618,6 +618,27 @@ function htmlToText(htmlString) {
 	return text;
 }
 
+/**
+ * Sends a /like API call and updates the display of the relevant action button
+ * before the update reloads the item.
+ *
+ * @param {string} ident The id of the relevant item
+ * @param {string} verb The verb of the action
+ * @returns {undefined}
+ */
+function doLikeAction(ident, verb) {
+	unpause();
+
+	if (verb.indexOf('attend') === 0) {
+		$('.item-' + ident + ' .button-event:not(#' + verb + '-' + ident + ')').removeClass('active');
+	}
+	$('#' + verb + '-' + ident).toggleClass('active');
+	$('#like-rotator-' + ident.toString()).show();
+	$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+	liking = 1;
+	force_update = true;
+}
+
 // Decodes a hexadecimally encoded binary string
 function hex2bin (s) {
 	//  discuss at: http://locutus.io/php/hex2bin/
@@ -666,4 +687,4 @@ function bin2hex (s) {
 	}
 
 	return o;
-}
\ No newline at end of file
+}
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index 56118cc90..87ccf3dc1 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -4,20 +4,17 @@
  * @brief The default site template
  */
 ?>
-
 
-
-
-
 
 
 	<?php if(x($page,'title')) echo $page['title'] ?>
-	
+	
 	
 	
 	
@@ -31,8 +28,6 @@
 			if(x($page,'htmlhead')) echo $page['htmlhead'];
 		}
 	?>
-	
-
 
 
-		
 			
 		
 
diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php
index 491fa9d5b..9e3d2ca63 100644
--- a/view/theme/frio/php/standard.php
+++ b/view/theme/frio/php/standard.php
@@ -4,21 +4,17 @@
  * @brief The default site template
  */
 ?>
-
 
-
 
 
 	<?php if(x($page,'title')) echo $page['title'] ?>
 	
-	
+	
 	
 	
 	
 	
 	
-	
-
 
 ";
 
@@ -54,7 +50,6 @@
 					
 						";
 ?>
-		
 			
 		
 
@@ -80,7 +75,7 @@
 			})
 		})
 	}
-	
+
 	$('textarea').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
 	$('input').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
 
@@ -126,7 +121,5 @@ $("nav").bind('nav-update', function(e,data)
 		
 	
 
-
-
 
 
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index a195c4dc0..8ce7805bb 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -27,52 +27,51 @@
 
 		
    
 		
 
 		
    
 	
-
+	
 
diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl
index 7cfd63528..b0be33b6c 100644
--- a/view/theme/frio/templates/common_tabs.tpl
+++ b/view/theme/frio/templates/common_tabs.tpl
@@ -12,13 +12,13 @@
 		
 
 		{{* The extended dropdown menu - this would be shown if the tab menu points
-			dosn't fit in the available space. This is done through flexMenu.js *}}
+			doesn't fit in the available space. This is done through flexMenu.js *}}
 		
  • 
 			
 		
    • 
@@ -45,9 +45,9 @@
 		
  • 
 			
      
 				
    • 
-					
+					
 					
    • HandlerDescription
    $name$version