Release wallabag 2.0.0-alpha.2

Few fixes

.editorconfig

@@ -0,0 +1,10 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -1,6 +1,40 @@
-assets/*
-cache/*
-vendor
-composer.phar
-db/poche.sqlite
-inc/poche/config.inc.php
+# Cache, logs & sessions
+/var/*
+!/var/cache
+/var/cache/*
+!var/cache/.gitkeep
+!/var/logs
+/var/logs/*
+!var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
+
+# Parameters
+/app/config/parameters.yml
+
+# Managed by Composer
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# Build
+/app/build
+/build
+
+# Composer PHAR
+/composer.phar
+
+# Data for wallabag
+data/assets/*
+data/db/wallabag*.sqlite
+
+# Docker container logs and data
+docker/logs/
+docker/data/
+
+# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
+composer.lock

.scrutinizer.yml

@@ -0,0 +1,28 @@
+filter:
+    paths:
+        - src/*
+    excluded_paths:
+        - 'vendor/*'
+        - 'app/*'
+        - 'var/*'
+        - 'web/*'
+        - 'src/Wallabag/*Bundle/Tests/*'
+        - '*Test.php'
+
+tools:
+    php_cs_fixer: true
+    php_analyzer: true
+    php_mess_detector: true
+    php_changetracking: true
+    php_code_sniffer: true
+    php_pdepend: true
+    sensiolabs_security_checker: true
+    #external_code_coverage:
+    #    timeout: 3600
+    php_code_coverage: true
+    php_sim: false
+    php_cpd: false
+
+checks:
+    php:
+        code_rating: true

.travis.yml

@@ -0,0 +1,51 @@
+language: php
+
+# faster builds on docker-container setup
+sudo: false
+
+# used for HHVM
+addons:
+  apt:
+    packages:
+      - tidy
+
+# cache vendor dirs
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
+
+php:
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
+
+env:
+  - DB=mysql
+  - DB=pgsql
+  - DB=sqlite
+
+matrix:
+    fast_finish: true
+    exclude:
+        - php: hhvm
+          env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
+    allow_failures:
+        - php: hhvm
+
+branches:
+    only:
+        - v2
+
+before_script:
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
+    - composer self-update --no-progress
+    - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
+    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
+
+script:
+    - travis_wait composer update --no-interaction --no-progress
+    - ant prepare-$DB
+    - bin/phpunit -v

CONTRIBUTING.md

@@ -1,11 +1,30 @@
-# How contributing
+# How to contribute
 
 ## You found a bug
-Please [open a new issue](https://github.com/inthepoche/poche/issues/new).
+Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
 
 To fix the bug quickly, we need some infos:
-* your poche version (in ./inc/poche/myconfig.inc.php)
-* the link you want to poche and which causes problem
+* your wallabag version (on top of the ./index.php file, and also on config page)
+* your webserver installation :
+  * type of hosting (shared or dedicated)
+  * in case of a dedicated server, the server and OS used
+  * the php version used, eventually `phpinfo()`
+* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL)
+* any problem on the `wallabag_compatibility_test.php` page
+* any particular details which could be related
+
+
+If relevant :
+* the link you want to save and which causes problem
+* the file you want to import into wallabag, or just an extract
+
+If you have the skills :
+* enable DEBUG mode and look the output at cache/log.txt
+* look for errors into php and server logs
+
+Note : If you have large portions of text, use [Github's Gist service](https://gist.github.com/) or other pastebin-like.
 
 ## You want to fix a bug or to add a feature
-Please fork poche and work with **the dev branch** only. Do not work on master branch.
+Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**.
+
+[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).

COPYING.md

@@ -1,14 +1,19 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
+Copyright (c) 2013-2016 Nicolas Lœuillet
+
+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.

CREDITS.md

@@ -1,15 +1,3 @@
-poche is based on :
-* PHP Readability https://bitbucket.org/fivefilters/php-readability
-* Full Text RSS http://code.fivefilters.org/full-text-rss/src
-* Encoding https://github.com/neitanod/forceutf8
-* logo by Brightmix http://www.iconfinder.com/icondetails/43256/128/jeans_monotone_pocket_icon
-* icons http://icomoon.io
-* PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
-* Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
-* Twig http://twig.sensiolabs.org
-* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
-* Pagination https://github.com/daveismyname/pagination
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r) and [@tcitworld](https://github.com/tcitworld) under the MIT License.
 
-poche is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
-
-Contributors : https://github.com/inthepoche/poche/graphs/contributors
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).

Capfile

@@ -0,0 +1,13 @@
+set :deploy_config_path, 'app/config/capistrano/deploy.rb'
+set :stage_config_path, 'app/config/capistrano/deploy'
+
+# Load DSL and set up stages
+require 'capistrano/setup'
+
+# Include default deployment tasks
+require 'capistrano/deploy'
+
+require 'capistrano/symfony'
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'capistrano',  '~> 3.1'
+gem 'capistrano-symfony', '~> 0.1', :github => 'capistrano/symfony'
+gem 'capistrano-composer', '~> 0.0.3'

Gemfile.lock

@@ -0,0 +1,41 @@
+GIT
+  remote: git://github.com/capistrano/symfony.git
+  revision: ca56a01b817097d2831400ef9b1867fc8e07dcf8
+  specs:
+    capistrano-symfony (0.4.0)
+      capistrano (~> 3.1)
+      capistrano-composer (~> 0.0.3)
+      capistrano-file-permissions (~> 0.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    capistrano (3.4.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
+    capistrano-composer (0.0.6)
+      capistrano (>= 3.0.0.pre)
+    capistrano-file-permissions (0.1.1)
+      capistrano (~> 3.1)
+    colorize (0.7.7)
+    i18n (0.7.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    rake (10.4.2)
+    sshkit (1.7.1)
+      colorize (>= 0.7.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capistrano (~> 3.1)
+  capistrano-composer (~> 0.0.3)
+  capistrano-symfony (~> 0.1)!
+
+BUNDLED WITH
+   1.10.6

INSTALL.md

@@ -1,3 +0,0 @@
-# Installing poche
-
-Read the full documentation here: http://doc.inthepoche.com/doku.php?id=users:begin:install

README.md

@@ -1,29 +1,26 @@
-# what is poche ?
-Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is free (like in freedom) and open source. 
+[![Build Status](https://travis-ci.org/wallabag/wallabag.svg?branch=v2)](https://travis-ci.org/wallabag/wallabag)
+[![Code Coverage](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/coverage.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
 
-## Some features
-* adding, deleting, archiving and setting as favorite a link
-* import from pocket / readability / instapaper
-* share links by email and on twitter
-* a design adapted to tablets and smartphones
-* extensions for Chrome and Firefox
-* Android application
-* multi languages: french, english, spanish, german.
-* multi users (very soon!)
-* update notification in configuration screen
-* many storage modes (sqlite, mysql, postgresql)
-* many templates: [have a look here](https://github.com/inthepoche/poche/tree/master/themes).
-* ...
+# What is wallabag?
+wallabag is a self hostable application allowing you to not miss any content anymore.
+Click, save and read it when you can. It extracts content so that you can read it when you have time.
 
-To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
+More informations on our website: [wallabag.org](http://wallabag.org)
 
-To use poche hosting, [you can create an account here](http://app.inthepoche.com/).
+# Want to test the v2?
 
-## Installation
-Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTALL.md).
+Keep in mind it's an **unstable** branch, everything can be broken :)
+
+If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands:
+
+```
+composer create-project wallabag/wallabag wallabag 2.0.*@alpha
+php bin/console wallabag:install
+php bin/console server:run
+```
 
 ## License
-Copyright © 2010-2013 Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
+Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
-terms of the Do What The Fuck You Want To Public License, Version 2,
-as published by Sam Hocevar. See the COPYING file for more details.
+terms of the MIT License. See the COPYING file for more details.

TODO.md

@@ -1,9 +0,0 @@
-# TODO
-
-* pouvoir annuler la suppression
-* conventions codage ? phing ? vérifier error_log qui trainent
-* phpDocumentor
-* minifier css 
-* barre fixe d'admin sur la page d'un billet ? 
-* revoir export (export vers pocket &cie ? )
-* raccourcis clavier 

app/.htaccess

@@ -0,0 +1,7 @@
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+</IfModule>

app/AppCache.php

@@ -0,0 +1,7 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+
+class AppCache extends HttpCache
+{
+}

app/AppKernel.php

@@ -0,0 +1,68 @@
+<?php
+
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+
+class AppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        $bundles = [
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
+            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new FOS\RestBundle\FOSRestBundle(),
+            new FOS\UserBundle\FOSUserBundle(),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
+            new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
+            new Nelmio\CorsBundle\NelmioCorsBundle(),
+            new Liip\ThemeBundle\LiipThemeBundle(),
+            new Wallabag\CoreBundle\WallabagCoreBundle(),
+            new Wallabag\ApiBundle\WallabagApiBundle(),
+            new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
+            new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
+            new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
+            new Wallabag\UserBundle\WallabagUserBundle(),
+            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
+            new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
+            new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+        ];
+
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
+            $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
+            $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
+            $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
+            $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+            $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
+        }
+
+        return $bundles;
+    }
+
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
+    }
+
+    public function getLogDir()
+    {
+        return dirname(__DIR__).'/var/logs';
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
+    }
+}

app/autoload.php

@@ -0,0 +1,13 @@
+<?php
+
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
+
+/**
+ * @var ClassLoader $loader
+ */
+$loader = require __DIR__.'/../vendor/autoload.php';
+
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+
+return $loader;

app/config/capistrano/deploy.rb

@@ -0,0 +1,23 @@
+# config valid only for current version of Capistrano
+lock '3.4.0'
+
+set :application, 'wallabag'
+set :repo_url, 'git@github.com:wallabag/wallabag.git'
+
+set :ssh_user, 'framasoft_bag'
+server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
+
+set :scm, :git
+
+set :format, :pretty
+set :log_level, :info
+# set :log_level, :debug
+
+set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
+
+set :linked_files, %w{app/config/parameters.yml}
+set :linked_dirs, %w{app/logs web/uploads data}
+
+set :keep_releases, 3
+
+after 'deploy:finishing', 'deploy:cleanup'

app/config/capistrano/deploy/staging.rb

@@ -0,0 +1,2 @@
+set :branch, 'v2'
+set :deploy_to, '/var/www/v2.wallabag.org/web/'

app/config/config.yml

@@ -0,0 +1,209 @@
+imports:
+    - { resource: parameters.yml }
+    - { resource: security.yml }
+    - { resource: services.yml }
+
+framework:
+    #esi:             ~
+    translator:      { fallback: "%locale%" }
+    secret:          "%secret%"
+    router:
+        resource: "%kernel.root_dir%/config/routing.yml"
+        strict_requirements: ~
+    form:            ~
+    csrf_protection: ~
+    validation:      { enable_annotations: true }
+    templating:
+        engines: ['twig']
+        #assets_version: SomeVersionScheme
+    default_locale:  "%locale%"
+    trusted_hosts:   ~
+    trusted_proxies: ~
+    session:
+        # handler_id set to null will use default session handler from php.ini
+        handler_id:  session.handler.native_file
+        save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
+    fragments:       ~
+    http_method_override: true
+    assets: ~
+
+wallabag_core:
+    languages:
+        en: 'English'
+        fr: 'Français'
+        de: 'Deutsch'
+
+wallabag_import:
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+    resource_dir: "%kernel.root_dir%/../web/uploads/import"
+
+# Twig Configuration
+twig:
+    debug:            "%kernel.debug%"
+    strict_variables: "%kernel.debug%"
+    globals:
+        share_twitter: %share_twitter%
+        share_mail: %share_mail%
+        share_shaarli: %share_shaarli%
+        shaarli_url: %shaarli_url%
+        share_diaspora: %share_diaspora%
+        diaspora_url: %diaspora_url%
+        flattr: %flattr%
+        flattrable: 1
+        flattred: 2
+        carrot: %carrot%
+        show_printlink: %show_printlink%
+        export_epub: %export_epub%
+        export_mobi: %export_mobi%
+        export_pdf: %export_pdf%
+        version: %app.version%
+        twofactor_auth: %twofactor_auth%
+        warning_message: %warning_message%
+        paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
+    form_themes:
+        - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
+
+# Assetic Configuration
+assetic:
+    debug:          "%kernel.debug%"
+    use_controller: false
+    bundles:        [ ]
+    #java: /usr/bin/java
+    filters:
+        cssrewrite: ~
+        #closure:
+        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
+        #yui_css:
+        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
+
+# Doctrine Configuration
+doctrine:
+    dbal:
+        driver:   "%database_driver%"
+        host: "%database_host%"
+        port: "%database_port%"
+        dbname: "%database_name%"
+        user: "%database_user%"
+        password: "%database_password%"
+        charset:  UTF8
+        path:     "%database_path%"
+
+    orm:
+        auto_generate_proxy_classes: "%kernel.debug%"
+        entity_managers:
+            default:
+                auto_mapping: true
+
+stof_doctrine_extensions:
+    default_locale: "%locale%"
+    translation_fallback: true
+    orm:
+        default:
+            tree: true
+            sluggable: true
+
+doctrine_migrations:
+    dir_name: "%kernel.root_dir%/DoctrineMigrations"
+    namespace: Application\Migrations
+    table_name: migration_versions
+    name: Application Migrations
+
+# Swiftmailer Configuration
+swiftmailer:
+    transport: "%mailer_transport%"
+    host:      "%mailer_host%"
+    username:  "%mailer_user%"
+    password:  "%mailer_password%"
+    spool:     { type: memory }
+
+fos_rest:
+    param_fetcher_listener: true
+    body_listener: true
+    format_listener: true
+    view:
+        view_response_listener: 'force'
+        formats:
+            xml: true
+            json : true
+        templating_formats:
+            html: true
+        force_redirects:
+            html: true
+        failed_validation: HTTP_BAD_REQUEST
+        default_engine: twig
+    routing_loader:
+        default_format: json
+
+nelmio_api_doc:
+    sandbox:
+        enabled: false
+    name: wallabag API documentation
+
+nelmio_cors:
+    defaults:
+        allow_credentials: false
+        allow_origin: []
+        allow_headers: []
+        allow_methods: []
+        expose_headers: []
+        max_age: 0
+        hosts: []
+        #origin_regex: false
+    paths:
+        '^/api/':
+            allow_origin: ['*']
+            allow_headers: ['X-Custom-Auth']
+            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
+            max_age: 3600
+        '^/':
+            #origin_regex: true
+            allow_origin: ['^http://localhost:[0-9]+']
+            allow_headers: ['X-Custom-Auth']
+            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
+            max_age: 3600
+            hosts: ['^api\.']
+
+liip_theme:
+    load_controllers: false
+    themes:
+        - baggy
+        - material
+    autodetect_theme: wallabag_core.helper.detect_active_theme
+
+    path_patterns:
+        bundle_resource:
+            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+
+fos_user:
+    db_driver: orm
+    firewall_name: main
+    user_class: Wallabag\UserBundle\Entity\User
+    registration:
+        confirmation:
+            enabled: true
+
+fos_oauth_server:
+    db_driver:           orm
+    client_class:        Wallabag\ApiBundle\Entity\Client
+    access_token_class:  Wallabag\ApiBundle\Entity\AccessToken
+    refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
+    auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
+    service:
+        user_provider: fos_user.user_manager
+
+scheb_two_factor:
+    trusted_computer:
+        enabled: true
+        cookie_name: wllbg_trusted_computer
+        cookie_lifetime: 2592000
+
+    email:
+        enabled: %twofactor_auth%
+        sender_email: %twofactor_sender%
+        digits: 6
+        template: WallabagUserBundle:Authentication:form.html.twig
+        mailer: wallabag_user.auth_code_mailer
+
+kphoen_rulerz:
+    executors:
+        doctrine: true

app/config/config_dev.yml

@@ -0,0 +1,44 @@
+imports:
+    - { resource: config.yml }
+
+framework:
+    router:
+        resource: "%kernel.root_dir%/config/routing_dev.yml"
+        strict_requirements: true
+    profiler: { only_exceptions: false }
+
+web_profiler:
+    toolbar: true
+    intercept_redirects: false
+
+monolog:
+    handlers:
+        main:
+            type:   stream
+            path:   "%kernel.logs_dir%/%kernel.environment%.log"
+            level:  debug
+            channels: [!event]
+        console:
+            type:   console
+            bubble: false
+            verbosity_levels:
+                VERBOSITY_VERBOSE: INFO
+                VERBOSITY_VERY_VERBOSE: DEBUG
+            channels: [!event, !doctrine]
+        console_very_verbose:
+            type:   console
+            bubble: false
+            verbosity_levels:
+                VERBOSITY_VERBOSE: NOTICE
+                VERBOSITY_VERY_VERBOSE: NOTICE
+                VERBOSITY_DEBUG: DEBUG
+            channels: [doctrine]
+
+assetic:
+    use_controller: true
+
+swiftmailer:
+    # see http://mailcatcher.me/
+    transport: smtp
+    host: 'localhost'
+    port: 1025

app/config/config_prod.yml

@@ -0,0 +1,25 @@
+imports:
+    - { resource: config.yml }
+
+#framework:
+#    validation:
+#        cache: apc
+
+#doctrine:
+#    orm:
+#        metadata_cache_driver: apc
+#        result_cache_driver: apc
+#        query_cache_driver: apc
+
+monolog:
+    handlers:
+        main:
+            type:         fingers_crossed
+            action_level: error
+            handler:      nested
+        nested:
+            type:  stream
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
+            level: debug
+        console:
+            type:  console

app/config/config_test.yml

@@ -0,0 +1,36 @@
+imports:
+    - { resource: config_dev.yml }
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.mock_file
+    profiler:
+        collect: false
+
+web_profiler:
+    toolbar: false
+    intercept_redirects: false
+
+swiftmailer:
+    # to be able to read emails sent
+    spool:
+        type: file
+
+doctrine:
+    dbal:
+        driver: "%test_database_driver%"
+        host: "%test_database_host%"
+        port: "%test_database_port%"
+        dbname: "%test_database_name%"
+        user: "%test_database_user%"
+        password: "%test_database_password%"
+        charset: UTF8
+        path: "%test_database_path%"
+    orm:
+        metadata_cache_driver:
+            type: service
+            id: filesystem_cache
+        query_cache_driver:
+            type: service
+            id: filesystem_cache

app/config/parameters.yml.dist

@@ -0,0 +1,75 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    # Uncomment these settings or manually update your parameters.yml
+    # to use docker-compose
+    #
+    # database_driver: %env.database_driver%
+    # database_host: %env.database_host%
+    # database_port: %env.database_port%
+    # database_name: %env.database_name%
+    # database_user: %env.database_user%
+    # database_password: %env.database_password%
+
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_sqlite
+    test_database_host: 127.0.0.1
+    test_database_port: ~
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/routing.yml

@@ -0,0 +1,33 @@
+wallabag_import:
+    resource: "@WallabagImportBundle/Controller/"
+    type:     annotation
+    prefix:   /import
+
+wallabag_api:
+    resource: "@WallabagApiBundle/Resources/config/routing.yml"
+    prefix: /
+
+app:
+    resource: "@WallabagCoreBundle/Controller/"
+    type: annotation
+
+doc-api:
+    resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
+    prefix: /api/doc
+
+rest :
+    type : rest
+    resource : "routing_rest.yml"
+    prefix : /api
+
+homepage:
+    path: "/{page}"
+    defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 }
+    requirements:
+        page: \d+
+
+fos_user:
+    resource: "@FOSUserBundle/Resources/config/routing/all.xml"
+
+fos_oauth_server_token:
+    resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"

app/config/routing_dev.yml

@@ -0,0 +1,14 @@
+_wdt:
+    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
+    prefix:   /_wdt
+
+_profiler:
+    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
+    prefix:   /_profiler
+
+_errors:
+    resource: "@TwigBundle/Resources/config/routing/errors.xml"
+    prefix:   /_error
+
+_main:
+    resource: routing.yml

app/config/routing_rest.yml

@@ -0,0 +1,3 @@
+Rest_Wallabag:
+  type : rest
+  resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"

app/config/security.yml

@@ -0,0 +1,60 @@
+security:
+    encoders:
+        FOS\UserBundle\Model\UserInterface: sha512
+
+    role_hierarchy:
+        ROLE_ADMIN:       ROLE_USER
+        ROLE_SUPER_ADMIN: [ ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH ]
+
+    providers:
+        administrators:
+            entity: { class: WallabagUserBundle:User, property: username }
+        fos_userbundle:
+            id: fos_user.user_provider.username
+
+    # the main part of the security, where you can set up firewalls
+    # for specific sections of your app
+    firewalls:
+        # disables authentication for assets and the profiler, adapt it according to your needs
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
+        oauth_token:
+            pattern: ^/oauth/v2/token
+            security: false
+
+        api:
+            pattern: /api/.*
+            fos_oauth: true
+            stateless: true
+            anonymous: true
+
+        login_firewall:
+            pattern:    ^/login$
+            anonymous:  ~
+
+        secured_area:
+            pattern: ^/
+            form_login:
+                provider: fos_userbundle
+                csrf_token_generator: security.csrf.token_manager
+
+            anonymous:    true
+            remember_me:
+                secret:   "%secret%"
+                lifetime: 31536000
+                path:     /
+                domain:   ~
+
+            logout:
+                path:   /logout
+                target: /
+
+    access_control:
+        - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/, roles: ROLE_USER }

app/config/services.yml

@@ -0,0 +1,32 @@
+parameters:
+    lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
+
+services:
+    # used for tests
+    filesystem_cache:
+        class: Doctrine\Common\Cache\FilesystemCache
+        arguments:
+            - %kernel.cache_dir%/doctrine/metadata
+
+    twig.extension.text:
+        class: Twig_Extensions_Extension_Text
+        tags:
+            - { name: twig.extension }
+
+    wallabag.twig_extension:
+        class: Wallabag\CoreBundle\Twig\WallabagExtension
+        public: false
+        tags:
+            - { name: twig.extension }
+
+    wallabag.locale_listener:
+        class: Wallabag\CoreBundle\EventListener\LocaleListener
+        arguments: ["%kernel.default_locale%"]
+        tags:
+            - { name: kernel.event_subscriber }
+
+    wallabag.user_locale_listener:
+        class: Wallabag\CoreBundle\EventListener\UserLocaleListener
+        arguments: ["@session"]
+        tags:
+            - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }

app/config/tests/parameters.yml.dist.mysql

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_mysql
+    test_database_host: localhost
+    test_database_port: 3306
+    test_database_name: wallabag
+    test_database_user: root
+    test_database_password: ~
+    test_database_path: ~
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters.yml.dist.pgsql

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_pgsql
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: wallabag
+    test_database_user: travis
+    test_database_password: ~
+    test_database_path: ~
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters.yml.dist.sqlite

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_sqlite
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

bin/console

@@ -0,0 +1,29 @@
+#!/usr/bin/env php
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
+// if you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
+//umask(0000);
+
+set_time_limit(0);
+
+/**
+ * @var Composer\Autoload\ClassLoader $loader
+ */
+$loader = require __DIR__.'/../app/autoload.php';
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
+
+if ($debug) {
+    Debug::enable();
+}
+
+$kernel = new AppKernel($env, $debug);
+$application = new Application($kernel);
+$application->run($input);

bin/doctrine

@@ -0,0 +1 @@
+../vendor/doctrine/orm/bin/doctrine

bin/doctrine-dbal

@@ -0,0 +1 @@
+../vendor/doctrine/dbal/bin/doctrine-dbal

bin/doctrine-migrations

@@ -0,0 +1 @@
+../vendor/doctrine/migrations/bin/doctrine-migrations

bin/doctrine.php

@@ -0,0 +1 @@
+../vendor/doctrine/orm/bin/doctrine.php

bin/phpunit

@@ -0,0 +1 @@
+../vendor/phpunit/phpunit/phpunit

bin/security-checker

@@ -0,0 +1 @@
+../vendor/sensiolabs/security-checker/security-checker

bin/symfony_requirements

@@ -0,0 +1,143 @@
+#!/usr/bin/env php
+<?php
+
+require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
+
+$lineSize = 70;
+$symfonyRequirements = new SymfonyRequirements();
+$iniPath = $symfonyRequirements->getPhpIniConfigPath();
+
+echo_title('Symfony2 Requirements Checker');
+
+echo '> PHP is using the following php.ini file:'.PHP_EOL;
+if ($iniPath) {
+    echo_style('green', '  '.$iniPath);
+} else {
+    echo_style('warning', '  WARNING: No configuration file (php.ini) used by PHP!');
+}
+
+echo PHP_EOL.PHP_EOL;
+
+echo '> Checking Symfony requirements:'.PHP_EOL.'  ';
+
+$messages = array();
+foreach ($symfonyRequirements->getRequirements() as $req) {
+    /** @var $req Requirement */
+    if ($helpText = get_error_message($req, $lineSize)) {
+        echo_style('red', 'E');
+        $messages['error'][] = $helpText;
+    } else {
+        echo_style('green', '.');
+    }
+}
+
+$checkPassed = empty($messages['error']);
+
+foreach ($symfonyRequirements->getRecommendations() as $req) {
+    if ($helpText = get_error_message($req, $lineSize)) {
+        echo_style('yellow', 'W');
+        $messages['warning'][] = $helpText;
+    } else {
+        echo_style('green', '.');
+    }
+}
+
+if ($checkPassed) {
+    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
+} else {
+    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
+
+    echo_title('Fix the following mandatory requirements', 'red');
+
+    foreach ($messages['error'] as $helpText) {
+        echo ' * '.$helpText.PHP_EOL;
+    }
+}
+
+if (!empty($messages['warning'])) {
+    echo_title('Optional recommendations to improve your setup', 'yellow');
+
+    foreach ($messages['warning'] as $helpText) {
+        echo ' * '.$helpText.PHP_EOL;
+    }
+}
+
+echo PHP_EOL;
+echo_style('title', 'Note');
+echo '  The command console could use a different php.ini file'.PHP_EOL;
+echo_style('title', '~~~~');
+echo '  than the one used with your web server. To be on the'.PHP_EOL;
+echo '      safe side, please check the requirements from your web'.PHP_EOL;
+echo '      server using the ';
+echo_style('yellow', 'web/config.php');
+echo ' script.'.PHP_EOL;
+echo PHP_EOL;
+
+exit($checkPassed ? 0 : 1);
+
+function get_error_message(Requirement $requirement, $lineSize)
+{
+    if ($requirement->isFulfilled()) {
+        return;
+    }
+
+    $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.'   ').PHP_EOL;
+    $errorMessage .= '   > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.'   > ').PHP_EOL;
+
+    return $errorMessage;
+}
+
+function echo_title($title, $style = null)
+{
+    $style = $style ?: 'title';
+
+    echo PHP_EOL;
+    echo_style($style, $title.PHP_EOL);
+    echo_style($style, str_repeat('~', strlen($title)).PHP_EOL);
+    echo PHP_EOL;
+}
+
+function echo_style($style, $message)
+{
+    // ANSI color codes
+    $styles = array(
+        'reset' => "\033[0m",
+        'red' => "\033[31m",
+        'green' => "\033[32m",
+        'yellow' => "\033[33m",
+        'error' => "\033[37;41m",
+        'success' => "\033[37;42m",
+        'title' => "\033[34m",
+    );
+    $supports = has_color_support();
+
+    echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : '');
+}
+
+function echo_block($style, $title, $message)
+{
+    $message = ' '.trim($message).' ';
+    $width = strlen($message);
+
+    echo PHP_EOL.PHP_EOL;
+
+    echo_style($style, str_repeat(' ', $width).PHP_EOL);
+    echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+    echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+    echo_style($style, str_repeat(' ', $width).PHP_EOL);
+}
+
+function has_color_support()
+{
+    static $support;
+
+    if (null === $support) {
+        if (DIRECTORY_SEPARATOR == '\\') {
+            $support = false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
+        } else {
+            $support = function_exists('posix_isatty') && @posix_isatty(STDOUT);
+        }
+    }
+
+    return $support;
+}

build.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="wallabag" default="build">
+    <target name="build" depends="clean,prepare,phpunit"/>
+    <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
+    <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
+    <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
+
+    <target name="clean" description="Cleanup build artifacts">
+        <delete dir="${basedir}/var/cache"/>
+    </target>
+
+    <target name="prepare" description="Prepare for build">
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:schema:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_mysql" description="Run test for MySQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.mysql"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_sqlite" description="Run test for SQLite">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.sqlite"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_pgsql" description="Run test for PostgreSQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.pgsql"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="phpunit" description="Run unit tests with PHPUnit + HTML Coverage">
+        <exec executable="phpunit" failonerror="true">
+            <arg value="--coverage-html"/>
+            <arg value="build/coverage"/>
+        </exec>
+    </target>
+</project>

composer.json

@@ -1,7 +1,119 @@
 {
+    "name": "wallabag/wallabag",
+    "type": "project",
+    "description": "open source self hostable read-it-later web application",
+    "keywords": ["read-it-later","read it later"],
+    "homepage": "https://github.com/wallabag/wallabag",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Lœuillet",
+            "email": "nicolas@loeuillet.org",
+            "homepage": "http://www.cdetc.fr",
+            "role": "Developer"
+        },
+        {
+            "name": "Thomas Citharel",
+            "homepage": "http://tcit.fr",
+            "role": "Developer"
+        },
+        {
+            "name": "Jérémy Benoist",
+            "homepage": "http://www.j0k3r.net",
+            "role": "Developer"
+        }
+    ],
+    "support": {
+        "email": "hello@wallabag.org",
+        "issues": "https://github.com/wallabag/wallabag/issues"
+    },
     "require": {
-        "twig/twig": "1.*",
-        "twig/extensions": "1.0.*",
-        "umpirsky/twig-gettext-extractor": "1.1.*"
-    }
-}
+        "php": ">=5.5.9",
+        "symfony/symfony": "3.0.*",
+        "doctrine/orm": "^2.5",
+        "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/doctrine-cache-bundle": "^1.2",
+        "twig/extensions": "~1.0",
+        "symfony/assetic-bundle": "~2.3",
+        "symfony/swiftmailer-bundle": "^2.3",
+        "symfony/monolog-bundle": "^2.8",
+        "sensio/distribution-bundle": "^5.0",
+        "sensio/framework-extra-bundle": "^3.0.2",
+        "incenteev/composer-parameter-handler": "^2.0",
+        "nelmio/cors-bundle": "~1.4.0",
+        "friendsofsymfony/rest-bundle": "~1.4",
+        "jms/serializer-bundle": "~1.0",
+        "nelmio/api-doc-bundle": "~2.7",
+        "ezyang/htmlpurifier": "~4.6",
+        "mgargano/simplehtmldom": "~1.5",
+        "tecnickcom/tcpdf": "~6.2",
+        "simplepie/simplepie": "~1.3.1",
+        "willdurand/hateoas-bundle": "~1.0",
+        "htmlawed/htmlawed": "~1.1.19",
+        "liip/theme-bundle": "~1.1",
+        "pagerfanta/pagerfanta": "~1.0.3",
+        "lexik/form-filter-bundle": "~5.0",
+        "j0k3r/graby": "~1.0",
+        "friendsofsymfony/user-bundle": "dev-master",
+        "friendsofsymfony/oauth-server-bundle": "^1.5@dev",
+        "stof/doctrine-extensions-bundle": "^1.2@dev",
+        "scheb/two-factor-bundle": "~2.0",
+        "grandt/phpepub": "~4.0",
+        "wallabag/php-mobi": "~1.0.0",
+        "kphoen/rulerz-bundle": "~0.10",
+        "guzzlehttp/guzzle": "^5.2.0",
+        "doctrine/doctrine-migrations-bundle": "^1.0",
+        "paragonie/random_compat": "~1.0"
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "~2.2",
+        "sensio/generator-bundle": "^3.0",
+        "phpunit/phpunit": "~4.4",
+        "symfony/phpunit-bridge": "^2.7"
+    },
+    "scripts": {
+        "build-parameters": [
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
+        ],
+        "post-cmd": [
+            "@build-parameters",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
+        ],
+        "post-install-cmd": [
+            "@post-cmd"
+        ],
+        "post-update-cmd": [
+            "@post-cmd"
+        ]
+    },
+    "extra": {
+        "symfony-app-dir": "app",
+        "symfony-bin-dir": "bin",
+        "symfony-var-dir": "var",
+        "symfony-web-dir": "web",
+        "symfony-tests-dir": "tests",
+        "symfony-assets-install": "relative",
+        "incenteev-parameters": {
+            "file": "app/config/parameters.yml",
+            "env-map": {
+                "mailer_host": "WALLABAG_MAILER_HOST",
+                "mailer_user": "WALLABAG_MAILER_USER",
+                "mailer_password": "WALLABAG_MAILER_PASSWORD",
+                "secret": "WALLABAG_SECRET"
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": { "": "src/" },
+        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}

docker-compose.yml

@@ -0,0 +1,42 @@
+nginx:
+    image: nginx
+    ports:
+        - "8080:80"
+    volumes:
+        - ./docker/nginx/nginx.conf:/nginx.conf
+        - ./docker/logs/nginx:/var/log/nginx
+        - .:/var/www/html
+    links:
+        - php:php
+    command: nginx -c /nginx.conf
+php:
+    build: docker/php
+    ports:
+        - "9000:9000"
+    volumes:
+        - .:/var/www/html
+    #links:
+        # - "postgres:rdbms"
+        # - "mariadb:rdbms"
+    env_file:
+        - ./docker/php/env
+        # Comment non-used DBMS lines
+        # If all DBMS are commented out, sqlite will be used as default
+        # - ./docker/postgres/env
+        # - ./docker/mariadb/env
+#postgres:
+#    image: postgres:9
+#    ports:
+#        - "5432:5432"
+#    volumes:
+#        - ./docker/data/pgsql:/var/lib/postgresql/data
+#    env_file:
+#        - ./docker/postgres/env
+#mariadb:
+#    image: mariadb:10
+#    ports:
+#        - "3306:3306"
+#    volumes:
+#        - ./docker/data/mariadb:/var/lib/mysql
+#    env_file:
+#        - ./docker/mariadb/env

docker/mariadb/env

@@ -0,0 +1,10 @@
+MYSQL_ROOT_PASSWORD=wallaroot
+MYSQL_USER=wallabag
+MYSQL_PASSWORD=wallapass
+MYSQL_DATABASE=wallabag
+SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
+SYMFONY__ENV__DATABASE_HOST=rdbms
+SYMFONY__ENV__DATABASE_PORT=3306
+SYMFONY__ENV__DATABASE_NAME=wallabag
+SYMFONY__ENV__DATABASE_USER=wallabag
+SYMFONY__ENV__DATABASE_PASSWORD=wallapass

docker/nginx/nginx.conf

@@ -0,0 +1,89 @@
+user  nginx;
+worker_processes  1;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  2048;
+    multi_accept on;
+    use epoll;
+}
+
+http {
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    server_tokens off;
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 15;
+    types_hash_max_size 2048;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    access_log off;
+    error_log off;
+    gzip on;
+    gzip_disable "msie6";
+    open_file_cache max=100;
+
+
+    upstream php-upstream {
+        server php:9000;
+    }
+
+    server {
+        #server_name domain.tld www.domain.tld;
+        root /var/www/html/web;
+
+        location / {
+            # try to serve file directly, fallback to app.php
+            try_files $uri /app.php$is_args$args;
+        }
+        # DEV
+        # This rule should only be placed on your development environment
+        # In production, don't include this and don't deploy app_dev.php or config.php
+        location ~ ^/(app_dev|config)\.php(/|$) {
+            fastcgi_pass php-upstream;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+        }
+        # PROD
+        location ~ ^/app\.php(/|$) {
+            fastcgi_pass php-upstream;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            # Prevents URIs that include the front controller. This will 404:
+            # http://domain.tld/app.php/some-path
+            # Remove the internal directive to allow URIs like this
+            internal;
+        }
+
+        error_log /var/log/nginx/project_error.log;
+        access_log /var/log/nginx/project_access.log;
+    }
+
+}
+
+daemon off;

docker/php/Dockerfile

@@ -0,0 +1,10 @@
+FROM php:fpm
+
+RUN apt-get update && apt-get install -y \
+        libmcrypt-dev libicu-dev libpq-dev libxml2-dev \
+    && docker-php-ext-install \
+        iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
+
+RUN usermod -u 1000 www-data
+
+CMD ["php-fpm"]

docker/php/env

@@ -0,0 +1,6 @@
+SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite
+SYMFONY__ENV__DATABASE_HOST=127.0.0.1
+SYMFONY__ENV__DATABASE_PORT=~
+SYMFONY__ENV__DATABASE_NAME=symfony
+SYMFONY__ENV__DATABASE_USER=root
+SYMFONY__ENV__DATABASE_PASSWORD=~

docker/postgres/env

@@ -0,0 +1,9 @@
+POSTGRES_USER=wallabag
+POSTGRES_PASSWORD=wallapass
+POSTGRES_DB=wallabag
+export SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql
+export SYMFONY__ENV__DATABASE_HOST=rdbms
+export SYMFONY__ENV__DATABASE_PORT=5432
+export SYMFONY__ENV__DATABASE_NAME=wallabag
+export SYMFONY__ENV__DATABASE_USER=wallabag
+export SYMFONY__ENV__DATABASE_PASSWORD=wallapass

docs/en/conf.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#
+# wallabag documentation build configuration file, created by
+# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
+
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'wallabag'
+copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
+version = '2.0.0'
+release = version
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+html_theme = 'default'
+html_static_path = ['_static']
+htmlhelp_basename = 'wallabagdoc'
+latex_elements = {
+
+}
+
+latex_documents = [
+  ('index', 'wallabag.tex', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'manual'),
+]
+
+man_pages = [
+    ('index', 'wallabag', u'wallabag Documentation',
+     [u'Nicolas Lœuillet'], 1)
+]
+
+texinfo_documents = [
+  ('index', 'wallabag', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
+   'Miscellaneous'),
+]
+
+##### Guzzle sphinx theme
+
+import guzzle_sphinx_theme
+html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
+html_theme_path = guzzle_sphinx_theme.html_theme_path()
+html_theme = 'guzzle_sphinx_theme'
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
+}
+
+# Register the theme as an extension to generate a sitemap.xml
+extensions.append("guzzle_sphinx_theme")

docs/en/developer/docker.rst

@@ -0,0 +1,51 @@
+Run Wallabag in docker-compose
+==============================
+
+In order to run your own development instance of wallabag, you may
+want to use the pre-configured docker compose files.
+
+Requirements
+------------
+
+Make sure to have `Docker
+<https://docs.docker.com/installation/ubuntulinux/>`__ and `Docker
+Compose <https://docs.docker.com/compose/install/>`__ availables on
+your system and up to date.
+
+Switch DBMS
+-----------
+
+By default, Wallabag will start with a sqlite database.
+Since Wallabag provide support for Postgresql and MySQL, docker
+containers are also available for these ones.
+
+In ``docker-compose.yml``, for the chosen DBMS uncomment :
+
+- the container definition (``postgres`` or ``mariadb`` root level
+  block)
+- the container link in the ``php`` container
+- the container env file in the ``php`` container
+
+In order to keep running Symfony commands on your host (such as
+``wallabag:install``), you also should :
+
+- source the proper env files on your command line, so variables
+  like ``SYMFONY__ENV__DATABASE_HOST`` will exist.
+- create a ``127.0.0.1 rdbms`` on your system ``hosts`` file
+
+Run Wallabag
+------------
+
+#. Fork and clone the project
+#. Edit ``app/config/parameters.yml`` to replace ``database_*``
+   properties with commented ones (with values prefixed by ``env.``)
+#. ``composer install`` the project dependencies
+#. ``php app/console wallabag:install`` to create the schema
+#. ``docker-compose up`` to run the containers
+#. Finally, browse to http://localhost:8080/ to find your freshly
+   installed wallabag.
+
+At various step, you'll probably run into UNIX permission problems,
+bad paths in generated cache, etc…
+Operations like removing cache files or changing files owners might
+be frequently required, so don't be afraid !

docs/en/index.rst

@@ -0,0 +1,37 @@
+wallabag documentation
+======================
+
+.. image:: ../img/wallabag.png
+   :alt: wallabag logo
+   :align: center
+
+**wallabag** is a read-it-later application: it saves a web page by
+keeping content only. Elements like navigation or ads are deleted.
+
+The main documentation for this application is organized into a couple sections:
+
+* :ref:`user-docs`
+* :ref:`dev-docs`
+
+.. _user-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: User documentation
+
+   user/create_account
+   user/login
+   user/configuration
+   user/first_article
+   user/import
+   user/download_articles
+   user/filters
+   user/tags
+
+.. _dev-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Developer documentation
+
+   developer/docker

docs/en/requirements.txt

@@ -0,0 +1,2 @@
+Sphinx>=1.3.0,<1.4.0
+guzzle_sphinx_theme>=0.7.0,<0.8.0

docs/en/user/configuration.rst

@@ -0,0 +1,99 @@
+Configuration
+=============
+
+Now you're logged in, it's time to configure your account as you want.
+
+Click on ``Config`` menu. You have five tabs: ``Settings``, ``RSS``, ``User information``, ``Password`` and ``Tagging rules``.
+
+Settings
+--------
+
+Theme
+~~~~~
+
+wallabag is customizable. You can choose your prefered theme here. You can also create a new one, a chapter is dedicated for this. The default theme is ``Material``, it's the theme used in the documentation screenshots. 
+
+Items per page
+~~~~~~~~~~~~~~
+
+You can change the number of articles displayed on each page.
+
+Language
+~~~~~~~~
+
+You can change the language of wallabag interface.
+
+RSS
+---
+
+wallabag provides RSS feeds for each article status: unread, starred and archive.
+
+Firstly, you need to create a personal token: click on ``Create your token``.
+It's possible to change your token by clicking on ``Reset your token``.
+
+Now you have three links, one for each status: add them into your favourite RSS reader.
+
+You can also define how many articles you want in each RSS feed (default value: 50).
+
+User information
+----------------
+
+You can change your name, your email address and enable ``Two factor authentication``.
+
+Two factor authentication
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Two-factor authentication (also known as 2FA) is a technology patented in 1984 that provides identification of users by means of the combination of two different components.
+
+https://en.wikipedia.org/wiki/Two-factor_authentication
+
+If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email. You have to put this code on the following form.
+
+.. image:: ../../img/user/2FA_form.png
+   :alt: Two factor authentication
+   :align: center
+
+If you don't want to receive a code each time you want to login, you can check the ``I'm on a trusted computer`` checkbox: wallabag will remember you for 15 days.
+
+Password
+--------
+
+You can change your password here.
+
+Tagging rules
+-------------
+
+If you want to automatically assign a tag to new articles, this part of the configuration is for you.
+
+What does « tagging rules » mean?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+They are rules used by wallabag to automatically tag new entries.
+Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.
+
+How do I use them?
+~~~~~~~~~~~~~~~~~~
+
+Let assume you want to tag new entries as *« short reading »* when the reading time is inferior to 3 minutes.
+In that case, you should put « readingTime <= 3 » in the **Rule** field and *« short reading »* in the **Tags** field.
+Several tags can added simultaneously by separating them by a comma: *« short reading, must read »*.
+Complex rules can be written by using predefined operators: if *« readingTime >= 5 AND domainName = "github.com" »* then tag as *« long reading, github »*.
+
+Which variables and operators can I use to write rules?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following variables and operators can be used to create tagging rules:
+
+===========  ==============================================  ========  ==========
+Variable     Meaning                                         Operator  Meaning
+-----------  ----------------------------------------------  --------  ----------
+title        Title of the entry                              <=        Less than…
+url          URL of the entry                                <         Strictly less than…
+isArchived   Whether the entry is archived or not            =>        Greater than…
+isStared     Whether the entry is starred or not             >         Strictly greater than…
+content      The entry's content                             =         Equal to…
+language     The entry's language                            !=        Not equal to…
+mimetype     The entry's mime-type                           OR        One rule or another
+readingTime  The estimated entry's reading time, in minutes  AND       One rule and another
+domainName   The domain name of the entry                    matches   Tests that a subject is matches a search (case-insensitive). Example: title matches "football"
+===========  ==============================================  ========  ==========

docs/en/user/create_account.rst

@@ -0,0 +1,43 @@
+Create an account
+=================
+
+On the login page, click on ``Register`` button.
+
+.. image:: ../../img/user/registration_form.png
+   :alt: Registration form
+   :align: center
+
+You have to fill the form. Please sure to type a valid email address, we'll send you an activation email.
+
+.. image:: ../../img/user/sent_email.png
+   :alt: Email was sent to activate account
+   :align: center
+
+Check your inbox, you now have a new mail with a link like this ``http://wallabag/register/confirm/Ba19wokGovN-DdBQNfg4YgRkUQWRP4-k2g0Bk-hBTX4``. Click on it to activate your account.
+
+Your account is now activated.
+
+.. image:: ../../img/user/activated_account.png
+   :alt: Welcome on board!
+   :align: center
+
+Frequently asked questions
+--------------------------
+
+I can't valid the registration form
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Make sure that all fields are well filled:
+
+* valid email address
+* same passwords in two fields
+
+I don't receive my activation email
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Are you sure your email address was correct? Did you check your spams folder?
+
+When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
+~~~~~~~~~~~~~~~
+
+You already enabled your account or the URL of the activation email is wrong.

docs/en/user/download_articles.rst

@@ -0,0 +1,16 @@
+Download articles
+=================
+
+You can download each article in several formats: ePUB, MOBI, PDF, XML, JSON, CSV.
+
+On the article view, click on this icon, in the sidebar:
+
+.. image:: ../../img/user/download_article.png
+   :alt: download article
+   :align: center
+
+You can also download a full category in these formats. For example, on **Unread** view, click on this icon in the top bar:
+
+.. image:: ../../img/user/download_articles.png
+   :alt: download articles
+   :align: center

docs/en/user/filters.rst

@@ -0,0 +1,2 @@
+Filters
+=======

docs/en/user/first_article.rst

@@ -0,0 +1,62 @@
+Save your first article
+=======================
+
+The main purpose of wallabag is to save web articles. You have many ways to do it.
+
+.. note::
+
+    A quickstart will be displayed in the application until you save your first article.
+
+By using a bookmarklet
+----------------------
+
+On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!`` link to your bookmarks bar of your browser.
+
+Now, each time you're reading an article on the web and you want to save it, click on the ``bag it!`` link in your bookmarks bar. The article is saved.
+
+By using the classic form
+-------------------------
+
+In the top bar of your screen, you have 3 icons. With the first one, a plus sign, you can easily save a new article.
+
+.. image:: ../../img/user/topbar.png
+   :alt: Top bar
+   :align: center
+
+Click on it to display a new field, paste the article URL inside and press your ``Return`` key. The article is saved.
+
+By using a browser add-on
+-------------------------
+
+Firefox
+~~~~~~~
+
+*This addon is not yet available for wallabag v2*.
+
+Chrome
+~~~~~~
+
+*This addon is not yet available for wallabag v2*.
+
+By using your smarphone application
+-----------------------------------
+
+Android
+~~~~~~~
+
+*This application is not yet available for wallabag v2*.
+
+Firefox OS
+~~~~~~~~~~
+
+*This application is not yet available for wallabag v2*.
+
+Windows Phone
+~~~~~~~~~~~~~
+
+*This application is not yet available for wallabag v2*.
+
+iOS
+~~~
+
+*This application is not yet available for wallabag v2*.

docs/en/user/import.rst

@@ -0,0 +1,64 @@
+Migrate to wallabag
+===================
+
+From wallabag 1.x
+-----------------
+
+Export your data from your wallabag 1.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section.
+
+.. image:: ../../img/user/export_wllbg_1.png
+   :alt: Export from wallabag 1.x
+   :align: center
+
+You will have a ``wallabag-export-1-1970-01-01.json`` file.
+
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Click on  ``Import`` link in the menu, select your export file on your computer and import it.
+
+.. image:: ../../img/user/import_wllbg.png
+   :alt: Import from wallabag 1.x
+   :align: center
+
+All your wallabag 1.x articles will be imported.
+
+From Pocket
+-----------
+
+Create a new applicaton on Pocket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue.
+
+* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_
+* Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application
+
+Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag.
+
+Now, all is fine to migrate from Pocket.
+
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Click on  ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``.
+
+You need to authorize wallabag to interact with your Pocket account. Your data will be imported. Data import can be a demanding process for your server (we need to work on this import to improve it). 
+
+From Instapaper
+---------------
+
+*Feature not yet implemented in wallabag v2.*
+
+From Readability
+----------------
+
+*Feature not yet implemented in wallabag v2.*
+
+From HTML or JSON file
+----------------------
+
+*Feature not yet implemented in wallabag v2.*

docs/en/user/login.rst

@@ -0,0 +1,20 @@
+Login
+=====
+
+Your account is now enabled, congratulations!
+
+To login to wallabag, fill the form on login page.
+
+If you are on your personal computer and you want to stay connected, you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year.
+
+.. image:: ../../img/user/login_form.png
+   :alt: Login form
+   :align: center
+
+Frequently asked questions
+--------------------------
+
+I forgot my password
+~~~~~~~~~~~~~~~~~~~~
+
+You can reset your password by clicking on ``Forgot your password?`` link, on the login page. Then, fill the form with your email address

docs/en/user/tags.rst

@@ -0,0 +1,2 @@
+Tags
+====

docs/fr/conf.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#
+# wallabag documentation build configuration file, created by
+# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
+
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'wallabag-fr'
+copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
+version = '2.0.0'
+release = version
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+html_theme = 'default'
+html_static_path = ['_static']
+htmlhelp_basename = 'wallabagfrdoc'
+
+latex_elements = {
+}
+
+latex_documents = [
+  ('index', 'wallabag-fr.tex', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'manual'),
+]
+
+man_pages = [
+    ('index', 'wallabagfr', u'wallabag Documentation',
+     [u'Nicolas Lœuillet'], 1)
+]
+
+texinfo_documents = [
+  ('index', 'wallabag', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
+   'Miscellaneous'),
+]
+
+##### Guzzle sphinx theme
+
+import guzzle_sphinx_theme
+html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
+html_theme_path = guzzle_sphinx_theme.html_theme_path()
+html_theme = 'guzzle_sphinx_theme'
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
+}
+
+# Register the theme as an extension to generate a sitemap.xml
+extensions.append("guzzle_sphinx_theme")

docs/fr/index.rst

@@ -0,0 +1,17 @@
+Documentation de wallabag
+=========================
+
+.. image:: ../img/wallabag.png
+   :alt: wallabag logo
+   :align: center
+
+**wallabag** est une application de lecture différée : elle permet
+simplement d’archiver une page web en ne conservant que le contenu. Les
+éléments superflus (menu, publicité, etc.) sont supprimés.
+
+La documentation principale de cette application est découpée en plusieurs sections :
+
+.. toctree::
+   :maxdepth: 2
+
+   index

docs/fr/requirements.txt

@@ -0,0 +1,2 @@
+Sphinx>=1.3.0,<1.4.0
+guzzle_sphinx_theme>=0.7.0,<0.8.0

docs/pt-br/conf.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#
+# wallabag documentation build configuration file, created by
+# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
+
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'wallabag-pt'
+copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
+version = '2.0.0'
+release = version
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+html_theme = 'default'
+html_static_path = ['_static']
+htmlhelp_basename = 'wallabagfrdoc'
+
+latex_elements = {
+}
+
+latex_documents = [
+  ('index', 'wallabag-pt.tex', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'manual'),
+]
+
+man_pages = [
+    ('index', 'wallabagpt', u'wallabag Documentation',
+     [u'Nicolas Lœuillet'], 1)
+]
+
+texinfo_documents = [
+  ('index', 'wallabag', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
+   'Miscellaneous'),
+]
+
+##### Guzzle sphinx theme
+
+import guzzle_sphinx_theme
+html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
+html_theme_path = guzzle_sphinx_theme.html_theme_path()
+html_theme = 'guzzle_sphinx_theme'
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
+}
+
+# Register the theme as an extension to generate a sitemap.xml
+extensions.append("guzzle_sphinx_theme")

docs/pt-br/index.rst

@@ -0,0 +1,36 @@
+wallabag documentation
+======================
+
+.. image:: ../img/wallabag.png
+   :alt: wallabag logo
+   :align: center
+
+**wallabag** É uma aplicação "leia mais tarde": Ele salva páginas da web mantendo apenas o conteúdo. Elementos como ícones de navegação ou propaganda são deletedos.
+
+A documentação principal desta aplicação é organizada em duas seções:
+
+* :ref:`doc-usuario`
+* :ref:`doc-desenvolvedor`
+
+.. _user-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Documentação do usuário
+
+   user/criar_conta
+   user/login
+   user/configuração
+   user/primeiro_artigo
+   user/importar
+   user/baixar_artigos
+   user/filtros
+   user/tags
+
+.. _dev-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Documentação do desenvolvedor
+
+   developer/docker

docs/pt-br/requirements.txt

@@ -0,0 +1,2 @@
+Sphinx>=1.3.0,<1.4.0
+guzzle_sphinx_theme>=0.7.0,<0.8.0

inc/3rdparty/FlattrItem.class.php

@@ -1,49 +0,0 @@
-<?php
-/* 
-* Class for Flattr querying
-*/
-class FlattrItem {
-
-    public $status;
-    public $urltoflattr;
-    public $flattrItemURL;
-    public $numflattrs;
-
-    public function checkItem($urltoflattr,$id) {
-        $this->cacheflattrfile($urltoflattr, $id);
-        $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache");
-        if($flattrResponse != FALSE) {
-            $result = json_decode($flattrResponse);
-			if (isset($result->message)){
-                if ($result->message == "flattrable") {
-                    $this->status = FLATTRABLE;
-                }
-            } 
- 		elseif (is_object($result) && $result->link) {
-                $this->status = FLATTRED;
-                $this->flattrItemURL = $result->link;
-                $this->numflattrs = $result->flattrs;
-            }
-            else {
-                $this->status = NOT_FLATTRABLE;
-            }
-        }
-        else {
-            $this->status = "FLATTR_ERR_CONNECTION";
-        }
-    }
-
-    private function cacheflattrfile($urltoflattr, $id) {
-        if (!is_dir(CACHE . '/flattr')) {
-            mkdir(CACHE . '/flattr', 0777);
-        }
-
-        // if a cache flattr file for this url already exists and it's been less than one day than it have been updated, see in /cache
-        if ((!file_exists(CACHE . "/flattr/".$id.".cache")) || (time() - filemtime(CACHE . "/flattr/".$id.".cache") > 86400)) {
-            $askForFlattr = Tools::getFile(FLATTR_API . $urltoflattr);
-            $flattrCacheFile = fopen(CACHE . "/flattr/".$id.".cache", 'w+');
-            fwrite($flattrCacheFile, $askForFlattr);
-            fclose($flattrCacheFile);
-        }
-    }
-}

inc/3rdparty/Session.class.php

@@ -1,286 +0,0 @@
-<?php
-/**
- * Session management class
- *
- * http://www.developpez.net/forums/d51943/php/langage/sessions/
- * http://sebsauvage.net/wiki/doku.php?id=php:session
- * http://sebsauvage.net/wiki/doku.php?id=php:shaarli
- * 
- * Features:
- * - Everything is stored on server-side (we do not trust client-side data,
- *   such as cookie expiration)
- * - IP addresses are checked on each access to prevent session cookie hijacking
- *   (such as Firesheep)
- * - Session expires on user inactivity (Session expiration date is
- *   automatically updated everytime the user accesses a page.)
- * - A unique secret key is generated on server-side for this session
- *   (and never sent over the wire) which can be used to sign forms (HMAC)
- *   (See $_SESSION['uid'])
- * - Token management to prevent XSRF attacks
- * - Brute force protection with ban management
- *
- * TODOs
- * - Replace globals with variables in Session class
- *
- * How to use:
- * - http://tontof.net/kriss/php5/session
- */
-class Session
-{
-    // Personnalize PHP session name
-    public static $sessionName = '';
-    // If the user does not access any page within this time,
-    // his/her session is considered expired (3600 sec. = 1 hour)
-    public static $inactivityTimeout = 3600;
-    // Extra timeout for long sessions (if enabled) (82800 sec. = 23 hours)
-    public static $longSessionTimeout = 82800;
-    // If you get disconnected often or if your IP address changes often.
-    // Let you disable session cookie hijacking protection
-    public static $disableSessionProtection = false;
-    // Ban IP after this many failures.
-    public static $banAfter = 4;
-    // Ban duration for IP address after login failures (in seconds).
-    // (1800 sec. = 30 minutes)
-    public static $banDuration = 1800;
-    // File storage for failures and bans. If empty, no ban management.
-    public static $banFile = '';
-
-    /**
-     * Initialize session
-     */
-    public static function init()
-    {
-        // Force cookie path (but do not change lifetime)
-        $cookie = session_get_cookie_params();
-        // Default cookie expiration and path.
-        $cookiedir = '';
-        if (dirname($_SERVER['SCRIPT_NAME'])!='/') {
-            $cookiedir = dirname($_SERVER["SCRIPT_NAME"]).'/';
-        }
-        $ssl = false;
-        if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
-            $ssl = true;
-        }
-        session_set_cookie_params($cookie['lifetime'], $cookiedir, $_SERVER['HTTP_HOST'], $ssl);
-        // Use cookies to store session.
-        ini_set('session.use_cookies', 1);
-        // Force cookies for session  (phpsessionID forbidden in URL)
-        ini_set('session.use_only_cookies', 1);
-        if (!session_id()) {
-            // Prevent php to use sessionID in URL if cookies are disabled.
-            ini_set('session.use_trans_sid', false);
-            if (!empty(self::$sessionName)) {
-                session_name(self::$sessionName);
-            }
-            session_start();
-        }
-    }
-
-    /**
-     * Returns the IP address
-     * (Used to prevent session cookie hijacking.)
-     *
-     * @return string IP addresses
-     */
-    private static function _allIPs()
-    {
-        $ip = $_SERVER["REMOTE_ADDR"];
-        $ip.= isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? '_'.$_SERVER['HTTP_X_FORWARDED_FOR'] : '';
-        $ip.= isset($_SERVER['HTTP_CLIENT_IP']) ? '_'.$_SERVER['HTTP_CLIENT_IP'] : '';
-
-        return $ip;
-    }
-
-    /**
-     * Check that user/password is correct and then init some SESSION variables.
-     *
-     * @param string $login        Login reference
-     * @param string $password     Password reference
-     * @param string $loginTest    Login to compare with login reference
-     * @param string $passwordTest Password to compare with password reference
-     * @param array  $pValues      Array of variables to store in SESSION
-     *
-     * @return true|false          True if login and password are correct, false
-     *                             otherwise
-     */
-    public static function login (
-        $login,
-        $password,
-        $loginTest,
-        $passwordTest,
-    	$longlastingsession,
-        $pValues = array())
-    {
-        self::banInit();
-        if (self::banCanLogin()) {
-            if ($login === $loginTest && $password === $passwordTest) {
-                self::banLoginOk();
-                // Generate unique random number to sign forms (HMAC)
-                $_SESSION['uid'] = sha1(uniqid('', true).'_'.mt_rand());
-                $_SESSION['ip'] = self::_allIPs();
-                $_SESSION['username'] = $login;
-                // Set session expiration.
-                $_SESSION['expires_on'] = time() + self::$inactivityTimeout;
-                if ($longlastingsession) {
-                	$_SESSION['longlastingsession'] = self::$longSessionTimeout;
-                	$_SESSION['expires_on'] += $_SESSION['longlastingsession'];
-                }
-                
-                foreach ($pValues as $key => $value) {
-                    $_SESSION[$key] = $value;
-                }
-
-                return true;
-            }
-            self::banLoginFailed();
-        }
-
-        return false;
-    }
-
-    /**
-     * Unset SESSION variable to force logout
-     */
-    public static function logout()
-    {
-        unset($_SESSION['uid'],$_SESSION['ip'],$_SESSION['expires_on'],$_SESSION['tokens'], $_SESSION['login'], $_SESSION['pass'], $_SESSION['longlastingsession'], $_SESSION['poche_user']);
-    }
-
-    /**
-     * Make sure user is logged in.
-     *
-     * @return true|false True if user is logged in, false otherwise
-     */
-    public static function isLogged()
-    {
-        if (!isset ($_SESSION['uid'])
-            || (self::$disableSessionProtection === false
-                && $_SESSION['ip'] !== self::_allIPs())
-            || time() >= $_SESSION['expires_on']) {
-            self::logout();
-
-            return false;
-        }
-        // User accessed a page : Update his/her session expiration date.
-        $_SESSION['expires_on'] = time() + self::$inactivityTimeout;
-        if (!empty($_SESSION['longlastingsession'])) {
-                $_SESSION['expires_on'] += $_SESSION['longlastingsession'];
-        }
-
-        return true;
-    }
-
-    /**
-     * Create a token, store it in SESSION and return it
-     *
-     * @param string $salt to prevent birthday attack
-     *
-     * @return string Token created
-     */
-    public static function getToken($salt = '')
-    {
-        if (!isset($_SESSION['tokens'])) {
-            $_SESSION['tokens']=array();
-        }
-        // We generate a random string and store it on the server side.
-        $rnd = sha1(uniqid('', true).'_'.mt_rand().$salt);
-        $_SESSION['tokens'][$rnd]=1;
-
-        return $rnd;
-    }
-
-    /**
-     * Tells if a token is ok. Using this function will destroy the token.
-     *
-     * @param string $token Token to test
-     *
-     * @return true|false   True if token is correct, false otherwise
-     */
-    public static function isToken($token)
-    {
-        if (isset($_SESSION['tokens'][$token])) {
-            unset($_SESSION['tokens'][$token]); // Token is used: destroy it.
-
-            return true; // Token is ok.
-        }
-
-        return false; // Wrong token, or already used.
-    }
-
-    /**
-     * Signal a failed login. Will ban the IP if too many failures:
-     */
-    public static function banLoginFailed()
-    {
-        if (self::$banFile !== '') {
-            $ip = $_SERVER["REMOTE_ADDR"];
-            $gb = $GLOBALS['IPBANS'];
-
-            if (!isset($gb['FAILURES'][$ip])) {
-                $gb['FAILURES'][$ip] = 0;
-            }
-            $gb['FAILURES'][$ip]++;
-            if ($gb['FAILURES'][$ip] > (self::$banAfter - 1)) {
-                $gb['BANS'][$ip]= time() + self::$banDuration;
-            }
-
-            $GLOBALS['IPBANS'] = $gb;
-            file_put_contents(self::$banFile, "<?php\n\$GLOBALS['IPBANS']=".var_export($gb, true).";\n?>");
-        }
-    }
-
-    /**
-     * Signals a successful login. Resets failed login counter.
-     */
-    public static function banLoginOk()
-    {
-        if (self::$banFile !== '') {
-            $ip = $_SERVER["REMOTE_ADDR"];
-            $gb = $GLOBALS['IPBANS'];
-            unset($gb['FAILURES'][$ip]); unset($gb['BANS'][$ip]);
-            $GLOBALS['IPBANS'] = $gb;
-            file_put_contents(self::$banFile, "<?php\n\$GLOBALS['IPBANS']=".var_export($gb, true).";\n?>");
-        }
-    }
-
-    /**
-     * Ban init
-     */
-    public static function banInit()
-    {
-        if (self::$banFile !== '') {
-            if (!is_file(self::$banFile)) {
-                file_put_contents(self::$banFile, "<?php\n\$GLOBALS['IPBANS']=".var_export(array('FAILURES'=>array(), 'BANS'=>array()), true).";\n?>");
-            }
-            include self::$banFile;
-        }
-    }
-
-    /**
-     * Checks if the user CAN login. If 'true', the user can try to login.
-     *
-     * @return boolean true if user is banned, false otherwise
-     */
-    public static function banCanLogin()
-    {
-        if (self::$banFile !== '') {
-            $ip = $_SERVER["REMOTE_ADDR"];
-            $gb = $GLOBALS['IPBANS'];
-            if (isset($gb['BANS'][$ip])) {
-                // User is banned. Check if the ban has expired:
-                if ($gb['BANS'][$ip] <= time()) {
-                    // Ban expired, user can try to login again.
-                    unset($gb['FAILURES'][$ip]);
-                    unset($gb['BANS'][$ip]);
-                    file_put_contents(self::$banFile, "<?php\n\$GLOBALS['IPBANS']=".var_export($gb, true).";\n?>");
-
-                    return true; // Ban has expired, user can login.
-                }
-
-                return false; // User is banned.
-            }
-        }
-
-        return true; // User is not banned.
-    }
-}

inc/3rdparty/class.messages.php

@@ -1,231 +0,0 @@
-<?php
-//--------------------------------------------------------------------------------------------------
-// Session-Based Flash Messages v1.0
-// Copyright 2012 Mike Everhart (http://mikeeverhart.net)
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//	 limitations under the License.
-//	 
-//------------------------------------------------------------------------------
-// Description:
-//------------------------------------------------------------------------------
-//
-//	Stores messages in Session data to be easily retrieved later on.
-// 	This class includes four different types of messages:
-//  - Success
-//  - Error
-//  - Warning
-//  - Information
-// 
-//  See README for basic usage instructions, or see samples/index.php for more advanced samples
-//
-//--------------------------------------------------------------------------------------------------
-// Changelog
-//--------------------------------------------------------------------------------------------------
-// 
-//	2011-05-15 - v1.0 - Initial Version
-//
-//--------------------------------------------------------------------------------------------------
-
-class Messages {
-	
-	//-----------------------------------------------------------------------------------------------
-	// Class Variables
-	//-----------------------------------------------------------------------------------------------	
-	var $msgId;
-	var $msgTypes = array( 'help', 'info', 'warning', 'success', 'error' );
-	var $msgClass = 'messages';
-	var $msgWrapper = "<div class='%s %s'><a href='#' class='closeMessage'>X</a>\n%s</div>\n";
-	var $msgBefore = '<p>';
-	var $msgAfter = "</p>\n";
-
-	
-	/**
-	 * Constructor
-	 * @author Mike Everhart
-	 */
-	public function __construct() {
-	
-		// Generate a unique ID for this user and session
-		$this->msgId = md5(uniqid());
-		
-		// Create the session array if it doesnt already exist
-		if( !array_key_exists('flash_messages', $_SESSION) ) $_SESSION['flash_messages'] = array();
-		
-	}
-	
-	/**
-	 * Add a message to the queue
-	 * 
-	 * @author Mike Everhart
-	 * 
-	 * @param  string   $type        	The type of message to add
-	 * @param  string   $message     	The message
-	 * @param  string   $redirect_to 	(optional) If set, the user will be redirected to this URL
-	 * @return  bool 
-	 * 
-	 */
-	public function add($type, $message, $redirect_to=null) {
-		
-		if( !isset($_SESSION['flash_messages']) ) return false;
-		
-		if( !isset($type) || !isset($message[0]) ) return false;
-
-		// Replace any shorthand codes with their full version
-		if( strlen(trim($type)) == 1 ) {
-			$type = str_replace( array('h', 'i', 'w', 'e', 's'), array('help', 'info', 'warning', 'error', 'success'), $type );
-		
-		// Backwards compatibility...
-		} elseif( $type == 'information' ) {
-			$type = 'info';	
-		}
-		
-		// Make sure it's a valid message type
-		if( !in_array($type, $this->msgTypes) ) die('"' . strip_tags($type) . '" is not a valid message type!' );
-		
-		// If the session array doesn't exist, create it
-		if( !array_key_exists( $type, $_SESSION['flash_messages'] ) ) $_SESSION['flash_messages'][$type] = array();
-		
-		$_SESSION['flash_messages'][$type][] = $message;
-
-		if( !is_null($redirect_to) ) {
-			header("Location: $redirect_to");
-			exit();
-		}
-		
-		return true;
-		
-	}
-	
-	//-----------------------------------------------------------------------------------------------
-	// display()
-	// print queued messages to the screen
-	//-----------------------------------------------------------------------------------------------
-	/**
-	 * Display the queued messages
-	 * 
-	 * @author Mike Everhart
-	 * 
-	 * @param  string   $type     Which messages to display
-	 * @param  bool  	$print    True  = print the messages on the screen
-	 * @return mixed              
-	 * 
-	 */
-	public function display($type='all', $print=true) {
-		$messages = '';
-		$data = '';
-		
-		if( !isset($_SESSION['flash_messages']) ) return false;
-		
-		if( $type == 'g' || $type == 'growl' ) {
-			$this->displayGrowlMessages();
-			return true;
-		}
-		
-		// Print a certain type of message?
-		if( in_array($type, $this->msgTypes) ) {
-			foreach( $_SESSION['flash_messages'][$type] as $msg ) {
-				$messages .= $this->msgBefore . $msg . $this->msgAfter;
-			}
-
-			$data .= sprintf($this->msgWrapper, $this->msgClass, $type, $messages);
-			
-			// Clear the viewed messages
-			$this->clear($type);
-		
-		// Print ALL queued messages
-		} elseif( $type == 'all' ) {
-			foreach( $_SESSION['flash_messages'] as $type => $msgArray ) {
-				$messages = '';
-				foreach( $msgArray as $msg ) {
-					$messages .= $this->msgBefore . $msg . $this->msgAfter;	
-				}
-				$data .= sprintf($this->msgWrapper, $this->msgClass, $type, $messages);
-			}
-			
-			// Clear ALL of the messages
-			$this->clear();
-		
-		// Invalid Message Type?
-		} else { 
-			return false;
-		}
-		
-		// Print everything to the screen or return the data
-		if( $print ) { 
-			echo $data; 
-		} else { 
-			return $data; 
-		}
-	}
-	
-	
-	/**
-	 * Check to  see if there are any queued error messages
-	 * 
-	 * @author Mike Everhart
-	 * 
-	 * @return bool  true  = There ARE error messages
-	 *               false = There are NOT any error messages
-	 * 
-	 */
-	public function hasErrors() { 
-		return empty($_SESSION['flash_messages']['error']) ? false : true;	
-	}
-	
-	/**
-	 * Check to see if there are any ($type) messages queued
-	 * 
-	 * @author Mike Everhart
-	 * 
-	 * @param  string   $type     The type of messages to check for
-	 * @return bool            	  
-	 * 
-	 */
-	public function hasMessages($type=null) {
-		if( !is_null($type) ) {
-			if( !empty($_SESSION['flash_messages'][$type]) ) return $_SESSION['flash_messages'][$type];	
-		} else {
-			foreach( $this->msgTypes as $type ) {
-				if( !empty($_SESSION['flash_messages']) ) return true;	
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Clear messages from the session data
-	 * 
-	 * @author Mike Everhart
-	 * 
-	 * @param  string   $type     The type of messages to clear
-	 * @return bool 
-	 * 
-	 */
-	public function clear($type='all') { 
-		if( $type == 'all' ) {
-			unset($_SESSION['flash_messages']); 
-		} else {
-			unset($_SESSION['flash_messages'][$type]);
-		}
-		return true;
-	}
-	
-	public function __toString() { return $this->hasMessages();	}
-
-	public function __destruct() {
-		//$this->clear();
-	}
-
-
-} // end class
-?>

inc/3rdparty/config.php

@@ -1,405 +0,0 @@
-<?php
-/* Full-Text RSS config */
-
-// ......IMPORTANT......................................
-// .....................................................
-// Please do not change this file (config.php) directly.
-// Save a copy as custom_config.php and make your
-// changes to that instead. It will automatically
-// override anything in config.php. Because config.php
-// always gets loaded anyway, you can simply specify
-// options you'd like to override in custom_config.php.
-// .....................................................
-
-// Create config object
-if (!isset($options)) $options = new stdClass();
-
-// Enable service
-// ----------------------
-// Set this to false if you want to disable the service.
-// If set to false, no feed is produced and users will 
-// be told that the service is disabled.
-$options->enabled = true;
-
-// Debug mode
-// ----------------------
-// Enable or disable debugging. When enabled debugging works by passing
-// &debug to the makefulltextfeed.php querystring.
-// Valid values:
-// true or 'user' (default) - let user decide
-// 'admin' - debug works only for logged in admin users
-// false - disabled
-$options->debug = true;
-
-// Default entries (without access key)
-// ----------------------
-// The number of feed items to process when no API key is supplied
-// and no &max=x value is supplied in the querystring.
-$options->default_entries = 5;
-
-// Max entries (without access key)
-// ----------------------
-// The maximum number of feed items to process when no access key is supplied.
-// This limits the user-supplied &max=x value. For example, if the user
-// asks for 20 items to be processed (&max=20), if max_entries is set to 
-// 10, only 10 will be processed.
-$options->max_entries = 10;
-
-// Rewrite relative URLs
-// ----------------------
-// With this enabled relative URLs found in the extracted content
-// block are automatically rewritten as absolute URLs.
-$options->rewrite_relative_urls = true;
-
-// Exclude items if extraction fails
-// ---------------------------------
-// Excludes items from the resulting feed
-// if we cannot extract any content from the
-// item URL.
-// Possible values...
-// Enable: true
-// Disable: false (default)
-// User decides: 'user' (this option will appear on the form)
-$options->exclude_items_on_fail = 'user';
-
-// Enable multi-page support
-// -------------------------
-// If enabled, we will try to follow next page links on multi-page articles.
-// Currently this only happens for sites where next_page_link has been defined 
-// in a site config file.
-$options->multipage = true;
-
-// Enable caching
-// ----------------------
-// Enable this if you'd like to cache results
-// for 10 minutes. Cache files are written to disk (in cache/ subfolders
-// - which must be writable).
-// Initially it's best to keep this disabled to make sure everything works
-// as expected. If you have APC enabled, please also see smart_cache in the
-// advanced section.
-$options->caching = false;
-
-// Cache directory
-// ----------------------
-// Only used if caching is true
-$options->cache_dir = dirname(__FILE__).'/cache';
-
-// Message to prepend (without access key)
-// ----------------------
-// HTML to insert at the beginning of each feed item when no access key is supplied.
-// Substitution tags:
-// {url} - Feed item URL
-// {effective-url} - Feed item URL after we've followed all redirects
-$options->message_to_prepend = '';
-
-// Message to append (without access key)
-// ----------------------
-// HTML to insert at the end of each feed item when no access key is supplied.
-// Substitution tags:
-// {url} - Feed item URL
-// {effective-url} - Feed item URL after we've followed all redirects
-$options->message_to_append = '';
-
-// Error message when content extraction fails (without access key)
-// ----------------------
-$options->error_message = '[unable to retrieve full-text content]';
-
-// Keep enclosure in feed items
-// If enabled, we will try to preserve enclosures if present.
-// ----------------------
-$options->keep_enclosures = true;
-
-// Detect language
-// ---------------
-// Should we try and find/guess the language of the article being processed?
-// Values will be placed inside the <dc:language> element inside each <item> element
-// Possible values:
-// * Ignore language: 0
-// * Use article/feed metadata (e.g. HTML lang attribute): 1 (default)
-// * As above, but guess if not present: 2
-// * Always guess: 3
-// * User decides: 'user' (value of 0-3 can be passed in querystring: e.g. &l=2)
-$options->detect_language = 1;
-
-// Registration key
-// ---------------
-// The registration key is optional. It is not required to use Full-Text RSS, 
-// and does not affect the normal operation of Full-Text RSS. It is currently 
-// only used on admin pages which help you update site patterns with the 
-// latest version offered by FiveFilters.org. For these admin-related 
-// tasks to complete, we will require a valid registration key.
-// If you would like one, you can purchase the latest version of Full-Text RSS
-// at http://fivefilters.org/content-only/
-// Your registration key will automatically be sent in the confirmation email.
-// Once you have it, simply copy and paste it here.
-$options->registration_key = '';
-
-/////////////////////////////////////////////////
-/// RESTRICT ACCESS /////////////////////////////
-/////////////////////////////////////////////////
-
-// Admin credentials
-// ----------------------
-// Certain pages/actions, e.g. updating site patterns with our online tool, will require admin credentials.
-// To use these pages, enter a password here and you'll be prompted for it when you try to access those pages.
-// If no password or username is set, pages requiring admin privelages will be inaccessible. 
-// The default username is 'admin'.
-// If overriding with an environment variable, separate username and password with a colon, e.g.:
-// ftr_admin_credentials: admin:my-secret-password
-// Example: $options->admin_credentials = array('username'=>'admin', 'password'=>'my-secret-password');
-$options->admin_credentials = array('username'=>'admin', 'password'=>'admin');
-
-// URLs to allow
-// ----------------------
-// List of URLs (or parts of a URL) which the service will accept.
-// If the list is empty, all URLs (except those specified in the blocked list below)
-// will be permitted.
-// Empty: array();
-// Non-empty example: array('example.com', 'anothersite.org');
-$options->allowed_urls = array();
-
-// URLs to block
-// ----------------------
-// List of URLs (or parts of a URL) which the service will not accept.
-// Note: this list is ignored if allowed_urls is not empty
-$options->blocked_urls = array();
-
-// Key holder(s) only?
-// ----------------------
-// Set this to true if you want to restrict access only to
-// those with a key (see below to specify key(s)).
-// If set to true, no feed is produced unless a valid
-// key is provided.
-$options->key_required = false;
-
-// Favour item titles in feed
-// ----------------------
-// By default, when processing feeds, we assume item titles in the feed
-// have not been truncated. So after processing web pages, the extracted titles
-// are not used in the generated feed. If you prefer to have extracted titles in 
-// the feed you can either set this to false, in which case we will always favour 
-// extracted titles. Alternatively, if set to 'user' (default) we'll use the 
-// extracted title if you pass '&use_extracted_title' in the querystring.
-// Possible values:
-// * Favour feed titles: true 
-// * Favour extracted titles: false
-// * Favour feed titles with user override: 'user' (default)
-// Note: this has no effect when the input URL is to a web page - in these cases
-// we always use the extracted title in the generated feed.
-$options->favour_feed_titles = 'user';
-
-// Access keys (password protected access)
-// ------------------------------------
-// NOTE: You do not need an API key from fivefilters.org to run your own 
-// copy of the code. This is here if you'd like to restrict access to
-// _your_ copy.
-// Keys let you group users - those with a key and those without - and
-// restrict access to the service to those without a key.
-// If you want everyone to access the service in the same way, you can
-// leave the array below empty and ignore the access key options further down.
-// The options further down let you control how the service should behave 
-// in each mode.
-// Note: Explicitly including the index number (1 and 2 in the examples below) 
-// is highly recommended (when generating feeds, we encode the key and 
-// refer to it by index number and hash).
-$options->api_keys = array();
-// Example:
-// $options->api_keys[1] = 'secret-key-1';
-// $options->api_keys[2] = 'secret-key-2';
-
-// Default entries (with access key)
-// ----------------------
-// The number of feed items to process when a valid access key is supplied.
-$options->default_entries_with_key = 5;
-
-// Max entries (with access key)
-// ----------------------
-// The maximum number of feed items to process when a valid access key is supplied.
-$options->max_entries_with_key = 10;
-
-/////////////////////////////////////////////////
-/// ADVANCED OPTIONS ////////////////////////////
-/////////////////////////////////////////////////
-
-// Enable XSS filter?
-// ----------------------
-// We have not enabled this by default because we assume the majority of
-// our users do not display the HTML retrieved by Full-Text RSS
-// in a web page without further processing. If you subscribe to our generated
-// feeds in your news reader application, it should, if it's good software, already
-// filter the resulting HTML for XSS attacks, making it redundant for
-// Full-Text RSS do the same. Similarly with frameworks/CMS which display
-// feed content - the content should be treated like any other user-submitted content.
-// 
-// If you are writing an application yourself which is processing feeds generated by
-// Full-Text RSS, you can either filter the HTML yourself to remove potential XSS attacks
-// or enable this option. This might be useful if you are processing our generated
-// feeds with JavaScript on the client side - although there's client side xss
-// filtering available too, e.g. https://code.google.com/p/google-caja/wiki/JsHtmlSanitizer
-// 
-// If enabled, we'll pass retrieved HTML content through htmLawed with
-// safe flag on and style attributes denied, see
-// http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/htmLawed_README.htm#s3.6
-// Note: if enabled this will also remove certain elements you may want to preserve, such as iframes.
-//
-// Valid values:
-// true - enabled, all content will be filtered
-// 'user' (default) - user must pass &xss in makefulltextfeed.php querystring to enable
-// false - disabled
-$options->xss_filter = 'user';
-
-// Allowed parsers
-// ----------------------
-// Full-Text RSS attempts to use PHP's libxml extension to process HTML.
-// While fast, on some sites it may not always produce good results. 
-// For these sites, you can specify an alternative HTML parser: 
-// parser: html5lib
-// The html5lib parser is bundled with Full-Text RSS.
-// see http://code.google.com/p/html5lib/
-//
-// To disable HTML parsing with html5lib, you can remove it from this list.
-// By default we allow both: libxml and html5lib.
-$options->allowed_parsers = array('libxml', 'html5lib');
-//$options->allowed_parsers = array('libxml'); //disable html5lib - forcing libxml in all cases
-
-// Enable Cross-Origin Resource Sharing (CORS)
-// ----------------------
-// If enabled we'll send the following HTTP header
-// Access-Control-Allow-Origin: *
-// see http://en.wikipedia.org/wiki/Cross-origin_resource_sharing
-$options->cors = false;
-
-// Use APC user cache?
-// ----------------------
-// If enabled we will store site config files (when requested 
-// for the first time) in APC's user cache. Keys prefixed with 'sc.'
-// This improves performance by reducing disk access.
-// Note: this has no effect if APC is unavailable on your server.
-$options->apc = true;
-
-// Smart cache (experimental)
-// ----------------------
-// With this option enabled we will not cache to disk immediately.
-// We will store the cache key in APC and if it's requested again
-// we will cache results to disk. Keys prefixed with 'cache.'
-// This improves performance by reducing disk access.
-// Note: this has no effect if APC is disabled or unavailable on your server,
-// or if you have caching disabled.
-$options->smart_cache = true;
-
-// Fingerprints
-// ----------------------
-// key is fingerprint (fragment to find in HTML)
-// value is host name to use for site config lookup if fingerprint matches
-$options->fingerprints = array(
-	// Posterous
-	'<meta name="generator" content="Posterous"' => array('hostname'=>'fingerprint.posterous.com', 'head'=>true),
-	// Blogger
-	'<meta content=\'blogger\' name=\'generator\'' => array('hostname'=>'fingerprint.blogspot.com', 'head'=>true),
-	'<meta name="generator" content="Blogger"' => array('hostname'=>'fingerprint.blogspot.com', 'head'=>true),
-	// WordPress (hosted)
-	// '<meta name="generator" content="WordPress.com"' => array('hostname'=>'fingerprint.wordpress.com', 'head'=>true),
-	// WordPress (self-hosted and hosted)
-	'<meta name="generator" content="WordPress' => array('hostname'=>'fingerprint.wordpress.com', 'head'=>true)
-);
-
-// User Agent strings - mapping domain names
-// ----------------------
-// e.g. $options->user_agents = array('example.org' => 'PHP/5.2');
-$options->user_agents = array( 'lifehacker.com' => 'PHP/5.2',
-							   'gawker.com' => 'PHP/5.2',
-							   'deadspin.com' => 'PHP/5.2',
-							   'kotaku.com' => 'PHP/5.2',
-							   'jezebel.com' => 'PHP/5.2',
-							   'io9.com' => 'PHP/5.2',
-							   'jalopnik.com' => 'PHP/5.2',
-							   'gizmodo.com' => 'PHP/5.2',
-							   '.wikipedia.org' => 'Mozilla/5.2',
-							   '.fok.nl' => 'Googlebot/2.1',
-							   'getpocket.com' => 'PHP/5.2'
-							  );
-
-// URL Rewriting
-// ----------------------
-// Currently allows simple string replace of URLs.
-// Useful for rewriting certain URLs to point to a single page
-// or HTML view. Although using the single_page_link site config
-// instruction is the preferred way to do this, sometimes, as
-// with Google Docs URLs, it's not possible.
-// Note: this might move to the site config file at some point.
-$options->rewrite_url = array(
-	// Rewrite public Google Docs URLs to point to HTML view:
-	// if a URL contains docs.google.com, replace /Doc? with /View?
-	'docs.google.com' => array('/Doc?' => '/View?'),
-	'tnr.com' => array('tnr.com/article/' => 'tnr.com/print/article/'),
-	'.m.wikipedia.org' => array('.m.wikipedia.org' => '.wikipedia.org'),
-	'm.vanityfair.com' => array('m.vanityfair.com' => 'www.vanityfair.com')
-);
-
-// Content-Type exceptions
-// -----------------------
-// Here you can define different actions based
-// on the Content-Type header returned by server.
-// MIME type as key, action as value.
-// Valid actions:
-// * 'exclude' - exclude this item from the result
-// * 'link' - create HTML link to the item
-$options->content_type_exc = array( 
-							   'application/pdf' => array('action'=>'link', 'name'=>'PDF'),
-							   'image' => array('action'=>'link', 'name'=>'Image'),
-							   'audio' => array('action'=>'link', 'name'=>'Audio'),
-							   'video' => array('action'=>'link', 'name'=>'Video')
-							  );
-
-// Cache directory level
-// ----------------------
-// Spread cache files over different directories (only used if caching is enabled).
-// Used to prevent large number of files in one directory.
-// This corresponds to Zend_Cache's hashed_directory_level
-// see http://framework.zend.com/manual/en/zend.cache.backends.html
-// It's best not to change this if you're unsure.
-$options->cache_directory_level = 0;
-
-// Cache cleanup
-// -------------
-// 0 = script will not clean cache (rename cachecleanup.php and use it for scheduled (e.g. cron) cache cleanup)
-// 1 = clean cache everytime the script runs (not recommended)
-// 100 = clean cache roughly once every 100 script runs
-// x = clean cache roughly once every x script runs
-// ...you get the idea :)
-$options->cache_cleanup = 100;
-
-/////////////////////////////////////////////////
-/// DO NOT CHANGE ANYTHING BELOW THIS ///////////
-/////////////////////////////////////////////////
-
-if (!defined('_FF_FTR_VERSION')) define('_FF_FTR_VERSION', '3.1');
-
-if (basename(__FILE__) == 'config.php') {
-	if (file_exists(dirname(__FILE__).'/custom_config.php')) {
-		require_once dirname(__FILE__).'/custom_config.php';
-	}
-	
-	// check for environment variables - often used on cloud platforms
-	// environment variables should be prefixed with 'ftr_', e.g.
-	// ftr_max_entries: 1
-	// will set the max_entries value to 1.
-	foreach ($options as $_key=>&$_val) {
-		$_key = "ftr_$_key";
-		if (($_env = getenv($_key)) !== false) {
-			if (is_array($_val)) {
-				if ($_key === 'ftr_admin_credentials') {
-					$_val = array_combine(array('username', 'password'), array_map('trim', explode(':', $_env, 2)));
-					if ($_val === false) $_val = array('username'=>'admin', 'password'=>'');
-				}
-			} elseif ($_env === 'true' || $_env === 'false') {
-				$_val = ($_env === 'true');
-			} elseif (is_numeric($_env)) {
-				$_val = (int)$_env;
-			} else { // string
-				$_val = $_env;
-			}
-		}
-	}
-	unset($_key, $_val, $_env);
-}

inc/3rdparty/libraries/Zend/Cache.php

@@ -1,250 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cache.php 24656 2012-02-26 06:02:53Z adamlundrigan $
- */
-
-
-/**
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Cache
-{
-
-    /**
-     * Standard frontends
-     *
-     * @var array
-     */
-    public static $standardFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
-
-    /**
-     * Standard backends
-     *
-     * @var array
-     */
-    public static $standardBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform',
-                                            'Xcache', 'TwoLevels', 'WinCache', 'ZendServer_Disk', 'ZendServer_ShMem');
-
-    /**
-     * Standard backends which implement the ExtendedInterface
-     *
-     * @var array
-     */
-    public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Libmemcached', 'Sqlite', 'WinCache');
-
-    /**
-     * Only for backward compatibility (may be removed in next major release)
-     *
-     * @var array
-     * @deprecated
-     */
-    public static $availableFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
-
-    /**
-     * Only for backward compatibility (may be removed in next major release)
-     *
-     * @var array
-     * @deprecated
-     */
-    public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', 'Xcache', 'WinCache', 'TwoLevels');
-
-    /**
-     * Consts for clean() method
-     */
-    const CLEANING_MODE_ALL              = 'all';
-    const CLEANING_MODE_OLD              = 'old';
-    const CLEANING_MODE_MATCHING_TAG     = 'matchingTag';
-    const CLEANING_MODE_NOT_MATCHING_TAG = 'notMatchingTag';
-    const CLEANING_MODE_MATCHING_ANY_TAG = 'matchingAnyTag';
-
-    /**
-     * Factory
-     *
-     * @param mixed  $frontend        frontend name (string) or Zend_Cache_Frontend_ object
-     * @param mixed  $backend         backend name (string) or Zend_Cache_Backend_ object
-     * @param array  $frontendOptions associative array of options for the corresponding frontend constructor
-     * @param array  $backendOptions  associative array of options for the corresponding backend constructor
-     * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name
-     * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name
-     * @param boolean $autoload if true, there will no require_once for backend and frontend (useful only for custom backends/frontends)
-     * @throws Zend_Cache_Exception
-     * @return Zend_Cache_Core|Zend_Cache_Frontend
-     */
-    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false, $autoload = false)
-    {
-        if (is_string($backend)) {
-            $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming, $autoload);
-        } else {
-            if ((is_object($backend)) && (in_array('Zend_Cache_Backend_Interface', class_implements($backend)))) {
-                $backendObject = $backend;
-            } else {
-                self::throwException('backend must be a backend name (string) or an object which implements Zend_Cache_Backend_Interface');
-            }
-        }
-        if (is_string($frontend)) {
-            $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming, $autoload);
-        } else {
-            if (is_object($frontend)) {
-                $frontendObject = $frontend;
-            } else {
-                self::throwException('frontend must be a frontend name (string) or an object');
-            }
-        }
-        $frontendObject->setBackend($backendObject);
-        return $frontendObject;
-    }
-
-    /**
-     * Backend Constructor
-     *
-     * @param string  $backend
-     * @param array   $backendOptions
-     * @param boolean $customBackendNaming
-     * @param boolean $autoload
-     * @return Zend_Cache_Backend
-     */
-    public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false, $autoload = false)
-    {
-        if (!$customBackendNaming) {
-            $backend  = self::_normalizeName($backend);
-        }
-        if (in_array($backend, Zend_Cache::$standardBackends)) {
-            // we use a standard backend
-            $backendClass = 'Zend_Cache_Backend_' . $backend;
-            // security controls are explicit
-            require_once realpath(dirname(__FILE__).'/..').DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
-        } else {
-            // we use a custom backend
-            if (!preg_match('~^[\w\\\\]+$~D', $backend)) {
-                Zend_Cache::throwException("Invalid backend name [$backend]");
-            }
-            if (!$customBackendNaming) {
-                // we use this boolean to avoid an API break
-                $backendClass = 'Zend_Cache_Backend_' . $backend;
-            } else {
-                $backendClass = $backend;
-            }
-            if (!$autoload) {
-                $file = str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
-                if (!(self::_isReadable($file))) {
-                    self::throwException("file $file not found in include_path");
-                }
-                require_once $file;
-            }
-        }
-        return new $backendClass($backendOptions);
-    }
-
-    /**
-     * Frontend Constructor
-     *
-     * @param string  $frontend
-     * @param array   $frontendOptions
-     * @param boolean $customFrontendNaming
-     * @param boolean $autoload
-     * @return Zend_Cache_Core|Zend_Cache_Frontend
-     */
-    public static function _makeFrontend($frontend, $frontendOptions = array(), $customFrontendNaming = false, $autoload = false)
-    {
-        if (!$customFrontendNaming) {
-            $frontend = self::_normalizeName($frontend);
-        }
-        if (in_array($frontend, self::$standardFrontends)) {
-            // we use a standard frontend
-            // For perfs reasons, with frontend == 'Core', we can interact with the Core itself
-            $frontendClass = 'Zend_Cache_' . ($frontend != 'Core' ? 'Frontend_' : '') . $frontend;
-            // security controls are explicit
-            require_once realpath(dirname(__FILE__).'/..').DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
-        } else {
-            // we use a custom frontend
-            if (!preg_match('~^[\w\\\\]+$~D', $frontend)) {
-                Zend_Cache::throwException("Invalid frontend name [$frontend]");
-            }
-            if (!$customFrontendNaming) {
-                // we use this boolean to avoid an API break
-                $frontendClass = 'Zend_Cache_Frontend_' . $frontend;
-            } else {
-                $frontendClass = $frontend;
-            }
-            if (!$autoload) {
-                $file = str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
-                if (!(self::_isReadable($file))) {
-                    self::throwException("file $file not found in include_path");
-                }
-                require_once $file;
-            }
-        }
-        return new $frontendClass($frontendOptions);
-    }
-
-    /**
-     * Throw an exception
-     *
-     * Note : for perf reasons, the "load" of Zend/Cache/Exception is dynamic
-     * @param  string $msg  Message for the exception
-     * @throws Zend_Cache_Exception
-     */
-    public static function throwException($msg, Exception $e = null)
-    {
-        // For perfs reasons, we use this dynamic inclusion
-        require_once 'Zend/Cache/Exception.php';
-        throw new Zend_Cache_Exception($msg, 0, $e);
-    }
-
-    /**
-     * Normalize frontend and backend names to allow multiple words TitleCased
-     *
-     * @param  string $name  Name to normalize
-     * @return string
-     */
-    protected static function _normalizeName($name)
-    {
-        $name = ucfirst(strtolower($name));
-        $name = str_replace(array('-', '_', '.'), ' ', $name);
-        $name = ucwords($name);
-        $name = str_replace(' ', '', $name);
-        if (stripos($name, 'ZendServer') === 0) {
-            $name = 'ZendServer_' . substr($name, strlen('ZendServer'));
-        }
-
-        return $name;
-    }
-
-    /**
-     * Returns TRUE if the $filename is readable, or FALSE otherwise.
-     * This function uses the PHP include_path, where PHP's is_readable()
-     * does not.
-     *
-     * Note : this method comes from Zend_Loader (see #ZF-2891 for details)
-     *
-     * @param string   $filename
-     * @return boolean
-     */
-    private static function _isReadable($filename)
-    {
-        if (!$fh = @fopen($filename, 'r', true)) {
-            return false;
-        }
-        @fclose($fh);
-        return true;
-    }
-
-}

inc/3rdparty/libraries/Zend/Cache/Backend.php

@@ -1,290 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Backend.php 24989 2012-06-21 07:24:13Z mabe $
- */
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend
-{
-    /**
-     * Frontend or Core directives
-     *
-     * =====> (int) lifetime :
-     * - Cache lifetime (in seconds)
-     * - If null, the cache is valid forever
-     *
-     * =====> (int) logging :
-     * - if set to true, a logging is activated throw Zend_Log
-     *
-     * @var array directives
-     */
-    protected $_directives = array(
-        'lifetime' => 3600,
-        'logging'  => false,
-        'logger'   => null
-    );
-
-    /**
-     * Available options
-     *
-     * @var array available options
-     */
-    protected $_options = array();
-
-    /**
-     * Constructor
-     *
-     * @param  array $options Associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-    }
-
-    /**
-     * Set the frontend directives
-     *
-     * @param  array $directives Assoc of directives
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setDirectives($directives)
-    {
-        if (!is_array($directives)) Zend_Cache::throwException('Directives parameter must be an array');
-        while (list($name, $value) = each($directives)) {
-            if (!is_string($name)) {
-                Zend_Cache::throwException("Incorrect option name : $name");
-            }
-            $name = strtolower($name);
-            if (array_key_exists($name, $this->_directives)) {
-                $this->_directives[$name] = $value;
-            }
-
-        }
-
-        $this->_loggerSanity();
-    }
-
-    /**
-     * Set an option
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setOption($name, $value)
-    {
-        if (!is_string($name)) {
-            Zend_Cache::throwException("Incorrect option name : $name");
-        }
-        $name = strtolower($name);
-        if (array_key_exists($name, $this->_options)) {
-            $this->_options[$name] = $value;
-        }
-    }
-
-    /**
-     * Returns an option
-     *
-     * @param string $name Optional, the options name to return
-     * @throws Zend_Cache_Exceptions
-     * @return mixed
-     */
-    public function getOption($name)
-    {
-        $name = strtolower($name);
-
-        if (array_key_exists($name, $this->_options)) {
-            return $this->_options[$name];
-        }
-
-        if (array_key_exists($name, $this->_directives)) {
-            return $this->_directives[$name];
-        }
-
-        Zend_Cache::throwException("Incorrect option name : {$name}");
-    }
-
-    /**
-     * Get the life time
-     *
-     * if $specificLifetime is not false, the given specific life time is used
-     * else, the global lifetime is used
-     *
-     * @param  int $specificLifetime
-     * @return int Cache life time
-     */
-    public function getLifetime($specificLifetime)
-    {
-        if ($specificLifetime === false) {
-            return $this->_directives['lifetime'];
-        }
-        return $specificLifetime;
-    }
-
-    /**
-     * Return true if the automatic cleaning is available for the backend
-     *
-     * DEPRECATED : use getCapabilities() instead
-     *
-     * @deprecated
-     * @return boolean
-     */
-    public function isAutomaticCleaningAvailable()
-    {
-        return true;
-    }
-
-    /**
-     * Determine system TMP directory and detect if we have read access
-     *
-     * inspired from Zend_File_Transfer_Adapter_Abstract
-     *
-     * @return string
-     * @throws Zend_Cache_Exception if unable to determine directory
-     */
-    public function getTmpDir()
-    {
-        $tmpdir = array();
-        foreach (array($_ENV, $_SERVER) as $tab) {
-            foreach (array('TMPDIR', 'TEMP', 'TMP', 'windir', 'SystemRoot') as $key) {
-                if (isset($tab[$key]) && is_string($tab[$key])) {
-                    if (($key == 'windir') or ($key == 'SystemRoot')) {
-                        $dir = realpath($tab[$key] . '\\temp');
-                    } else {
-                        $dir = realpath($tab[$key]);
-                    }
-                    if ($this->_isGoodTmpDir($dir)) {
-                        return $dir;
-                    }
-                }
-            }
-        }
-        $upload = ini_get('upload_tmp_dir');
-        if ($upload) {
-            $dir = realpath($upload);
-            if ($this->_isGoodTmpDir($dir)) {
-                return $dir;
-            }
-        }
-        if (function_exists('sys_get_temp_dir')) {
-            $dir = sys_get_temp_dir();
-            if ($this->_isGoodTmpDir($dir)) {
-                return $dir;
-            }
-        }
-        // Attemp to detect by creating a temporary file
-        $tempFile = tempnam(md5(uniqid(rand(), TRUE)), '');
-        if ($tempFile) {
-            $dir = realpath(dirname($tempFile));
-            unlink($tempFile);
-            if ($this->_isGoodTmpDir($dir)) {
-                return $dir;
-            }
-        }
-        if ($this->_isGoodTmpDir('/tmp')) {
-            return '/tmp';
-        }
-        if ($this->_isGoodTmpDir('\\temp')) {
-            return '\\temp';
-        }
-        Zend_Cache::throwException('Could not determine temp directory, please specify a cache_dir manually');
-    }
-
-    /**
-     * Verify if the given temporary directory is readable and writable
-     *
-     * @param string $dir temporary directory
-     * @return boolean true if the directory is ok
-     */
-    protected function _isGoodTmpDir($dir)
-    {
-        if (is_readable($dir)) {
-            if (is_writable($dir)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Make sure if we enable logging that the Zend_Log class
-     * is available.
-     * Create a default log object if none is set.
-     *
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _loggerSanity()
-    {
-        if (!isset($this->_directives['logging']) || !$this->_directives['logging']) {
-            return;
-        }
-
-        if (isset($this->_directives['logger'])) {
-            if ($this->_directives['logger'] instanceof Zend_Log) {
-                return;
-            }
-            Zend_Cache::throwException('Logger object is not an instance of Zend_Log class.');
-        }
-
-        // Create a default logger to the standard output stream
-        require_once 'Zend/Log.php';
-        require_once 'Zend/Log/Writer/Stream.php';
-        require_once 'Zend/Log/Filter/Priority.php';
-        $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output'));
-        $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<='));
-        $this->_directives['logger'] = $logger;
-    }
-
-    /**
-     * Log a message at the WARN (4) priority.
-     *
-     * @param  string $message
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _log($message, $priority = 4)
-    {
-        if (!$this->_directives['logging']) {
-            return;
-        }
-
-        if (!isset($this->_directives['logger'])) {
-            Zend_Cache::throwException('Logging is enabled but logger is not set.');
-        }
-        $logger = $this->_directives['logger'];
-        if (!$logger instanceof Zend_Log) {
-            Zend_Cache::throwException('Logger object is not an instance of Zend_Log class.');
-        }
-        $logger->log($message, $priority);
-    }
-}

inc/3rdparty/libraries/Zend/Cache/Backend/ExtendedInterface.php

@@ -1,127 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ExtendedInterface.php 24593 2012-01-05 20:35:02Z matthew $
- */
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-//require_once 'Zend/Cache/Backend/Interface.php';
-require_once dirname(__FILE__).'/Interface.php';
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interface
-{
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds();
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags();
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array());
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array());
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array());
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage();
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id);
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime);
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities();
-
-}

inc/3rdparty/libraries/Zend/Cache/Backend/Interface.php

@@ -1,99 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $
- */
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Cache_Backend_Interface
-{
-    /**
-     * Set the frontend directives
-     *
-     * @param array $directives assoc of directives
-     */
-    public function setDirectives($directives);
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * Note : return value is always "string" (unserialization is done by the core not by the backend)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return string|false cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false);
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id cache id
-     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id);
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data            Datas to cache
-     * @param  string $id              Cache id
-     * @param  array $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int   $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false);
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function remove($id);
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array());
-
-}

inc/3rdparty/libraries/Zend/Cache/Core.php

@@ -1,765 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Core.php 24989 2012-06-21 07:24:13Z mabe $
- */
-
-
-/**
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Core
-{
-    /**
-     * Messages
-     */
-    const BACKEND_NOT_SUPPORTS_TAG = 'tags are not supported by the current backend';
-    const BACKEND_NOT_IMPLEMENTS_EXTENDED_IF = 'Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available';
-
-    /**
-     * Backend Object
-     *
-     * @var Zend_Cache_Backend_Interface $_backend
-     */
-    protected $_backend = null;
-
-    /**
-     * Available options
-     *
-     * ====> (boolean) write_control :
-     * - Enable / disable write control (the cache is read just after writing to detect corrupt entries)
-     * - Enable write control will lightly slow the cache writing but not the cache reading
-     * Write control can detect some corrupt cache files but maybe it's not a perfect control
-     *
-     * ====> (boolean) caching :
-     * - Enable / disable caching
-     * (can be very useful for the debug of cached scripts)
-     *
-     * =====> (string) cache_id_prefix :
-     * - prefix for cache ids (namespace)
-     *
-     * ====> (boolean) automatic_serialization :
-     * - Enable / disable automatic serialization
-     * - It can be used to save directly datas which aren't strings (but it's slower)
-     *
-     * ====> (int) automatic_cleaning_factor :
-     * - Disable / Tune the automatic cleaning process
-     * - The automatic cleaning process destroy too old (for the given life time)
-     *   cache files when a new cache file is written :
-     *     0               => no automatic cache cleaning
-     *     1               => systematic cache cleaning
-     *     x (integer) > 1 => automatic cleaning randomly 1 times on x cache write
-     *
-     * ====> (int) lifetime :
-     * - Cache lifetime (in seconds)
-     * - If null, the cache is valid forever.
-     *
-     * ====> (boolean) logging :
-     * - If set to true, logging is activated (but the system is slower)
-     *
-     * ====> (boolean) ignore_user_abort
-     * - If set to true, the core will set the ignore_user_abort PHP flag inside the
-     *   save() method to avoid cache corruptions in some cases (default false)
-     *
-     * @var array $_options available options
-     */
-    protected $_options = array(
-        'write_control'             => true,
-        'caching'                   => true,
-        'cache_id_prefix'           => null,
-        'automatic_serialization'   => false,
-        'automatic_cleaning_factor' => 10,
-        'lifetime'                  => 3600,
-        'logging'                   => false,
-        'logger'                    => null,
-        'ignore_user_abort'         => false
-    );
-
-    /**
-     * Array of options which have to be transfered to backend
-     *
-     * @var array $_directivesList
-     */
-    protected static $_directivesList = array('lifetime', 'logging', 'logger');
-
-    /**
-     * Not used for the core, just a sort a hint to get a common setOption() method (for the core and for frontends)
-     *
-     * @var array $_specificOptions
-     */
-    protected $_specificOptions = array();
-
-    /**
-     * Last used cache id
-     *
-     * @var string $_lastId
-     */
-    private $_lastId = null;
-
-    /**
-     * True if the backend implements Zend_Cache_Backend_ExtendedInterface
-     *
-     * @var boolean $_extendedBackend
-     */
-    protected $_extendedBackend = false;
-
-    /**
-     * Array of capabilities of the backend (only if it implements Zend_Cache_Backend_ExtendedInterface)
-     *
-     * @var array
-     */
-    protected $_backendCapabilities = array();
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options Associative array of options or Zend_Config instance
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        if (!is_array($options)) {
-            Zend_Cache::throwException("Options passed were not an array"
-            . " or Zend_Config instance.");
-        }
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-        $this->_loggerSanity();
-    }
-
-    /**
-     * Set options using an instance of type Zend_Config
-     *
-     * @param Zend_Config $config
-     * @return Zend_Cache_Core
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        $options = $config->toArray();
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Set the backend
-     *
-     * @param  Zend_Cache_Backend $backendObject
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setBackend(Zend_Cache_Backend $backendObject)
-    {
-        $this->_backend= $backendObject;
-        // some options (listed in $_directivesList) have to be given
-        // to the backend too (even if they are not "backend specific")
-        $directives = array();
-        foreach (Zend_Cache_Core::$_directivesList as $directive) {
-            $directives[$directive] = $this->_options[$directive];
-        }
-        $this->_backend->setDirectives($directives);
-        if (in_array('Zend_Cache_Backend_ExtendedInterface', class_implements($this->_backend))) {
-            $this->_extendedBackend = true;
-            $this->_backendCapabilities = $this->_backend->getCapabilities();
-        }
-
-    }
-
-    /**
-     * Returns the backend
-     *
-     * @return Zend_Cache_Backend backend object
-     */
-    public function getBackend()
-    {
-        return $this->_backend;
-    }
-
-    /**
-     * Public frontend to set an option
-     *
-     * There is an additional validation (relatively to the protected _setOption method)
-     *
-     * @param  string $name  Name of the option
-     * @param  mixed  $value Value of the option
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setOption($name, $value)
-    {
-        if (!is_string($name)) {
-            Zend_Cache::throwException("Incorrect option name!");
-        }
-        $name = strtolower($name);
-        if (array_key_exists($name, $this->_options)) {
-            // This is a Core option
-            $this->_setOption($name, $value);
-            return;
-        }
-        if (array_key_exists($name, $this->_specificOptions)) {
-            // This a specic option of this frontend
-            $this->_specificOptions[$name] = $value;
-            return;
-        }
-    }
-
-    /**
-     * Public frontend to get an option value
-     *
-     * @param  string $name  Name of the option
-     * @throws Zend_Cache_Exception
-     * @return mixed option value
-     */
-    public function getOption($name)
-    {
-        $name = strtolower($name);
-
-        if (array_key_exists($name, $this->_options)) {
-            // This is a Core option
-            return $this->_options[$name];
-        }
-
-        if (array_key_exists($name, $this->_specificOptions)) {
-            // This a specic option of this frontend
-            return $this->_specificOptions[$name];
-        }
-
-        Zend_Cache::throwException("Incorrect option name : $name");
-    }
-
-    /**
-     * Set an option
-     *
-     * @param  string $name  Name of the option
-     * @param  mixed  $value Value of the option
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    private function _setOption($name, $value)
-    {
-        if (!is_string($name) || !array_key_exists($name, $this->_options)) {
-            Zend_Cache::throwException("Incorrect option name : $name");
-        }
-        if ($name == 'lifetime' && empty($value)) {
-            $value = null;
-        }
-        $this->_options[$name] = $value;
-    }
-
-    /**
-     * Force a new lifetime
-     *
-     * The new value is set for the core/frontend but for the backend too (directive)
-     *
-     * @param  int $newLifetime New lifetime (in seconds)
-     * @return void
-     */
-    public function setLifetime($newLifetime)
-    {
-        $this->_options['lifetime'] = $newLifetime;
-        $this->_backend->setDirectives(array(
-            'lifetime' => $newLifetime
-        ));
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @param  boolean $doNotUnserialize       Do not serialize (even if automatic_serialization is true) => for internal use
-     * @return mixed|false Cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = false)
-    {
-        if (!$this->_options['caching']) {
-            return false;
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        $this->_lastId = $id;
-        self::_validateIdOrTag($id);
-
-        $this->_log("Zend_Cache_Core: load item '{$id}'", 7);
-        $data = $this->_backend->load($id, $doNotTestCacheValidity);
-        if ($data===false) {
-            // no cache available
-            return false;
-        }
-        if ((!$doNotUnserialize) && $this->_options['automatic_serialization']) {
-            // we need to unserialize before sending the result
-            return unserialize($data);
-        }
-        return $data;
-    }
-
-    /**
-     * Test if a cache is available for the given id
-     *
-     * @param  string $id Cache id
-     * @return int|false Last modified time of cache entry if it is available, false otherwise
-     */
-    public function test($id)
-    {
-        if (!$this->_options['caching']) {
-            return false;
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        self::_validateIdOrTag($id);
-        $this->_lastId = $id;
-
-        $this->_log("Zend_Cache_Core: test item '{$id}'", 7);
-        return $this->_backend->test($id);
-    }
-
-    /**
-     * Save some data in a cache
-     *
-     * @param  mixed $data           Data to put in cache (can be another type than string if automatic_serialization is on)
-     * @param  string $id             Cache id (if not set, the last cache id will be used)
-     * @param  array $tags           Cache tags
-     * @param  int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
-     * @throws Zend_Cache_Exception
-     * @return boolean True if no problem
-     */
-    public function save($data, $id = null, $tags = array(), $specificLifetime = false, $priority = 8)
-    {
-        if (!$this->_options['caching']) {
-            return true;
-        }
-        if ($id === null) {
-            $id = $this->_lastId;
-        } else {
-            $id = $this->_id($id);
-        }
-        self::_validateIdOrTag($id);
-        self::_validateTagsArray($tags);
-        if ($this->_options['automatic_serialization']) {
-            // we need to serialize datas before storing them
-            $data = serialize($data);
-        } else {
-            if (!is_string($data)) {
-                Zend_Cache::throwException("Datas must be string or set automatic_serialization = true");
-            }
-        }
-
-        // automatic cleaning
-        if ($this->_options['automatic_cleaning_factor'] > 0) {
-            $rand = rand(1, $this->_options['automatic_cleaning_factor']);
-            if ($rand==1) {
-                //  new way                 || deprecated way
-                if ($this->_extendedBackend || method_exists($this->_backend, 'isAutomaticCleaningAvailable')) {
-                    $this->_log("Zend_Cache_Core::save(): automatic cleaning running", 7);
-                    $this->clean(Zend_Cache::CLEANING_MODE_OLD);
-                } else {
-                    $this->_log("Zend_Cache_Core::save(): automatic cleaning is not available/necessary with current backend", 4);
-                }
-            }
-        }
-
-        $this->_log("Zend_Cache_Core: save item '{$id}'", 7);
-        if ($this->_options['ignore_user_abort']) {
-            $abort = ignore_user_abort(true);
-        }
-        if (($this->_extendedBackend) && ($this->_backendCapabilities['priority'])) {
-            $result = $this->_backend->save($data, $id, $tags, $specificLifetime, $priority);
-        } else {
-            $result = $this->_backend->save($data, $id, $tags, $specificLifetime);
-        }
-        if ($this->_options['ignore_user_abort']) {
-            ignore_user_abort($abort);
-        }
-
-        if (!$result) {
-            // maybe the cache is corrupted, so we remove it !
-            $this->_log("Zend_Cache_Core::save(): failed to save item '{$id}' -> removing it", 4);
-            $this->_backend->remove($id);
-            return false;
-        }
-
-        if ($this->_options['write_control']) {
-            $data2 = $this->_backend->load($id, true);
-            if ($data!=$data2) {
-                $this->_log("Zend_Cache_Core::save(): write control of item '{$id}' failed -> removing it", 4);
-                $this->_backend->remove($id);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Remove a cache
-     *
-     * @param  string $id Cache id to remove
-     * @return boolean True if ok
-     */
-    public function remove($id)
-    {
-        if (!$this->_options['caching']) {
-            return true;
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        self::_validateIdOrTag($id);
-
-        $this->_log("Zend_Cache_Core: remove item '{$id}'", 7);
-        return $this->_backend->remove($id);
-    }
-
-    /**
-     * Clean cache entries
-     *
-     * Available modes are :
-     * 'all' (default)  => remove all cache entries ($tags is not used)
-     * 'old'            => remove too old cache entries ($tags is not used)
-     * 'matchingTag'    => remove cache entries matching all given tags
-     *                     ($tags can be an array of strings or a single string)
-     * 'notMatchingTag' => remove cache entries not matching one of the given tags
-     *                     ($tags can be an array of strings or a single string)
-     * 'matchingAnyTag' => remove cache entries matching any given tags
-     *                     ($tags can be an array of strings or a single string)
-     *
-     * @param  string       $mode
-     * @param  array|string $tags
-     * @throws Zend_Cache_Exception
-     * @return boolean True if ok
-     */
-    public function clean($mode = 'all', $tags = array())
-    {
-        if (!$this->_options['caching']) {
-            return true;
-        }
-        if (!in_array($mode, array(Zend_Cache::CLEANING_MODE_ALL,
-                                   Zend_Cache::CLEANING_MODE_OLD,
-                                   Zend_Cache::CLEANING_MODE_MATCHING_TAG,
-                                   Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG,
-                                   Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG))) {
-            Zend_Cache::throwException('Invalid cleaning mode');
-        }
-        self::_validateTagsArray($tags);
-
-        return $this->_backend->clean($mode, $tags);
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        if (!($this->_backendCapabilities['tags'])) {
-            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORTS_TAG);
-        }
-
-        $ids = $this->_backend->getIdsMatchingTags($tags);
-
-        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
-        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
-            $prefix    = & $this->_options['cache_id_prefix'];
-            $prefixLen = strlen($prefix);
-            foreach ($ids as &$id) {
-                if (strpos($id, $prefix) === 0) {
-                    $id = substr($id, $prefixLen);
-                }
-            }
-        }
-
-        return $ids;
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        if (!($this->_backendCapabilities['tags'])) {
-            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORTS_TAG);
-        }
-
-        $ids = $this->_backend->getIdsNotMatchingTags($tags);
-
-        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
-        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
-            $prefix    = & $this->_options['cache_id_prefix'];
-            $prefixLen = strlen($prefix);
-            foreach ($ids as &$id) {
-                if (strpos($id, $prefix) === 0) {
-                    $id = substr($id, $prefixLen);
-                }
-            }
-        }
-
-        return $ids;
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching any cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        if (!($this->_backendCapabilities['tags'])) {
-            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORTS_TAG);
-        }
-
-        $ids = $this->_backend->getIdsMatchingAnyTags($tags);
-
-        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
-        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
-            $prefix    = & $this->_options['cache_id_prefix'];
-            $prefixLen = strlen($prefix);
-            foreach ($ids as &$id) {
-                if (strpos($id, $prefix) === 0) {
-                    $id = substr($id, $prefixLen);
-                }
-            }
-        }
-
-        return $ids;
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-
-        $ids = $this->_backend->getIds();
-
-        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
-        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
-            $prefix    = & $this->_options['cache_id_prefix'];
-            $prefixLen = strlen($prefix);
-            foreach ($ids as &$id) {
-                if (strpos($id, $prefix) === 0) {
-                    $id = substr($id, $prefixLen);
-                }
-            }
-        }
-
-        return $ids;
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        if (!($this->_backendCapabilities['tags'])) {
-            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORTS_TAG);
-        }
-        return $this->_backend->getTags();
-    }
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage()
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        return $this->_backend->getFillingPercentage();
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array will include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        return $this->_backend->getMetadatas($id);
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        $id = $this->_id($id); // cache id may need prefix
-
-        $this->_log("Zend_Cache_Core: touch item '{$id}'", 7);
-        return $this->_backend->touch($id, $extraLifetime);
-    }
-
-    /**
-     * Validate a cache id or a tag (security, reliable filenames, reserved prefixes...)
-     *
-     * Throw an exception if a problem is found
-     *
-     * @param  string $string Cache id or tag
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected static function _validateIdOrTag($string)
-    {
-        if (!is_string($string)) {
-            Zend_Cache::throwException('Invalid id or tag : must be a string');
-        }
-        if (substr($string, 0, 9) == 'internal-') {
-            Zend_Cache::throwException('"internal-*" ids or tags are reserved');
-        }
-        if (!preg_match('~^[a-zA-Z0-9_]+$~D', $string)) {
-            Zend_Cache::throwException("Invalid id or tag '$string' : must use only [a-zA-Z0-9_]");
-        }
-    }
-
-    /**
-     * Validate a tags array (security, reliable filenames, reserved prefixes...)
-     *
-     * Throw an exception if a problem is found
-     *
-     * @param  array $tags Array of tags
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected static function _validateTagsArray($tags)
-    {
-        if (!is_array($tags)) {
-            Zend_Cache::throwException('Invalid tags array : must be an array');
-        }
-        foreach($tags as $tag) {
-            self::_validateIdOrTag($tag);
-        }
-        reset($tags);
-    }
-
-    /**
-     * Make sure if we enable logging that the Zend_Log class
-     * is available.
-     * Create a default log object if none is set.
-     *
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _loggerSanity()
-    {
-        if (!isset($this->_options['logging']) || !$this->_options['logging']) {
-            return;
-        }
-
-        if (isset($this->_options['logger']) && $this->_options['logger'] instanceof Zend_Log) {
-            return;
-        }
-
-        // Create a default logger to the standard output stream
-        require_once 'Zend/Log.php';
-        require_once 'Zend/Log/Writer/Stream.php';
-        require_once 'Zend/Log/Filter/Priority.php';
-        $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output'));
-        $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<='));
-        $this->_options['logger'] = $logger;
-    }
-
-    /**
-     * Log a message at the WARN (4) priority.
-     *
-     * @param string $message
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _log($message, $priority = 4)
-    {
-        if (!$this->_options['logging']) {
-            return;
-        }
-        if (!(isset($this->_options['logger']) || $this->_options['logger'] instanceof Zend_Log)) {
-            Zend_Cache::throwException('Logging is enabled but logger is not set');
-        }
-        $logger = $this->_options['logger'];
-        $logger->log($message, $priority);
-    }
-
-    /**
-     * Make and return a cache id
-     *
-     * Checks 'cache_id_prefix' and returns new id with prefix or simply the id if null
-     *
-     * @param  string $id Cache id
-     * @return string Cache id (with or without prefix)
-     */
-    protected function _id($id)
-    {
-        if (($id !== null) && isset($this->_options['cache_id_prefix'])) {
-            return $this->_options['cache_id_prefix'] . $id; // return with prefix
-        }
-        return $id; // no prefix, just return the $id passed
-    }
-
-}

inc/3rdparty/libraries/Zend/Cache/Exception.php

@@ -1,32 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Exception extends Zend_Exception {}

inc/3rdparty/libraries/Zend/Exception.php

@@ -1,96 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $
- */
-
-/**
-* @category   Zend
-* @package    Zend
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
-* @license    http://framework.zend.com/license/new-bsd     New BSD License
-*/
-class Zend_Exception extends Exception
-{
-    /**
-     * @var null|Exception
-     */
-    private $_previous = null;
-
-    /**
-     * Construct the exception
-     *
-     * @param  string $msg
-     * @param  int $code
-     * @param  Exception $previous
-     * @return void
-     */
-    public function __construct($msg = '', $code = 0, Exception $previous = null)
-    {
-        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-            parent::__construct($msg, (int) $code);
-            $this->_previous = $previous;
-        } else {
-            parent::__construct($msg, (int) $code, $previous);
-        }
-    }
-
-    /**
-     * Overloading
-     *
-     * For PHP < 5.3.0, provides access to the getPrevious() method.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     */
-    public function __call($method, array $args)
-    {
-        if ('getprevious' == strtolower($method)) {
-            return $this->_getPrevious();
-        }
-        return null;
-    }
-
-    /**
-     * String representation of the exception
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-            if (null !== ($e = $this->getPrevious())) {
-                return $e->__toString()
-                       . "\n\nNext "
-                       . parent::__toString();
-            }
-        }
-        return parent::__toString();
-    }
-
-    /**
-     * Returns previous Exception
-     *
-     * @return Exception|null
-     */
-    protected function _getPrevious()
-    {
-        return $this->_previous;
-    }
-}

inc/3rdparty/libraries/content-extractor/ContentExtractor.php

@@ -1,728 +0,0 @@
-<?php
-/**
- * Content Extractor
- * 
- * Uses patterns specified in site config files and auto detection (hNews/PHP Readability) 
- * to extract content from HTML files.
- * 
- * @version 1.0
- * @date 2013-02-05
- * @author Keyvan Minoukadeh
- * @copyright 2013 Keyvan Minoukadeh
- * @license http://www.gnu.org/licenses/agpl-3.0.html AGPL v3
- */
-
-class ContentExtractor
-{
-	protected static $tidy_config = array(
-				 'clean' => true,
-				 'output-xhtml' => true,
-				 'logical-emphasis' => true,
-				 'show-body-only' => false,
-				 'new-blocklevel-tags' => 'article, aside, footer, header, hgroup, menu, nav, section, details, datagrid',
-				 'new-inline-tags' => 'mark, time, meter, progress, data',
-				 'wrap' => 0,
-				 'drop-empty-paras' => true,
-				 'drop-proprietary-attributes' => false,
-				 'enclose-text' => true,
-				 'enclose-block-text' => true,
-				 'merge-divs' => true,
-				 'merge-spans' => true,
-				 'char-encoding' => 'utf8',
-				 'hide-comments' => true
-				 );
-	protected $html;
-	protected $config;
-	protected $title;
-	protected $author = array();
-	protected $language;
-	protected $date;
-	protected $body;
-	protected $success = false;
-	protected $nextPageUrl;
-	public $allowedParsers = array('libxml', 'html5lib');
-	public $fingerprints = array();
-	public $readability;
-	public $debug = false;
-	public $debugVerbose = false;
-
-	function __construct($path, $fallback=null) {
-		SiteConfig::set_config_path($path, $fallback);	
-	}
-	
-	protected function debug($msg) {
-		if ($this->debug) {
-			$mem = round(memory_get_usage()/1024, 2);
-			$memPeak = round(memory_get_peak_usage()/1024, 2);
-			echo '* ',$msg;
-			if ($this->debugVerbose) echo ' - mem used: ',$mem," (peak: $memPeak)";
-			echo "\n";
-			ob_flush();
-			flush();
-		}
-	}
-	
-	public function reset() {
-		$this->html = null;
-		$this->readability = null;
-		$this->config = null;
-		$this->title = null;
-		$this->body = null;
-		$this->author = array();
-		$this->language = null;
-		$this->date = null;
-		$this->nextPageUrl = null;
-		$this->success = false;
-	}
-
-	public function findHostUsingFingerprints($html) {
-		$this->debug('Checking fingerprints...');
-		$head = substr($html, 0, 8000);
-		foreach ($this->fingerprints as $_fp => $_fphost) {
-			$lookin = 'html';
-			if (is_array($_fphost)) {
-				if (isset($_fphost['head']) && $_fphost['head']) {
-					$lookin = 'head';
-				}
-				$_fphost = $_fphost['hostname'];
-			}
-			if (strpos($$lookin, $_fp) !== false) {
-				$this->debug("Found match: $_fphost");
-				return $_fphost;
-			}
-		}
-		$this->debug('No fingerprint matches');
-		return false;
-	}
-	
-	// returns SiteConfig instance (joined in order: exact match, wildcard, fingerprint, global, default)
-	public function buildSiteConfig($url, $html='', $add_to_cache=true) {
-		// extract host name
-		$host = @parse_url($url, PHP_URL_HOST);
-		$host = strtolower($host);
-		if (substr($host, 0, 4) == 'www.') $host = substr($host, 4);
-		// is merged version already cached?
-		if (SiteConfig::is_cached("$host.merged")) {
-			$this->debug("Returning cached and merged site config for $host");
-			return SiteConfig::build("$host.merged");
-		}
-		// let's build from site_config/custom/ and standard/
-		$config = SiteConfig::build($host);
-		if ($add_to_cache && $config && !SiteConfig::is_cached("$host")) {
-			SiteConfig::add_to_cache($host, $config);
-		}
-		// if no match, use defaults
-		if (!$config) $config = new SiteConfig();
-		// load fingerprint config?
-		if ($config->autodetect_on_failure()) {
-			// check HTML for fingerprints
-			if (!empty($this->fingerprints) && ($_fphost = $this->findHostUsingFingerprints($html))) {
-				if ($config_fingerprint = SiteConfig::build($_fphost)) {
-					$this->debug("Appending site config settings from $_fphost (fingerprint match)");
-					$config->append($config_fingerprint);
-					if ($add_to_cache && !SiteConfig::is_cached($_fphost)) {
-						//$config_fingerprint->cache_in_apc = true;
-						SiteConfig::add_to_cache($_fphost, $config_fingerprint);
-					}
-				}
-			}
-		}
-		// load global config?
-		if ($config->autodetect_on_failure()) {
-			if ($config_global = SiteConfig::build('global', true)) {
-				$this->debug('Appending site config settings from global.txt');
-				$config->append($config_global);
-				if ($add_to_cache && !SiteConfig::is_cached('global')) {
-					//$config_global->cache_in_apc = true;
-					SiteConfig::add_to_cache('global', $config_global);
-				}
-			}
-		}
-		// store copy of merged config
-		if ($add_to_cache) {
-			// do not store in APC if wildcard match
-			$use_apc = ($host == $config->cache_key);
-			$config->cache_key = null;
-			SiteConfig::add_to_cache("$host.merged", $config, $use_apc);
-		}
-		return $config;
-	}
-	
-	// returns true on success, false on failure
-	// $smart_tidy indicates that if tidy is used and no results are produced, we will
-	// try again without it. Tidy helps us deal with PHP's patchy HTML parsing most of the time
-	// but it has problems of its own which we try to avoid with this option.
-	public function process($html, $url, $smart_tidy=true) {
-		$this->reset();
-		$this->config = $this->buildSiteConfig($url, $html);
-		
-		// do string replacements
-		if (!empty($this->config->find_string)) {
-			if (count($this->config->find_string) == count($this->config->replace_string)) {
-				$html = str_replace($this->config->find_string, $this->config->replace_string, $html, $_count);
-				$this->debug("Strings replaced: $_count (find_string and/or replace_string)");
-			} else {
-				$this->debug('Skipped string replacement - incorrect number of find-replace strings in site config');
-			}
-			unset($_count);
-		}
-		
-		// use tidy (if it exists)?
-		// This fixes problems with some sites which would otherwise
-		// trouble DOMDocument's HTML parsing. (Although sometimes it
-		// makes matters worse, which is why you can override it in site config files.)
-		$tidied = false;
-		if ($this->config->tidy() && function_exists('tidy_parse_string') && $smart_tidy) {
-			$this->debug('Using Tidy');
-			$tidy = tidy_parse_string($html, self::$tidy_config, 'UTF8');
-			if (tidy_clean_repair($tidy)) {
-				$original_html = $html;
-				$tidied = true;
-				$html = $tidy->value;
-			}
-			unset($tidy);
-		}
-		
-		// load and parse html
-		$_parser = $this->config->parser();
-		if (!in_array($_parser, $this->allowedParsers)) {
-			$this->debug("HTML parser $_parser not listed, using libxml instead");
-			$_parser = 'libxml';
-		}
-		$this->debug("Attempting to parse HTML with $_parser");
-		$this->readability = new Readability($html, $url, $_parser);
-		
-		// we use xpath to find elements in the given HTML document
-		// see http://en.wikipedia.org/wiki/XPath_1.0
-		$xpath = new DOMXPath($this->readability->dom);
-
-		// try to get next page link
-		foreach ($this->config->next_page_link as $pattern) {
-			$elems = @$xpath->evaluate($pattern, $this->readability->dom);
-			if (is_string($elems)) {
-				$this->nextPageUrl = trim($elems);
-				break;
-			} elseif ($elems instanceof DOMNodeList && $elems->length > 0) {
-				foreach ($elems as $item) {
-					if ($item instanceof DOMElement && $item->hasAttribute('href')) {
-						$this->nextPageUrl = $item->getAttribute('href');
-						break 2;
-					} elseif ($item instanceof DOMAttr && $item->value) {
-						$this->nextPageUrl = $item->value;
-						break 2;
-					}
-				}
-			}
-		}
-		
-		// try to get title
-		foreach ($this->config->title as $pattern) {
-			// $this->debug("Trying $pattern");
-			$elems = @$xpath->evaluate($pattern, $this->readability->dom);
-			if (is_string($elems)) {
-				$this->title = trim($elems);
-				$this->debug('Title expression evaluated as string: '.$this->title);
-				$this->debug("...XPath match: $pattern");
-				break;
-			} elseif ($elems instanceof DOMNodeList && $elems->length > 0) {
-				$this->title = $elems->item(0)->textContent;
-				$this->debug('Title matched: '.$this->title);
-				$this->debug("...XPath match: $pattern");
-				// remove title from document
-				try {
-					$elems->item(0)->parentNode->removeChild($elems->item(0));
-				} catch (DOMException $e) {
-					// do nothing
-				}
-				break;
-			}
-		}
-		
-		// try to get author (if it hasn't already been set)
-		if (empty($this->author)) {
-			foreach ($this->config->author as $pattern) {
-				$elems = @$xpath->evaluate($pattern, $this->readability->dom);
-				if (is_string($elems)) {
-					if (trim($elems) != '') {
-						$this->author[] = trim($elems);
-						$this->debug('Author expression evaluated as string: '.trim($elems));
-						$this->debug("...XPath match: $pattern");
-						break;
-					}
-				} elseif ($elems instanceof DOMNodeList && $elems->length > 0) {
-					foreach ($elems as $elem) {
-						if (!isset($elem->parentNode)) continue;
-						$this->author[] = trim($elem->textContent);
-						$this->debug('Author matched: '.trim($elem->textContent));
-					}
-					if (!empty($this->author)) {
-						$this->debug("...XPath match: $pattern");
-						break;
-					}
-				}
-			}
-		}
-		
-		// try to get language
-		$_lang_xpath = array('//html[@lang]/@lang', '//meta[@name="DC.language"]/@content');
-		foreach ($_lang_xpath as $pattern) {
-			$elems = @$xpath->evaluate($pattern, $this->readability->dom);
-			if (is_string($elems)) {
-				if (trim($elems) != '') {
-					$this->language = trim($elems);
-					$this->debug('Language matched: '.$this->language);
-					break;
-				}
-			} elseif ($elems instanceof DOMNodeList && $elems->length > 0) {
-				foreach ($elems as $elem) {
-					if (!isset($elem->parentNode)) continue;
-					$this->language = trim($elem->textContent);
-					$this->debug('Language matched: '.$this->language);					
-				}
-				if ($this->language) break;
-			}
-		}
-		
-		// try to get date
-		foreach ($this->config->date as $pattern) {
-			$elems = @$xpath->evaluate($pattern, $this->readability->dom);
-			if (is_string($elems)) {
-				$this->date = strtotime(trim($elems, "; \t\n\r\0\x0B"));				
-			} elseif ($elems instanceof DOMNodeList && $elems->length > 0) {
-				$this->date = $elems->item(0)->textContent;
-				$this->date = strtotime(trim($this->date, "; \t\n\r\0\x0B"));
-				// remove date from document
-				// $elems->item(0)->parentNode->removeChild($elems->item(0));
-			}
-			if (!$this->date) {
-				$this->date = null;
-			} else {
-				$this->debug('Date matched: '.date('Y-m-d H:i:s', $this->date));
-				$this->debug("...XPath match: $pattern");
-				break;
-			}
-		}
-
-		// strip elements (using xpath expressions)
-		foreach ($this->config->strip as $pattern) {
-			$elems = @$xpath->query($pattern, $this->readability->dom);
-			// check for matches
-			if ($elems && $elems->length > 0) {
-				$this->debug('Stripping '.$elems->length.' elements (strip)');
-				for ($i=$elems->length-1; $i >= 0; $i--) {
-					$elems->item($i)->parentNode->removeChild($elems->item($i));
-				}
-			}
-		}
-		
-		// strip elements (using id and class attribute values)
-		foreach ($this->config->strip_id_or_class as $string) {
-			$string = strtr($string, array("'"=>'', '"'=>''));
-			$elems = @$xpath->query("//*[contains(@class, '$string') or contains(@id, '$string')]", $this->readability->dom);
-			// check for matches
-			if ($elems && $elems->length > 0) {
-				$this->debug('Stripping '.$elems->length.' elements (strip_id_or_class)');
-				for ($i=$elems->length-1; $i >= 0; $i--) {
-					$elems->item($i)->parentNode->removeChild($elems->item($i));
-				}
-			}
-		}
-		
-		// strip images (using src attribute values)
-		foreach ($this->config->strip_image_src as $string) {
-			$string = strtr($string, array("'"=>'', '"'=>''));
-			$elems = @$xpath->query("//img[contains(@src, '$string')]", $this->readability->dom);
-			// check for matches
-			if ($elems && $elems->length > 0) {
-				$this->debug('Stripping '.$elems->length.' image elements');
-				for ($i=$elems->length-1; $i >= 0; $i--) {
-					$elems->item($i)->parentNode->removeChild($elems->item($i));
-				}
-			}
-		}
-		// strip elements using Readability.com and Instapaper.com ignore class names
-		// .entry-unrelated and .instapaper_ignore
-		// See https://www.readability.com/publishers/guidelines/#view-plainGuidelines
-		// and http://blog.instapaper.com/post/730281947
-		$elems = @$xpath->query("//*[contains(concat(' ',normalize-space(@class),' '),' entry-unrelated ') or contains(concat(' ',normalize-space(@class),' '),' instapaper_ignore ')]", $this->readability->dom);
-		// check for matches
-		if ($elems && $elems->length > 0) {
-			$this->debug('Stripping '.$elems->length.' .entry-unrelated,.instapaper_ignore elements');
-			for ($i=$elems->length-1; $i >= 0; $i--) {
-				$elems->item($i)->parentNode->removeChild($elems->item($i));
-			}
-		}
-		
-		// strip elements that contain style="display: none;"
-		$elems = @$xpath->query("//*[contains(@style,'display:none')]", $this->readability->dom);
-		// check for matches
-		if ($elems && $elems->length > 0) {
-			$this->debug('Stripping '.$elems->length.' elements with inline display:none style');
-			for ($i=$elems->length-1; $i >= 0; $i--) {
-				$elems->item($i)->parentNode->removeChild($elems->item($i));
-			}
-		}
-		
-		// try to get body
-		foreach ($this->config->body as $pattern) {
-			$elems = @$xpath->query($pattern, $this->readability->dom);
-			// check for matches
-			if ($elems && $elems->length > 0) {
-				$this->debug('Body matched');
-				$this->debug("...XPath match: $pattern");
-				if ($elems->length == 1) {				
-					$this->body = $elems->item(0);
-					// prune (clean up elements that may not be content)
-					if ($this->config->prune()) {
-						$this->debug('...pruning content');
-						$this->readability->prepArticle($this->body);
-					}
-					break;
-				} else {
-					$this->body = $this->readability->dom->createElement('div');
-					$this->debug($elems->length.' body elems found');
-					foreach ($elems as $elem) {
-						if (!isset($elem->parentNode)) continue;
-						$isDescendant = false;
-						foreach ($this->body->childNodes as $parent) {
-							if ($this->isDescendant($parent, $elem)) {
-								$isDescendant = true;
-								break;
-							}
-						}
-						if ($isDescendant) {
-							$this->debug('...element is child of another body element, skipping.');
-						} else {
-							// prune (clean up elements that may not be content)
-							if ($this->config->prune()) {
-								$this->debug('Pruning content');
-								$this->readability->prepArticle($elem);
-							}
-							$this->debug('...element added to body');
-							$this->body->appendChild($elem);
-						}
-					}
-					if ($this->body->hasChildNodes()) break;
-				}
-			}
-		}		
-		
-		// auto detect?
-		$detect_title = $detect_body = $detect_author = $detect_date = false;
-		// detect title?
-		if (!isset($this->title)) {
-			if (empty($this->config->title) || $this->config->autodetect_on_failure()) {
-				$detect_title = true;
-			}
-		}
-		// detect body?
-		if (!isset($this->body)) {
-			if (empty($this->config->body) || $this->config->autodetect_on_failure()) {
-				$detect_body = true;
-			}
-		}
-		// detect author?
-		if (empty($this->author)) {
-			if (empty($this->config->author) || $this->config->autodetect_on_failure()) {
-				$detect_author = true;
-			}
-		}
-		// detect date?
-		if (!isset($this->date)) {
-			if (empty($this->config->date) || $this->config->autodetect_on_failure()) {
-				$detect_date = true;
-			}
-		}
-
-		// check for hNews
-		if ($detect_title || $detect_body) {
-			// check for hentry
-			$elems = @$xpath->query("//*[contains(concat(' ',normalize-space(@class),' '),' hentry ')]", $this->readability->dom);
-			if ($elems && $elems->length > 0) {
-				$this->debug('hNews: found hentry');
-				$hentry = $elems->item(0);
-				
-				if ($detect_title) {
-					// check for entry-title
-					$elems = @$xpath->query(".//*[contains(concat(' ',normalize-space(@class),' '),' entry-title ')]", $hentry);
-					if ($elems && $elems->length > 0) {
-						$this->title = $elems->item(0)->textContent;
-						$this->debug('hNews: found entry-title: '.$this->title);
-						// remove title from document
-						$elems->item(0)->parentNode->removeChild($elems->item(0));
-						$detect_title = false;
-					}
-				}
-				
-				if ($detect_date) {
-					// check for time element with pubdate attribute
-					$elems = @$xpath->query(".//time[@pubdate] | .//abbr[contains(concat(' ',normalize-space(@class),' '),' published ')]", $hentry);
-					if ($elems && $elems->length > 0) {
-						$this->date = strtotime(trim($elems->item(0)->textContent));
-						// remove date from document
-						//$elems->item(0)->parentNode->removeChild($elems->item(0));
-						if ($this->date) {
-							$this->debug('hNews: found publication date: '.date('Y-m-d H:i:s', $this->date));
-							$detect_date = false;
-						} else {
-							$this->date = null;
-						}
-					}
-				}
-
-				if ($detect_author) {
-					// check for time element with pubdate attribute
-					$elems = @$xpath->query(".//*[contains(concat(' ',normalize-space(@class),' '),' vcard ') and (contains(concat(' ',normalize-space(@class),' '),' author ') or contains(concat(' ',normalize-space(@class),' '),' byline '))]", $hentry);
-					if ($elems && $elems->length > 0) {
-						$author = $elems->item(0);
-						$fn = @$xpath->query(".//*[contains(concat(' ',normalize-space(@class),' '),' fn ')]", $author);
-						if ($fn && $fn->length > 0) {
-							foreach ($fn as $_fn) {
-								if (trim($_fn->textContent) != '') {
-									$this->author[] = trim($_fn->textContent);
-									$this->debug('hNews: found author: '.trim($_fn->textContent));
-								}
-							}
-						} else {
-							if (trim($author->textContent) != '') {
-								$this->author[] = trim($author->textContent);
-								$this->debug('hNews: found author: '.trim($author->textContent));
-							}
-						}
-						$detect_author = empty($this->author);
-					}
-				}
-				
-				// check for entry-content.
-				// according to hAtom spec, if there are multiple elements marked entry-content,
-				// we include all of these in the order they appear - see http://microformats.org/wiki/hatom#Entry_Content
-				if ($detect_body) {
-					$elems = @$xpath->query(".//*[contains(concat(' ',normalize-space(@class),' '),' entry-content ')]", $hentry);
-					if ($elems && $elems->length > 0) {
-						$this->debug('hNews: found entry-content');
-						if ($elems->length == 1) {
-							// what if it's empty? (some sites misuse hNews - place their content outside an empty entry-content element)
-							$e = $elems->item(0);
-							if (($e->tagName == 'img') || (trim($e->textContent) != '')) {
-								$this->body = $elems->item(0);
-								// prune (clean up elements that may not be content)
-								if ($this->config->prune()) {
-									$this->debug('Pruning content');
-									$this->readability->prepArticle($this->body);
-								}
-								$detect_body = false;
-							} else {
-								$this->debug('hNews: skipping entry-content - appears not to contain content');
-							}
-							unset($e);
-						} else {
-							$this->body = $this->readability->dom->createElement('div');
-							$this->debug($elems->length.' entry-content elems found');
-							foreach ($elems as $elem) {
-								if (!isset($elem->parentNode)) continue;
-								$isDescendant = false;
-								foreach ($this->body->childNodes as $parent) {
-									if ($this->isDescendant($parent, $elem)) {
-										$isDescendant = true;
-										break;
-									}
-								}
-								if ($isDescendant) {
-									$this->debug('Element is child of another body element, skipping.');
-								} else {
-									// prune (clean up elements that may not be content)
-									if ($this->config->prune()) {
-										$this->debug('Pruning content');
-										$this->readability->prepArticle($elem);
-									}								
-									$this->debug('Element added to body');									
-									$this->body->appendChild($elem);
-								}
-							}
-							$detect_body = false;
-						}
-					}
-				}
-			}
-		}
-
-		// check for elements marked with instapaper_title
-		if ($detect_title) {
-			// check for instapaper_title
-			$elems = @$xpath->query("//*[contains(concat(' ',normalize-space(@class),' '),' instapaper_title ')]", $this->readability->dom);
-			if ($elems && $elems->length > 0) {
-				$this->title = $elems->item(0)->textContent;
-				$this->debug('Title found (.instapaper_title): '.$this->title);
-				// remove title from document
-				$elems->item(0)->parentNode->removeChild($elems->item(0));
-				$detect_title = false;
-			}
-		}
-		// check for elements marked with instapaper_body
-		if ($detect_body) {
-			$elems = @$xpath->query("//*[contains(concat(' ',normalize-space(@class),' '),' instapaper_body ')]", $this->readability->dom);
-			if ($elems && $elems->length > 0) {
-				$this->debug('body found (.instapaper_body)');
-				$this->body = $elems->item(0);
-				// prune (clean up elements that may not be content)
-				if ($this->config->prune()) {
-					$this->debug('Pruning content');
-					$this->readability->prepArticle($this->body);
-				}
-				$detect_body = false;
-			}
-		}
-		
-		// Find author in rel="author" marked element
-		// We only use this if there's exactly one.
-		// If there's more than one, it could indicate more than
-		// one author, but it could also indicate that we're processing
-		// a page listing different articles with different authors.
-		if ($detect_author) {
-			$elems = @$xpath->query("//a[contains(concat(' ',normalize-space(@rel),' '),' author ')]", $this->readability->dom);
-			if ($elems && $elems->length == 1) {
-				$author = trim($elems->item(0)->textContent);
-				if ($author != '') {
-					$this->debug("Author found (rel=\"author\"): $author");
-					$this->author[] = $author;
-					$detect_author = false;
-				}
-			}
-		}
-
-		// Find date in pubdate marked time element
-		// For the same reason given above, we only use this
-		// if there's exactly one element.
-		if ($detect_date) {
-			$elems = @$xpath->query("//time[@pubdate]", $this->readability->dom);
-			if ($elems && $elems->length == 1) {
-				$this->date = strtotime(trim($elems->item(0)->textContent));
-				// remove date from document
-				//$elems->item(0)->parentNode->removeChild($elems->item(0));
-				if ($this->date) {
-					$this->debug('Date found (pubdate marked time element): '.date('Y-m-d H:i:s', $this->date));
-					$detect_date = false;
-				} else {
-					$this->date = null;
-				}
-			}
-		}
-
-		// still missing title or body, so we detect using Readability
-		if ($detect_title || $detect_body) {
-			$this->debug('Using Readability');
-			// clone body if we're only using Readability for title (otherwise it may interfere with body element)
-			if (isset($this->body)) $this->body = $this->body->cloneNode(true);
-			$success = $this->readability->init();
-		}
-		if ($detect_title) {
-			$this->debug('Detecting title');
-			$this->title = $this->readability->getTitle()->textContent;
-		}
-		if ($detect_body && $success) {
-			$this->debug('Detecting body');
-			$this->body = $this->readability->getContent();
-			if ($this->body->childNodes->length == 1 && $this->body->firstChild->nodeType === XML_ELEMENT_NODE) {
-				$this->body = $this->body->firstChild;
-			}
-			// prune (clean up elements that may not be content)
-			if ($this->config->prune()) {
-				$this->debug('Pruning content');
-				$this->readability->prepArticle($this->body);
-			}
-		}
-		if (isset($this->body)) {
-			// remove scripts
-			$this->readability->removeScripts($this->body);
-			// remove any h1-h6 elements that appear as first thing in the body
-			// and which match our title
-			if (isset($this->title) && ($this->title != '')) {
-				$firstChild = $this->body->firstChild;
-				while ($firstChild->nodeType && ($firstChild->nodeType !== XML_ELEMENT_NODE)) {
-					$firstChild = $firstChild->nextSibling;
-				}
-				if (($firstChild->nodeType === XML_ELEMENT_NODE)
-					&& in_array(strtolower($firstChild->tagName), array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))
-					&& (strtolower(trim($firstChild->textContent)) == strtolower(trim($this->title)))) {
-						$this->body->removeChild($firstChild);
-				}
-			}
-			// prevent self-closing iframes
-			$elems = $this->body->getElementsByTagName('iframe');
-			for ($i = $elems->length-1; $i >= 0; $i--) {
-				$e = $elems->item($i);
-				if (!$e->hasChildNodes()) {
-					$e->appendChild($this->body->ownerDocument->createTextNode('[embedded content]'));
-				}
-			}
-			// remove image lazy loading - WordPress plugin http://wordpress.org/extend/plugins/lazy-load/
-			// the plugin replaces the src attribute to point to a 1x1 gif and puts the original src
-			// inside the data-lazy-src attribute. It also places the original image inside a noscript element 
-			// next to the amended one.
-			$elems = @$xpath->query("//img[@data-lazy-src]", $this->body);
-			for ($i = $elems->length-1; $i >= 0; $i--) {
-				$e = $elems->item($i);
-				// let's see if we can grab image from noscript
-				if ($e->nextSibling !== null && $e->nextSibling->nodeName === 'noscript') {
-					$_new_elem = $e->ownerDocument->createDocumentFragment();
-					@$_new_elem->appendXML($e->nextSibling->innerHTML);
-					$e->nextSibling->parentNode->replaceChild($_new_elem, $e->nextSibling);
-					$e->parentNode->removeChild($e);
-				} else {
-					// Use data-lazy-src as src value
-					$e->setAttribute('src', $e->getAttribute('data-lazy-src'));
-					$e->removeAttribute('data-lazy-src');
-				}
-			}
-		
-			$this->success = true;
-		}
-		
-		// if we've had no success and we've used tidy, there's a chance
-		// that tidy has messed up. So let's try again without tidy...
-		if (!$this->success && $tidied && $smart_tidy) {
-			$this->debug('Trying again without tidy');
-			$this->process($original_html, $url, false);
-		}
-
-		return $this->success;
-	}
-	
-	private function isDescendant(DOMElement $parent, DOMElement $child) {
-		$node = $child->parentNode;
-		while ($node != null) {
-			if ($node->isSameNode($parent))	return true;
-			$node = $node->parentNode;
-		}
-		return false;
-	}
-
-	public function getContent() {
-		return $this->body;
-	}
-	
-	public function getTitle() {
-		return $this->title;
-	}
-	
-	public function getAuthors() {
-		return $this->author;
-	}
-	
-	public function getLanguage() {
-		return $this->language;
-	}
-	
-	public function getDate() {
-		return $this->date;
-	}
-	
-	public function getSiteConfig() {
-		return $this->config;
-	}
-	
-	public function getNextPageUrl() {
-		return $this->nextPageUrl;
-	}
-}
-?>

inc/3rdparty/libraries/content-extractor/SiteConfig.php

@@ -1,338 +0,0 @@
-<?php
-/**
- * Site Config
- * 
- * Each instance of this class should hold extraction patterns and other directives
- * for a website. See ContentExtractor class to see how it's used.
- * 
- * @version 0.7
- * @date 2012-08-27
- * @author Keyvan Minoukadeh
- * @copyright 2012 Keyvan Minoukadeh
- * @license http://www.gnu.org/licenses/agpl-3.0.html AGPL v3
- */
-
-class SiteConfig
-{
-	// Use first matching element as title (0 or more xpath expressions)
-	public $title = array();
-	
-	// Use first matching element as body (0 or more xpath expressions)
-	public $body = array();
-	
-	// Use first matching element as author (0 or more xpath expressions)
-	public $author = array();
-	
-	// Use first matching element as date (0 or more xpath expressions)
-	public $date = array();
-	
-	// Strip elements matching these xpath expressions (0 or more)
-	public $strip = array();
-	
-	// Strip elements which contain these strings (0 or more) in the id or class attribute 
-	public $strip_id_or_class = array();
-	
-	// Strip images which contain these strings (0 or more) in the src attribute 
-	public $strip_image_src = array();
-	
-	// Additional HTTP headers to send
-	// NOT YET USED
-	public $http_header = array();
-	
-	// Process HTML with tidy before creating DOM (bool or null if undeclared)
-	public $tidy = null;
-	
-	protected $default_tidy = true; // used if undeclared
-	
-	// Autodetect title/body if xpath expressions fail to produce results.
-	// Note that this applies to title and body separately, ie. 
-	//   * if we get a body match but no title match, this option will determine whether we autodetect title 
-	//   * if neither match, this determines whether we autodetect title and body.
-	// Also note that this only applies when there is at least one xpath expression in title or body, ie.
-	//   * if title and body are both empty (no xpath expressions), this option has no effect (both title and body will be auto-detected)
-	//   * if there's an xpath expression for title and none for body, body will be auto-detected and this option will determine whether we auto-detect title if the xpath expression for it fails to produce results.
-	// Usage scenario: you want to extract something specific from a set of URLs, e.g. a table, and if the table is not found, you want to ignore the entry completely. Auto-detection is unlikely to succeed here, so you construct your patterns and set this option to false. Another scenario may be a site where auto-detection has proven to fail (or worse, picked up the wrong content).
-	// bool or null if undeclared
-	public $autodetect_on_failure = null;
-	protected $default_autodetect_on_failure = true; // used if undeclared
-	
-	// Clean up content block - attempt to remove elements that appear to be superfluous
-	// bool or null if undeclared
-	public $prune = null;
-	protected $default_prune = true; // used if undeclared
-	
-	// Test URL - if present, can be used to test the config above
-	public $test_url = array();
-	
-	// Single-page link - should identify a link element or URL pointing to the page holding the entire article
-	// This is useful for sites which split their articles across multiple pages. Links to such pages tend to 
-	// display the first page with links to the other pages at the bottom. Often there is also a link to a page
-	// which displays the entire article on one page (e.g. 'print view').
-	// This should be an XPath expression identifying the link to that page. If present and we find a match,
-	// we will retrieve that page and the rest of the options in this config will be applied to the new page.
-	public $single_page_link = array();
-	
-	public $next_page_link = array();
-	
-	// Single-page link in feed? - same as above, but patterns applied to item description HTML taken from feed
-	public $single_page_link_in_feed = array();
-	
-	// Which parser to use for turning raw HTML into a DOMDocument (either 'libxml' or 'html5lib')
-	// string or null if undeclared
-	public $parser = null;
-	protected $default_parser = 'libxml'; // used if undeclared
-	
-	// Strings to search for in HTML before processing begins (used with $replace_string)
-	public $find_string = array();
-	// Strings to replace those found in $find_string before HTML processing begins
-	public $replace_string = array();
-	
-	// the options below cannot be set in the config files which this class represents
-	
-	//public $cache_in_apc = false; // used to decide if we should cache in apc or not
-	public $cache_key = null;
-	public static $debug = false;
-	protected static $apc = false;
-	protected static $config_path;
-	protected static $config_path_fallback;
-	protected static $config_cache = array();
-	const HOSTNAME_REGEX = '/^(([a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9-]*[A-Za-z0-9])$/';
-	
-	protected static function debug($msg) {
-		if (self::$debug) {
-			//$mem = round(memory_get_usage()/1024, 2);
-			//$memPeak = round(memory_get_peak_usage()/1024, 2);
-			echo '* ',$msg;
-			//echo ' - mem used: ',$mem," (peak: $memPeak)\n";
-			echo "\n";
-			ob_flush();
-			flush();
-		}
-	}
-	
-	// enable APC caching of certain site config files?
-	// If enabled the following site config files will be 
-	// cached in APC cache (when requested for first time):
-	// * anything in site_config/custom/ and its corresponding file in site_config/standard/
-	// * the site config files associated with HTML fingerprints
-	// * the global site config file
-	// returns true if enabled, false otherwise
-	public static function use_apc($apc=true) {
-		if (!function_exists('apc_add')) {
-			if ($apc) self::debug('APC will not be used (function apc_add does not exist)');
-			return false;
-		}
-		self::$apc = $apc;
-		return $apc;
-	}
-	
-	// return bool or null
-	public function tidy($use_default=true) {
-		if ($use_default) return (isset($this->tidy)) ? $this->tidy : $this->default_tidy;
-		return $this->tidy;
-	}
-	
-	// return bool or null
-	public function prune($use_default=true) {
-		if ($use_default) return (isset($this->prune)) ? $this->prune : $this->default_prune;
-		return $this->prune;
-	}
-	
-	// return string or null
-	public function parser($use_default=true) {
-		if ($use_default) return (isset($this->parser)) ? $this->parser : $this->default_parser;
-		return $this->parser;
-	}
-
-	// return bool or null
-	public function autodetect_on_failure($use_default=true) {
-		if ($use_default) return (isset($this->autodetect_on_failure)) ? $this->autodetect_on_failure : $this->default_autodetect_on_failure;
-		return $this->autodetect_on_failure;
-	}
-	
-	public static function set_config_path($path, $fallback=null) {
-		self::$config_path = $path;
-		self::$config_path_fallback = $fallback;
-	}
-	
-	public static function add_to_cache($key, SiteConfig $config, $use_apc=true) {
-		$key = strtolower($key);
-		if (substr($key, 0, 4) == 'www.') $key = substr($key, 4);
-		if ($config->cache_key) $key = $config->cache_key;
-		self::$config_cache[$key] = $config;
-		if (self::$apc && $use_apc) {
-			self::debug("Adding site config to APC cache with key sc.$key");
-			apc_add("sc.$key", $config);
-		}
-		self::debug("Cached site config with key $key");
-	}
-	
-	public static function is_cached($key) {
-		$key = strtolower($key);
-		if (substr($key, 0, 4) == 'www.') $key = substr($key, 4);
-		if (array_key_exists($key, self::$config_cache)) {
-			return true;
-		} elseif (self::$apc && (bool)apc_fetch("sc.$key")) {
-			return true;
-		}
-		return false;
-	}
-	
-	public function append(SiteConfig $newconfig) {
-		// check for commands where we accept multiple statements (no test_url)
-		foreach (array('title', 'body', 'author', 'date', 'strip', 'strip_id_or_class', 'strip_image_src', 'single_page_link', 'single_page_link_in_feed', 'next_page_link', 'http_header', 'find_string', 'replace_string') as $var) {
-			// append array elements for this config variable from $newconfig to this config
-			//$this->$var = $this->$var + $newconfig->$var;
-			$this->$var = array_unique(array_merge($this->$var, $newconfig->$var));
-		}
-		// check for single statement commands
-		// we do not overwrite existing non null values
-		foreach (array('tidy', 'prune', 'parser', 'autodetect_on_failure') as $var) {
-			if ($this->$var === null) $this->$var = $newconfig->$var;
-		}
-	}
-	
-	// returns SiteConfig instance if an appropriate one is found, false otherwise
-	// if $exact_host_match is true, we will not look for wildcard config matches
-	// by default if host is 'test.example.org' we will look for and load '.example.org.txt' if it exists
-	public static function build($host, $exact_host_match=false) {
-		$host = strtolower($host);
-		if (substr($host, 0, 4) == 'www.') $host = substr($host, 4);
-		if (!$host || (strlen($host) > 200) || !preg_match(self::HOSTNAME_REGEX, ltrim($host, '.'))) return false;
-		// check for site configuration
-		$try = array($host);
-		// should we look for wildcard matches 
-		if (!$exact_host_match) {
-			$split = explode('.', $host);
-			if (count($split) > 1) {
-				array_shift($split);
-				$try[] = '.'.implode('.', $split);
-			}
-		}
-		
-		// look for site config file in primary folder
-		self::debug(". looking for site config for $host in primary folder");
-		foreach ($try as $h) {
-			if (array_key_exists($h, self::$config_cache)) {
-				self::debug("... site config for $h already loaded in this request");
-				return self::$config_cache[$h];
-			} elseif (self::$apc && ($sconfig = apc_fetch("sc.$h"))) {
-				self::debug("... site config for $h in APC cache");
-				return $sconfig;
-			} elseif (file_exists(self::$config_path."/$h.txt")) {
-				self::debug("... found site config ($h.txt)");
-				$file_primary = self::$config_path."/$h.txt";
-				$matched_name = $h;
-				break;
-			}
-		}
-		
-		// if we found site config, process it
-		if (isset($file_primary)) {
-			$config_lines = file($file_primary, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-			if (!$config_lines || !is_array($config_lines)) return false;
-			$config = self::build_from_array($config_lines);
-			// if APC caching is available and enabled, mark this for cache
-			//$config->cache_in_apc = true;
-			$config->cache_key = $matched_name;
-			
-			// if autodetec on failure is off (on by default) we do not need to look
-			// in secondary folder
-			if (!$config->autodetect_on_failure()) {
-				self::debug('... autodetect on failure is disabled (no other site config files will be loaded)');
-				return $config;
-			}
-		}
-		
-		// look for site config file in secondary folder
-		if (isset(self::$config_path_fallback)) {
-			self::debug(". looking for site config for $host in secondary folder");
-			foreach ($try as $h) {
-				if (file_exists(self::$config_path_fallback."/$h.txt")) {
-					self::debug("... found site config in secondary folder ($h.txt)");
-					$file_secondary = self::$config_path_fallback."/$h.txt";
-					$matched_name = $h;
-					break;
-				}
-			}
-			if (!isset($file_secondary)) {
-				self::debug("... no site config match in secondary folder");
-			}
-		}
-		
-		// return false if no config file found
-		if (!isset($file_primary) && !isset($file_secondary)) {
-			self::debug("... no site config match for $host");
-			return false;
-		}
-		
-		// return primary config if secondary not found
-		if (!isset($file_secondary) && isset($config)) {
-			return $config;
-		}
-		
-		// process secondary config file
-		$config_lines = file($file_secondary, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-		if (!$config_lines || !is_array($config_lines)) {
-			// failed to process secondary
-			if (isset($config)) {
-				// return primary config
-				return $config;
-			} else {
-				return false;
-			}
-		}
-		
-		// merge with primary and return
-		if (isset($config)) {
-			self::debug('. merging config files');
-			$config->append(self::build_from_array($config_lines));
-			return $config;
-		} else {
-			// return just secondary
-			$config = self::build_from_array($config_lines);
-			// if APC caching is available and enabled, mark this for cache
-			//$config->cache_in_apc = true;
-			$config->cache_key = $matched_name;
-			return $config;
-		}
-	}
-	
-	public static function build_from_array(array $lines) {
-		$config = new SiteConfig();
-		foreach ($lines as $line) {
-			$line = trim($line);
-			
-			// skip comments, empty lines
-			if ($line == '' || $line[0] == '#') continue;
-			
-			// get command
-			$command = explode(':', $line, 2);
-			// if there's no colon ':', skip this line
-			if (count($command) != 2) continue;
-			$val = trim($command[1]);
-			$command = trim($command[0]);
-			if ($command == '' || $val == '') continue;
-			
-			// check for commands where we accept multiple statements
-			if (in_array($command, array('title', 'body', 'author', 'date', 'strip', 'strip_id_or_class', 'strip_image_src', 'single_page_link', 'single_page_link_in_feed', 'next_page_link', 'http_header', 'test_url', 'find_string', 'replace_string'))) {
-				array_push($config->$command, $val);
-			// check for single statement commands that evaluate to true or false
-			} elseif (in_array($command, array('tidy', 'prune', 'autodetect_on_failure'))) {
-				$config->$command = ($val == 'yes');
-			// check for single statement commands stored as strings
-			} elseif (in_array($command, array('parser'))) {
-				$config->$command = $val;
-			// check for replace_string(find): replace
-			} elseif ((substr($command, -1) == ')') && preg_match('!^([a-z0-9_]+)\((.*?)\)$!i', $command, $match)) {
-				if (in_array($match[1], array('replace_string'))) {
-					$command = $match[1];
-					array_push($config->find_string, $match[2]);
-					array_push($config->$command, $val);
-				}
-			}
-		}
-		return $config;
-	}
-}
-?>

inc/3rdparty/libraries/feedwriter/FeedItem.php

@@ -1,185 +0,0 @@
-<?php
- /**
- * Univarsel Feed Writer
- * 
- * FeedItem class - Used as feed element in FeedWriter class
- *
- * @package         UnivarselFeedWriter
- * @author          Anis uddin Ahmad <anisniit@gmail.com>
- * @link            http://www.ajaxray.com/projects/rss
- */
- class FeedItem
- {
-	private $elements = array();    //Collection of feed elements
-	private $version;
-	
-	/**
-	* Constructor 
-	* 
-	* @param    contant     (RSS1/RSS2/ATOM) RSS2 is default. 
-	*/ 
-	function __construct($version = RSS2)
-	{    
-		$this->version = $version;
-	}
-
-	/**
-	* Set element (overwrites existing elements with $elementName)
-	* 
-	* @access   public
-	* @param    srting  The tag name of an element
-	* @param    srting  The content of tag
-	* @param    array   Attributes(if any) in 'attrName' => 'attrValue' format
-	* @return   void
-	*/
-	public function setElement($elementName, $content, $attributes = null)
-	{
-		if (isset($this->elements[$elementName])) {
-			unset($this->elements[$elementName]);
-		}
-		$this->addElement($elementName, $content, $attributes);
-	}	
-	
-	/**
-	* Add an element to elements array
-	* 
-	* @access   public
-	* @param    srting  The tag name of an element
-	* @param    srting  The content of tag
-	* @param    array   Attributes(if any) in 'attrName' => 'attrValue' format
-	* @return   void
-	*/
-	public function addElement($elementName, $content, $attributes = null)
-	{
-		$i = 0;
-		if (isset($this->elements[$elementName])) {
-			$i = count($this->elements[$elementName]);
-		} else {
-			$this->elements[$elementName] = array();
-		}
-		$this->elements[$elementName][$i]['name']       = $elementName;
-		$this->elements[$elementName][$i]['content']    = $content;
-		$this->elements[$elementName][$i]['attributes'] = $attributes;
-	}
-	
-	/**
-	* Set multiple feed elements from an array. 
-	* Elements which have attributes cannot be added by this method
-	* 
-	* @access   public
-	* @param    array   array of elements in 'tagName' => 'tagContent' format.
-	* @return   void
-	*/
-	public function addElementArray($elementArray)
-	{
-		if(! is_array($elementArray)) return;
-		foreach ($elementArray as $elementName => $content) 
-		{
-			$this->addElement($elementName, $content);
-		}
-	}
-	
-	/**
-	* Return the collection of elements in this feed item
-	* 
-	* @access   public
-	* @return   array
-	*/
-	public function getElements()
-	{
-		return $this->elements;
-	}
-	
-	// Wrapper functions ------------------------------------------------------
-	
-	/**
-	* Set the 'dscription' element of feed item
-	* 
-	* @access   public
-	* @param    string  The content of 'description' element
-	* @return   void
-	*/
-	public function setDescription($description) 
-	{
-		$tag = 'description'; 
-		$this->setElement($tag, $description);
-	}
-	
-	/**
-	* @desc     Set the 'title' element of feed item
-	* @access   public
-	* @param    string  The content of 'title' element
-	* @return   void
-	*/
-	public function setTitle($title) 
-	{
-		$this->setElement('title', $title);  	
-	}
-	
-	/**
-	* Set the 'date' element of feed item
-	* 
-	* @access   public
-	* @param    string  The content of 'date' element
-	* @return   void
-	*/
-	public function setDate($date) 
-	{
-		if(! is_numeric($date))
-		{
-			$date = strtotime($date);
-		}
-      
-		if($this->version == RSS2) 
-		{
-			$tag    = 'pubDate';
-			$value  = date(DATE_RSS, $date);
-		}
-		else                                
-		{
-			$tag    = 'dc:date';
-			$value  = date("Y-m-d", $date);
-		}
-		
-		$this->setElement($tag, $value);    
-	}
-	
-	/**
-	* Set the 'link' element of feed item
-	* 
-	* @access   public
-	* @param    string  The content of 'link' element
-	* @return   void
-	*/
-	public function setLink($link) 
-	{
-		if($this->version == RSS2 || $this->version == RSS1)
-		{
-			$this->setElement('link', $link);
-		}
-		else
-		{
-			$this->setElement('link','',array('href'=>$link));
-			$this->setElement('id', FeedWriter::uuid($link,'urn:uuid:'));
-		} 
-		
-	}
-	
-	/**
-	* Set the 'encloser' element of feed item
-	* For RSS 2.0 only
-	* 
-	* @access   public
-	* @param    string  The url attribute of encloser tag
-	* @param    string  The length attribute of encloser tag
-	* @param    string  The type attribute of encloser tag
-	* @return   void
-	*/
-	public function setEncloser($url, $length, $type)
-	{
-		$attributes = array('url'=>$url, 'length'=>$length, 'type'=>$type);
-		$this->setElement('enclosure','',$attributes);
-	}
-	
- } // end of class FeedItem
-?>

inc/3rdparty/libraries/feedwriter/FeedWriter.php

@@ -1,441 +0,0 @@
-<?php
-define('RSS2', 1, true);
-define('JSON', 2, true);
-define('JSONP', 3, true);
-
- /**
- * Univarsel Feed Writer class
- *
- * Genarate RSS2 or JSON (original: RSS 1.0, RSS2.0 and ATOM Feed)
- *
- * Modified for FiveFilters.org's Full-Text RSS project
- * to allow for inclusion of hubs, JSON output. 
- * Stripped RSS1 and ATOM support.
- *                             
- * @package     UnivarselFeedWriter
- * @author      Anis uddin Ahmad <anisniit@gmail.com>
- * @link        http://www.ajaxray.com/projects/rss
- */
- class FeedWriter
- {
-	 private $self          = null;     // self URL - http://feed2.w3.org/docs/warning/MissingAtomSelfLink.html
-	 private $hubs          = array();  // PubSubHubbub hubs
-	 private $channels      = array();  // Collection of channel elements
-	 private $items         = array();  // Collection of items as object of FeedItem class.
-	 private $data          = array();  // Store some other version wise data
-	 private $CDATAEncoding = array();  // The tag names which have to encoded as CDATA
-	 private $xsl			= null;		// stylesheet to render RSS (used by Chrome)
-	 private $json			= null;		// JSON object
-	 
-	 private $version   = null; 
-	
-	/**
-	* Constructor
-	* 
-	* @param    constant    the version constant (RSS2 or JSON).       
-	*/ 
-	function __construct($version = RSS2)
-	{	
-		$this->version = $version;
-			
-		// Setting default value for assential channel elements
-		$this->channels['title']        = $version . ' Feed';
-		$this->channels['link']         = 'http://www.ajaxray.com/blog';
-				
-		//Tag names to encode in CDATA
-		$this->CDATAEncoding = array('description', 'content:encoded', 'content', 'subtitle', 'summary');
-	}
-	
-	public function setFormat($format) {
-		$this->version = $format;
-	}
-
-	// Start # public functions ---------------------------------------------
-	
-	/**
-	* Set a channel element
-	* @access   public
-	* @param    srting  name of the channel tag
-	* @param    string  content of the channel tag
-	* @return   void
-	*/
-	public function setChannelElement($elementName, $content)
-	{
-		$this->channels[$elementName] = $content ;
-	}
-	
-	/**
-	* Set multiple channel elements from an array. Array elements 
-	* should be 'channelName' => 'channelContent' format.
-	* 
-	* @access   public
-	* @param    array   array of channels
-	* @return   void
-	*/
-	public function setChannelElementsFromArray($elementArray)
-	{
-		if(! is_array($elementArray)) return;
-		foreach ($elementArray as $elementName => $content) 
-		{
-			$this->setChannelElement($elementName, $content);
-		}
-	}
-	
-	/**
-	* Genarate the actual RSS/JSON file
-	* 
-	* @access   public
-	* @return   void
-	*/ 
-	public function genarateFeed()
-	{
-		if ($this->version == RSS2) {
-			header('Content-type: text/xml; charset=UTF-8');
-			// this line prevents Chrome 20 from prompting download
-			// used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss
-			header('X-content-type-options: nosniff');
-		} elseif ($this->version == JSON) {
-			header('Content-type: application/json; charset=UTF-8');
-			$this->json = new stdClass();
-		} elseif ($this->version == JSONP) {
-			header('Content-type: application/javascript; charset=UTF-8');
-			$this->json = new stdClass();
-		}
-		$this->printHead();
-		$this->printChannels();
-		$this->printItems();
-		$this->printTale();
-		if ($this->version == JSON || $this->version == JSONP) {
-			echo json_encode($this->json);
-		}
-	}
-	
-	/**
-	* Create a new FeedItem.
-	* 
-	* @access   public
-	* @return   object  instance of FeedItem class
-	*/
-	public function createNewItem()
-	{
-		$Item = new FeedItem($this->version);
-		return $Item;
-	}
-	
-	/**
-	* Add a FeedItem to the main class
-	* 
-	* @access   public
-	* @param    object  instance of FeedItem class
-	* @return   void
-	*/
-	public function addItem($feedItem)
-	{
-		$this->items[] = $feedItem;    
-	}
-	
-	// Wrapper functions -------------------------------------------------------------------
-	
-	/**
-	* Set the 'title' channel element
-	* 
-	* @access   public
-	* @param    srting  value of 'title' channel tag
-	* @return   void
-	*/
-	public function setTitle($title)
-	{
-		$this->setChannelElement('title', $title);
-	}
-	
-	/**
-	* Add a hub to the channel element
-	* 
-	* @access   public
-	* @param    string URL
-	* @return   void
-	*/
-	public function addHub($hub)
-	{
-		$this->hubs[] = $hub;    
-	}
-	
-	/**
-	* Set XSL URL
-	* 
-	* @access   public
-	* @param    string URL
-	* @return   void
-	*/
-	public function setXsl($xsl)
-	{
-		$this->xsl = $xsl;    
-	}	
-	
-	/**
-	* Set self URL
-	* 
-	* @access   public
-	* @param    string URL
-	* @return   void
-	*/
-	public function setSelf($self)
-	{
-		$this->self = $self;    
-	}	
-	
-	/**
-	* Set the 'description' channel element
-	* 
-	* @access   public
-	* @param    srting  value of 'description' channel tag
-	* @return   void
-	*/
-	public function setDescription($desciption)
-	{
-		$tag = ($this->version == ATOM)? 'subtitle' : 'description'; 
-		$this->setChannelElement($tag, $desciption);
-	}
-	
-	/**
-	* Set the 'link' channel element
-	* 
-	* @access   public
-	* @param    srting  value of 'link' channel tag
-	* @return   void
-	*/
-	public function setLink($link)
-	{
-		$this->setChannelElement('link', $link);
-	}
-	
-	/**
-	* Set the 'image' channel element
-	* 
-	* @access   public
-	* @param    srting  title of image
-	* @param    srting  link url of the imahe
-	* @param    srting  path url of the image
-	* @return   void
-	*/
-	public function setImage($title, $link, $url)
-	{
-		$this->setChannelElement('image', array('title'=>$title, 'link'=>$link, 'url'=>$url));
-	}
-	
-	// End # public functions ----------------------------------------------
-	
-	// Start # private functions ----------------------------------------------
-	
-	/**
-	* Prints the xml and rss namespace
-	* 
-	* @access   private
-	* @return   void
-	*/
-	private function printHead()
-	{
-		if ($this->version == RSS2)
-		{
-			$out  = '<?xml version="1.0" encoding="utf-8"?>'."\n";
-			if ($this->xsl) $out .= '<?xml-stylesheet type="text/xsl" href="'.htmlspecialchars($this->xsl).'"?>' . PHP_EOL;
-			$out .= '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">' . PHP_EOL;
-			echo $out;
-		}
-		elseif ($this->version == JSON || $this->version == JSONP)
-		{
-			$this->json->rss = array('@attributes' => array('version' => '2.0'));
-		}
-	}
-	
-	/**
-	* Closes the open tags at the end of file
-	* 
-	* @access   private
-	* @return   void
-	*/
-	private function printTale()
-	{
-		if ($this->version == RSS2)
-		{
-			echo '</channel>',PHP_EOL,'</rss>'; 
-		}    
-		// do nothing for JSON
-	}
-
-	/**
-	* Creates a single node as xml format
-	* 
-	* @access   private
-	* @param    string  name of the tag
-	* @param    mixed   tag value as string or array of nested tags in 'tagName' => 'tagValue' format
-	* @param    array   Attributes(if any) in 'attrName' => 'attrValue' format
-	* @return   string  formatted xml tag
-	*/
-	private function makeNode($tagName, $tagContent, $attributes = null)
-	{        
-		if ($this->version == RSS2)
-		{
-			$nodeText = '';
-			$attrText = '';
-			if (is_array($attributes))
-			{
-				foreach ($attributes as $key => $value) 
-				{
-					$attrText .= " $key=\"$value\" ";
-				}
-			}
-			$nodeText .= "<{$tagName}{$attrText}>";
-			if (is_array($tagContent))
-			{ 
-				foreach ($tagContent as $key => $value) 
-				{
-					$nodeText .= $this->makeNode($key, $value);
-				}
-			}
-			else
-			{
-				//$nodeText .= (in_array($tagName, $this->CDATAEncoding))? $tagContent : htmlentities($tagContent);
-				$nodeText .= htmlspecialchars($tagContent);
-			}           
-			//$nodeText .= (in_array($tagName, $this->CDATAEncoding))? "]]></$tagName>" : "</$tagName>";
-			$nodeText .= "</$tagName>";
-			return $nodeText . PHP_EOL;
-		}
-		elseif ($this->version == JSON || $this->version == JSONP)
-		{
-			$tagName = (string)$tagName;
-			$tagName = strtr($tagName, ':', '_');
-			$node = null;
-			if (!$tagContent && is_array($attributes) && count($attributes))
-			{
-				$node = array('@attributes' => $this->json_keys($attributes));
-			} else {
-				if (is_array($tagContent)) {
-					$node = $this->json_keys($tagContent);
-				} else {
-					$node = $tagContent;
-				}
-			}
-			return $node;
-		}
-		return ''; // should not get here
-	}
-	
-	private function json_keys(array $array) {
-		$new = array();
-		foreach ($array as $key => $val) {
-			if (is_string($key)) $key = strtr($key, ':', '_');
-			if (is_array($val)) {
-				$new[$key] = $this->json_keys($val);
-			} else {
-				$new[$key] = $val;
-			}
-		}
-		return $new;
-	}
-	
-	/**
-	* @desc     Print channels
-	* @access   private
-	* @return   void
-	*/
-	private function printChannels()
-	{
-		//Start channel tag
-		if ($this->version == RSS2) {
-			echo '<channel>' . PHP_EOL;    
-			// add hubs
-			foreach ($this->hubs as $hub) {
-				//echo $this->makeNode('link', '', array('rel'=>'hub', 'href'=>$hub, 'xmlns'=>'http://www.w3.org/2005/Atom'));
-				echo '<link rel="hub"  href="'.htmlspecialchars($hub).'" xmlns="http://www.w3.org/2005/Atom" />' . PHP_EOL;
-			}
-			// add self
-			if (isset($this->self)) {
-				//echo $this->makeNode('link', '', array('rel'=>'self', 'href'=>$this->self, 'xmlns'=>'http://www.w3.org/2005/Atom'));
-				echo '<link rel="self" href="'.htmlspecialchars($this->self).'" xmlns="http://www.w3.org/2005/Atom" />' . PHP_EOL;
-			}
-			//Print Items of channel
-			foreach ($this->channels as $key => $value) 
-			{
-				echo $this->makeNode($key, $value);
-			}
-		} elseif ($this->version == JSON || $this->version == JSONP) {
-			$this->json->rss['channel'] = (object)$this->json_keys($this->channels);
-		}
-	}
-	
-	/**
-	* Prints formatted feed items
-	* 
-	* @access   private
-	* @return   void
-	*/
-	private function printItems()
-	{    
-		foreach ($this->items as $item) {
-			$itemElements = $item->getElements();
-			
-			echo $this->startItem();
-			
-			if ($this->version == JSON || $this->version == JSONP) {
-				$json_item = array();
-			}
-			
-			foreach ($itemElements as $thisElement) {
-				foreach ($thisElement as $instance) {			
-					if ($this->version == RSS2) {
-						echo $this->makeNode($instance['name'], $instance['content'], $instance['attributes']);
-					} elseif ($this->version == JSON || $this->version == JSONP) {
-						$_json_node = $this->makeNode($instance['name'], $instance['content'], $instance['attributes']);
-						if (count($thisElement) > 1) {
-							$json_item[strtr($instance['name'], ':', '_')][] = $_json_node;
-						} else {
-							$json_item[strtr($instance['name'], ':', '_')] = $_json_node;
-						}
-					}
-				}
-			}
-			echo $this->endItem();
-			if ($this->version == JSON || $this->version == JSONP) {
-				if (count($this->items) > 1) {
-					$this->json->rss['channel']->item[] = $json_item;
-				} else {
-					$this->json->rss['channel']->item = $json_item;
-				}
-			}
-		}
-	}
-	
-	/**
-	* Make the starting tag of channels
-	* 
-	* @access   private
-	* @return   void
-	*/
-	private function startItem()
-	{
-		if ($this->version == RSS2)
-		{
-			echo '<item>' . PHP_EOL; 
-		}    
-		// nothing for JSON
-	}
-	
-	/**
-	* Closes feed item tag
-	* 
-	* @access   private
-	* @return   void
-	*/
-	private function endItem()
-	{
-		if ($this->version == RSS2)
-		{
-			echo '</item>' . PHP_EOL; 
-		}    
-		// nothing for JSON
-	}
-	
-	// End # private functions ----------------------------------------------
- }

inc/3rdparty/libraries/htmLawed/htmLawed.php

@@ -1,728 +0,0 @@
-<?php
-
-/*
-htmLawed 1.1.14, 8 August 2012
-OOP code, 8 August 2012
-Copyright Santosh Patnaik
-Dual LGPL v3 and GPL v2+ license
-A PHP Labware internal utility; www.bioinformatics.org/phplabware/internal_utilities/htmLawed
-
-See htmLawed_README.txt/htm
-*/
-
-class htmLawed{
-// begin class
-public static function hl($t, $C=1, $S=array()){
-$C = is_array($C) ? $C : array();
-if(!empty($C['valid_xhtml'])){
- $C['elements'] = empty($C['elements']) ? '*-center-dir-font-isindex-menu-s-strike-u' : $C['elements'];
- $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2;
- $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2;
-}
-// config eles
-$e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'del'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'p'=>1, 'param'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'table'=>1, 'tbody'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'tt'=>1, 'u'=>1, 'ul'=>1, 'var'=>1); // 86/deprecated+embed+ruby
-if(!empty($C['safe'])){
- unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']);
-}
-$x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*';
-if($x == '-*'){$e = array();}
-elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));}
-else{
- if(isset($x[1])){
-  preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
-  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];}
-  foreach($m as $v){
-   if($v[0] == '+'){$e[substr($v, 1)] = 1;}
-   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);}
-  }
- }
-}
-$C['elements'] =& $e;
-// config attrs
-$x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : '';
-$x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : '')));
-if(isset($x['on*'])){
- unset($x['on*']);
- $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1);
-}
-$C['deny_attribute'] = $x;
-// config URL
-$x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https';
-$C['schemes'] = array();
-foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){
- $x = $x2 = null; list($x, $x2) = explode(':', $v, 2);
- if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));}
-}
-if(!isset($C['schemes']['*'])){$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,);}
-if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);}
-$C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0;
-if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){
- $C['base_url'] = $C['abs_url'] = 0;
-}
-// config rest
-$C['and_mark'] = empty($C['and_mark']) ? 0 : 1;
-$C['anti_link_spam'] = (isset($C['anti_link_spam']) && is_array($C['anti_link_spam']) && count($C['anti_link_spam']) == 2 && (empty($C['anti_link_spam'][0]) or htmLawed::hl_regex($C['anti_link_spam'][0])) && (empty($C['anti_link_spam'][1]) or htmLawed::hl_regex($C['anti_link_spam'][1]))) ? $C['anti_link_spam'] : 0;
-$C['anti_mail_spam'] = isset($C['anti_mail_spam']) ? $C['anti_mail_spam'] : 0;
-$C['balance'] = isset($C['balance']) ? (bool)$C['balance'] : 1;
-$C['cdata'] = isset($C['cdata']) ? $C['cdata'] : (empty($C['safe']) ? 3 : 0);
-$C['clean_ms_char'] = empty($C['clean_ms_char']) ? 0 : $C['clean_ms_char'];
-$C['comment'] = isset($C['comment']) ? $C['comment'] : (empty($C['safe']) ? 3 : 0);
-$C['css_expression'] = empty($C['css_expression']) ? 0 : 1;
-$C['direct_list_nest'] = empty($C['direct_list_nest']) ? 0 : 1;
-$C['hexdec_entity'] = isset($C['hexdec_entity']) ? $C['hexdec_entity'] : 1;
-$C['hook'] = (!empty($C['hook']) && function_exists($C['hook'])) ? $C['hook'] : 0;
-$C['hook_tag'] = (!empty($C['hook_tag']) && function_exists($C['hook_tag'])) ? $C['hook_tag'] : 0;
-$C['keep_bad'] = isset($C['keep_bad']) ? $C['keep_bad'] : 6;
-$C['lc_std_val'] = isset($C['lc_std_val']) ? (bool)$C['lc_std_val'] : 1;
-$C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 1;
-$C['named_entity'] = isset($C['named_entity']) ? (bool)$C['named_entity'] : 1;
-$C['no_deprecated_attr'] = isset($C['no_deprecated_attr']) ? $C['no_deprecated_attr'] : 1;
-$C['parent'] = isset($C['parent'][0]) ? strtolower($C['parent']) : 'body';
-$C['show_setting'] = !empty($C['show_setting']) ? $C['show_setting'] : 0;
-$C['style_pass'] = empty($C['style_pass']) ? 0 : 1;
-$C['tidy'] = empty($C['tidy']) ? 0 : $C['tidy'];
-$C['unique_ids'] = isset($C['unique_ids']) ? $C['unique_ids'] : 1;
-$C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 0;
-
-if(isset($GLOBALS['C'])){$reC = $GLOBALS['C'];}
-$GLOBALS['C'] = $C;
-$S = is_array($S) ? $S : htmLawed::hl_spec($S);
-if(isset($GLOBALS['S'])){$reS = $GLOBALS['S'];}
-$GLOBALS['S'] = $S;
-
-$t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t);
-if($C['clean_ms_char']){
- $x = array("\x7f"=>'', "\x80"=>'&#8364;', "\x81"=>'', "\x83"=>'&#402;', "\x85"=>'&#8230;', "\x86"=>'&#8224;', "\x87"=>'&#8225;', "\x88"=>'&#710;', "\x89"=>'&#8240;', "\x8a"=>'&#352;', "\x8b"=>'&#8249;', "\x8c"=>'&#338;', "\x8d"=>'', "\x8e"=>'&#381;', "\x8f"=>'', "\x90"=>'', "\x95"=>'&#8226;', "\x96"=>'&#8211;', "\x97"=>'&#8212;', "\x98"=>'&#732;', "\x99"=>'&#8482;', "\x9a"=>'&#353;', "\x9b"=>'&#8250;', "\x9c"=>'&#339;', "\x9d"=>'', "\x9e"=>'&#382;', "\x9f"=>'&#376;');
- $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'&#8218;', "\x84"=>'&#8222;', "\x91"=>'&#8216;', "\x92"=>'&#8217;', "\x93"=>'&#8220;', "\x94"=>'&#8221;') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
- $t = strtr($t, $x);
-}
-if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'htmLawed::hl_cmtcd', $t);}
-$t = preg_replace_callback('`&amp;([A-Za-z][A-Za-z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'htmLawed::hl_ent', str_replace('&', '&amp;', $t));
-if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();}
-if($C['hook']){$t = $C['hook']($t, $C, $S);}
-if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){
- $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime());
-}
-// main
-$t = preg_replace_callback('`<(?:(?:\s|$)|(?:[^>]*(?:>|$)))|>`m', 'htmLawed::hl_tag', $t);
-$t = $C['balance'] ? htmLawed::hl_bal($t, $C['keep_bad'], $C['parent']) : $t;
-$t = (($C['cdata'] or $C['comment']) && strpos($t, "\x01") !== false) ? str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05"), array('', '', '&', '<', '>'), $t) : $t;
-$t = $C['tidy'] ? htmLawed::hl_tidy($t, $C['tidy'], $C['parent']) : $t;
-unset($C, $e);
-if(isset($reC)){$GLOBALS['C'] = $reC;}
-if(isset($reS)){$GLOBALS['S'] = $reS;}
-return $t;
-// eof
-}
-
-public static function hl_attrval($t, $p){
-// check attr val against $S
-$o = 1; $l = strlen($t);
-foreach($p as $k=>$v){
- switch($k){
-  case 'maxlen':if($l > $v){$o = 0;}
-  break; case 'minlen': if($l < $v){$o = 0;}
-  break; case 'maxval': if((float)($t) > $v){$o = 0;}
-  break; case 'minval': if((float)($t) < $v){$o = 0;}
-  break; case 'match': if(!preg_match($v, $t)){$o = 0;}
-  break; case 'nomatch': if(preg_match($v, $t)){$o = 0;}
-  break; case 'oneof':
-   $m = 0;
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}}
-   $o = $m;
-  break; case 'noneof':
-   $m = 1;
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}}
-   $o = $m;
-  break; default:
-  break;
- }
- if(!$o){break;}
-}
-return ($o ? $t : (isset($p['default']) ? $p['default'] : 0));
-// eof
-}
-
-public static function hl_bal($t, $do=1, $in='div'){
-// balance tags
-// by content
-$cB = array('blockquote'=>1, 'form'=>1, 'map'=>1, 'noscript'=>1); // Block
-$cE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty
-$cF = array('button'=>1, 'del'=>1, 'div'=>1, 'dd'=>1, 'fieldset'=>1, 'iframe'=>1, 'ins'=>1, 'li'=>1, 'noscript'=>1, 'object'=>1, 'td'=>1, 'th'=>1); // Flow; later context-wise dynamic move of ins & del to $cI
-$cI = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'caption'=>1, 'cite'=>1, 'code'=>1, 'dfn'=>1, 'dt'=>1, 'em'=>1, 'font'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'i'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'p'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rt'=>1, 's'=>1, 'samp'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'tt'=>1, 'u'=>1, 'var'=>1); // Inline
-$cN = array('a'=>array('a'=>1), 'button'=>array('a'=>1, 'button'=>1, 'fieldset'=>1, 'form'=>1, 'iframe'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'fieldset'=>array('fieldset'=>1), 'form'=>array('form'=>1), 'label'=>array('label'=>1), 'noscript'=>array('script'=>1), 'pre'=>array('big'=>1, 'font'=>1, 'img'=>1, 'object'=>1, 'script'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1), 'rb'=>array('ruby'=>1), 'rt'=>array('ruby'=>1)); // Illegal
-$cN2 = array_keys($cN);
-$cR = array('blockquote'=>1, 'dir'=>1, 'dl'=>1, 'form'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
-$cS = array('colgroup'=>array('col'=>1), 'dir'=>array('li'=>1), 'dl'=>array('dd'=>1, 'dt'=>1), 'menu'=>array('li'=>1), 'ol'=>array('li'=>1), 'optgroup'=>array('option'=>1), 'option'=>array('#pcdata'=>1), 'rbc'=>array('rb'=>1), 'rp'=>array('#pcdata'=>1), 'rtc'=>array('rt'=>1), 'ruby'=>array('rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1), 'select'=>array('optgroup'=>1, 'option'=>1), 'script'=>array('#pcdata'=>1), 'table'=>array('caption'=>1, 'col'=>1, 'colgroup'=>1, 'tfoot'=>1, 'tbody'=>1, 'tr'=>1, 'thead'=>1), 'tbody'=>array('tr'=>1), 'tfoot'=>array('tr'=>1), 'textarea'=>array('#pcdata'=>1), 'thead'=>array('tr'=>1), 'tr'=>array('td'=>1, 'th'=>1), 'ul'=>array('li'=>1)); // Specific - immediate parent-child
-if($GLOBALS['C']['direct_list_nest']){$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1);}
-$cO = array('address'=>array('p'=>1), 'applet'=>array('param'=>1), 'blockquote'=>array('script'=>1), 'fieldset'=>array('legend'=>1, '#pcdata'=>1), 'form'=>array('script'=>1), 'map'=>array('area'=>1), 'object'=>array('param'=>1, 'embed'=>1)); // Other
-$cT = array('colgroup'=>1, 'dd'=>1, 'dt'=>1, 'li'=>1, 'option'=>1, 'p'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1); // Omitable closing
-// block/inline type; ins & del both type; #pcdata: text
-$eB = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'del'=>1, 'dir'=>1, 'dl'=>1, 'div'=>1, 'fieldset'=>1, 'form'=>1, 'ins'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'isindex'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'table'=>1, 'ul'=>1);
-$eI = array('#pcdata'=>1, 'a'=>1, 'abbr'=>1, 'acronym'=>1, 'applet'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'br'=>1, 'button'=>1, 'cite'=>1, 'code'=>1, 'del'=>1, 'dfn'=>1, 'em'=>1, 'embed'=>1, 'font'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'kbd'=>1, 'label'=>1, 'map'=>1, 'object'=>1, 'q'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'select'=>1, 'script'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1, 'tt'=>1, 'u'=>1, 'var'=>1);
-$eN = array('a'=>1, 'big'=>1, 'button'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'label'=>1, 'object'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1); // Exclude from specific ele; $cN values
-$eO = array('area'=>1, 'caption'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'dt'=>1, 'legend'=>1, 'li'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'script'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'thead'=>1, 'th'=>1, 'tr'=>1); // Missing in $eB & $eI
-$eF = $eB + $eI;
-
-// $in sets allowed child
-$in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div';
-if(isset($cE[$in])){
- return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t));
-}
-if(isset($cS[$in])){$inOk = $cS[$in];}
-elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);}
-elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);}
-if(isset($cO[$in])){$inOk = $inOk + $cO[$in];}
-if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);}
-
-$t = explode('<', $t);
-$ok = $q = array(); // $q seq list of open non-empty ele
-ob_start();
-
-for($i=-1, $ci=count($t); ++$i<$ci;){
- // allowed $ok in parent $p
- if($ql = count($q)){
-  $p = array_pop($q);
-  $q[] = $p;
-  if(isset($cS[$p])){$ok = $cS[$p];}
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
-  if(isset($cO[$p])){$ok = $ok + $cO[$p];}
-  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
- // bad tags, & ele content
- if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
-  echo '&lt;', $s, $e, $a, '&gt;';
- }
- if(isset($x[0])){
-  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
-   echo '<div>', $x, '</div>';
-  }
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
-  elseif(strpos($x, "\x02\x04")){
-   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
-    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
-   }
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
- }
- // get markup
- if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;}
- $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r;
- // close tag
- if($s){
-  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen
-  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
-  $add = ''; // Nesting - close open tags that need to be
-  for($j=-1, $cj=count($q); ++$j<$cj;){
-   if(($d = array_pop($q)) == $e){break;}
-   else{$add .= "</{$d}>";}
-  }
-  echo $add, '</', $e, '>'; unset($e); continue;
- }
- // open tag
- // $cB ele needs $eB ele as child
- if(isset($cB[$e]) && strlen(trim($x))){
-  $t[$i] = "{$e}{$a}>";
-  array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue;
- }
- if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){
-  array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue;
- }
- // if no open ele, $in = parent; mostly immediate parent-child relation should hold
- if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){
-  if(!isset($ok[$e])){
-   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;}
-   continue;
-  }
-  if(!isset($cE[$e])){$q[] = $e;}
-  echo '<', $e, $a, '>'; unset($e); continue;
- }
- // specific parent-child
- if(isset($cS[$p][$e])){
-  if(!isset($cE[$e])){$q[] = $e;}
-  echo '<', $e, $a, '>'; unset($e); continue;
- }
- // nesting
- $add = '';
- $q2 = array();
- for($k=-1, $kc=count($q); ++$k<$kc;){
-  $d = $q[$k];
-  $ok2 = array();
-  if(isset($cS[$d])){$q2[] = $d; continue;}
-  $ok2 = isset($cI[$d]) ? $eI : $eF;
-  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];}
-  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);}
-  if(!isset($ok2[$e])){
-   if(!$k && !isset($inOk[$e])){continue 2;}
-   $add = "</{$d}>";
-   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";}
-   break;
-  }
-  else{$q2[] = $d;}
- }
- $q = $q2;
- if(!isset($cE[$e])){$q[] = $e;}
- echo $add, '<', $e, $a, '>'; unset($e); continue;
-}
-
-// end
-if($ql = count($q)){
- $p = array_pop($q);
- $q[] = $p;
- if(isset($cS[$p])){$ok = $cS[$p];}
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
- if(isset($cO[$p])){$ok = $ok + $cO[$p];}
- if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
-}else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
-if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
- echo '&lt;', $s, $e, $a, '&gt;';
-}
-if(isset($x[0])){
- if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
-  echo '<div>', $x, '</div>';
- }
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
- elseif(strpos($x, "\x02\x04")){
-  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
-   echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
-  }
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
-}
-while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';}
-$o = ob_get_contents();
-ob_end_clean();
-return $o;
-// eof
-}
-
-public static function hl_cmtcd($t){
-// comment/CDATA sec handler
-$t = $t[0];
-global $C;
-if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;}
-if($v == 1){return '';}
-if($n == 'comment'){
- if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';}
-}
-else{$t = substr($t, 1, -1);}
-$t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
-return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01"));
-// eof
-}
-
-public static function hl_ent($t){
-// entitity handler
-global $C;
-$t = $t[1];
-static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1);
-static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
-if($t[0] != '#'){
- return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
-}
-if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){
- return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
-}
-return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
-// eof
-}
-
-public static function hl_prot($p, $c=null){
-// check URL scheme
-global $C;
-$b = $a = '';
-if($c == null){$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]);}
-$c = isset($C['schemes'][$c]) ? $C['schemes'][$c] : $C['schemes']['*'];
-static $d = 'denied:';
-if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";}
-if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param
-if(preg_match('`^([a-z\d\-+.&#; ]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot
- return "{$b}{$d}{$p}{$a}";
-}
-if($C['abs_url']){
- if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel
-  $p = substr($p, strlen($C['base_url']));
- }elseif(empty($m[1])){ // Make URL abs
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;}
-  else{
-   preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
-   $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
-   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
-    $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
-   }
-   $p = $m[1]. $p;
-  }
- }
-}
-return "{$b}{$p}{$a}";
-// eof
-}
-
-public static function hl_regex($p){
-// ?regex
-if(empty($p)){return 0;}
-if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;}
-else{ini_set('track_errors', 1);}
-unset($php_errormsg);
-if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);}
-preg_match($p, '');
-if($d){ini_set('display_errors', 1);}
-$r = isset($php_errormsg) ? 0 : 1;
-if($t){$php_errormsg = isset($o) ? $o : null;}
-else{ini_set('track_errors', 0);}
-return $r;
-// eof
-}
-
-public static function hl_spec($t){
-// final $spec
-$s = array();
-$t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace('/"(?>(`.|[^"])*)"/sme', 'substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), "$0"), 1, -1)', trim($t)));
-for($i = count(($t = explode(';', $t))); --$i>=0;){
- $w = $t[$i];
- if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;}
- $y = $n = array();
- foreach(explode(',', $a) as $v){
-  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;}
-  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;}
-  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;}
-  if(!isset($m[2])){$y[$x] = 1; continue;}
-  foreach(explode('/', $m[2]) as $m){
-   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;}
-   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1));
-  }
-  if(isset($y[$x]['match']) && !htmLawed::hl_regex($y[$x]['match'])){unset($y[$x]['match']);}
-  if(isset($y[$x]['nomatch']) && !htmLawed::hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);}
- }
- if(!count($y) && !count($n)){continue;}
- foreach(explode(',', substr($w, 0, $e)) as $v){
-  if(!strlen(($v = strtolower($v)))){continue;}
-  if(count($y)){$s[$v] = $y;}
-  if(count($n)){$s[$v]['n'] = $n;}
- }
-}
-return $s;
-// eof
-}
-
-public static function hl_tag($t){
-// tag/attribute handler
-global $C;
-$t = $t[0];
-// invalid < >
-if($t == '< '){return '&lt; ';}
-if($t == '>'){return '&gt;';}
-if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){
- return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
-}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){
- return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
-}
-// attr string
-$a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3]));
-// tag transform
-static $eD = array('applet'=>1, 'center'=>1, 'dir'=>1, 'embed'=>1, 'font'=>1, 'isindex'=>1, 'menu'=>1, 's'=>1, 'strike'=>1, 'u'=>1); // Deprecated
-if($C['make_tag_strict'] && isset($eD[$e])){
- $trt = htmLawed::hl_tag2($e, $a, $C['make_tag_strict']);
- if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');}
-}
-// close tag
-static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele
-if(!empty($m[1])){
- return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
-}
-
-// open tag & attr
-static $aN = array('abbr'=>array('td'=>1, 'th'=>1), 'accept-charset'=>array('form'=>1), 'accept'=>array('form'=>1, 'input'=>1), 'accesskey'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'legend'=>1, 'textarea'=>1), 'action'=>array('form'=>1), 'align'=>array('caption'=>1, 'embed'=>1, 'applet'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'legend'=>1, 'table'=>1, 'hr'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'p'=>1, 'col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'alt'=>array('applet'=>1, 'area'=>1, 'img'=>1, 'input'=>1), 'archive'=>array('applet'=>1, 'object'=>1), 'axis'=>array('td'=>1, 'th'=>1), 'bgcolor'=>array('embed'=>1, 'table'=>1, 'tr'=>1, 'td'=>1, 'th'=>1), 'border'=>array('table'=>1, 'img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'cellpadding'=>array('table'=>1), 'cellspacing'=>array('table'=>1), 'char'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'charoff'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'charset'=>array('a'=>1, 'script'=>1), 'checked'=>array('input'=>1), 'cite'=>array('blockquote'=>1, 'q'=>1, 'del'=>1, 'ins'=>1), 'classid'=>array('object'=>1), 'clear'=>array('br'=>1), 'code'=>array('applet'=>1), 'codebase'=>array('object'=>1, 'applet'=>1), 'codetype'=>array('object'=>1), 'color'=>array('font'=>1), 'cols'=>array('textarea'=>1), 'colspan'=>array('td'=>1, 'th'=>1), 'compact'=>array('dir'=>1, 'dl'=>1, 'menu'=>1, 'ol'=>1, 'ul'=>1), 'coords'=>array('area'=>1, 'a'=>1), 'data'=>array('object'=>1), 'datetime'=>array('del'=>1, 'ins'=>1), 'declare'=>array('object'=>1), 'defer'=>array('script'=>1), 'dir'=>array('bdo'=>1), 'disabled'=>array('button'=>1, 'input'=>1, 'optgroup'=>1, 'option'=>1, 'select'=>1, 'textarea'=>1), 'enctype'=>array('form'=>1), 'face'=>array('font'=>1), 'for'=>array('label'=>1), 'frame'=>array('table'=>1), 'frameborder'=>array('iframe'=>1), 'headers'=>array('td'=>1, 'th'=>1), 'height'=>array('embed'=>1, 'iframe'=>1, 'td'=>1, 'th'=>1, 'img'=>1, 'object'=>1, 'applet'=>1), 'href'=>array('a'=>1, 'area'=>1), 'hreflang'=>array('a'=>1), 'hspace'=>array('applet'=>1, 'img'=>1, 'object'=>1), 'ismap'=>array('img'=>1, 'input'=>1), 'label'=>array('option'=>1, 'optgroup'=>1), 'language'=>array('script'=>1), 'longdesc'=>array('img'=>1, 'iframe'=>1), 'marginheight'=>array('iframe'=>1), 'marginwidth'=>array('iframe'=>1), 'maxlength'=>array('input'=>1), 'method'=>array('form'=>1), 'model'=>array('embed'=>1), 'multiple'=>array('select'=>1), 'name'=>array('button'=>1, 'embed'=>1, 'textarea'=>1, 'applet'=>1, 'select'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'a'=>1, 'input'=>1, 'object'=>1, 'map'=>1, 'param'=>1), 'nohref'=>array('area'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'object'=>array('applet'=>1), 'onblur'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'onchange'=>array('input'=>1, 'select'=>1, 'textarea'=>1), 'onfocus'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'onreset'=>array('form'=>1), 'onselect'=>array('input'=>1, 'textarea'=>1), 'onsubmit'=>array('form'=>1), 'pluginspage'=>array('embed'=>1), 'pluginurl'=>array('embed'=>1), 'prompt'=>array('isindex'=>1), 'readonly'=>array('textarea'=>1, 'input'=>1), 'rel'=>array('a'=>1), 'rev'=>array('a'=>1), 'rows'=>array('textarea'=>1), 'rowspan'=>array('td'=>1, 'th'=>1), 'rules'=>array('table'=>1), 'scope'=>array('td'=>1, 'th'=>1), 'scrolling'=>array('iframe'=>1), 'selected'=>array('option'=>1), 'shape'=>array('area'=>1, 'a'=>1), 'size'=>array('hr'=>1, 'font'=>1, 'input'=>1, 'select'=>1), 'span'=>array('col'=>1, 'colgroup'=>1), 'src'=>array('embed'=>1, 'script'=>1, 'input'=>1, 'iframe'=>1, 'img'=>1), 'standby'=>array('object'=>1), 'start'=>array('ol'=>1), 'summary'=>array('table'=>1), 'tabindex'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'object'=>1, 'select'=>1, 'textarea'=>1), 'target'=>array('a'=>1, 'area'=>1, 'form'=>1), 'type'=>array('a'=>1, 'embed'=>1, 'object'=>1, 'param'=>1, 'script'=>1, 'input'=>1, 'li'=>1, 'ol'=>1, 'ul'=>1, 'button'=>1), 'usemap'=>array('img'=>1, 'input'=>1, 'object'=>1), 'valign'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'value'=>array('input'=>1, 'option'=>1, 'param'=>1, 'button'=>1, 'li'=>1), 'valuetype'=>array('param'=>1), 'vspace'=>array('applet'=>1, 'img'=>1, 'object'=>1), 'width'=>array('embed'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'object'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'applet'=>1, 'col'=>1, 'colgroup'=>1, 'pre'=>1), 'wmode'=>array('embed'=>1), 'xml:space'=>array('pre'=>1, 'script'=>1, 'style'=>1)); // Ele-specific
-static $aNE = array('checked'=>1, 'compact'=>1, 'declare'=>1, 'defer'=>1, 'disabled'=>1, 'ismap'=>1, 'multiple'=>1, 'nohref'=>1, 'noresize'=>1, 'noshade'=>1, 'nowrap'=>1, 'readonly'=>1, 'selected'=>1); // Empty
-static $aNP = array('action'=>1, 'cite'=>1, 'classid'=>1, 'codebase'=>1, 'data'=>1, 'href'=>1, 'longdesc'=>1, 'model'=>1, 'pluginspage'=>1, 'pluginurl'=>1, 'usemap'=>1); // Need scheme check; excludes style, on* & src
-static $aNU = array('class'=>array('param'=>1, 'script'=>1), 'dir'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'id'=>array('script'=>1), 'lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'xml:lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'onclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'ondblclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeydown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeypress'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeyup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousedown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousemove'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseout'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseover'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'style'=>array('param'=>1, 'script'=>1), 'title'=>array('param'=>1, 'script'=>1)); // Univ & exceptions
-
-if($C['lc_std_val']){
- // predef attr vals for $eAL & $aNE ele
- static $aNL = array('all'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'center'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'cols'=>1, 'data'=>1, 'default'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'middle'=>1, 'none'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'submit'=>1, 'text'=>1, 'top'=>1);
- static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'xml:space'=>1);
- $lcase = isset($eAL[$e]) ? 1 : 0;
-}
-
-$depTr = 0;
-if($C['no_deprecated_attr']){
- // dep attr:applicable ele
- static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'start'=>array('ol'=>1), 'type'=>array('li'=>1, 'ol'=>1, 'ul'=>1), 'value'=>array('li'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'td'=>1, 'th'=>1));
- static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1);
- $depTr = isset($eAD[$e]) ? 1 : 0;
-}
-
-// attr name-vals
-if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec
-$mode = 0; $a = trim($a, ' /'); $aA = array();
-while(strlen($a)){
- $w = 0;
- switch($mode){
-  case 0: // Name
-   if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){
-    $nm = strtolower($m[0]);
-    $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
-   }
-  break; case 1:
-   if($a[0] == '='){ // =
-    $w = 1; $mode = 2; $a = ltrim($a, '= ');
-   }else{ // No val
-    $w = 1; $mode = 0; $a = ltrim($a);
-    $aA[$nm] = '';
-   }
-  break; case 2: // Val
-   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
-    $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
-    $aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
-   }
-  break;
- }
- if($w == 0){ // Parse errs, deal with space, " & '
-  $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a);
-  $mode = 0;
- }
-}
-if($mode == 1){$aA[$nm] = '';}
-
-// clean attrs
-global $S;
-$rl = isset($S[$e]) ? $S[$e] : array();
-$a = array(); $nfr = 0;
-foreach($aA as $k=>$v){
- if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){
-  if(isset($aNE[$k])){$v = $k;}
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
-   $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v;
-  }
-  if($k == 'style' && !$C['style_pass']){
-   if(false !== strpos($v, '&#')){
-    static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
-    $v = strtr($v, $sC);
-   }
-   $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'htmLawed::hl_prot', $v);
-   $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
-  }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){
-   $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v));
-   $v = htmLawed::hl_prot($v, $k);
-   if($k == 'href'){ // X-spam
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
-     $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
-     $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
-     $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
-     }
-    }
-   }
-  }
-  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = htmLawed::hl_attrval($v, $rl[$k])) === 0){continue;}
-  $a[$k] = str_replace('"', '&quot;', $v);
- }
-}
-if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';}
-
-// rqd attr
-static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'script'=>array('type'=>'text/javascript'), 'textarea'=>array('rows'=>'10', 'cols'=>'50'));
-if(isset($eAR[$e])){
- foreach($eAR[$e] as $k=>$v){
-  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;}
- }
-}
-
-// depr attrs
-if($depTr){
- $c = array();
- foreach($a as $k=>$v){
-  if($k == 'style' or !isset($aND[$k][$e])){continue;}
-  if($k == 'align'){
-   unset($a['align']);
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;}
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';}
-   else{$c[] = 'text-align: '. $v;}
-  }elseif($k == 'bgcolor'){
-   unset($a['bgcolor']);
-   $c[] = 'background-color: '. $v;
-  }elseif($k == 'border'){
-   unset($a['border']); $c[] = "border: {$v}px";
-  }elseif($k == 'bordercolor'){
-   unset($a['bordercolor']); $c[] = 'border-color: '. $v;
-  }elseif($k == 'clear'){
-   unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
-  }elseif($k == 'compact'){
-   unset($a['compact']); $c[] = 'font-size: 85%';
-  }elseif($k == 'height' or $k == 'width'){
-   unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
-  }elseif($k == 'hspace'){
-   unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px";
-  }elseif($k == 'language' && !isset($a['type'])){
-   unset($a['language']);
-   $a['type'] = 'text/'. strtolower($v);
-  }elseif($k == 'name'){
-   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);}
-   if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;}
-  }elseif($k == 'noshade'){
-   unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray';
-  }elseif($k == 'nowrap'){
-   unset($a['nowrap']); $c[] = 'white-space: nowrap';
-  }elseif($k == 'size'){
-   unset($a['size']); $c[] = 'size: '. $v. 'px';
-  }elseif($k == 'start' or $k == 'value'){
-   unset($a[$k]);
-  }elseif($k == 'type'){
-   unset($a['type']);
-   static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal');
-   $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
-  }elseif($k == 'vspace'){
-   unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
-  }
- }
- if(count($c)){
-  $c = implode('; ', $c);
-  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
- }
-}
-// unique ID
-if($C['unique_ids'] && isset($a['id'])){
- if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']);
- }else{
-  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;}
-  $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
- }
-}
-// xml:lang
-if($C['xml:lang'] && isset($a['lang'])){
- $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang'];
- if($C['xml:lang'] == 2){unset($a['lang']);}
-}
-// for transformed tag
-if(!empty($trt)){
- $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
-}
-// return with empty ele /
-if(empty($C['hook_tag'])){
- $aA = '';
- foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";}
- return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
-}
-else{return $C['hook_tag']($e, $a);}
-// eof
-}
-
-public static function hl_tag2(&$e, &$a, $t=1){
-// transform tag
-if($e == 'center'){$e = 'div'; return 'text-align: center;';}
-if($e == 'dir' or $e == 'menu'){$e = 'ul'; return '';}
-if($e == 's' or $e == 'strike'){$e = 'span'; return 'text-decoration: line-through;';}
-if($e == 'u'){$e = 'span'; return 'text-decoration: underline;';}
-static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%');
-if($e == 'font'){
- $a2 = '';
- if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)){
-  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';';
- }
- if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)){
-  $a2 .= ' color: '. trim($m[2]). ';';
- }
- if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])){
-  $a2 .= ' font-size: '. $fs[$m]. ';';
- }
- $e = 'span'; return ltrim($a2);
-}
-if($t == 2){$e = 0; return 0;}
-return '';
-// eof
-}
-
-public static function hl_tidy($t, $w, $p){
-// Tidy/compact HTM
-if(strpos(' pre,script,textarea', "$p,")){return $t;}
-$t = str_replace(' </', '</', preg_replace(array('`(<\w[^>]*(?<!/)>)\s+`', '`\s+`', '`(<\w[^>]*(?<!/)>) `'), array(' $1', ' ', '$1'), preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), create_function('$m', 'return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", " "), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];'), $t)));
-if(($w = strtolower($w)) == -1){
- return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
-}
-$s = strpos(" $w", 't') ? "\t" : ' ';
-$s = preg_match('`\d`', $w, $m) ? str_repeat($s, $m[0]) : str_repeat($s, ($s == "\t" ? 1 : 2));
-$N = preg_match('`[ts]([1-9])`', $w, $m) ? $m[1] : 0;
-$a = array('br'=>1);
-$b = array('button'=>1, 'input'=>1, 'option'=>1);
-$c = array('caption'=>1, 'dd'=>1, 'dt'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'isindex'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'object'=>1, 'p'=>1, 'pre'=>1, 'td'=>1, 'textarea'=>1, 'th'=>1);
-$d = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'form'=>1, 'hr'=>1, 'iframe'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
-$T = explode('<', $t);
-$X = 1;
-while($X){
- $n = $N;
- $t = $T;
- ob_start();
- if(isset($d[$p])){echo str_repeat($s, ++$n);}
- echo ltrim(array_shift($t));
- for($i=-1, $j=count($t); ++$i<$j;){
-  $r = ''; list($e, $r) = explode('>', $t[$i]);
-  $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
-  $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0);
-  $e = "<$e>"; 
-  if(isset($d[$y])){
-   if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
-   }
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
-   echo ltrim($r); continue;
-  }
-  $f = "\n". str_repeat($s, $n);
-  if(isset($c[$y])){
-   if(!$x){echo $e, $f, ltrim($r);}
-   else{echo $f, $e, $r;}
-  }elseif(isset($b[$y])){echo $f, $e, $r;
-  }elseif(isset($a[$y])){echo $e, $f, ltrim($r);
-  }elseif(!$y){echo $f, $e, $f, ltrim($r);
-  }else{echo $e, $r;}
- }
- $X = 0;
-}
-$t = preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents());
-ob_end_clean();
-if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){
- $t = str_replace("\n", $l, $t);
-}
-return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
-// eof
-}
-
-public static function hl_version(){
-// rel
-return '1.1.14';
-// eof
-}
-
-public static function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')){
-// kses compat
-foreach($h as $k=>$v){
- $h[$k]['n']['*'] = 1;
-}
-$C['cdata'] = $C['comment'] = $C['make_tag_strict'] = $C['no_deprecated_attr'] = $C['unique_ids'] = 0;
-$C['keep_bad'] = 1;
-$C['elements'] = count($h) ? strtolower(implode(',', array_keys($h))) : '-*';
-$C['hook'] = 'htmLawed::kses_hook';
-$C['schemes'] = '*:'. implode(',', $p);
-return htmLawed::hl($t, $C, $h);
-// eof
-}
-
-public static function kses_hook($t, &$C, &$S){
-// kses compat
-return $t;
-// eof
-}
-// end class
-}