SECURITY: prevent a DoS attack by disabling HTTP access to tools/ scripts.

.dockerignore

@@ -1,4 +0,0 @@
-**/.git
-**/.gitignore
-/local-instances
-**/.gitkeep

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,69 +0,0 @@
-name: Bug Report
-description: File a bug report for Vichan
-title: "[BUG] "
-labels: ["bug"]
-assignees: []
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Thank you for reporting a bug! Please provide as much detail as possible.**
-        
-        Before submitting, check the [Vichan Wiki](https://vichan.info) to see if there's already a solution to your problem.
-
-  - type: textarea
-    id: bug_description
-    attributes:
-      label: "Describe the bug"
-      description: "A clear and concise description of what the bug is."
-      placeholder: "Posting doesn't go through and displays a collation error. The exact error message given is the text below and I've attached a screenshot..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: steps_to_reproduce
-    attributes:
-      label: "Steps to Reproduce"
-      description: "Provide step-by-step instructions to reproduce the issue. If you're unsure on how, that is alright, just try and explain as well as you can."
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-      render: markdown
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: "Expected Behavior"
-      description: "What did you expect to happen?"
-      placeholder: "Expected behavior here..."
-      render: markdown
-    validations:
-      required: true
-
-  - type: textarea
-    id: server_specs
-    attributes:
-      label: "Server Specifications"
-      description: "Provide details about your server environment. If you're unsure about any of this, you might be using shared hosting (Hostinger, HostGator, Serv00, etc). If so, put the name of your hosting provider here."
-      placeholder: |
-        - OS: (Ubuntu, CentOS, Windows Server 2025, etc.)
-        - PHP Version: (e.g., 7.4, 8.0, 8.4)
-        - Web Server: (Apache, NGINX, etc.)
-        - Database: (MySQL, MariaDB, etc.)
-        - Vichan Version: (5.2.0, 5.3.0 (dev branch), etc)
-      render: markdown
-    validations:
-      required: true
-
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: "Additional Context"
-      description: "Any other details we should know?"
-      placeholder: "Add any additional context here..."
-      render: markdown

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.gitignore

@@ -11,8 +11,11 @@
 !/templates/*.html
 !/inc/config.php
 
+# minify
+/inc/lib/minify
+
 # instance-config
-/inc/secrets.php
+/inc/instance-config.php
 
 # .installed
 /.installed
@@ -35,15 +38,6 @@ Thumbs.db
 *.orig
 *~
 
-# tmp filesystem
-/tmp/cache/*
-/tmp/locks/*
-!/tmp/cache/.gitkeep
-!/tmp/locks/.gitkeep
-
 #vichan custom
 favicon.ico
 /static/spoiler.png
-/local-instances
-
-/vendor/

.gitmodules

@@ -1,12 +1,3 @@
 [submodule "js/wPaint"]
 	path = js/wPaint
 	url = https://github.com/vichan-devel/wPaint.git
-	branch = master
-
-[submodule "inc/lib/parsedown"]
-	path = inc/lib/parsedown
-	url = https://github.com/vichan-devel/parsedown.git
-	branch = master
-[submodule "js/twemoji"]
-	path = js/twemoji
-	url = https://github.com/basedgentoo/twemoji

LICENSE.md

@@ -1,5 +1,5 @@
 # License of vichan
-Copyright (c) 2012-2018 vichan-devel
+Copyright (c) 2012-2014 vichan-devel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,50 +1,34 @@
 vichan - A lightweight and full featured PHP imageboard.
 ========================================================
 
-**Please do not contact Fredrick Brennan in regards to vichan issues.**
-
-As of 29 August 2022 it supports PHP8.1.
-
 About
 ------------
 vichan is a free light-weight, fast, highly configurable and user-friendly
 imageboard software package. It is written in PHP and has few dependencies.
 
-Some documentation may be found on our [wiki](https://github.com/vichan-devel/vichan/wiki). (feel free to contribute)
+vichan is a fork of [Tinyboard](http://tinyboard.org/), a great imageboard package, actively
+building on it and adding a lot of features and other improvements.
 
-History
-------------
-vichan is a fork of (now defunc'd) [Tinyboard](http://github.com/savetheinternet/Tinyboard),
-a great imageboard package, actively building on it and adding a lot of features and other
-improvements.
-
-![](static/doc/timeline.svg)
-
-### Maintainer timeline
-1. [@perdedora](https://github.com/perdedora) and [@RealAngeleno](https://github.com/RealAngeleno) - 2023-Present.
-2. Development Commission lead by [@basedgentoo](https://github.com/basedgentoo), [@kuz-sysadmin](https://github.com/kuz-sysadmin), and [@RealAngeleno](https://github.com/RealAngeleno). (2023 - 2023)
-3. [@h00j](https://github.com/h00j) (2021 - ???)
-4. [@ctrlcctrlv](https://github.com/ctrlcctrlv) (2017 - 2021)
-5. [@czaks](https://github.com/czaks) (2014 - 2017) (The author of vichan fork)
-6. [@savetheinternet](https://github.com/savetheinternet) (2010 - 2014) (The creator of Tinyboard)
+Support and announcements: https://int.vichan.net/devel/
 
 Requirements
 ------------
-1.	PHP >= 7.4
+1.	PHP >= 5.3
 2.	MySQL/MariaDB server
 3.	[mbstring](http://www.php.net/manual/en/mbstring.installation.php) 
 4.	[PHP GD](http://www.php.net/manual/en/intro.image.php)
 5.	[PHP PDO](http://www.php.net/manual/en/intro.pdo.php)
-6.	A Unix-like OS, preferrably FreeBSD or GNU/Linux
 
-We try to make sure vichan is compatible with all major web servers. vichan does not include an Apache `.htaccess` file nor does it need one.
+We try to make sure vichan is compatible with all major web servers and
+operating systems. vichan does not include an Apache ```.htaccess``` file nor does
+it need one.
 
 ### Recommended
 1.	MySQL/MariaDB server >= 5.5.3
 2.	ImageMagick (command-line ImageMagick or GraphicsMagick preferred).
-3.	[APCu (Alternative PHP Cache)](http://php.net/manual/en/book.apcu.php),
-	[Memcached](http://www.php.net/manual/en/intro.memcached.php) or
-	[Redis](https://redis.io/docs/about/)
+3.	[APC (Alternative PHP Cache)](http://php.net/manual/en/book.apc.php),
+	[XCache](http://xcache.lighttpd.net/) or
+	[Memcached](http://www.php.net/manual/en/intro.memcached.php)
 
 Contributing
 ------------
@@ -53,47 +37,56 @@ You can contribute to vichan by:
 *	Providing feedback and suggestions
 *	Writing/editing documentation
 
+If you need help developing a patch, please join our IRC channel.
+
 Installation
 -------------
-1.	Get the latest development version with:
+1.	Download and extract Tinyboard to your web directory or get the latest
+	development version with:
 
         git clone git://github.com/vichan-devel/vichan.git
 	
-2.	run ```composer install``` inside the directory
-3.	Navigate to ```install.php``` in your web browser and follow the
+2.	Navigate to ```install.php``` in your web browser and follow the
 	prompts.
-4.	vichan should now be installed. Log in to ```mod.php``` with the
+3.	vichan should now be installed. Log in to ```mod.php``` with the
 	default username and password combination: **admin / password**.
 
 Please remember to change the administrator account password.
 
-See also: [Configuration Basics](https://github.com/vichan-devel/vichan/wiki/config).
-
-Upgrade
--------
-To upgrade from any version of Tinyboard or vichan:
-
-Either run ```git pull``` to update your files, if you used git, or
-backup your ```inc/instance-config.php```, replace all your files in place
-(don't remove boards etc.), then put ```inc/instance-config.php``` back and
-finally run ```install.php```.
-
-To migrate from a Kusaba X board, use http://github.com/vichan-devel/Tinyboard-Migration
-
-Demo
---------
-Demo with the most updated version of [Vichan](https://vichan.27chan.org).
-
-1. PHP 8.1
-2. MySQL 5.7
-3. KeyDB 6.2.1 (Redis)
-4. NGINX 1.14.0
+See also: [Configuration Basics](http://tinyboard.org/docs/?p=Config).
 
 Support
 --------
-vichan is still beta software -- there are bound to be bugs. If you find a
+Tinyboard is still beta software -- there are bound to be bugs. If you find a
 bug, please report it.
 
+If you need assistance with installing, configuring, or using vichan, you may
+find support from a variety of sources:
+
+*	If you're unsure about how to enable or configure certain features, make
+	sure you have read the comments in ```inc/config.php```.
+*	Check out an [official vichan board](http://int.vichan.net/devel/).
+*	You can join vichan's IRC channel for support
+	[irc.6irc.net #vichan-devel](irc://irc.6irc.net/vichan-devel)
+
+### Tinyboard support
+vichan is based on a Tinyboard, so both engines have very much in common. These
+links may be helpful for you as well: 
+
+*	Tinyboard documentation can be found [here](http://tinyboard.org/docs/).
+*	You can join Tinyboard's IRC channel for support and general queries: 
+	[irc.datnode.net #tinyboard](irc://irc.datnode.net/tinyboard).
+*	You may find help at [tinyboard.org](http://tinyboard.org/#help).
+
+Donations
+---------
+Do you like our work? You can motivate us financially to do better ;)
+* Bitcoin: [![tip for next commit](http://tip4commit.com/projects/708.svg)](http://tip4commit.com/projects/708)
+
+You can also ask us to develop some feature specially for you <3. Join our IRC
+channel and ask for a quote (there are a few of us, who work with the codebase
+and are skilled enough to develop such features pretty quickly).
+
 CLI tools
 -----------------
 There are a few command line interface tools, based on Tinyboard-Tools. These need
@@ -104,6 +97,12 @@ You actually don't need these tools for your imageboard functioning, they are ai
 at the power users. You won't be able to run these from shared hosting accounts
 (i.e. all free web servers).
 
+Localisation
+------------
+Wanting to have vichan in your language? You can contribute your translations at this URL:
+
+https://www.transifex.com/projects/p/tinyboard-vichan-devel/
+
 Oekaki
 ------
 vichan makes use of [wPaint](https://github.com/websanova/wPaint) for oekaki. After you pull the repository, however, you will need to download wPaint separately using git's `submodule` feature. Use the following commands:
@@ -113,22 +112,13 @@ git submodule init
 git submodule update
 ```
 
-To enable oekaki, add all the scripts listed in `js/wpaint.js` to your `instance-config.php`.
+To enable oekaki, add all the scripts listed in `js/oekaki.js` to your `instance-config.php`.
 
 WebM support
 ------------
 Read `inc/lib/webm/README.md` for information about enabling webm.
 
-Docker
-------------
-Vichan comes with a Dockerfile and docker-compose configuration, the latter aimed primarily at development and testing.
-See the `docker/doc.md` file for more information.
-
-vichan API
-----------
-vichan provides by default a 4chan-compatible JSON API. For documentation on this, see:
-https://github.com/vichan-devel/vichan-API/ .
-
 License
 --------
 See [LICENSE.md](http://github.com/vichan-devel/vichan/blob/master/LICENSE.md).
+

attentionbar.php

@@ -0,0 +1,11 @@
+<?php
+ require_once 'inc/functions.php';
+ checkBan();
+ $text = isset($_POST['text']) ? $_POST['text'] : '';
+ if(strlen($text)>0 && !preg_match('/a href/', $text)) {
+	file_put_contents("attentionbar.txt",htmlspecialchars($text));
+	 if(strlen($_SERVER['HTTP_REFERER'])>0) { header('Location: ' . $_SERVER['HTTP_REFERER']); }
+ 	else { header('Location: /'); }
+ } else print(file_get_contents("attentionbar.txt"));
+ return;
+?>

attentionbar.txt

@@ -0,0 +1 @@
+- * ( Pasek Atencji ) * -

b.php

@@ -1,8 +0,0 @@
-<?php
-
-$files = scandir('static/banners/', SCANDIR_SORT_NONE);
-$files = array_diff($files, ['.', '..']);
-
-$name = $files[array_rand($files)];
-header("Location: /static/banners/$name", true, 307);
-header('Cache-Control: no-cache');

banned.php

@@ -1,14 +1,7 @@
 <?php
-  require_once 'inc/bootstrap.php';
-  checkBan();
-
-  //If the user is not banned, show the "not banned" page.
-  die(
-    Element('page.html', array(
-      'title' => _('Not banned!'),
-      'config' => $config,
-      'nojavascript' => true,
-      'body' => Element('notbanned.html', array()
-    ))
-  )); 
+ require_once 'inc/functions.php';
+ checkBan();
+ print "<!doctype html><html><head><meta charset='utf-8'><title>"._("Banned?")."</title></head><body>";
+ print "<h1>"._("You are not banned.")."</h1>";
+ print "</body></html>";
 ?>

compose.yml

@@ -1,40 +0,0 @@
-services:
-  #nginx webserver + php 8.x
-  web:
-    build:
-      context: .
-      dockerfile: ./docker/nginx/Dockerfile
-    ports:
-      - "9090:80"
-    depends_on:
-      - db
-    volumes:
-      - ./local-instances/${INSTANCE:-0}/www:/var/www/html
-      - ./docker/nginx/vichan.conf:/etc/nginx/conf.d/default.conf
-      - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./docker/nginx/proxy.conf:/etc/nginx/conf.d/proxy.conf
-    links:
-      - php
-
-  php:
-    build:
-      context: .
-      dockerfile: ./docker/php/Dockerfile
-    volumes:
-      - ./local-instances/${INSTANCE:-0}/www:/var/www
-      - ./docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
-      - ./docker/php/jit.ini:/usr/local/etc/php/conf.d/jit.ini
-
-  #MySQL Service
-  db:
-    image: mysql:8.0.35
-    container_name: db
-    restart: unless-stopped
-    tty: true
-    ports:
-      - "3306:3306"
-    environment:
-      MYSQL_DATABASE: vichan
-      MYSQL_ROOT_PASSWORD: password
-    volumes:
-      - ./local-instances/${INSTANCE:-0}/mysql:/var/lib/mysql

composer.json

@@ -1,65 +0,0 @@
-{
-    "name": "vichan-devel/vichan",
-    "description": "vichan imageboard",
-    "type": "project",
-    "config": {
-        "platform": {
-            "php": "7.4"
-        }
-    },
-    "require": {
-        "php": ">=7.4",
-        "ext-mbstring": ">=7.4",
-        "ext-gd": ">=7.4",
-        "ext-pdo": ">=7.4",
-        "twig/twig": "^2.9",
-        "phpmyadmin/twig-i18n-extension": "^4.0",
-        "lifo/ip": "^1.0",
-        "gettext/gettext": "^5.5",
-        "mrclay/minify": "^2.1.6",
-        "geoip/geoip": "^1.17",
-        "dapphp/securimage": "^4.0",
-        "erusev/parsedown":  "^1.7.4"
-    },
-    "autoload": {
-        "classmap": ["inc/"],
-        "files": [
-            "inc/bootstrap.php",
-            "inc/display.php",
-            "inc/template.php",
-            "inc/database.php",
-            "inc/events.php",
-            "inc/api.php",
-            "inc/mod/auth.php",
-            "inc/lock.php",
-            "inc/queue.php",
-            "inc/functions.php",
-            "inc/functions/dice.php",
-            "inc/functions/format.php",
-            "inc/functions/net.php",
-            "inc/functions/num.php",
-            "inc/functions/theme.php",
-            "inc/service/captcha-queries.php",
-            "inc/context.php"
-        ]
-    },
-    "license": "Tinyboard + vichan",
-    "authors": [
-        {
-            "name": "savetheinternet",
-            "homepage": "https://github.com/savetheinternet"
-        },
-        {
-            "name": "czaks",
-            "homepage": "https://github.com/czaks"
-        },
-        {
-            "name": "ctrlcctrlv",
-            "homepage": "https://github.com/ctrlcctrlv"
-        },
-        {
-            "name": "h00j",
-            "homepage": "https://github.com/h00j"
-        }
-    ]
-}

composer.lock

@@ -1,757 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "72e79f203581eea6e6b0455147b25878",
-    "packages": [
-        {
-            "name": "dapphp/securimage",
-            "version": "4.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dapphp/securimage.git",
-                "reference": "aabde76d839d75a238970661187f83312c2eeda7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dapphp/securimage/zipball/aabde76d839d75a238970661187f83312c2eeda7",
-                "reference": "aabde76d839d75a238970661187f83312c2eeda7",
-                "shasum": ""
-            },
-            "require": {
-                "ext-gd": "*",
-                "php": ">=5.4"
-            },
-            "suggest": {
-                "ext-pdo": "For database storage support",
-                "ext-pdo_mysql": "For MySQL database support",
-                "ext-pdo_sqlite": "For SQLite3 database support"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Securimage\\": "./"
-                },
-                "classmap": [
-                    "securimage.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Drew Phillips",
-                    "email": "drew@drew-phillips.com"
-                }
-            ],
-            "description": "PHP CAPTCHA Library",
-            "homepage": "https://www.phpcaptcha.org",
-            "keywords": [
-                "Forms",
-                "anti-spam",
-                "captcha",
-                "security"
-            ],
-            "support": {
-                "issues": "https://github.com/dapphp/securimage/issues",
-                "source": "https://github.com/dapphp/securimage/tree/4.0.2"
-            },
-            "abandoned": true,
-            "time": "2020-05-30T10:05:48+00:00"
-        },
-        {
-            "name": "geoip/geoip",
-            "version": "v1.17",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/maxmind/geoip-api-php.git",
-                "reference": "2053a85c2ed3e7adcbaf0117e26832f57366e370"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/maxmind/geoip-api-php/zipball/2053a85c2ed3e7adcbaf0117e26832f57366e370",
-                "reference": "2053a85c2ed3e7adcbaf0117e26832f57366e370",
-                "shasum": ""
-            },
-            "conflict": {
-                "ext-geoip": "*"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.*",
-                "satooshi/php-coveralls": "1.0.*"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/geoip.inc",
-                    "src/geoipcity.inc",
-                    "src/timezone.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL 2.1+"
-            ],
-            "authors": [
-                {
-                    "name": "MaxMind, Inc.",
-                    "email": "support@maxmind.com",
-                    "homepage": "http://www.maxmind.com/"
-                }
-            ],
-            "description": "MaxMind GeoIP PHP API",
-            "homepage": "http://dev.maxmind.com/geoip/legacy/downloadable",
-            "keywords": [
-                "geoip",
-                "geolocation",
-                "maxmind"
-            ],
-            "support": {
-                "issues": "https://github.com/maxmind/geoip-api-php/issues",
-                "source": "https://github.com/maxmind/geoip-api-php/tree/master"
-            },
-            "abandoned": "geoip2/geoip2",
-            "time": "2016-05-16T19:06:50+00:00"
-        },
-        {
-            "name": "gettext/gettext",
-            "version": "v5.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-gettext/Gettext.git",
-                "reference": "8657e580747bb3baacccdcebe69cac094661e404"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/8657e580747bb3baacccdcebe69cac094661e404",
-                "reference": "8657e580747bb3baacccdcebe69cac094661e404",
-                "shasum": ""
-            },
-            "require": {
-                "gettext/languages": "^2.3",
-                "php": "^7.2|^8.0"
-            },
-            "require-dev": {
-                "brick/varexporter": "^0.3.5",
-                "friendsofphp/php-cs-fixer": "^3.2",
-                "oscarotero/php-cs-fixer-config": "^2.0",
-                "phpunit/phpunit": "^8.0|^9.0",
-                "squizlabs/php_codesniffer": "^3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Gettext\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Oscar Otero",
-                    "email": "oom@oscarotero.com",
-                    "homepage": "http://oscarotero.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "PHP gettext manager",
-            "homepage": "https://github.com/php-gettext/Gettext",
-            "keywords": [
-                "JS",
-                "gettext",
-                "i18n",
-                "mo",
-                "po",
-                "translation"
-            ],
-            "support": {
-                "email": "oom@oscarotero.com",
-                "issues": "https://github.com/php-gettext/Gettext/issues",
-                "source": "https://github.com/php-gettext/Gettext/tree/v5.7.0"
-            },
-            "funding": [
-                {
-                    "url": "https://paypal.me/oscarotero",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/oscarotero",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/misteroom",
-                    "type": "patreon"
-                }
-            ],
-            "time": "2022-07-27T19:54:55+00:00"
-        },
-        {
-            "name": "gettext/languages",
-            "version": "2.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-gettext/Languages.git",
-                "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-gettext/Languages/zipball/4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab",
-                "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4"
-            },
-            "bin": [
-                "bin/export-plural-rules"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Gettext\\Languages\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michele Locati",
-                    "email": "mlocati@gmail.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "gettext languages with plural rules",
-            "homepage": "https://github.com/php-gettext/Languages",
-            "keywords": [
-                "cldr",
-                "i18n",
-                "internationalization",
-                "l10n",
-                "language",
-                "languages",
-                "localization",
-                "php",
-                "plural",
-                "plural rules",
-                "plurals",
-                "translate",
-                "translations",
-                "unicode"
-            ],
-            "support": {
-                "issues": "https://github.com/php-gettext/Languages/issues",
-                "source": "https://github.com/php-gettext/Languages/tree/2.10.0"
-            },
-            "funding": [
-                {
-                    "url": "https://paypal.me/mlocati",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/mlocati",
-                    "type": "github"
-                }
-            ],
-            "time": "2022-10-18T15:00:10+00:00"
-        },
-        {
-            "name": "lifo/ip",
-            "version": "v1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/lifo101/ip.git",
-                "reference": "4c4cf5b554884be93f1d0422eaec8d6426993229"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/lifo101/ip/zipball/4c4cf5b554884be93f1d0422eaec8d6426993229",
-                "reference": "4c4cf5b554884be93f1d0422eaec8d6426993229",
-                "shasum": ""
-            },
-            "require": {
-                "ext-bcmath": "*",
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Lifo\\IP\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jason Morriss",
-                    "email": "lifo2013@gmail.com"
-                }
-            ],
-            "description": "IP address helper PHP library for working with IPv4 and IPv6 addresses",
-            "keywords": [
-                "IP",
-                "ip address",
-                "ipv4",
-                "ipv6"
-            ],
-            "support": {
-                "issues": "https://github.com/lifo101/ip/issues",
-                "source": "https://github.com/lifo101/ip/tree/v1.1.1"
-            },
-            "time": "2022-07-12T15:45:54+00:00"
-        },
-        {
-            "name": "mrclay/minify",
-            "version": "2.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mrclay/minify.git",
-                "reference": "1928e89208d28e91427b2f13b67acdbd8cd01ac9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mrclay/minify/zipball/1928e89208d28e91427b2f13b67acdbd8cd01ac9",
-                "reference": "1928e89208d28e91427b2f13b67acdbd8cd01ac9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pcre": "*",
-                "php": ">=5.2.1"
-            },
-            "require-dev": {
-                "tubalmartin/cssmin": "~2.4.8"
-            },
-            "suggest": {
-                "tubalmartin/cssmin": "Support minify with CSSMin (YUI PHP port)"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "min/lib/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Stephen Clay",
-                    "email": "steve@mrclay.org",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers",
-            "homepage": "http://code.google.com/p/minify/",
-            "support": {
-                "email": "minify@googlegroups.com",
-                "issues": "http://code.google.com/p/minify/issues/list",
-                "source": "https://github.com/mrclay/minify/tree/2.x",
-                "wiki": "http://code.google.com/p/minify/w/list"
-            },
-            "time": "2017-11-03T21:04:01+00:00"
-        },
-        {
-            "name": "phpmyadmin/twig-i18n-extension",
-            "version": "v4.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpmyadmin/twig-i18n-extension.git",
-                "reference": "c0d0dd171cd1c7733bf152fd44b61055843df052"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/twig-i18n-extension/zipball/c0d0dd171cd1c7733bf152fd44b61055843df052",
-                "reference": "c0d0dd171cd1c7733bf152fd44b61055843df052",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0",
-                "twig/twig": "^1.42.3|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpmyadmin/coding-standard": "^3.0.0",
-                "phpmyadmin/motranslator": "^5.2",
-                "phpstan/phpstan": "^0.12.66",
-                "phpunit/phpunit": "^7 || ^8 || ^9"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PhpMyAdmin\\Twig\\Extensions\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "The phpMyAdmin Team",
-                    "email": "developers@phpmyadmin.net",
-                    "homepage": "https://www.phpmyadmin.net/team/"
-                }
-            ],
-            "description": "Internationalization support for Twig via the gettext library",
-            "keywords": [
-                "gettext",
-                "i18n"
-            ],
-            "support": {
-                "issues": "https://github.com/phpmyadmin/twig-i18n-extension/issues",
-                "source": "https://github.com/phpmyadmin/twig-i18n-extension"
-            },
-            "time": "2021-06-10T15:53:38+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-mbstring": "*"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
-                "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "twig/twig",
-            "version": "v2.15.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e059001d6d597dd50ea7c74dd2464b4adea48d3",
-                "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1.3",
-                "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php72": "^1.8"
-            },
-            "require-dev": {
-                "psr/container": "^1.0",
-                "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.15-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                },
-                "psr-4": {
-                    "Twig\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Twig Team",
-                    "role": "Contributors"
-                },
-                {
-                    "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
-                    "role": "Project Founder"
-                }
-            ],
-            "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "https://twig.symfony.com",
-            "keywords": [
-                "templating"
-            ],
-            "support": {
-                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v2.15.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-27T12:26:20+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "ext-mbstring": ">=5.4",
-        "ext-gd": ">=5.4",
-        "ext-pdo": ">=5.4"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
-}

docker/doc.md

@@ -1,20 +0,0 @@
-The `php-fpm` process runs containerized.
-The php application always uses `/var/www` as it's work directory and home folder, and if `/var/www` is bind mounted it
-is necessary to adjust the path passed via FastCGI to `php-fpm` by changing the root directory to `/var/www`.
-This can achieved in nginx by setting the `fastcgi_param SCRIPT_FILENAME` to `/var/www/$fastcgi_script_name;`
-
-The default docker compose settings are intended for development and testing purposes.
-The folder structure expected by compose is as follows
-
-```
-<vichan-project>
-└── local-instances
-    └── 1
-        ├── mysql
-        └── www
-```
-The vichan container is by itself much less rigid.
-
-
-Use `docker compose up --build` to start the docker compose.
-Use `docker compose up --build -d php` to rebuild just the vichan container while the compose is running. Useful for development.

docker/nginx/Dockerfile

@@ -1,8 +0,0 @@
-FROM nginx:1.25.3-alpine
-
-COPY . /code
-RUN adduser --system www-data \
-  && adduser www-data www-data
-
-CMD [ "nginx", "-g", "daemon off;" ]
-EXPOSE 80

docker/nginx/nginx.conf

@@ -1,34 +0,0 @@
-# This and proxy.conf are based on
-# https://github.com/dead-guru/devichan/blob/master/nginx/nginx.conf
-
-user www-data;
-worker_processes auto;
-
-error_log /dev/stdout warn;
-pid       /var/run/nginx.pid;
-
-events {
-	worker_connections  1024;
-}
-
-http {
-	include       /etc/nginx/mime.types;
-	default_type  application/octet-stream;
-
-	# Switch logging to console out to view via Docker
-	access_log /dev/stdout;
-	error_log /dev/stdout warn;
-	sendfile        on;
-	keepalive_timeout  5;
-
-	gzip              on;
-	gzip_http_version 1.0;
-	gzip_vary         on;
-	gzip_comp_level   6;
-	gzip_types        text/xml text/plain text/css application/xhtml+xml application/xml application/rss+xml application/atom_xml application/x-javascript application/x-httpd-php;
-	gzip_disable      "MSIE [1-6]\.";
-
-
-	include /etc/nginx/conf.d/*.conf;
-	include /etc/nginx/sites-available/*.conf;
-}

docker/nginx/proxy.conf

@@ -1,40 +0,0 @@
-proxy_cache_path  /var/cache/nginx levels=1:2 keys_zone=czone:4m max_size=50m inactive=120m;
-proxy_temp_path   /var/tmp/nginx;
-proxy_cache_key   "$scheme://$host$request_uri";
-
-
-map $http_forwarded_request_id $x_request_id {
-	""          $request_id;
-	default     $http_forwarded_request_id;
-}
-
-map $http_forwarded_forwarded_host $forwardedhost {
-	""          $host;
-	default     $http_forwarded_forwarded_host;
-}
-
-
-map $http_x_forwarded_proto $fcgi_https {
-	default "";
-	https on;
-}
-
-map $http_x_forwarded_proto $real_scheme {
-	default $scheme;
-	https https;
-}
-
-proxy_set_header  Host               $host;
-proxy_set_header  X-Real-IP          $remote_addr;
-proxy_set_header  X-Forwarded-Host   $host;
-proxy_set_header  X-Forwarded-Server $host;
-
-real_ip_header X-Forwarded-For;
-
-set_real_ip_from 10.0.0.0/8;
-set_real_ip_from 172.16.0.0/12;
-set_real_ip_from 172.18.0.0;
-set_real_ip_from 192.168.0.0/24;
-set_real_ip_from 127.0.0.0/8;
-
-real_ip_recursive on;

docker/nginx/vichan.conf

@@ -1,66 +0,0 @@
-upstream php-upstream {
-	server php:9000;
-}
-
-server {
-	listen 80 default_server;
-	listen [::]:80 default_server ipv6only=on;
-	server_name vichan;
-	root /var/www/html;
-	add_header X-Frame-Options "SAMEORIGIN";
-	add_header X-Content-Type-Options "nosniff";
-
-	index index.html index.php;
-
-	charset utf-8;
-
-	location ~ ^([^.\?]*[^\/])$ {
-		try_files $uri @addslash;
-	}
-
-	# Expire rules for static content
-	# Media: images, icons, video, audio, HTC
-	location ~* \.(?:jpg|jpeg|gif|png|webp|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
-		expires 1M;
-		access_log off;
-		log_not_found off;
-		add_header Cache-Control "public";
-	}
-	# CSS and Javascript
-	location ~* \.(?:css|js)$ {
-		expires 1y;
-		access_log off;
-		log_not_found off;
-		add_header Cache-Control "public";
-	}
-
-	location ~* \.(html)$ {
-		expires -1;
-	}
-
-	location @addslash {
-		return 301 $uri/;
-	}
-
-	location / {
-		try_files $uri $uri/ /index.php$is_args$args;
-	}
-
-	client_max_body_size 2G;
-
-	location ~ \.php$ {
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $remote_addr;
-		proxy_set_header X-Request-Id $x_request_id;
-		proxy_set_header X-Forwarded-Host $host;
-		proxy_set_header Forwarded-Request-Id $x_request_id;
-		fastcgi_pass php-upstream;
-		fastcgi_index index.php;
-		fastcgi_param SCRIPT_FILENAME /var/www/$fastcgi_script_name;
-		fastcgi_read_timeout 600;
-		include fastcgi_params;
-	}
-
-	location = /favicon.ico { access_log off; log_not_found off; }
-	location = /robots.txt  { access_log off; log_not_found off; }
-}

docker/php/Dockerfile

@@ -1,88 +0,0 @@
-# Based on https://github.com/dead-guru/devichan/blob/master/php-fpm/Dockerfile
-
-FROM composer:lts AS composer
-FROM php:8.1-fpm-alpine
-
-RUN apk add --no-cache \
-    zlib \
-    zlib-dev \
-    libpng \
-    libpng-dev \
-    libjpeg-turbo \
-    libjpeg-turbo-dev \
-    libwebp \
-    libwebp-dev \
-    libcurl \
-    curl-dev \
-    imagemagick \
-    graphicsmagick \
-    gifsicle \
-    ffmpeg \
-    bind-tools \
-    gettext \
-    gettext-dev \
-    icu-dev \
-    oniguruma \
-    oniguruma-dev \
-    libmcrypt \
-    libmcrypt-dev \
-    lz4-libs \
-    lz4-dev \
-    imagemagick-dev \
-    pcre-dev \
-    $PHPIZE_DEPS \
-    && docker-php-ext-configure gd \
-        --with-webp=/usr/include/webp \
-        --with-jpeg=/usr/include \
-    && docker-php-ext-install -j$(nproc) \
-        gd \
-        curl \
-        bcmath \
-        opcache \
-        pdo_mysql \
-        gettext \
-        intl \
-        mbstring \
-    && pecl update-channels \
-    && pecl install -o -f igbinary \
-    && pecl install redis \
-    && pecl install imagick \
-    $$ docker-php-ext-enable \
-        igbinary \
-        redis \
-        imagick \
-    && apk del \
-        zlib-dev \
-        libpng-dev \
-        libjpeg-turbo-dev \
-        libwebp-dev \
-        curl-dev \
-        gettext-dev \
-        oniguruma-dev \
-        libmcrypt-dev \
-        lz4-dev \
-        imagemagick-dev \
-        pcre-dev \
-        $PHPIZE_DEPS \
-    && rm -rf /var/cache/* \
-    && rm -rf /tmp/pear
-RUN rmdir /var/www/html \
-    && install -d -m 744 -o www-data -g www-data /var/www \
-    && install -d -m 700 -o www-data -g www-data /var/tmp/vichan \
-    && install -d -m 700 -o www-data -g www-data /var/cache/gen-cache \
-    && install -d -m 700 -o www-data -g www-data /var/cache/template-cache
-
-# Copy the bootstrap script.
-COPY ./docker/php/bootstrap.sh /usr/local/bin/bootstrap.sh
-
-COPY --from=composer /usr/bin/composer /usr/local/bin/composer
-
-# Copy the actual project (use .dockerignore to exclude stuff).
-COPY . /code
-
-# Install the compose depedencies.
-RUN cd /code && composer install
-
-WORKDIR "/var/www"
-CMD [ "bootstrap.sh" ]
-EXPOSE 9000

docker/php/Dockerfile.profile

@@ -1,16 +0,0 @@
-# syntax = devthefuture/dockerfile-x
-INCLUDE ./docker/php/Dockerfile
-
-RUN apk add --no-cache \
-        linux-headers \
-        $PHPIZE_DEPS \
-    && pecl update-channels \
-    && pecl install xdebug \
-    && docker-php-ext-enable xdebug \
-    && apk del \
-        linux-headers \
-        $PHPIZE_DEPS \
-    && rm -rf /var/cache/*
-
-ENV XDEBUG_OUT_DIR=/var/www/xdebug_out
-CMD [ "bootstrap.sh" ]

docker/php/bootstrap.sh

@@ -1,87 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-function set_cfg() {
-    if [ -L "/var/www/inc/$1" ]; then
-        echo "INFO: Resetting $1"
-        rm "/var/www/inc/$1"
-        cp "/code/inc/$1" "/var/www/inc/$1"
-        chown www-data "/var/www/inc/$1"
-        chgrp www-data "/var/www/inc/$1"
-        chmod 600 "/var/www/inc/$1"
-    else
-        echo "INFO: Using existing $1"
-    fi
-}
-
-if ! mountpoint -q /var/www; then
-    echo "WARNING: '/var/www' is not a mountpoint. All the data will remain inside the container!"
-fi
-
-if [ ! -w /var/www ] ; then
-    echo "ERROR: '/var/www' is not writable. Closing."
-    exit 1
-fi
-
-if [ -z  "${XDEBUG_OUT_DIR:-''}" ] ; then
-    echo "INFO: Initializing xdebug out directory at $XDEBUG_OUT_DIR"
-    mkdir -p "$XDEBUG_OUT_DIR"
-    chown www-data "$XDEBUG_OUT_DIR"
-    chgrp www-data "$XDEBUG_OUT_DIR"
-    chmod 755 "$XDEBUG_OUT_DIR"
-fi
-
-# Link the entrypoints from the exposed directory.
-ln -nfs \
-    /code/tools/ \
-    /code/*.php \
-    /code/LICENSE.* \
-    /code/install.sql \
-    /var/www/
-# Static files accessible from the webserver must be copied.
-cp -ur /code/static /var/www/
-cp -ur /code/stylesheets /var/www/
-
-# Ensure correct permissions are set, since this might be bind mount.
-chown www-data /var/www
-chgrp www-data /var/www
-
-# Initialize an empty robots.txt with the default if it doesn't exist.
-touch /var/www/robots.txt
-
-# Link the cache and tmp files directory.
-ln -nfs /var/tmp/vichan /var/www/tmp
-
-# Link the javascript directory.
-ln -nfs /code/js /var/www/
-
-# Link the html templates directory and it's cache.
-ln -nfs /code/templates /var/www/
-ln -nfs -T /var/cache/template-cache /var/www/templates/cache
-chown -h www-data /var/www/templates/cache
-chgrp -h www-data /var/www/templates/cache
-
-# Link the generic cache.
-ln -nfs -T /var/cache/gen-cache /var/www/tmp/cache
-chown -h www-data /var/www/tmp/cache
-chgrp -h www-data /var/www/tmp/cache
-
-# Create the included files directory and link them
-install -d -m 700 -o www-data -g www-data /var/www/inc
-for file in /code/inc/*; do
-    file="${file##*/}"
-    if [ ! -e /var/www/inc/$file ]; then
-        ln -s /code/inc/$file /var/www/inc/
-    fi
-done
-
-# Copy an empty instance configuration if the file is a link (it was linked because it did not exist before).
-set_cfg 'instance-config.php'
-set_cfg 'secrets.php'
-
-# Link the composer dependencies.
-ln -nfs /code/vendor /var/www/
-
-# Start the php-fpm server.
-exec php-fpm

docker/php/jit.ini

@@ -1,2 +0,0 @@
-opcache.jit_buffer_size=192M
-opcache.jit=tracing

docker/php/www.conf

@@ -1,13 +0,0 @@
-[www]
-access.log = /proc/self/fd/2
-
-; Ensure worker stdout and stderr are sent to the main error log.
-catch_workers_output = yes
-decorate_workers_output = no
-
-user = www-data
-group = www-data
-
-listen = 127.0.0.1:9000
-pm = static
-pm.max_children = 16

docker/php/xdebug-prof.ini

@@ -1,7 +0,0 @@
-zend_extension=xdebug
-
-[xdebug]
-xdebug.mode = profile
-xdebug.start_with_request = start
-error_reporting = E_ALL
-xdebug.output_dir = /var/www/xdebug_out

inc/Data/Driver/ApcuCacheDriver.php

@@ -1,28 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-class ApcuCacheDriver implements CacheDriver {
-	public function get(string $key): mixed {
-		$success = false;
-		$ret = \apcu_fetch($key, $success);
-		if ($success === false) {
-			return null;
-		}
-		return $ret;
-	}
-
-	public function set(string $key, mixed $value, mixed $expires = false): void {
-		\apcu_store($key, $value, (int)$expires);
-	}
-
-	public function delete(string $key): void {
-		\apcu_delete($key);
-	}
-
-	public function flush(): void {
-		\apcu_clear_cache();
-	}
-}

inc/Data/Driver/ArrayCacheDriver.php

@@ -1,28 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-
-defined('TINYBOARD') or exit;
-
-/**
- * A simple process-wide PHP array.
- */
-class ArrayCacheDriver implements CacheDriver {
-	private static $inner = [];
-
-	public function get(string $key) {
-		return isset(self::$inner[$key]) ? self::$inner[$key] : null;
-	}
-
-	public function set(string $key, $value, $expires = false): void {
-		self::$inner[$key] = $value;
-	}
-
-	public function delete(string $key): void {
-		unset(self::$inner[$key]);
-	}
-
-	public function flush(): void {
-		self::$inner = [];
-	}
-}

inc/Data/Driver/CacheDriver.php

@@ -1,38 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-interface CacheDriver {
-        /**
-         * Get the value of associated with the key.
-         *
-         * @param string $key The key of the value.
-         * @return mixed|null The value associated with the key, or null if there is none.
-         */
-        public function get(string $key);
-
-        /**
-         * Set a key-value pair.
-         *
-         * @param string $key The key.
-         * @param mixed $value The value.
-         * @param int|false $expires After how many seconds the pair will expire. Use false or ignore this parameter to keep
-         *                           the value until it gets evicted to make space for more items. Some drivers will always
-         *                           ignore this parameter and store the pair until it's removed.
-         */
-        public function set(string $key, $value, $expires = false);
-
-        /**
-         * Delete a key-value pair.
-         *
-         * @param string $key The key.
-         */
-        public function delete(string $key);
-
-        /**
-         * Delete all the key-value pairs.
-         */
-        public function flush();
-}

inc/Data/Driver/ErrorLogLogDriver.php

@@ -1,28 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-/**
- * Log via the php function error_log.
- */
-class ErrorLogLogDriver implements LogDriver {
-	use LogTrait;
-
-	private string $name;
-	private int $level;
-
-	public function __construct(string $name, int $level) {
-		$this->name = $name;
-		$this->level = $level;
-	}
-
-	public function log(int $level, string $message): void {
-		if ($level <= $this->level) {
-			$lv = $this->levelToString($level);
-			$line = "{$this->name} $lv: $message";
-			\error_log($line, 0, null, null);
-		}
-	}
-}

inc/Data/Driver/FileLogDriver.php

@@ -1,61 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-/**
- * Log to a file.
- */
-class FileLogDriver implements LogDriver {
-	use LogTrait;
-
-	private string $name;
-	private int $level;
-	private mixed $fd;
-
-	public function __construct(string $name, int $level, string $file_path) {
-		/*
-		 * error_log is slow as hell in it's 3rd mode, so use fopen + file locking instead.
-		 * https://grobmeier.solutions/performance-ofnonblocking-write-to-files-via-php-21082009.html
-		 *
-		 * Whatever file appending is atomic is contentious:
-		 *  - There are no POSIX guarantees: https://stackoverflow.com/a/7237901
-		 *  - But linus suggested they are on linux, on some filesystems: https://web.archive.org/web/20151201111541/http://article.gmane.org/gmane.linux.kernel/43445
-		 *  - But it doesn't seem to be always the case: https://www.notthewizard.com/2014/06/17/are-files-appends-really-atomic/
-		 *
-		 * So we just use file locking to be sure.
-		 */
-
-		$this->fd = \fopen($file_path, 'a');
-		if ($this->fd === false) {
-			throw new \RuntimeException("Unable to open log file at $file_path");
-		}
-
-		$this->name = $name;
-		$this->level = $level;
-
-		// In some cases PHP does not run the destructor.
-		\register_shutdown_function([$this, 'close']);
-	}
-
-	public function __destruct() {
-		$this->close();
-	}
-
-	public function log(int $level, string $message): void {
-		if ($level <= $this->level) {
-			$lv = $this->levelToString($level);
-			$line = "{$this->name} $lv: $message\n";
-			\flock($this->fd, LOCK_EX);
-			\fwrite($this->fd, $line);
-			\fflush($this->fd);
-			\flock($this->fd, LOCK_UN);
-		}
-	}
-
-	public function close() {
-		\flock($this->fd, LOCK_UN);
-		\fclose($this->fd);
-	}
-}

inc/Data/Driver/FsCachedriver.php

@@ -1,155 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-class FsCacheDriver implements CacheDriver {
-	private string $prefix;
-	private string $base_path;
-	private mixed $lock_fd;
-	private int|false $collect_chance_den;
-
-
-	private function prepareKey(string $key): string {
-		$key = \str_replace('/', '::', $key);
-		$key = \str_replace("\0", '', $key);
-		return $this->prefix . $key;
-	}
-
-	private function sharedLockCache(): void {
-		\flock($this->lock_fd, LOCK_SH);
-	}
-
-	private function exclusiveLockCache(): void {
-		\flock($this->lock_fd, LOCK_EX);
-	}
-
-	private function unlockCache(): void {
-		\flock($this->lock_fd, LOCK_UN);
-	}
-
-	private function collectImpl(): int {
-		/*
-		 * A read lock is ok, since it's alright if we delete expired items from under the feet of other processes, and
-		 * no other process add new cache items or refresh existing ones.
-		 */
-		$files = \glob($this->base_path . $this->prefix . '*', \GLOB_NOSORT);
-		$count = 0;
-		foreach ($files as $file) {
-			$data = \file_get_contents($file);
-			$wrapped = \json_decode($data, true, 512, \JSON_THROW_ON_ERROR);
-			if ($wrapped['expires'] !== false && $wrapped['expires'] <= \time()) {
-				if (@\unlink($file)) {
-					$count++;
-				}
-			}
-		}
-		return $count;
-	}
-
-	private function maybeCollect(): void {
-		if ($this->collect_chance_den !== false && \mt_rand(0, $this->collect_chance_den - 1) === 0) {
-			$this->collect_chance_den = false; // Collect only once per instance (aka process).
-			$this->collectImpl();
-		}
-	}
-
-	public function __construct(string $prefix, string $base_path, string $lock_file, int|false $collect_chance_den) {
-		if ($base_path[\strlen($base_path) - 1] !== '/') {
-			$base_path = "$base_path/";
-		}
-
-		if (!\is_dir($base_path)) {
-			throw new \RuntimeException("$base_path is not a directory!");
-		}
-
-		if (!\is_writable($base_path)) {
-			throw new \RuntimeException("$base_path is not writable!");
-		}
-
-		$this->lock_fd = \fopen($base_path . $lock_file, 'w');
-		if ($this->lock_fd === false) {
-			throw new \RuntimeException('Unable to open the lock file!');
-		}
-
-		$this->prefix = $prefix;
-		$this->base_path = $base_path;
-		$this->collect_chance_den = $collect_chance_den;
-	}
-
-	public function __destruct() {
-		$this->close();
-	}
-
-	public function get(string $key): mixed {
-		$key = $this->prepareKey($key);
-
-		$this->sharedLockCache();
-
-		// Collect expired items first so if the target key is expired we shortcut to failure in the next lines.
-		$this->maybeCollect();
-
-		$fd = \fopen($this->base_path . $key, 'r');
-		if ($fd === false) {
-			$this->unlockCache();
-			return null;
-		}
-
-		$data = \stream_get_contents($fd);
-		\fclose($fd);
-		$this->unlockCache();
-		$wrapped = \json_decode($data, true, 512, \JSON_THROW_ON_ERROR);
-
-		if ($wrapped['expires'] !== false && $wrapped['expires'] <= \time()) {
-			// Already expired, leave it there since we already released the lock and pretend it doesn't exist.
-			return null;
-		} else {
-			return $wrapped['inner'];
-		}
-	}
-
-	public function set(string $key, mixed $value, mixed $expires = false): void {
-		$key = $this->prepareKey($key);
-
-		$wrapped = [
-			'expires' => $expires ? \time() + $expires : false,
-			'inner' => $value
-		];
-
-		$data = \json_encode($wrapped);
-		$this->exclusiveLockCache();
-		$this->maybeCollect();
-		\file_put_contents($this->base_path . $key, $data);
-		$this->unlockCache();
-	}
-
-	public function delete(string $key): void {
-		$key = $this->prepareKey($key);
-
-		$this->exclusiveLockCache();
-		@\unlink($this->base_path . $key);
-		$this->maybeCollect();
-		$this->unlockCache();
-	}
-
-	public function collect(): int {
-		$this->sharedLockCache();
-		$count = $this->collectImpl();
-		$this->unlockCache();
-		return $count;
-	}
-
-	public function flush(): void {
-		$this->exclusiveLockCache();
-		$files = \glob($this->base_path . $this->prefix . '*', \GLOB_NOSORT);
-		foreach ($files as $file) {
-			@\unlink($file);
-		}
-		$this->unlockCache();
-	}
-
-	public function close(): void {
-		\fclose($this->lock_fd);
-	}
-}

inc/Data/Driver/HttpDriver.php

@@ -1,131 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-/**
- * Honestly this is just a wrapper for cURL. Still useful to mock it and have an OOP API on PHP 7.
- */
-class HttpDriver {
-	private $inner;
-	private int $timeout;
-	private int $max_file_size;
-
-
-	private function resetTowards(string $url, int $timeout): void {
-		\curl_reset($this->inner);
-		\curl_setopt_array($this->inner, [
-			\CURLOPT_URL => $url,
-			\CURLOPT_TIMEOUT => $timeout,
-			\CURLOPT_USERAGENT => 'Tinyboard',
-			\CURLOPT_PROTOCOLS => \CURLPROTO_HTTP | \CURLPROTO_HTTPS,
-		]);
-	}
-
-	public function __construct(int $timeout, int $max_file_size) {
-		$this->inner = \curl_init();
-		$this->timeout = $timeout;
-		$this->max_file_size = $max_file_size;
-	}
-
-	public function __destruct() {
-		\curl_close($this->inner);
-	}
-
-	/**
-	 * Execute a GET request.
-	 *
-	 * @param string $endpoint Uri endpoint.
-	 * @param ?array $data Optional GET parameters.
-	 * @param int $timeout Optional request timeout in seconds. Use the default timeout if 0.
-	 * @return string Returns the body of the response.
-	 * @throws RuntimeException Throws on IO error.
-	 */
-	public function requestGet(string $endpoint, ?array $data, int $timeout = 0): string {
-		if (!empty($data)) {
-			$endpoint .= '?' . \http_build_query($data);
-		}
-		if ($timeout == 0) {
-			$timeout = $this->timeout;
-		}
-
-		$this->resetTowards($endpoint, $timeout);
-		\curl_setopt($this->inner, \CURLOPT_RETURNTRANSFER, true);
-		$ret = \curl_exec($this->inner);
-
-		if ($ret === false) {
-			throw new \RuntimeException(\curl_error($this->inner));
-		}
-		return $ret;
-	}
-
-	/**
-	 * Execute a POST request.
-	 *
-	 * @param string $endpoint Uri endpoint.
-	 * @param ?array $data Optional POST parameters.
-	 * @param int $timeout Optional request timeout in seconds. Use the default timeout if 0.
-	 * @return string Returns the body of the response.
-	 * @throws RuntimeException Throws on IO error.
-	 */
-	public function requestPost(string $endpoint, ?array $data, int $timeout = 0): string {
-		if ($timeout == 0) {
-			$timeout = $this->timeout;
-		}
-
-		$this->resetTowards($endpoint, $timeout);
-		\curl_setopt($this->inner, \CURLOPT_POST, true);
-		if (!empty($data)) {
-			\curl_setopt($this->inner, \CURLOPT_POSTFIELDS, \http_build_query($data));
-		}
-		\curl_setopt($this->inner, \CURLOPT_RETURNTRANSFER, true);
-		$ret = \curl_exec($this->inner);
-
-		if ($ret === false) {
-			throw new \RuntimeException(\curl_error($this->inner));
-		}
-		return $ret;
-	}
-
-	/**
-	 * Download the url's target with curl.
-	 *
-	 * @param string $url Url to the file to download.
-	 * @param ?array $data Optional GET parameters.
-	 * @param resource $fd File descriptor to save the content to.
-	 * @param int $timeout Optional request timeout in seconds. Use the default timeout if 0.
-	 * @return bool Returns true on success, false if the file was too large.
-	 * @throws RuntimeException Throws on IO error.
-	 */
-	public function requestGetInto(string $endpoint, ?array $data, $fd, int $timeout = 0): bool {
-		if (!empty($data)) {
-			$endpoint .= '?' . \http_build_query($data);
-		}
-		if ($timeout == 0) {
-			$timeout = $this->timeout;
-		}
-
-		$this->resetTowards($endpoint, $timeout);
-		// Adapted from: https://stackoverflow.com/a/17642638
-		$opt = (\PHP_MAJOR_VERSION >= 8 && \PHP_MINOR_VERSION >= 2) ? \CURLOPT_XFERINFOFUNCTION : \CURLOPT_PROGRESSFUNCTION;
-		\curl_setopt_array($this->inner, [
-			\CURLOPT_NOPROGRESS => false,
-			$opt => fn($res, $next_dl, $dl, $next_up, $up) => (int)($dl <= $this->max_file_size),
-			\CURLOPT_FAILONERROR => true,
-			\CURLOPT_FOLLOWLOCATION => false,
-			\CURLOPT_FILE => $fd,
-			\CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4,
-		]);
-		$ret = \curl_exec($this->inner);
-
-		if ($ret === false) {
-			if (\curl_errno($this->inner) === CURLE_ABORTED_BY_CALLBACK) {
-				return false;
-			}
-
-			throw new \RuntimeException(\curl_error($this->inner));
-		}
-		return true;
-	}
-}

inc/Data/Driver/LogDriver.php

@@ -1,22 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-interface LogDriver {
-	public const EMERG = \LOG_EMERG;
-	public const ERROR = \LOG_ERR;
-	public const WARNING = \LOG_WARNING;
-	public const NOTICE = \LOG_NOTICE;
-	public const INFO = \LOG_INFO;
-	public const DEBUG = \LOG_DEBUG;
-
-	/**
-	 * Log a message if the level of relevancy is at least the minimum.
-	 *
-	 * @param int $level Message level. Use Log interface constants.
-	 * @param string $message The message to log.
-	 */
-	public function log(int $level, string $message): void;
-}

inc/Data/Driver/LogTrait.php

@@ -1,26 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-trait LogTrait {
-	public static function levelToString(int $level): string {
-		switch ($level) {
-			case LogDriver::EMERG:
-				return 'EMERG';
-			case LogDriver::ERROR:
-				return 'ERROR';
-			case LogDriver::WARNING:
-				return 'WARNING';
-			case LogDriver::NOTICE:
-				return 'NOTICE';
-			case LogDriver::INFO:
-				return 'INFO';
-			case LogDriver::DEBUG:
-				return 'DEBUG';
-			default:
-				throw new \InvalidArgumentException('Not a logging level');
-		}
-	}
-}

inc/Data/Driver/MemcacheCacheDriver.php

@@ -1,43 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-class MemcachedCacheDriver implements CacheDriver {
-	private \Memcached $inner;
-
-	public function __construct(string $prefix, string $memcached_server) {
-		$this->inner = new \Memcached();
-		if (!$this->inner->setOption(\Memcached::OPT_BINARY_PROTOCOL, true)) {
-			throw new \RuntimeException('Unable to set the memcached protocol!');
-		}
-		if (!$this->inner->setOption(\Memcached::OPT_PREFIX_KEY, $prefix)) {
-			throw new \RuntimeException('Unable to set the memcached prefix!');
-		}
-		if (!$this->inner->addServers($memcached_server)) {
-			throw new \RuntimeException('Unable to add the memcached server!');
-		}
-	}
-
-	public function get(string $key): mixed {
-		$ret = $this->inner->get($key);
-		// If the returned value is false but the retrival was a success, then the value stored was a boolean false.
-		if ($ret === false && $this->inner->getResultCode() !== \Memcached::RES_SUCCESS) {
-			return null;
-		}
-		return $ret;
-	}
-
-	public function set(string $key, mixed $value, mixed $expires = false): void {
-		$this->inner->set($key, $value, (int)$expires);
-	}
-
-	public function delete(string $key): void {
-		$this->inner->delete($key);
-	}
-
-	public function flush(): void {
-		$this->inner->flush();
-	}
-}

inc/Data/Driver/NoneCacheDriver.php

@@ -1,26 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-/**
- * No-op cache. Useful for testing.
- */
-class NoneCacheDriver implements CacheDriver {
-	public function get(string $key): mixed {
-		return null;
-	}
-
-	public function set(string $key, mixed $value, mixed $expires = false): void {
-		// No-op.
-	}
-
-	public function delete(string $key): void {
-		// No-op.
-	}
-
-	public function flush(): void {
-		// No-op.
-	}
-}

inc/Data/Driver/RedisCacheDriver.php

@@ -1,48 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-class RedisCacheDriver implements CacheDriver {
-	private string $prefix;
-	private \Redis $inner;
-
-	public function __construct(string $prefix, string $host, int $port, ?string $password, string $database) {
-		$this->inner = new \Redis();
-		$this->inner->connect($host, $port);
-		if ($password) {
-			$this->inner->auth($password);
-		}
-		if (!$this->inner->select($database)) {
-			throw new \RuntimeException('Unable to connect to Redis!');
-		}
-
-		$$this->prefix = $prefix;
-	}
-
-	public function get(string $key): mixed {
-		$ret = $this->inner->get($this->prefix . $key);
-		if ($ret === false) {
-			return null;
-		}
-		return \json_decode($ret, true);
-	}
-
-	public function set(string $key, mixed $value, mixed $expires = false): void {
-		if ($expires === false) {
-			$this->inner->set($this->prefix . $key, \json_encode($value));
-		} else {
-			$expires = $expires * 1000; // Seconds to milliseconds.
-			$this->inner->setex($this->prefix . $key, $expires, \json_encode($value));
-		}
-	}
-
-	public function delete(string $key): void {
-		$this->inner->del($this->prefix . $key);
-	}
-
-	public function flush(): void {
-		$this->inner->flushDB();
-	}
-}

inc/Data/Driver/StderrLogDriver.php

@@ -1,27 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-
-/**
- * Log to php's standard error file stream.
- */
-class StderrLogDriver implements LogDriver {
-	use LogTrait;
-
-	private string $name;
-	private int $level;
-
-	public function __construct(string $name, int $level) {
-		$this->name = $name;
-		$this->level = $level;
-	}
-
-	public function log(int $level, string $message): void {
-		if ($level <= $this->level) {
-			$lv = $this->levelToString($level);
-			\fwrite(\STDERR, "{$this->name} $lv: $message\n");
-		}
-	}
-}

inc/Data/Driver/SyslogLogDriver.php

@@ -1,35 +0,0 @@
-<?php
-namespace Vichan\Data\Driver;
-
-defined('TINYBOARD') or exit;
-
-/**
- * Log to syslog.
- */
-class SyslogLogDriver implements LogDriver {
-	private int $level;
-
-	public function __construct(string $name, int $level, bool $print_stderr) {
-		$flags = \LOG_ODELAY;
-		if ($print_stderr) {
-			$flags |= \LOG_PERROR;
-		}
-
-		if (!\openlog($name, $flags, \LOG_USER)) {
-			throw new \RuntimeException('Unable to open syslog');
-		}
-
-		$this->level = $level;
-	}
-
-	public function log(int $level, string $message): void {
-		if ($level <= $this->level) {
-			if (isset($_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_METHOD'], $_SERVER['REQUEST_URI'])) {
-				// CGI
-				\syslog($level, "$message - client: {$_SERVER['REMOTE_ADDR']}, request: \"{$_SERVER['REQUEST_METHOD']} {$_SERVER['REQUEST_URI']}\"");
-			} else {
-				\syslog($level, $message);
-			}
-		}
-	}
-}

inc/anti-bot.php

@@ -1,5 +1,282 @@
 <?php
 
 /*
- *  Anti-bot.php has been deprecated and removed due to its functions not being necessary and being easily bypassable, by both customized and uncustomized spambots.
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
  */
+
+defined('TINYBOARD') or exit;
+
+$hidden_inputs_twig = array();
+
+class AntiBot {
+	public $salt, $inputs = array(), $index = 0;
+	
+	public static function randomString($length, $uppercase = false, $special_chars = false, $unicode_chars = false) {
+		$chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
+		if ($uppercase)
+			$chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+		if ($special_chars)
+			$chars .= ' ~!@#$%^&*()_+,./;\'[]\\{}|:<>?=-` ';
+		if ($unicode_chars) {
+			$len = strlen($chars) / 10;
+			for ($n = 0; $n < $len; $n++)
+				$chars .= mb_convert_encoding('&#' . mt_rand(0x2600, 0x26FF) . ';', 'UTF-8', 'HTML-ENTITIES');
+		}
+		
+		$chars = preg_split('//u', $chars, -1, PREG_SPLIT_NO_EMPTY);
+		
+		$ch = array();
+		
+		// fill up $ch until we reach $length
+		while (count($ch) < $length) {
+			$n = $length - count($ch);
+			$keys = array_rand($chars, $n > count($chars) ? count($chars) : $n);
+			if ($n == 1) {
+				$ch[] = $chars[$keys];
+				break;
+			}
+			shuffle($keys);
+			foreach ($keys as $key)
+				$ch[] = $chars[$key];
+		}
+		
+		$chars = $ch;
+		
+		return implode('', $chars);
+	}
+	
+	public static function make_confusing($string) {
+		$chars = preg_split('//u', $string, -1, PREG_SPLIT_NO_EMPTY);
+		
+		foreach ($chars as &$c) {
+			if (mt_rand(0, 3) != 0)
+				$c = utf8tohtml($c);
+			else
+				$c = mb_encode_numericentity($c, array(0, 0xffff, 0, 0xffff), 'UTF-8');
+		}
+		
+		return implode('', $chars);
+	}
+	
+	public function __construct(array $salt = array()) {
+		global $config;
+		
+		if (!empty($salt)) {
+			// create a salted hash of the "extra salt"
+			$this->salt = implode(':', $salt);
+		} else { 
+			$this->salt = '';
+		}
+		
+		shuffle($config['spam']['hidden_input_names']);
+		
+		$input_count = mt_rand($config['spam']['hidden_inputs_min'], $config['spam']['hidden_inputs_max']);
+		$hidden_input_names_x = 0;
+		
+		for ($x = 0; $x < $input_count ; $x++) {
+			if ($hidden_input_names_x === false || mt_rand(0, 2) == 0) {
+				// Use an obscure name
+				$name = $this->randomString(mt_rand(10, 40), false, false, $config['spam']['unicode']);
+			} else {
+				// Use a pre-defined confusing name
+				$name = $config['spam']['hidden_input_names'][$hidden_input_names_x++];
+				if ($hidden_input_names_x >= count($config['spam']['hidden_input_names']))
+					$hidden_input_names_x = false;
+			}
+			
+			if (mt_rand(0, 2) == 0) {
+				// Value must be null
+				$this->inputs[$name] = '';
+			} elseif (mt_rand(0, 4) == 0) {
+				// Numeric value
+				$this->inputs[$name] = (string)mt_rand(0, 100000);
+			} else {
+				// Obscure value
+				$this->inputs[$name] = $this->randomString(mt_rand(5, 100), true, true, $config['spam']['unicode']);
+			}
+		}
+	}
+	
+	public static function space() {
+		if (mt_rand(0, 3) != 0)
+			return ' ';
+		return str_repeat(' ', mt_rand(1, 3));
+	}
+	
+	public function html($count = false) {
+		global $config;
+		
+		$elements = array(
+			'<input type="hidden" name="%name%" value="%value%">',
+			'<input type="hidden" value="%value%" name="%name%">',
+			'<input name="%name%" value="%value%" type="hidden">',
+			'<input value="%value%" name="%name%" type="hidden">',
+			'<input style="display:none" type="text" name="%name%" value="%value%">',
+			'<input style="display:none" type="text" value="%value%" name="%name%">',
+			'<span style="display:none"><input type="text" name="%name%" value="%value%"></span>',
+			'<div style="display:none"><input type="text" name="%name%" value="%value%"></div>',
+			'<div style="display:none"><input type="text" name="%name%" value="%value%"></div>',
+			'<textarea style="display:none" name="%name%">%value%</textarea>',
+			'<textarea name="%name%" style="display:none">%value%</textarea>'
+		);
+		
+		$html = '';
+		
+		if ($count === false) {
+			$count = mt_rand(1, abs(count($this->inputs) / 15) + 1);
+		}
+		
+		if ($count === true) {
+			// all elements
+			$inputs = array_slice($this->inputs, $this->index);
+		} else {
+			$inputs = array_slice($this->inputs, $this->index, $count);
+		}
+		$this->index += count($inputs);
+		
+		foreach ($inputs as $name => $value) {
+			$element = false;
+			while (!$element) {
+				$element = $elements[array_rand($elements)];
+				$element = str_replace(' ', self::space(), $element);
+				if (mt_rand(0, 5) == 0)
+					$element = str_replace('>', self::space() . '>', $element);
+				if (strpos($element, 'textarea') !== false && $value == '') {
+					// There have been some issues with mobile web browsers and empty <textarea>'s.
+					$element = false;
+				}
+			}
+			
+			$element = str_replace('%name%', utf8tohtml($name), $element);
+			
+			if (mt_rand(0, 2) == 0)
+				$value = $this->make_confusing($value);
+			else
+				$value = utf8tohtml($value);
+			
+			if (strpos($element, 'textarea') === false)
+				$value = str_replace('"', '&quot;', $value);
+			
+			$element = str_replace('%value%', $value, $element);
+			
+			$html .= $element;
+		}
+		
+		return $html;
+	}
+	
+	public function reset() {
+		$this->index = 0;
+	}
+	
+	public function hash() {
+		global $config;
+		
+		// This is the tricky part: create a hash to validate it after
+		// First, sort the keys in alphabetical order (A-Z)
+		$inputs = $this->inputs;
+		ksort($inputs);
+		
+		$hash = '';
+		// Iterate through each input
+		foreach ($inputs as $name => $value) {
+			$hash .= $name . '=' . $value;
+		}
+		// Add a salt to the hash
+		$hash .= $config['cookies']['salt'];
+		
+		// Use SHA1 for the hash
+		return sha1($hash . $this->salt);
+	}
+}
+
+function _create_antibot($board, $thread) {
+	global $config, $purged_old_antispam;
+	
+	$antibot = new AntiBot(array($board, $thread));
+	
+	if (!isset($purged_old_antispam)) {
+		$purged_old_antispam = true;
+		query('DELETE FROM ``antispam`` WHERE `expires` < UNIX_TIMESTAMP()') or error(db_error());
+	}
+	
+	if ($thread)
+		$query = prepare('UPDATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` = :thread AND `expires` IS NULL');
+	else
+		$query = prepare('UPDATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` IS NULL AND `expires` IS NULL');
+	
+	$query->bindValue(':board', $board);
+	if ($thread)
+		$query->bindValue(':thread', $thread);
+	$query->bindValue(':expires', $config['spam']['hidden_inputs_expire']);
+	$query->execute() or error(db_error($query));
+	
+	$query = prepare('INSERT INTO ``antispam`` VALUES (:board, :thread, :hash, UNIX_TIMESTAMP(), NULL, 0)');
+	$query->bindValue(':board', $board);
+	$query->bindValue(':thread', $thread);
+	$query->bindValue(':hash', $antibot->hash());
+	$query->execute() or error(db_error($query));
+	
+	return $antibot;
+}
+
+function checkSpam(array $extra_salt = array()) {
+	global $config, $pdo;
+
+	if (!isset($_POST['hash']))
+		return true;
+
+	$hash = $_POST['hash'];
+
+	if (!empty($extra_salt)) {
+		// create a salted hash of the "extra salt"
+		$extra_salt = implode(':', $extra_salt);
+	} else { 
+		$extra_salt = '';
+	}
+
+	// Reconsturct the $inputs array
+	$inputs = array();
+
+	foreach ($_POST as $name => $value) {
+		if (in_array($name, $config['spam']['valid_inputs']))
+			continue;
+
+		$inputs[$name] = $value;
+	}
+
+	// Sort the inputs in alphabetical order (A-Z)
+	ksort($inputs);
+
+	$_hash = '';
+
+	// Iterate through each input
+	foreach ($inputs as $name => $value) {
+		$_hash .= $name . '=' . $value;
+	}
+
+	// Add a salt to the hash
+	$_hash .= $config['cookies']['salt'];
+
+	// Use SHA1 for the hash
+	$_hash = sha1($_hash . $extra_salt);
+
+	if ($hash != $_hash)
+		return true;
+
+	$query = prepare('SELECT `passed` FROM ``antispam`` WHERE `hash` = :hash');
+	$query->bindValue(':hash', $hash);
+	$query->execute() or error(db_error($query));
+	if ((($passed = $query->fetchColumn(0)) === false) || ($passed > $config['spam']['hidden_inputs_max_pass'])) {
+		// there was no database entry for this hash. most likely expired.
+		return true;
+	}
+
+	return $hash;
+}
+
+function incrementSpamHash($hash) {
+	$query = prepare('UPDATE ``antispam`` SET `passed` = `passed` + 1 WHERE `hash` = :hash');
+	$query->bindValue(':hash', $hash);
+	$query->execute() or error(db_error($query));
+}

inc/api.php

@@ -9,12 +9,49 @@ defined('TINYBOARD') or exit;
  * Class for generating json API compatible with 4chan API
  */
 class Api {
-	private bool $show_filename;
-	private bool $hide_email;
-	private bool $country_flags;
-	private array $postFields;
+	function __construct(){
+		global $config;
+		/**
+		 * Translation from local fields to fields in 4chan-style API
+		 */
+		$this->config = $config;
 
-	private const INTS = [
+		$this->postFields = array(
+			'id' => 'no',
+			'thread' => 'resto',
+			'subject' => 'sub',
+			'body' => 'com',
+			'email' => 'email',
+			'name' => 'name',
+			'trip' => 'trip',
+			'capcode' => 'capcode',
+			'time' => 'time',
+			'thumbheight' => 'tn_w',
+			'thumbwidth' => 'tn_h',
+			'fileheight' => 'w',
+			'filewidth' => 'h',
+			'filesize' => 'fsize',
+			'filename' => 'filename',
+			'omitted' => 'omitted_posts',
+			'omitted_images' => 'omitted_images',
+			'replies' => 'replies',
+			'images' => 'images',
+			'sticky' => 'sticky',
+			'locked' => 'locked',
+			'bump' => 'last_modified',
+		);
+
+		$this->threadsPageFields = array(
+			'id' => 'no',
+			'bump' => 'last_modified'
+		);
+
+		if (isset($config['api']['extra_fields']) && gettype($config['api']['extra_fields']) == 'array'){
+			$this->postFields = array_merge($this->postFields, $config['api']['extra_fields']);
+		}
+	}
+
+	private static $ints = array(
 		'no' => 1,
 		'resto' => 1,
 		'time' => 1,
@@ -25,110 +62,38 @@ class Api {
 		'fsize' => 1,
 		'omitted_posts' => 1,
 		'omitted_images' => 1,
-		'replies' => 1,
-		'images' => 1,
 		'sticky' => 1,
 		'locked' => 1,
 		'last_modified' => 1
-	];
+	);
 
-	private const THREADS_PAGE_FIELDS = [
-		'id' => 'no',
-		'bump' => 'last_modified'
-	];
-
-	private const FILE_FIELDS = [
-		'thumbheight' => 'tn_h',
-		'thumbwidth' => 'tn_w',
-		'height' => 'h',
-		'width' => 'w',
-		'size' => 'fsize'
-	];
-
-	public function __construct(bool $show_filename, bool $hide_email, bool $country_flags) {
-		// Translation from local fields to fields in 4chan-style API
-		$this->show_filename = $show_filename;
-		$this->hide_email = $hide_email;
-		$this->country_flags = $country_flags;
-
-		$this->postFields = [
-			'id' => 'no',
-			'thread' => 'resto',
-			'subject' => 'sub',
-			'body' => 'com',
-			'email' => 'email',
-			'name' => 'name',
-			'trip' => 'trip',
-			'capcode' => 'capcode',
-			'time' => 'time',
-			'omitted' => 'omitted_posts',
-			'omitted_images' => 'omitted_images',
-			'replies' => 'replies',
-			'images' => 'images',
-			'sticky' => 'sticky',
-			'locked' => 'locked',
-			'cycle' => 'cyclical',
-			'bump' => 'last_modified',
-			'embed' => 'embed',
-		];
-
-		if (isset($config['api']['extra_fields']) && gettype($config['api']['extra_fields']) == 'array'){
-			$this->postFields = array_merge($this->postFields, $config['api']['extra_fields']);
-		}
-	}
-
-	private function translateFields($fields, $object, &$apiPost) {
+	private function translatePost($post, $threadsPage = false) {
+		$apiPost = array();
+		$fields = $threadsPage ? $this->threadsPageFields : $this->postFields;
 		foreach ($fields as $local => $translated) {
-			if (!isset($object->$local)) {
+			if (!isset($post->$local))
 				continue;
-			}
 
-			$toInt = isset(self::INTS[$translated]);
-			$val = $object->$local;
-			if ($this->hide_email && $local === 'email') {
-				$val = '';
-			}
+			$toInt = isset(self::$ints[$translated]);
+			$val = $post->$local;
 			if ($val !== null && $val !== '') {
 				$apiPost[$translated] = $toInt ? (int) $val : $val;
 			}
+
 		}
-	}
 
-	private function translateFile($file, $post, &$apiPost) {
-		$this->translateFields(self::FILE_FIELDS, $file, $apiPost);
-		$dotPos = strrpos($file->file, '.');
-		$apiPost['ext'] = substr($file->file, $dotPos);
-		$apiPost['tim'] = substr($file->file, 0, $dotPos);
+		if ($threadsPage) return $apiPost;
 
-		if ($this->show_filename) {
-			$apiPost['filename'] = @substr($file->name, 0, strrpos($file->name, '.'));
-		} else {
-			$apiPost['filename'] = substr($file->file, 0, $dotPos);
-		}
-		if (isset ($file->hash) && $file->hash) {
-			$apiPost['md5'] = base64_encode(hex2bin($file->hash));
-		} elseif (isset ($post->filehash) && $post->filehash) {
-			$apiPost['md5'] = base64_encode(hex2bin($post->filehash));
-		}
-	}
-
-	private function translatePost($post, bool $threadsPage = false) {
-		global $config, $board;
-
-		$apiPost = [];
-		$fields = $threadsPage ? self::THREADS_PAGE_FIELDS : $this->postFields;
-		$this->translateFields($fields, $post, $apiPost);
-
-
-		if (isset($config['poster_ids']) && $config['poster_ids']) {
-			$apiPost['id'] = poster_id($post->ip, $post->thread ?? $post->id);
-		}
-		if ($threadsPage) {
-			return $apiPost;
+		if (isset($post->filename)) {
+			$dotPos = strrpos($post->filename, '.');
+			$apiPost['filename'] = substr($post->filename, 0, $dotPos);
+			$apiPost['ext'] = substr($post->filename, $dotPos);
+			$dotPos = strrpos($post->file, '.');
+			$apiPost['tim'] = substr($post->file, 0, $dotPos);
 		}
 
 		// Handle country field
-		if (isset($post->body_nomarkup) && $this->country_flags) {
+		if (isset($post->body_nomarkup) && $this->config['country_flags']) {
 			$modifiers = extract_modifiers($post->body_nomarkup);
 			if (isset($modifiers['flag']) && isset($modifiers['flag alt']) && preg_match('/^[a-z]{2}$/', $modifiers['flag'])) {
 				$country = strtoupper($modifiers['flag']);
@@ -139,37 +104,11 @@ class Api {
 			}
 		}
 
-		if ($config['slugify'] && !$post->thread) {
-			$apiPost['semantic_url'] = $post->slug;
-		}
-
-		// Handle files
-		// Note: 4chan only supports one file, so only the first file is taken into account for 4chan-compatible API.
-		if (isset($post->files) && $post->files && !$threadsPage) {
-			$file = $post->files[0];
-			$this->translateFile($file, $post, $apiPost);
-
-			if (sizeof($post->files) > 1) {
-				$extra_files = [];
-				foreach ($post->files as $i => $f) {
-					if ($i == 0) {
-						continue;
-					}
-
-					$extra_file = [];
-					$this->translateFile($f, $post, $extra_file);
-
-					$extra_files[] = $extra_file;
-				}
-				$apiPost['extra_files'] = $extra_files;
-			}
-		}
-
 		return $apiPost;
 	}
 
-	public function translateThread(Thread $thread, bool $threadsPage = false) {
-		$apiPosts = [];
+	function translateThread(Thread $thread, $threadsPage = false) {
+		$apiPosts = array();
 		$op = $this->translatePost($thread, $threadsPage);
 		if (!$threadsPage) $op['resto'] = 0;
 		$apiPosts['posts'][] = $op;
@@ -181,16 +120,16 @@ class Api {
 		return $apiPosts;
 	}
 
-	public function translatePage(array $threads) {
-		$apiPage = [];
+	function translatePage(array $threads) {
+		$apiPage = array();
 		foreach ($threads as $thread) {
 			$apiPage['threads'][] = $this->translateThread($thread);
 		}
 		return $apiPage;
 	}
 
-	public function translateCatalogPage(array $threads, bool $threadsPage = false) {
-		$apiPage = [];
+	function translateCatalogPage(array $threads, $threadsPage = false) {
+		$apiPage = array();
 		foreach ($threads as $thread) {
 			$ts = $this->translateThread($thread, $threadsPage);
 			$apiPage['threads'][] = current($ts['posts']);
@@ -198,8 +137,8 @@ class Api {
 		return $apiPage;
 	}
 
-	public function translateCatalog($catalog, bool $threadsPage = false) {
-		$apiCatalog = [];
+	function translateCatalog($catalog, $threadsPage = false) {
+		$apiCatalog = array();
 		foreach ($catalog as $page => $threads) {
 			$apiPage = $this->translateCatalogPage($threads, $threadsPage);
 			$apiPage['page'] = $page;

inc/bans.php

@@ -1,163 +1,12 @@
 <?php
 
-use Vichan\Functions\Format;
+require 'inc/lib/IP/Lifo/IP/IP.php';
+require 'inc/lib/IP/Lifo/IP/BC.php';
+require 'inc/lib/IP/Lifo/IP/CIDR.php';
+
 use Lifo\IP\CIDR;
 
 class Bans {
-	static private function shouldDelete(array $ban, bool $require_ban_view) {
-		return $ban['expires'] && ($ban['seen'] || !$require_ban_view) && $ban['expires'] < time();
-	}
-
-	static private function deleteBans(array $ban_ids) {
-		$len = count($ban_ids);
-		if ($len === 1) {
-			$query = prepare('DELETE FROM ``bans`` WHERE `id` = :id');
-			$query->bindValue(':id', $ban_ids[0], PDO::PARAM_INT);
-			$query->execute() or error(db_error());
-
-			Vichan\Functions\Theme\rebuild_themes('bans');
-		} elseif ($len >= 1) {
-			// Build the query.
-			$query = 'DELETE FROM ``bans`` WHERE `id` IN (';
-			for ($i = 0; $i < $len; $i++) {
-				$query .= ":id{$i},";
-			}
-			// Substitute the last comma with a parenthesis.
-			substr_replace($query, ')', strlen($query) - 1);
-
-			// Bind the params
-			$query = prepare($query);
-			for ($i = 0; $i < $len; $i++) {
-				$query->bindValue(":id{$i}", (int)$ban_ids[$i], PDO::PARAM_INT);
-			}
-
-			$query->execute() or error(db_error());
-
-			Vichan\Functions\Theme\rebuild_themes('bans');
-		}
-	}
-
-	static private function findSingleAutoGc(string $ip, int $ban_id, bool $require_ban_view) {
-		// Use OR in the query to also garbage collect bans.
-		$query = prepare(
-			'SELECT ``bans``.* FROM ``bans``
-			 WHERE ((`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)) OR (``bans``.id = :id))
-			 ORDER BY `expires` IS NULL, `expires` DESC'
-		);
-
-		$query->bindValue(':id', $ban_id);
-		$query->bindValue(':ip', inet_pton($ip));
-
-		$query->execute() or error(db_error($query));
-
-		$found_ban = null;
-		$to_delete_list = [];
-
-		while ($ban = $query->fetch(PDO::FETCH_ASSOC)) {
-			if (self::shouldDelete($ban, $require_ban_view)) {
-				$to_delete_list[] = $ban['id'];
-			} elseif ($ban['id'] === $ban_id) {
-				if ($ban['post']) {
-					$ban['post'] = json_decode($ban['post'], true);
-				}
-				$ban['mask'] = self::range_to_string([$ban['ipstart'], $ban['ipend']]);
-				$found_ban = $ban;
-			}
-		}
-
-		self::deleteBans($to_delete_list);
-
-		return $found_ban;
-	}
-
-	static private function findSingleNoGc(int $ban_id) {
-		$query = prepare(
-			'SELECT ``bans``.* FROM ``bans``
-			 WHERE ``bans``.id = :id
-			 ORDER BY `expires` IS NULL, `expires` DESC
-			 LIMIT 1'
-		);
-
-		$query->bindValue(':id', $ban_id);
-
-		$query->execute() or error(db_error($query));
-		$ret = $query->fetch(PDO::FETCH_ASSOC);
-		if ($query->rowCount() == 0) {
-			return null;
-		} else {
-			if ($ret['post']) {
-				$ret['post'] = json_decode($ret['post'], true);
-			}
-			$ret['mask'] = self::range_to_string([$ret['ipstart'], $ret['ipend']]);
-
-			return $ret;
-		}
-	}
-
-	static private function findAutoGc(?string $ip, $board, bool $get_mod_info, bool $require_ban_view, ?int $ban_id): array {
-		$query = prepare('SELECT ``bans``.*' . ($get_mod_info ? ', `username`' : '') . ' FROM ``bans``
-		' . ($get_mod_info ? 'LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`' : '') . '
-		WHERE
-			(' . ($board !== false ? '(`board` IS NULL OR `board` = :board) AND' : '') . '
-			(`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)) OR (``bans``.id = :id))
-		ORDER BY `expires` IS NULL, `expires` DESC');
-
-		if ($board !== false) {
-			$query->bindValue(':board', $board, PDO::PARAM_STR);
-		}
-
-		$query->bindValue(':id', $ban_id);
-		$query->bindValue(':ip', inet_pton($ip));
-		$query->execute() or error(db_error($query));
-
-		$ban_list = [];
-		$to_delete_list = [];
-
-		while ($ban = $query->fetch(PDO::FETCH_ASSOC)) {
-			if (self::shouldDelete($ban, $require_ban_view)) {
-				$to_delete_list[] = $ban['id'];
-			} else {
-				if ($ban['post']) {
-					$ban['post'] = json_decode($ban['post'], true);
-				}
-				$ban['mask'] = self::range_to_string([$ban['ipstart'], $ban['ipend']]);
-				$ban_list[] = $ban;
-			}
-		}
-
-		self::deleteBans($to_delete_list);
-
-		return $ban_list;
-	}
-
-	static private function findNoGc(?string $ip, string $board, bool $get_mod_info, ?int $ban_id): array {
-		$query = prepare('SELECT ``bans``.*' . ($get_mod_info ? ', `username`' : '') . ' FROM ``bans``
-		' . ($get_mod_info ? 'LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`' : '') . '
-		WHERE
-			(' . ($board !== false ? '(`board` IS NULL OR `board` = :board) AND' : '') . '
-			(`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)) OR (``bans``.id = :id))
-			AND (`expires` IS NULL OR `expires` >= :curr_time)
-		ORDER BY `expires` IS NULL, `expires` DESC');
-
-		if ($board !== false) {
-			$query->bindValue(':board', $board, PDO::PARAM_STR);
-		}
-
-		$query->bindValue(':id', $ban_id);
-		$query->bindValue(':ip', inet_pton($ip));
-		$query->bindValue(':curr_time', time());
-		$query->execute() or error(db_error($query));
-
-		$ban_list = $query->fetchAll(PDO::FETCH_ASSOC);
-		array_walk($ban_list, function (&$ban, $_index) {
-			if ($ban['post']) {
-				$ban['post'] = json_decode($ban['post'], true);
-			}
-			$ban['mask'] = self::range_to_string([$ban['ipstart'], $ban['ipend']]);
-		});
-		return $ban_list;
-	}
-
 	static public function range_to_string($mask) {
 		list($ipstart, $ipend) = $mask;
 		
@@ -181,7 +30,7 @@ class Bans {
 		$cidr = new CIDR($mask);
 		$range = $cidr->getRange();
 		
-		return [ inet_pton($range[0]), inet_pton($range[1]) ];
+		return array(inet_pton($range[0]), inet_pton($range[1]));
 	}
 	
 	public static function parse_time($str) {
@@ -198,31 +47,31 @@ class Bans {
 	
 		if (isset($matches[2])) {
 			// Years
-			$expire += (int)$matches[2]*60*60*24*365;
+			$expire += $matches[2]*60*60*24*365;
 		}
 		if (isset($matches[4])) {
 			// Months
-			$expire += (int)$matches[4]*60*60*24*30;
+			$expire += $matches[4]*60*60*24*30;
 		}
 		if (isset($matches[6])) {
 			// Weeks
-			$expire += (int)$matches[6]*60*60*24*7;
+			$expire += $matches[6]*60*60*24*7;
 		}
 		if (isset($matches[8])) {
 			// Days
-			$expire += (int)$matches[8]*60*60*24;
+			$expire += $matches[8]*60*60*24;
 		}
 		if (isset($matches[10])) {
 			// Hours
-			$expire += (int)$matches[10]*60*60;
+			$expire += $matches[10]*60*60;
 		}
 		if (isset($matches[12])) {
 			// Minutes
-			$expire += (int)$matches[12]*60;
+			$expire += $matches[12]*60;
 		}
 		if (isset($matches[14])) {
 			// Seconds
-			$expire += (int)$matches[14];
+			$expire += $matches[14];
 		}
 	
 		return time() + $expire;
@@ -265,135 +114,90 @@ class Bans {
 				return false;
 		}
 		
-		return [$ipstart, $ipend];
+		return array($ipstart, $ipend);
 	}
 	
-	static public function findSingle(string $ip, int $ban_id, bool $require_ban_view, bool $auto_gc) {
-		if ($auto_gc) {
-			return self::findSingleAutoGc($ip, $ban_id, $require_ban_view);
-		} else {
-			return self::findSingleNoGc($ban_id);
-		}
-	}
-
-	static public function find(?string $ip, $board = false, bool $get_mod_info = false, ?int $ban_id = null, bool $auto_gc = true) {
+	static public function find($ip, $board = false, $get_mod_info = false) {
 		global $config;
 		
-		if ($auto_gc) {
-			return self::findAutoGc($ip, $board, $get_mod_info, $config['require_ban_view'], $ban_id);
-		} else {
-			return self::findNoGc($ip, $board, $get_mod_info, $ban_id);
+		$query = prepare('SELECT ``bans``.*' . ($get_mod_info ? ', `username`' : '') . ' FROM ``bans``
+		' . ($get_mod_info ? 'LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`' : '') . '
+		WHERE
+			(' . ($board ? '(`board` IS NULL OR `board` = :board) AND' : '') . '
+			(`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)))
+		ORDER BY `expires` IS NULL, `expires` DESC');
+		
+		if ($board)
+			$query->bindValue(':board', $board);
+		
+		$query->bindValue(':ip', inet_pton($ip));
+		$query->execute() or error(db_error($query));
+		
+		$ban_list = array();
+		
+		while ($ban = $query->fetch(PDO::FETCH_ASSOC)) {
+			if ($ban['expires'] && ($ban['seen'] || !$config['require_ban_view']) && $ban['expires'] < time()) {
+				self::delete($ban['id']);
+			} else {
+				if ($ban['post'])
+					$ban['post'] = json_decode($ban['post'], true);
+				$ban['mask'] = self::range_to_string(array($ban['ipstart'], $ban['ipend']));
+				$ban_list[] = $ban;
+			}
 		}
+		
+		return $ban_list;
 	}
 	
-	static public function stream_json($out = false, $filter_ips = false, $filter_staff = false, $board_access = false) {
+	static public function list_all($offset = 0, $limit = 9001) {
+		$offset = (int)$offset;
+		$limit = (int)$limit;
+		
 		$query = query("SELECT ``bans``.*, `username` FROM ``bans``
 			LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`
- 			ORDER BY `created` DESC") or error(db_error());
-                $bans = $query->fetchAll(PDO::FETCH_ASSOC);
-
-		if ($board_access && $board_access[0] == '*') $board_access = false;
-
-		$out ? fputs($out, "[") : print("[");
-
-		$end = end($bans);
+			ORDER BY `created` DESC LIMIT $offset, $limit") or error(db_error());
+		$bans = $query->fetchAll(PDO::FETCH_ASSOC);
 		
 		foreach ($bans as &$ban) {
-			$ban['mask'] = self::range_to_string([$ban['ipstart'], $ban['ipend']]);
-
-			if ($ban['post']) {
-				$post = json_decode($ban['post']);
-				$ban['message'] = isset($post->body) ? $post->body : 0;
-			}
-			unset($ban['ipstart'], $ban['ipend'], $ban['post'], $ban['creator']);
-
-			if ($board_access === false || in_array ($ban['board'], $board_access)) {
-				$ban['access'] = true;
-			}
-
-			if (filter_var($uncloaked_mask, FILTER_VALIDATE_IP) !== false) {
-				$ban['single_addr'] = true;
-			}
-			if ($filter_staff || ($board_access !== false && !in_array($ban['board'], $board_access))) {
-				$ban['username'] = '?';
-			}
-			if ($filter_ips || ($board_access !== false && !in_array($ban['board'], $board_access))) {
-				@list($ban['mask'], $subnet) = explode("/", $ban['mask']);
-				$ban['mask'] = preg_split("/[\.:]/", $ban['mask']);
-				$ban['mask'] = array_slice($ban['mask'], 0, 2);
-				$ban['mask'] = implode(".", $ban['mask']);
-				$ban['mask'] .= ".x.x";
-				if (isset ($subnet)) {
-					$ban['mask'] .= "/$subnet";
-				}
-				$ban['masked'] = true;
-			}
-
-			$json = json_encode($ban);
-			$out ? fputs($out, $json) : print($json);
-
-			if ($ban['id'] != $end['id']) {
-				$out ? fputs($out, ",") : print(",");
-			}
+			$ban['mask'] = self::range_to_string(array($ban['ipstart'], $ban['ipend']));
 		}
 		
-		$out ? fputs($out, "]") : print("]");
+		return $bans;
+	}
 	
+	static public function count() {
+		$query = query("SELECT COUNT(*) FROM ``bans``") or error(db_error());
+		return (int)$query->fetchColumn();
 	}
 	
 	static public function seen($ban_id) {
 		$query = query("UPDATE ``bans`` SET `seen` = 1 WHERE `id` = " . (int)$ban_id) or error(db_error());
-                Vichan\Functions\Theme\rebuild_themes('bans');
 	}
 	
-	static public function purge($require_seen, $moratorium) {
-		if ($require_seen) {
-			$query = prepare("DELETE FROM ``bans`` WHERE `expires` IS NOT NULL AND `expires` + :moratorium < :curr_time AND `seen` = 1");
-		} else {
-			$query = prepare("DELETE FROM ``bans`` WHERE `expires` IS NOT NULL AND `expires` + :moratorium < :curr_time");
-		}
-		$query->bindValue(':moratorium', $moratorium);
-		$query->bindValue(':curr_time', time());
-		$query->execute() or error(db_error($query));
-
-		$affected = $query->rowCount();
-		if ($affected > 0) {
-			Vichan\Functions\Theme\rebuild_themes('bans');
-		}
-		return $affected;
+	static public function purge() {
+		$query = query("DELETE FROM ``bans`` WHERE `expires` IS NOT NULL AND `expires` < " . time() . " AND `seen` = 1") or error(db_error());
 	}
 	
-	static public function delete($ban_id, $modlog = false, $boards = false, $dont_rebuild = false) {
-		global $config;
-
-		if ($boards && $boards[0] == '*') $boards = false;
-
+	static public function delete($ban_id, $modlog = false) {
 		if ($modlog) {
-			$query = query("SELECT `ipstart`, `ipend`, `board` FROM ``bans`` WHERE `id` = " . (int)$ban_id) or error(db_error());
+			$query = query("SELECT `ipstart`, `ipend` FROM ``bans`` WHERE `id` = " . (int)$ban_id) or error(db_error());
 			if (!$ban = $query->fetch(PDO::FETCH_ASSOC)) {
 				// Ban doesn't exist
 				return false;
 			}
 			
-			if ($boards !== false && !in_array($ban['board'], $boards))
-		                error($config['error']['noaccess']);
-
-			$mask = self::range_to_string([$ban['ipstart'], $ban['ipend']]);
+			$mask = self::range_to_string(array($ban['ipstart'], $ban['ipend']));
 			
 			modLog("Removed ban #{$ban_id} for " .
-				(filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$cloaked_mask\">$cloaked_mask</a>" : $cloaked_mask));
+				(filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$mask\">$mask</a>" : $mask));
 		}
 		
 		query("DELETE FROM ``bans`` WHERE `id` = " . (int)$ban_id) or error(db_error());
 		
-		if (!$dont_rebuild) Vichan\Functions\Theme\rebuild_themes('bans');
-
 		return true;
 	}
 	
-	static public function new_ban($cloaked_mask, $reason, $length = false, $ban_board = false, $mod_id = false, $post = false) {
-		$mask = uncloak_mask($cloaked_mask);
-
+	static public function new_ban($mask, $reason, $length = false, $ban_board = false, $mod_id = false, $post = false) {
 		global $mod, $pdo, $board;
 		
 		if ($mod_id === false) {
@@ -402,7 +206,6 @@ class Bans {
 				
 		$range = self::parse_range($mask);
 		$mask = self::range_to_string($range);
-		$cloaked_mask = cloak_mask($mask);
 		
 		$query = prepare("INSERT INTO ``bans`` VALUES (NULL, :ipstart, :ipend, :time, :expires, :board, :mod, :reason, 0, :post)");
 		
@@ -439,34 +242,23 @@ class Bans {
 			$query->bindValue(':board', null, PDO::PARAM_NULL);
 		
 		if ($post) {
-			if (!isset($board['uri']))
-				openBoard($post['board']);
-
 			$post['board'] = $board['uri'];
-			/*
-			 * The body can be so long to make the json longer than 64KBs, causing the query to fail.
-			 * Truncate it to a safe length (32KBs). It could probably be longer, but if the deleted body is THAT big
-			 * already, the likelihood of it being just assorted spam/garbage is about 101%.
-			 */
-			// We're on UTF-8 only, right...?
-			$post['body'] = mb_strcut($post['body'], 0, 32768);
-
 			$query->bindValue(':post', json_encode($post));
 		} else
 			$query->bindValue(':post', null, PDO::PARAM_NULL);
 		
 		$query->execute() or error(db_error($query));
 		
-		$ban_len = $length > 0 ? preg_replace('/^(\d+) (\w+?)s?$/', '$1-$2', Format\until($length)) : 'permanent';
-		$ban_board = $ban_board ? "/$ban_board/" : 'all boards';
-		$ban_ip = filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$cloaked_mask\">$cloaked_mask</a>" : $cloaked_mask;
-		$ban_id = $pdo->lastInsertId();
-		$ban_reason = $reason ? 'reason: ' . utf8tohtml($reason) : 'no reason';
-
-		modLog("Created a new $ban_len ban on $ban_board for $ban_ip (<small># $ban_id </small>) with $ban_reason");
-
-		Vichan\Functions\Theme\rebuild_themes('bans');
-
+		if (isset($mod['id']) && $mod['id'] == $mod_id) {
+			modLog('Created a new ' .
+				($length > 0 ? preg_replace('/^(\d+) (\w+?)s?$/', '$1-$2', until($length)) : 'permanent') .
+				' ban on ' .
+				($ban_board ? '/' . $ban_board . '/' : 'all boards') .
+				' for ' .
+				(filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$mask\">$mask</a>" : $mask) .
+				' (<small>#' . $pdo->lastInsertId() . '</small>)' .
+				' with ' . ($reason ? 'reason: ' . utf8tohtml($reason) . '' : 'no reason'));
+		}
 		return $pdo->lastInsertId();
 	}
 }

inc/bootstrap.php

@@ -1,3 +0,0 @@
-<?php
-@define('TINYBOARD', 'xD');
-require_once('vendor/autoload.php');

inc/cache.php

@@ -4,89 +4,143 @@
  *  Copyright (c) 2010-2013 Tinyboard Development Group
  */
 
-use Vichan\Data\Driver\{CacheDriver, ApcuCacheDriver, ArrayCacheDriver, FsCacheDriver, MemcachedCacheDriver, NoneCacheDriver, RedisCacheDriver};
-
 defined('TINYBOARD') or exit;
 
-
 class Cache {
-	private static function buildCache(): CacheDriver {
+	private static $cache;
+	public static function init() {
 		global $config;
 		
 		switch ($config['cache']['enabled']) {
 			case 'memcached':
-				return new MemcachedCacheDriver(
-					$config['cache']['prefix'],
-					$config['cache']['memcached']
-				);
+				self::$cache = new Memcached();
+				self::$cache->addServers($config['cache']['memcached']);
+				break;
 			case 'redis':
-				return new RedisCacheDriver(
-					$config['cache']['prefix'],
-					$config['cache']['redis'][0],
-					$config['cache']['redis'][1],
-					$config['cache']['redis'][2],
-					$config['cache']['redis'][3]
-				);
-			case 'apcu':
-				return new ApcuCacheDriver;
-			case 'fs':
-				return new FsCacheDriver(
-					$config['cache']['prefix'],
-					"tmp/cache/{$config['cache']['prefix']}",
-					'.lock',
-					$config['auto_maintenance'] ? 1000 : false
-				);
-			case 'none':
-				return new NoneCacheDriver();
+				self::$cache = new Redis();
+				self::$cache->connect($config['cache']['redis'][0], $config['cache']['redis'][1]);
+				if ($config['cache']['redis'][2]) {
+					self::$cache->auth($config['cache']['redis'][2]);
+				}
+				self::$cache->select($config['cache']['redis'][3]) or die('cache select failure');
+				break;
 			case 'php':
-			default:
-				return new ArrayCacheDriver();
+				self::$cache = array();
+				break;
 		}
 	}
-
-	public static function getCache(): CacheDriver {
-		static $cache;
-		return $cache ??= self::buildCache();
-	}
-
 	public static function get($key) {
 		global $config, $debug;
 		
-		$ret = self::getCache()->get($key);
-		if ($ret === null) {
-			$ret = false;
+		$key = $config['cache']['prefix'] . $key;
+		
+		$data = false;
+		switch ($config['cache']['enabled']) {
+			case 'memcached':
+				if (!self::$cache)
+					self::init();
+				$data = self::$cache->get($key);
+				break;
+			case 'apc':
+				$data = apc_fetch($key);
+				break;
+			case 'xcache':
+				$data = xcache_get($key);
+				break;
+			case 'php':
+				$data = isset(self::$cache[$key]) ? self::$cache[$key] : false;
+				break;
+			case 'redis':
+				if (!self::$cache)
+					self::init();
+				$data = json_decode(self::$cache->get($key), true);
+				break;
 		}
 		
-		if ($config['debug']) {
-			$debug['cached'][] = $config['cache']['prefix'] . $key . ($ret === false ? ' (miss)' : ' (hit)');
-		}
+		if ($config['debug'])
+			$debug['cached'][] = $key . ($data === false ? ' (miss)' : ' (hit)');
 		
-		return $ret;
+		return $data;
 	}
 	public static function set($key, $value, $expires = false) {
 		global $config, $debug;
 		
-		if (!$expires) {
+		$key = $config['cache']['prefix'] . $key;
+		
+		if (!$expires)
 			$expires = $config['cache']['timeout'];
+		
+		switch ($config['cache']['enabled']) {
+			case 'memcached':
+				if (!self::$cache)
+					self::init();
+				self::$cache->set($key, $value, $expires);
+				break;
+			case 'redis':
+				if (!self::$cache)
+					self::init();
+				self::$cache->setex($key, $expires, json_encode($value));
+				break;
+			case 'apc':
+				apc_store($key, $value, $expires);
+				break;
+			case 'xcache':
+				xcache_set($key, $value, $expires);
+				break;
+			case 'php':
+				self::$cache[$key] = $value;
+				break;
 		}
 		
-		self::getCache()->set($key, $value, $expires);
-
-		if ($config['debug']) {
-			$debug['cached'][] = $config['cache']['prefix'] . $key . ' (set)';
-		}
+		if ($config['debug'])
+			$debug['cached'][] = $key . ' (set)';
 	}
 	public static function delete($key) {
 		global $config, $debug;
 		
-		self::getCache()->delete($key);
+		$key = $config['cache']['prefix'] . $key;
 		
-		if ($config['debug']) {
-			$debug['cached'][] = $config['cache']['prefix'] . $key . ' (deleted)';
+		switch ($config['cache']['enabled']) {
+			case 'memcached':
+			case 'redis':
+				if (!self::$cache)
+					self::init();
+				self::$cache->delete($key);
+				break;
+			case 'apc':
+				apc_delete($key);
+				break;
+			case 'xcache':
+				xcache_unset($key);
+				break;
+			case 'php':
+				unset(self::$cache[$key]);
+				break;
 		}
+		
+		if ($config['debug'])
+			$debug['cached'][] = $key . ' (deleted)';
 	}
 	public static function flush() {
-		self::getCache()->flush();
+		global $config;
+		
+		switch ($config['cache']['enabled']) {
+			case 'memcached':
+				if (!self::$cache)
+					self::init();
+				return self::$cache->flush();
+			case 'apc':
+				return apc_clear_cache('user');
+			case 'php':
+				self::$cache = array();
+				break;
+			case 'redis':
+				if (!self::$cache)
+					self::init();
+				return self::$cache->flushDB();
+		}
+		
 		return false;
 	}
 }
+

inc/captcha/captcha.php

@@ -1,357 +0,0 @@
-<?php
-class CzaksCaptcha {
-  var $content = array();
-
-  var $width, $height, $color, $charset, $style;
-
-  function __construct($text, $left, $top, $charset=false) {
-    if (!$charset) {
-      $charset = 'abcdefghijklmnopqrstuvwxyz';
-    }
-
-    $len = mb_strlen($text, 'utf-8');
-
-    $this->width = $left;
-    $this->height = $top;
-
-    $this->charset = preg_split('//u', $charset);
-    
-    $this->style = "";
-
-    for ($i = 0; $i < $len; $i++) {
-      $this->content[] = array(mb_substr($text, $i, 1, 'utf-8'), "top" => $top / 2 - $top / 4,
-                                                                 "left" => $left/10 + 9*$left*$i/10/$len,
-                                                                 "position" => "absolute");
-    }
-
-    $this->color = "hsla(".rand(1,360).", 76%, 78%, 1)";
-
-    $this->add_junk();
-    $this->mutate_sizes();
-    $this->mutate_positions();
-    $this->mutate_transform();
-    $this->mutate_anchors();
-    $this->randomize();
-    $this->mutate_containers();
-    $this->mutate_margins();
-    $this->mutate_styles();
-    $this->randomize();
-  }
-
-  function mutate_sizes() {
-    foreach ($this->content as &$v) {
-      if (!isset ($v['font-size']))
-        $v['font-size'] = rand(intval($this->height/3) - 4, intval($this->height/3) + 8);
-    }
-  }
-  function mutate_positions() {
-    foreach ($this->content as &$v) {
-      $v['top'] += rand(-10,10);
-      $v['left'] += rand(-10,10);
-    }
-  }
-  function mutate_transform() {
-    $fromto = array('6'=>'9', '9'=>'6', '8'=>'8', '0'=>'0',
-                    'z'=>'z', 's'=>'s', 'n'=>'u', 'u'=>'n',
-                    'a'=>'ɐ', 'e'=>'ə', 'p'=>'d', 'd'=>'p',
-                    'A'=>'∀', 'E'=>'∃', 'H'=>'H', 'o'=>'o',
-		    'O'=>'O');
-
-    foreach ($this->content as &$v) {
-      $basefrom = -20;
-      $baseto = 20;
-
-      if (isset($fromto[$v[0]]) && rand(0,1)) {
-        $v[0] = $fromto[$v[0]];
-        $basefrom = 160;
-        $baseto = 200;
-      }
-
-      $v['transform'] = 'rotate('.rand($basefrom,$baseto).'deg)';
-      $v['-ms-transform'] = 'rotate('.rand($basefrom,$baseto).'deg)';
-      $v['-webkit-transform'] = 'rotate('.rand($basefrom,$baseto).'deg)';
-    }
-  }
-  function randomize(&$a = false) {
-    if ($a === false) {
-      $a = &$this->content;
-    }
-  
-    shuffle($a);
-
-    foreach ($a as &$v) {
-      $this->shuffle_assoc($v);
-      
-      if (is_array ($v[0])) {
-        $this->randomize($v[0]);
-      }
-    }
-  }
-
-  function add_junk() {
-    $count = rand(200, 300);
-
-    while ($count--) {
-      $elem = array();
-
-      $elem['top'] = rand(0, $this->height);
-      $elem['left'] = rand(0, $this->width);
-      
-      $elem['position'] = 'absolute';
-
-      $elem[0] = $this->charset[rand(0, count($this->charset)-1)];
-
-      switch($t = rand (0,9)) {
-        case 0:
-          $elem['display'] = 'none'; break;
-        case 1:
-          $elem['top'] = rand(-60, -90); break;
-        case 2:
-          $elem['left'] = rand(-40, -70); break;
-        case 3:
-          $elem['top'] = $this->height + rand(10, 60); break;
-        case 4:
-          $elem['left'] = $this->width + rand(10, 60); break;
-        case 5:
-          $elem['color'] = $this->color; break;
-        case 6:
-          $elem['visibility'] = 'hidden'; break;
-        case 7:
-          $elem['height'] = rand(0,2);
-          $elem['overflow'] = 'hidden'; break;
-        case 8:
-          $elem['width'] = rand(0,1);
-          $elem['overflow'] = 'hidden'; break;
-        case 9:
-          $elem['font-size'] = rand(2, 6); break;
-      }
-
-      $this->content[] = $elem;
-    }
-  }
-  
-  function mutate_anchors() {
-    foreach ($this->content as &$elem) {
-      if (rand(0,1)) {
-        $elem['right'] = $this->width - $elem['left'] - (int)(0.5*$elem['font-size']);
-        unset($elem['left']);
-      }
-      if (rand(0,1)) {
-        $elem['bottom'] = $this->height - $elem['top'] - (int)(1.5*$elem['font-size']);
-        unset($elem['top']);
-      }
-    }
-  }
-  
-  function mutate_containers() {
-    for ($i = 0; $i <= 80; $i++) {
-      $new = [];
-      $new['width'] = rand(0, $this->width*2);
-      $new['height'] = rand(0, $this->height*2);
-      $new['top'] = rand(-$this->height * 2, $this->height * 2);
-      $new['bottom'] = $this->height - ($new['top'] + $new['height']);
-      $new['left'] = rand(-$this->width * 2, $this->width * 2);
-      $new['right'] = $this->width - ($new['left'] + $new['width']);
-      
-      $new['position'] = 'absolute';
-
-      $new[0] = [];
-      
-      $cnt = rand(0,10);
-      for ($j = 0; $j < $cnt; $j++) {
-        $elem = array_pop($this->content);
-        if (!$elem) break;
-        
-        if (isset($elem['top'])) $elem['top'] -= $new['top'];
-        if (isset($elem['bottom'])) $elem['bottom'] -= $new['bottom'];
-        if (isset($elem['left'])) $elem['left'] -= $new['left'];
-        if (isset($elem['right'])) $elem['right'] -= $new['right'];
-        
-        $new[0][] = $elem;
-      }
-      
-      if (rand (0,1)) unset($new['top']);
-                 else unset($new['bottom']);
-      if (rand (0,1)) unset($new['left']);
-                 else unset($new['right']);
-                 
-      $this->content[] = $new;
-      
-      shuffle($this->content);
-    }
-  }
-  
-  function mutate_margins(&$a = false) {
-    if ($a === false) {
-      $a = &$this->content;
-    }
-    
-    foreach ($a as &$v) {
-      $ary = ['top', 'left', 'bottom', 'right'];
-      shuffle($ary);
-      $cnt = rand(0,4);
-      $ary = array_slice($ary, 0, $cnt);
-      
-      foreach ($ary as $prop) {
-	$margin = rand(-1000, 1000);
-	
-	$v['margin-'.$prop] = $margin;
-	
-	if (isset($v[$prop])) {
-	  $v[$prop] -= $margin;
-	}
-      }
-      
-      if (is_array($v[0])) {
-	$this->mutate_margins($v[0]);
-      }
-    }
-  }
-  
-  function mutate_styles(&$a = false) {
-    if ($a === false) {
-      $a = &$this->content;
-    }
-    
-    foreach ($a as &$v) {
-      $content = $v[0];
-      unset($v[0]);
-      $styles = array_splice($v, 0, rand(0, 6));
-      $v[0] = $content;
-      
-      $id_or_class = rand(0,1);
-      $param = $id_or_class ? "id" : "class";
-      $prefix = $id_or_class ? "#" : ".";
-      $genname = "zz-".base_convert(rand(1,999999999), 10, 36);
-      
-      if ($styles || rand(0,1)) {
-        $this->style .= $prefix.$genname."{";
-        $this->style .= $this->rand_whitespace();
-      
-        foreach ($styles as $k => $val) {
-          if (is_int($val)) {
-            $val = "".$val."px";
-          }
-
-          $this->style .= "$k:";
-          $this->style .= $this->rand_whitespace();
-          $this->style .= "$val;";
-          $this->style .= $this->rand_whitespace();
-        }
-        $this->style .= "}";
-        $this->style .= $this->rand_whitespace();
-      }
-      
-      $v[$param] = $genname;
-    
-      if (is_array($v[0])) {
-	$this->mutate_styles($v[0]);
-      }
-    }
-  }
-
-  function to_html(&$a = false) {
-    $inside = true;
-    
-    if ($a === false) {
-      if ($this->style) {
-        echo "<style type='text/css'>";
-        echo $this->style;
-        echo "</style>";
-      }
-    
-      echo "<div style='position: relative; width: ".$this->width."px; height: ".$this->height."px; overflow: hidden; background-color: ".$this->color."'>";
-      $a = &$this->content;
-      $inside = false;
-    }
-    
-    foreach ($a as &$v) {
-      $letter = $v[0];
-
-      unset ($v[0]);
-
-      echo "<div";
-      echo $this->rand_whitespace(1);
-      
-      if (isset ($v['id'])) {
-        echo "id='$v[id]'";
-        echo $this->rand_whitespace(1);
-
-        unset ($v['id']);
-      }
-      if (isset ($v['class'])) {
-        echo "class='$v[class]'";
-        echo $this->rand_whitespace(1);
-                
-        unset ($v['class']);
-      }
-      
-      echo "style='";
-
-      foreach ($v as $k => $val) {
-        if (is_int($val)) {
-          $val = "".$val."px";
-        }
-
-        echo "$k:";
-        echo $this->rand_whitespace();
-        echo "$val;";
-        echo $this->rand_whitespace();
-
-      }
-
-      echo "'>";
-      echo $this->rand_whitespace();
-      
-      if (is_array ($letter)) {
-        $this->to_html($letter);
-      }
-      else {
-        echo $letter;
-      }
-      
-      echo "</div>";
-    }
-
-    if (!$inside) {
-      echo "</div>";
-    }
-
-  }
-
-  function rand_whitespace($r = 0) {
-    switch (rand($r,4)) {
-      case 0:
-        return "";
-      case 1:
-        return "\n";
-      case 2:
-        return "\t";
-      case 3:
-        return " ";
-      case 4:
-        return "   ";
-    }
-  }
-
-
-
-    function shuffle_assoc(&$array) {
-        $keys = array_keys($array);
-
-        shuffle($keys);
-
-        foreach($keys as $key) {
-            $new[$key] = $array[$key];
-        }
-
-        $array = $new;
-
-        return true;
-    }
-}
-
-//$charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789卐";
-
-//(new CzaksCaptcha("hotwheels", 300, 80, $charset))->to_html();
-?>

inc/captcha/config.php

@@ -1,16 +0,0 @@
-<?php
-// We are using a custom path here to connect to the database.
-// Why? Performance reasons.
-
-$pdo = new PDO("mysql:dbname=database_name;host=localhost", "database_user", "database_password", array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-
-
-// Captcha expiration:
-$expires_in = 120; // 120 seconds
-
-// Captcha dimensions:
-$width = 250;
-$height = 80;
-
-// Captcha length:
-$length = 6;

inc/captcha/entrypoint.php

@@ -1,85 +0,0 @@
-<?php
-$mode = @$_GET['mode'];
-
-require_once("captcha.php");
-
-function rand_string($length, $charset) {
-  $ret = "";
-  while ($length--) {
-    $ret .= mb_substr($charset, rand(0, mb_strlen($charset, 'utf-8')-1), 1, 'utf-8');
-  }
-  return $ret;
-}
-
-function cleanup ($pdo, $expires_in) {
-  $pdo->prepare("DELETE FROM `captchas` WHERE `created_at` < ?")->execute([time() - $expires_in]);
-}
-
-switch ($mode) {
-// Request: GET entrypoint.php?mode=get&extra=1234567890
-// Response: JSON: cookie => "generatedcookie", captchahtml => "captchahtml", expires_in => 120
-case "get":
-  if (!isset ($_GET['extra'])) {
-    die();
-  }
-
-  header("Content-type: application/json");
-
-  $extra = $_GET['extra'];
-
-  require_once("config.php");
-
-  $text = rand_string($length, $extra);
-
-  $captcha = new CzaksCaptcha($text, $width, $height, $extra);
-
-  $cookie = rand_string(20, "abcdefghijklmnopqrstuvwxyz");
-
-  ob_start();
-  $captcha->to_html();
-  $html = ob_get_contents();
-  ob_end_clean();
-
-  $query = $pdo->prepare("INSERT INTO `captchas` (`cookie`, `extra`, `text`, `created_at`) VALUES (?, ?, ?, ?)");
-  $query->execute(                               [$cookie,  $extra,  $text,  time()]);
-
-  echo json_encode(["cookie" => $cookie, "captchahtml" => $html, "expires_in" => $expires_in]);
-  
-  break;
-
-// Request: GET entrypoint.php?mode=check&cookie=generatedcookie&extra=1234567890&text=captcha
-// Response: 0 OR 1
-case "check":
-  if (!isset ($_GET['mode'])
-   || !isset ($_GET['cookie'])
-   || !isset ($_GET['extra'])
-   || !isset ($_GET['text'])) {
-    die();
-  }
-
-  require_once("config.php");
-
-  cleanup($pdo, $expires_in);
-
-  $query = $pdo->prepare("SELECT * FROM `captchas` WHERE `cookie` = ? AND `extra` = ?");
-  $query->execute([$_GET['cookie'], $_GET['extra']]);
-
-  $ary = $query->fetchAll();
-
-  if (!$ary) {
-    echo "0";
-  }
-  else {
-    $query = $pdo->prepare("DELETE FROM `captchas` WHERE `cookie` = ? AND `extra` = ?");
-    $query->execute([$_GET['cookie'], $_GET['extra']]);
-
-    if ($ary[0]['text'] !== $_GET['text']) {
-      echo "0";
-    }
-    else {
-      echo "1";
-    }
-  }
-
-  break;
-}

inc/captcha/readme.md

@@ -1,8 +0,0 @@
-I integrated this from: https://github.com/ctrlcctrlv/infinity/commit/62a6dac022cb338f7b719d0c35a64ab3efc64658
-
-In inc/captcha/config.php change the database_name database_user database_password to your own settings.
-
-Add js/captcha.js in your secrets.php or config.php
-
-Go to Line 305 in the /inc/config file and copy the settings in instance config, while changing the url to your website.
-Go to the line beneath it if you only want to enable it when posting a new thread.

inc/context.php

@@ -1,91 +0,0 @@
-<?php
-namespace Vichan;
-
-use Vichan\Data\Driver\{CacheDriver, HttpDriver, ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
-use Vichan\Service\HCaptchaQuery;
-use Vichan\Service\NativeCaptchaQuery;
-use Vichan\Service\ReCaptchaQuery;
-use Vichan\Service\RemoteCaptchaQuery;
-
-defined('TINYBOARD') or exit;
-
-class Context {
-	private array $definitions;
-
-	public function __construct(array $definitions) {
-		$this->definitions = $definitions;
-	}
-
-	public function get(string $name){
-		if (!isset($this->definitions[$name])) {
-			throw new \RuntimeException("Could not find a dependency named $name");
-		}
-
-		$ret = $this->definitions[$name];
-		if (is_callable($ret) && !is_string($ret) && !is_array($ret)) {
-			$ret = $ret($this);
-			$this->definitions[$name] = $ret;
-		}
-		return $ret;
-	}
-}
-
-function build_context(array $config): Context {
-	return new Context([
-		'config' => $config,
-		LogDriver::class => function($c) {
-			$config = $c->get('config');
-
-			$name = $config['log_system']['name'];
-			$level = $config['debug'] ? LogDriver::DEBUG : LogDriver::NOTICE;
-			$backend = $config['log_system']['type'];
-
-			// Check 'syslog' for backwards compatibility.
-			if ((isset($config['syslog']) && $config['syslog']) || $backend === 'syslog') {
-				return new SyslogLogDriver($name, $level, $this->config['log_system']['syslog_stderr']);
-			} elseif ($backend === 'file') {
-				return new FileLogDriver($name, $level, $this->config['log_system']['file_path']);
-			} elseif ($backend === 'stderr') {
-				return new StderrLogDriver($name, $level);
-			} else {
-				return new ErrorLogLogDriver($name, $level);
-			}
-		},
-		HttpDriver::class => function($c) {
-			$config = $c->get('config');
-			return new HttpDriver($config['upload_by_url_timeout'], $config['max_filesize']);
-		},
-		RemoteCaptchaQuery::class => function($c) {
-			$config = $c->get('config');
-			$http = $c->get(HttpDriver::class);
-			switch ($config['captcha']['provider']) {
-				case 'recaptcha':
-					return new ReCaptchaQuery($http, $config['captcha']['recaptcha']['secret']);
-				case 'hcaptcha':
-					return new HCaptchaQuery(
-						$http,
-						$config['captcha']['hcaptcha']['secret'],
-						$config['captcha']['hcaptcha']['sitekey']
-					);
-				default:
-					throw new \RuntimeException('No remote captcha service available');
-			}
-		},
-		NativeCaptchaQuery::class => function($c) {
-			$config = $c->get('config');
-			if ($config['captcha']['provider'] !== 'native') {
-				throw new \RuntimeException('No native captcha service available');
-			}
-			return new NativeCaptchaQuery(
-				$c->get(HttpDriver::class),
-				$config['domain'],
-				$config['captcha']['native']['provider_check'],
-				$config['captcha']['native']['extra']
-			);
-		},
-		CacheDriver::class => function($c) {
-			// Use the global for backwards compatibility.
-			return \cache::getCache();
-		}
-	]);
-}

inc/controller.php

@@ -1,108 +0,0 @@
-<?php
-
-// This file contains the controller part of vichan
-
-// don't bother with that unless you use smart build or advanced build
-// you can use those parts for your own implementations though :^)
-
-defined('TINYBOARD') or exit;
-
-function sb_board($b, $page = 1) { global $config, $build_pages; $page = (int)$page;
-  if ($page < 1) return false;
-  if (!openBoard($b)) return false;
-  if ($page > $config['max_pages']) return false;
-  $config['try_smarter'] = true;
-  $build_pages = array($page);
-  buildIndex("skip");
-  return true;
-}
-
-function sb_api_board($b, $page = 0) { $page = (int)$page;
-  return sb_board($b, $page + 1);
-}
-
-function sb_thread($b, $thread, $slugcheck = false) { global $config; $thread = (int)$thread;
-  if ($thread < 1) return false;
-
-  if (!preg_match('/^'.$config['board_regex'].'$/u', $b)) return false;
-
-  if (Cache::get("thread_exists_".$b."_".$thread) == "no") return false;
-
-  $query = prepare(sprintf("SELECT MAX(`id`) AS `max` FROM ``posts_%s``", $b));
-  if (!$query->execute()) return false;
-
-  $s = $query->fetch(PDO::FETCH_ASSOC);
-  $max = $s['max'];
-
-  if ($thread > $max) return false;
-
-  $query = prepare(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL", $b));
-  $query->bindValue(':id', $thread);
-  
-  if (!$query->execute() || !$query->fetch(PDO::FETCH_ASSOC) ) {
-    Cache::set("thread_exists_".$b."_".$thread, "no", 3600);
-    return false;
-  }
-
-  if ($slugcheck && $config['slugify']) {
-    global $request;
-
-    $link = link_for(array("id" => $thread), $slugcheck === 50, array("uri" => $b));
-    $link = "/".$b."/".$config['dir']['res'].$link;
-
-    if ($link != $request) {
-      header("Location: $link", true, 301);
-      die();
-    }
-  }
-
-  if ($slugcheck == 50) { // Should we really generate +50 page? Maybe there are not enough posts anyway
-    global $request;
-    $r = str_replace("+50", "", $request);
-    $r = substr($r, 1); // Cut the slash
-
-    if (file_exists($r)) return false;
-  }
-  
-  if (!openBoard($b)) return false;
-  buildThread($thread);
-  return true;
-}
-
-function sb_thread_slugcheck($b, $thread) {
-  return sb_thread($b, $thread, true);
-}
-function sb_thread_slugcheck50($b, $thread) {
-  return sb_thread($b, $thread, 50);
-}
-
-function sb_api($b) { global $config, $build_pages;
-  if (!openBoard($b)) return false;
-  $config['try_smarter'] = true;
-  $build_pages = array(-1);
-  buildIndex();
-  return true;
-}
-
-function sb_ukko() {
-  Vichan\Functions\Theme\rebuild_theme("ukko", "post-thread");
-  return true;
-}
-
-function sb_catalog($b) {
-  if (!openBoard($b)) return false;
-
-  Vichan\Functions\Theme\rebuild_theme("catalog", "post-thread", $b); 
-  return true;
-}
-
-function sb_recent() {
-  Vichan\Functions\Theme\rebuild_theme("recent", "post-thread");
-  return true;
-}
-
-function sb_sitemap() {
-  Vichan\Functions\Theme\rebuild_theme("sitemap", "all");
-  return true;
-}
-

inc/database.php

@@ -103,7 +103,7 @@ function mysql_version() {
 	$v = explode('.', $version);
 	if (count($v) != 3)
 		return false;
-	return (int) sprintf("%02d%02d%02d", $v[0], $v[1], is_int($v[2]) ? (int)$v[2] : 0);
+	return (int) sprintf("%02d%02d%02d", $v[0], $v[1], $v[2]);
 }
 
 function prepare($query) {

inc/display.php

@@ -71,7 +71,7 @@ function createBoardlist($mod=false) {
 	);
 }
 
-function error($message, $priority = true, $debug_stuff = []) {
+function error($message, $priority = true, $debug_stuff = false) {
 	global $board, $mod, $config, $db_error;
 	
 	if ($config['syslog'] && $priority !== false) {
@@ -94,18 +94,23 @@ function error($message, $priority = true, $debug_stuff = []) {
 		$debug_stuff['backtrace'] = debug_backtrace();
 	}
 
+	// Return the bad request header, necessary for AJAX posts
+	// czaks: is it really so? the ajax errors only work when this is commented out
+	//        better yet use it when ajax is disabled
+	if (!isset ($_POST['json_response'])) {
+		header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
+	}
+	
+	// Is there a reason to disable this?
 	if (isset($_POST['json_response'])) {
 		header('Content-Type: text/json; charset=utf-8');
 		die(json_encode(array(
 			'error' => $message
 		)));
 	}
-	else {
-		header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
-	}
 	
 	$pw = $config['db']['password'];
-	$debug_callback = function($item) use (&$debug_callback, $pw) {
+	$debug_callback = function(&$item) use (&$debug_callback, $pw) {
 		if (is_array($item)) {
 			$item = array_filter($item, $debug_callback);
 		}
@@ -116,16 +121,16 @@ function error($message, $priority = true, $debug_stuff = []) {
 	if ($debug_stuff) 
 		$debug_stuff = array_filter($debug_stuff, $debug_callback);
 
-	die(Element($config['file_page_template'], array(
+	die(Element('page.html', array(
 		'config' => $config,
 		'title' => _('Error'),
 		'subtitle' => _('An error has occured.'),
-		'body' => Element($config['file_error'], array(
+		'body' => Element('error.html', array(
 			'config' => $config,
 			'message' => $message,
 			'mod' => $mod,
 			'board' => isset($board) ? $board : false,
-			'debug' => $config['debug'] ? (is_array($debug_stuff) ? str_replace("\n", '
', utf8tohtml(print_r($debug_stuff, true))) : utf8tohtml($debug_stuff)) : null
+			'debug' => is_array($debug_stuff) ? str_replace("\n", '
', utf8tohtml(print_r($debug_stuff, true))) : utf8tohtml($debug_stuff)
 		))
 	)));
 }
@@ -133,11 +138,11 @@ function error($message, $priority = true, $debug_stuff = []) {
 function loginForm($error=false, $username=false, $redirect=false) {
 	global $config;
 	
-	die(Element($config['file_page_template'], array(
+	die(Element('page.html', array(
 		'index' => $config['root'],
 		'title' => _('Login'),
 		'config' => $config,
-		'body' => Element($config['file_login'], array(
+		'body' => Element('login.html', array(
 			'config'=>$config,
 			'error'=>$error,
 			'username'=>utf8tohtml($username),
@@ -348,26 +353,6 @@ class Post {
 			$this->{$key} = $value;
 		}
 		
-		if (isset($this->files) && $this->files) {
-			$this->files = is_string($this->files) ? json_decode($this->files) : $this->files;
-			// Compatibility for posts before individual file hashing
-						foreach ($this->files as $i => &$file) {
-				if (empty($file)) {
-					unset($this->files[$i]);
-					continue;
-				}
-				if (is_array($file)) {
-					if (!isset($file['hash'])) {
-						$file['hash'] = $this->filehash;
-					}
-				} else if (is_object($file)) {
-					if (!isset($file->hash)) {
-						$file->hash = $this->filehash;
-					}
-				}
-			}
-		}
-
 		$this->subject = utf8tohtml($this->subject);
 		$this->name = utf8tohtml($this->name);
 		$this->mod = $mod;
@@ -395,24 +380,66 @@ class Post {
 	public function link($pre = '', $page = false) {
 		global $config, $board;
 		
-		return $this->root . $board['dir'] . $config['dir']['res'] . link_for((array)$this, $page == '50') . '#' . $pre . $this->id;
+		return $this->root . $board['dir'] . $config['dir']['res'] . sprintf(($page ? $page : $config['file_page']), $this->thread) . '#' . $pre . $this->id;
+	}
+	public function postControls() {
+		global $board, $config;
+		
+		$built = '';
+		if ($this->mod) {
+			// Mod controls (on posts)
+			
+			// Delete
+			if (hasPermission($config['mod']['delete'], $board['uri'], $this->mod))
+				$built .= ' ' . secure_link_confirm($config['mod']['link_delete'], 'Delete', 'Are you sure you want to delete this?', $board['dir'] . 'delete/' . $this->id);
+			
+			// Delete all posts by IP
+			if (hasPermission($config['mod']['deletebyip'], $board['uri'], $this->mod))
+				$built .= ' ' . secure_link_confirm($config['mod']['link_deletebyip'], 'Delete all posts by IP', 'Are you sure you want to delete all posts by this IP address?', $board['dir'] . 'deletebyip/' . $this->id);
+			
+			// Delete all posts by IP (global)
+			if (hasPermission($config['mod']['deletebyip_global'], $board['uri'], $this->mod))
+				$built .= ' ' . secure_link_confirm($config['mod']['link_deletebyip_global'], 'Delete all posts by IP across all boards', 'Are you sure you want to delete all posts by this IP address, across all boards?', $board['dir'] . 'deletebyip/' . $this->id . '/global');
+			
+			// Ban
+			if (hasPermission($config['mod']['ban'], $board['uri'], $this->mod))
+				$built .= ' <a title="'._('Ban').'" href="?/' . $board['dir'] . 'ban/' . $this->id . '">' . $config['mod']['link_ban'] . '</a>';
+			
+			// Ban & Delete
+			if (hasPermission($config['mod']['bandelete'], $board['uri'], $this->mod))
+				$built .= ' <a title="'._('Ban & Delete').'" href="?/' . $board['dir'] . 'ban&amp;delete/' . $this->id . '">' . $config['mod']['link_bandelete'] . '</a>';
+			
+			// Delete file (keep post)
+			if (!empty($this->file) && hasPermission($config['mod']['deletefile'], $board['uri'], $this->mod))
+				$built .= ' ' . secure_link_confirm($config['mod']['link_deletefile'], _('Delete file'), _('Are you sure you want to delete this file?'), $board['dir'] . 'deletefile/' . $this->id);
+			
+			// Spoiler file (keep post)
+			if (!empty($this->file)  && $this->file != "deleted" && $this->file != null && $this->thumb != 'spoiler' && hasPermission($config['mod']['spoilerimage'], $board['uri'], $this->mod) && $config['spoiler_images'])
+				$built .= ' ' . secure_link_confirm($config['mod']['link_spoilerimage'], _('Spoiler File'), _('Are you sure you want to spoiler this file?'), $board['uri'] . '/spoiler/' . $this->id);
+
+			// Move post
+			if (hasPermission($config['mod']['move'], $board['uri'], $this->mod) && $config['move_replies'])
+				$built .= ' <a title="'._('Move reply to another board').'" href="?/' . $board['uri'] . '/move_reply/' . $this->id . '">' . $config['mod']['link_move'] . '</a>';
+
+			// Edit post
+			if (hasPermission($config['mod']['editpost'], $board['uri'], $this->mod))
+				$built .= ' <a title="'._('Edit post').'" href="?/' . $board['dir'] . 'edit' . ($config['mod']['raw_html_default'] ? '_raw' : '') . '/' . $this->id . '">' . $config['mod']['link_editpost'] . '</a>';
+
+			
+			if (!empty($built))
+				$built = '<span class="controls">' . $built . '</span>';
+		}
+		return $built;
+	}
+	
+	public function ratio() {
+		return fraction($this->filewidth, $this->fileheight, ':');
 	}
 	
 	public function build($index=false) {
 		global $board, $config;
 		
-		$options = [
-			'config' => $config,
-			'board' => $board,
-			'post' => &$this,
-			'index' => $index,
-			'mod' => $this->mod
-		];
-		if ($this->mod) {
-			$options['pm'] = create_pm_header();
-		}
-
-		return Element($config['file_post_reply'], $options);
+		return Element('post_reply.html', array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index));
 	}
 };
 
@@ -426,9 +453,6 @@ class Thread {
 			$this->{$key} = $value;
 		}
 		
-		if (isset($this->files))
-			$this->files = is_string($this->files) ? json_decode($this->files) : $this->files;
-
 		$this->subject = utf8tohtml($this->subject);
 		$this->name = utf8tohtml($this->name);
 		$this->mod = $mod;
@@ -461,14 +485,85 @@ class Thread {
 	public function link($pre = '', $page = false) {
 		global $config, $board;
 		
-		return $this->root . $board['dir'] . $config['dir']['res'] . link_for((array)$this, $page == '50') . '#' . $pre . $this->id;
+		return $this->root . $board['dir'] . $config['dir']['res'] . sprintf(($page ? $page : $config['file_page']), $this->id) . '#' . $pre . $this->id;
 	}
 	public function add(Post $post) {
 		$this->posts[] = $post;
 	}
 	public function postCount() {
-		   return count($this->posts) + $this->omitted;
+	       return count($this->posts) + $this->omitted;
 	}
+	public function postControls() {
+		global $board, $config;
+		
+		$built = '';
+		if ($this->mod) {
+			// Mod controls (on posts)
+			// Delete
+			if (hasPermission($config['mod']['delete'], $board['uri'], $this->mod))
+				$built .= ' ' . secure_link_confirm($config['mod']['link_delete'], _('Delete'), _('Are you sure you want to delete this?'), $board['dir'] . 'delete/' . $this->id);
+			
+			// Delete all posts by IP
+			if (hasPermission($config['mod']['deletebyip'], $board['uri'], $this->mod))
+				$built .= ' ' . secure_link_confirm($config['mod']['link_deletebyip'], _('Delete all posts by IP'), _('Are you sure you want to delete all posts by this IP address?'), $board['dir'] . 'deletebyip/' . $this->id);
+			
+			// Delete all posts by IP (global)
+			if (hasPermission($config['mod']['deletebyip_global'], $board['uri'], $this->mod))
+				$built .= ' ' . secure_link_confirm($config['mod']['link_deletebyip_global'], _('Delete all posts by IP across all boards'), _('Are you sure you want to delete all posts by this IP address, across all boards?'), $board['dir'] . 'deletebyip/' . $this->id . '/global');
+			
+			// Ban
+			if (hasPermission($config['mod']['ban'], $board['uri'], $this->mod))
+				$built .= ' <a title="'._('Ban').'" href="?/' . $board['dir'] . 'ban/' . $this->id . '">' . $config['mod']['link_ban'] . '</a>';
+			
+			// Ban & Delete
+			if (hasPermission($config['mod']['bandelete'], $board['uri'], $this->mod))
+				$built .= ' <a title="'._('Ban & Delete').'" href="?/' . $board['dir'] . 'ban&amp;delete/' . $this->id . '">' . $config['mod']['link_bandelete'] . '</a>';
+			
+			// Delete file (keep post)
+			if (!empty($this->file) && $this->file != 'deleted' && hasPermission($config['mod']['deletefile'], $board['uri'], $this->mod))
+				$built .= ' ' . secure_link_confirm($config['mod']['link_deletefile'], _('Delete file'), _('Are you sure you want to delete this file?'), $board['dir'] . 'deletefile/' . $this->id);
+
+			// Spoiler file (keep post)
+			if (!empty($this->file)  && $this->file != "deleted" && $this->file != null && $this->thumb != 'spoiler' && hasPermission($config['mod']['spoilerimage'], $board['uri'], $this->mod) && $config['spoiler_images'])
+				$built .= ' ' . secure_link_confirm($config['mod']['link_spoilerimage'], _('Spoiler File'), _('Are you sure you want to spoiler this file?'), $board['uri'] . '/spoiler/' . $this->id);
+			
+			// Sticky
+			if (hasPermission($config['mod']['sticky'], $board['uri'], $this->mod))
+				if ($this->sticky)
+					$built .= ' <a title="'._('Make thread not sticky').'" href="?/' . secure_link($board['dir'] . 'unsticky/' . $this->id) . '">' . $config['mod']['link_desticky'] . '</a>';
+				else
+					$built .= ' <a title="'._('Make thread sticky').'" href="?/' . secure_link($board['dir'] . 'sticky/' . $this->id) . '">' . $config['mod']['link_sticky'] . '</a>';
+			
+			if (hasPermission($config['mod']['bumplock'], $board['uri'], $this->mod))
+				if ($this->sage)
+					$built .= ' <a title="'._('Allow thread to be bumped').'" href="?/' . secure_link($board['dir'] . 'bumpunlock/' . $this->id) . '">' . $config['mod']['link_bumpunlock'] . '</a>';
+				else
+					$built .= ' <a title="'._('Prevent thread from being bumped').'" href="?/' . secure_link($board['dir'] . 'bumplock/' . $this->id) . '">' . $config['mod']['link_bumplock'] . '</a>';
+			
+			// Lock
+			if (hasPermission($config['mod']['lock'], $board['uri'], $this->mod))
+				if ($this->locked)
+					$built .= ' <a title="'._('Unlock thread').'" href="?/' . secure_link($board['dir'] . 'unlock/' . $this->id) . '">' . $config['mod']['link_unlock'] . '</a>';
+				else
+					$built .= ' <a title="'._('Lock thread').'" href="?/' . secure_link($board['dir'] . 'lock/' . $this->id) . '">' . $config['mod']['link_lock'] . '</a>';
+			
+			if (hasPermission($config['mod']['move'], $board['uri'], $this->mod))
+				$built .= ' <a title="'._('Move thread to another board').'" href="?/' . $board['dir'] . 'move/' . $this->id . '">' . $config['mod']['link_move'] . '</a>';
+			
+			// Edit post
+			if (hasPermission($config['mod']['editpost'], $board['uri'], $this->mod))
+				$built .= ' <a title="'._('Edit post').'" href="?/' . $board['dir'] . 'edit' . ($config['mod']['raw_html_default'] ? '_raw' : '') . '/' . $this->id . '">' . $config['mod']['link_editpost'] . '</a>';
+			
+			if (!empty($built))
+				$built = '<span class="controls op">' . $built . '</span>';
+		}
+		return $built;
+	}
+	
+	public function ratio() {
+		return fraction($this->filewidth, $this->fileheight, ':');
+	}
+	
 	public function build($index=false, $isnoko50=false) {
 		global $board, $config, $debug;
 		
@@ -476,22 +571,9 @@ class Thread {
 		
 		event('show-thread', $this);
 
-		$options = [
-			'config' => $config,
-			'board' => $board,
-			'post' => &$this,
-			'index' => $index,
-			'hasnoko50' => $hasnoko50,
-			'isnoko50' => $isnoko50,
-			'mod' => $this->mod
-		];
-		if ($this->mod) {
-			$options['pm'] = create_pm_header();
-		}
-
-		$file = ($index && $config['file_board']) ? $config['file_post_thread_fileboard'] : $config['file_post_thread'];
-		$built = Element($file, $options);
+		$built = Element('post_thread.html', array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'hasnoko50' => $hasnoko50, 'isnoko50' => $isnoko50));
 		
 		return $built;
 	}
 };
+

inc/filters.php

@@ -9,29 +9,23 @@ defined('TINYBOARD') or exit;
 class Filter {
 	public $flood_check;
 	private $condition;
-	private $post;
-
 	
 	public function __construct(array $arr) {
-		foreach ($arr as $key => $value) {
+		foreach ($arr as $key => $value)
 			$this->$key = $value;		
-		}
 	}
 	
-	public function match($condition, $match) {
+	public function match(array $post, $condition, $match) {
 		$condition = strtolower($condition);
-		$post = &$this->post;
 		
 		switch($condition) {
 			case 'custom':
-				if (!is_callable($match)) {
+				if (!is_callable($match))
 					error('Custom condition for filter is not callable!');
-				}
 				return $match($post);
 			case 'flood-match':
-				if (!is_array($match)) {
+				if (!is_array($match))
 					error('Filter condition "flood-match" must be an array.');
-				}
 								
 				// Filter out "flood" table entries which do not match this filter.
 				
@@ -41,32 +35,26 @@ class Filter {
 					foreach ($match as $flood_match_arg) {
 						switch ($flood_match_arg) {
 							case 'ip':
-								if ($flood_post['ip'] != $_SERVER['REMOTE_ADDR']) {
+								if ($flood_post['ip'] != $_SERVER['REMOTE_ADDR'])
 									continue 3;
-								}
 								break;
 							case 'body':
-								if ($flood_post['posthash'] != make_comment_hex($post['body_nomarkup'])) {
+								if ($flood_post['posthash'] != make_comment_hex($post['body_nomarkup']))
 									continue 3;
-								}
 								break;
 							case 'file':
-								if (!isset($post['filehash'])) {
+								if (!isset($post['filehash']))
 									return false;
-								}
-								if ($flood_post['filehash'] != $post['filehash']) {
+								if ($flood_post['filehash'] != $post['filehash'])
 									continue 3;
-								}
 								break;
 							case 'board':
-								if ($flood_post['board'] != $post['board']) {
+								if ($flood_post['board'] != $post['board'])
 									continue 3;
-								}
 								break;
 							case 'isreply':
-								if ($flood_post['isreply'] == $post['op']) {
+								if ($flood_post['isreply'] == $post['op'])
 									continue 3;
-								}
 								break;
 							default:
 								error('Invalid filter flood condition: ' . $flood_match_arg);
@@ -76,6 +64,7 @@ class Filter {
 				}
 				
 				$this->flood_check = $flood_check_matched;
+				
 				return !empty($this->flood_check);
 			case 'flood-time':
 				foreach ($this->flood_check as $flood_post) {
@@ -105,45 +94,19 @@ class Filter {
 			case 'filehash':
 				return $match === $post['filehash'];
 			case 'filename':
-				if (!$post['files']) {
+				if (!$post['has_file'])
 					return false;
-				}
-
-				foreach ($post['files'] as $file) {
-					if (preg_match($match, $file['filename'])) {
-						return true;
-					}
-				}
-				return false;
+				return preg_match($match, $post['filename']);
 			case 'extension':
-				if (!$post['files']) {
+				if (!$post['has_file'])
 					return false;
-				}
-
-				foreach ($post['files'] as $file) {
-					if (preg_match($match, $file['extension'])) {
-						return true;
-					}
-				}
-				return false;
+				return preg_match($match, $post['body']);
 			case 'ip':
 				return preg_match($match, $_SERVER['REMOTE_ADDR']);
 			case 'op':
 				return $post['op'] == $match;
 			case 'has_file':
 				return $post['has_file'] == $match;
-			case 'board':
-				return $post['board'] == $match;
-			case 'password':
-				return $post['password'] == $match;
-			case 'unshorten':
-				$extracted_urls = get_urls($post['body_nomarkup']);
-				foreach ($extracted_urls as $url) {
-					if (preg_match($match, trace_url($url))) {
-						return true;
-					}
-				}
-				return false;
 			default:
 				error('Unknown filter condition: ' . $condition);
 		}
@@ -152,59 +115,42 @@ class Filter {
 	public function action() {
 		global $board;
 		
-		$this->add_note = isset($this->add_note) ? $this->add_note : false;
-		if ($this->add_note) {
-			$query = prepare('INSERT INTO ``ip_notes`` VALUES (NULL, :ip, :mod, :time, :body)');
-			$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
-			$query->bindValue(':mod', -1);
-			$query->bindValue(':time', time());
-			$query->bindValue(':body', "Autoban message: ".$this->post['body']);
-			$query->execute() or error(db_error($query));
-		}
-		if (isset($this->action)) {
-			switch($this->action) {
-				case 'reject':
-					error(isset($this->message) ? $this->message : 'Posting throttled by filter.');
-				case 'ban':
-					if (!isset($this->reason)) {
-						error('The ban action requires a reason.');
-					}
+		switch($this->action) {
+			case 'reject':
+				error(isset($this->message) ? $this->message : 'Posting throttled by filter.');
+			case 'ban':
+				if (!isset($this->reason))
+					error('The ban action requires a reason.');
 				
-					$this->expires = isset($this->expires) ? $this->expires : false;
-					$this->reject = isset($this->reject) ? $this->reject : true;
-					$this->all_boards = isset($this->all_boards) ? $this->all_boards : false;
+				$this->expires = isset($this->expires) ? $this->expires : false;
+				$this->reject = isset($this->reject) ? $this->reject : true;
+				$this->all_boards = isset($this->all_boards) ? $this->all_boards : false;
 				
-					Bans::new_ban($_SERVER['REMOTE_ADDR'], $this->reason, $this->expires, $this->all_boards ? false : $board['uri'], -1);
+				Bans::new_ban($_SERVER['REMOTE_ADDR'], $this->reason, $this->expires, $this->all_boards ? false : $board['uri'], -1);
 				
-					if ($this->reject) {
-						if (isset($this->message)) {
-							error($message);
-						}
+				if ($this->reject) {
+					if (isset($this->message))
+						error($message);
 					
-						checkBan($board['uri']);
-						exit;
-					}
+					checkBan($board['uri']);
+					exit;
+				}
 				
-					break;
-				default:
-					error('Unknown filter action: ' . $this->action);
-			}
+				break;
+			default:
+				error('Unknown filter action: ' . $this->action);
 		}
 	}
 	
 	public function check(array $post) {
-		$this->post = $post;
 		foreach ($this->condition as $condition => $value) {
 			if ($condition[0] == '!') {
 				$NOT = true;
 				$condition = substr($condition, 1);
-			} else {
-				$NOT = false;
-			}
+			} else $NOT = false;
 			
-			if ($this->match($condition, $value) == $NOT) {
+			if ($this->match($post, $condition, $value) == $NOT)
 				return false;
-			}
 		}
 		return true;
 	}
@@ -217,14 +163,13 @@ function purge_flood_table() {
 	// aware of flood filters in other board configurations. You can solve this problem by settings the
 	// config variable $config['flood_cache'] (seconds).
 	
-	if ($config['flood_cache'] != -1) {
+	if (isset($config['flood_cache'])) {
 		$max_time = &$config['flood_cache'];
 	} else {
 		$max_time = 0;
 		foreach ($config['filters'] as $filter) {
-			if (isset($filter['condition']['flood-time'])) {
+			if (isset($filter['condition']['flood-time']))
 				$max_time = max($max_time, $filter['condition']['flood-time']);
-			}
 		}
 	}
 	
@@ -236,9 +181,8 @@ function purge_flood_table() {
 function do_filters(array $post) {
 	global $config;
 	
-	if (!isset($config['filters']) || empty($config['filters'])) {
+	if (!isset($config['filters']) || empty($config['filters']))
 		return;
-	}
 	
 	foreach ($config['filters'] as $filter) {
 		if (isset($filter['condition']['flood-match'])) {
@@ -267,10 +211,10 @@ function do_filters(array $post) {
 	foreach ($config['filters'] as $filter_array) {
 		$filter = new Filter($filter_array);
 		$filter->flood_check = $flood_check;
-		if ($filter->check($post)) {
+		if ($filter->check($post))
 			$filter->action();
-		}
 	}
 	
 	purge_flood_table();
 }
+

inc/functions/dice.php

@@ -1,114 +0,0 @@
-<?php
-namespace Vichan\Functions\Dice;
-
-function _get_or_default_int(array $arr, int $index, int $default) {
-	return (isset($arr[$index]) && is_numeric($arr[$index])) ? (int)$arr[$index] : $default;
-}
-
-
-/* Die rolling:
- * If "dice XdY+/-Z" is in the email field (where X or +/-Z may be
- * missing), X Y-sided dice are rolled and summed, with the modifier Z
- * added on.  The result is displayed at the top of the post.
- */
-function email_dice_roll($post) {
-	global $config;
-	if(strpos(strtolower($post->email), 'dice%20') === 0) {
-		$dicestr = str_split(substr($post->email, strlen('dice%20')));
-
-		// Get params
-		$diceX = '';
-		$diceY = '';
-		$diceZ = '';
-
-		$curd = 'diceX';
-		for($i = 0; $i < count($dicestr); $i ++) {
-			if(is_numeric($dicestr[$i])) {
-				$$curd .= $dicestr[$i];
-			} else if($dicestr[$i] == 'd') {
-				$curd = 'diceY';
-			} else if($dicestr[$i] == '-' || $dicestr[$i] == '+') {
-				$curd = 'diceZ';
-				$$curd = $dicestr[$i];
-			}
-		}
-
-		// Default values for X and Z
-		if($diceX == '') {
-			$diceX = '1';
-		}
-
-		if($diceZ == '') {
-			$diceZ = '+0';
-		}
-
-		// Intify them
-		$diceX = intval($diceX);
-		$diceY = intval($diceY);
-		$diceZ = intval($diceZ);
-
-		// Continue only if we have valid values
-		if($diceX > 0 && $diceY > 0) {
-			$dicerolls = array();
-			$dicesum = $diceZ;
-			for($i = 0; $i < $diceX; $i++) {
-				$roll = rand(1, $diceY);
-				$dicerolls[] = $roll;
-				$dicesum += $roll;
-			}
-
-			// Prepend the result to the post body
-			$modifier = ($diceZ != 0) ? ((($diceZ < 0) ? ' - ' : ' + ') . abs($diceZ)) : '';
-			$dicesum = ($diceX > 1) ? ' = ' . $dicesum : '';
-			$post->body = '<table class="diceroll"><tr><td><img src="'.$config['dir']['static'].'d10.svg" alt="Dice roll" width="24"></td><td>Rolled ' . implode(', ', $dicerolls) . $modifier . $dicesum . '</td></tr></table><br/>' . $post->body;
-		}
-	}
-}
-
-/**
- * Rolls a dice and generates the appropriate html from the markup.
- * @param array $matches The array of the matches according to the default configuration.
- *                       1 -> The number of dices to roll.
- *                       3 -> The number faces of the dices.
- *                       4 -> The offset to apply to the dice.
- * @param string $img_path Path to the image to use relative to the root. Null if none.
- * @return string The html to replace the original markup with.
- */
-function inline_dice_roll_markup(array $matches, ?string $img_path): string {
-	global $config;
-
-	$dice_count = _get_or_default_int($matches, 1, 1);
-	$dice_faces = _get_or_default_int($matches, 3, 6);
-	$dice_offset = _get_or_default_int($matches, 4, 0);
-
-	// Clamp between 1 and max_roll_count.
-	$dice_count = max(min($dice_count, $config['max_roll_count']), 1);
-	// Must be at least 2.
-	if ($dice_faces < 2) {
-		$dice_faces = 6;
-	}
-
-	$tot = 0;
-	for ($i = 0; $i < $dice_count; $i++) {
-		$tot += mt_rand(1, $dice_faces);
-	}
-	// Ensure that final result is at least an integer.
-	$tot = abs((int)($dice_offset + $tot));
-
-
-	if ($img_path !== null) {
-		$img_text = "<img src='{$config['root']}{$img_path}' alt='dice' title='dice' class=\"inline-dice\"/>";
-	} else {
-		$img_text = '';
-	}
-
-	if ($dice_offset === 0) {
-		$dice_offset_text = '';
-	} elseif ($dice_offset > 0) {
-		$dice_offset_text = "+{$dice_offset}";
-	} else {
-		$dice_offset_text = (string)$dice_offset;
-	}
-
-	return "<span>$img_text {$dice_count}d{$dice_faces}{$dice_offset_text} = <b>$tot</b></span>";
-}

inc/functions/format.php

@@ -1,28 +0,0 @@
-<?php
-namespace Vichan\Functions\Format;
-
-
-function format_timestamp(int $delta): string {
-	switch (true) {
-		case $delta < 60:
-			return $delta . ' ' . ngettext('second', 'seconds', $delta);
-		case $delta < 3600: //60*60 = 3600
-			return ($num = round($delta/ 60)) . ' ' . ngettext('minute', 'minutes', $num);
-		case $delta < 86400: //60*60*24 = 86400
-			return ($num = round($delta / 3600)) . ' ' . ngettext('hour', 'hours', $num);
-		case $delta < 604800: //60*60*24*7 = 604800
-			return ($num = round($delta / 86400)) . ' ' . ngettext('day', 'days', $num);
-		case $delta < 31536000: //60*60*24*365 = 31536000
-			return ($num = round($delta / 604800)) . ' ' . ngettext('week', 'weeks', $num);
-		default:
-			return ($num = round($delta / 31536000)) . ' ' . ngettext('year', 'years', $num);
-	}
-}
-
-function until(int $timestamp): string {
-	return format_timestamp($timestamp - time());
-}
-
-function ago(int $timestamp): string {
-	return format_timestamp(time() - $timestamp);
-}

inc/functions/net.php

@@ -1,16 +0,0 @@
-<?php
-namespace Vichan\Functions\Net;
-
-
-/**
- * @param bool $trust_headers. If true, trust the `HTTP_X_FORWARDED_PROTO` header to check if the connection is HTTPS.
- * @return bool Returns if the client-server connection is an encrypted one (HTTPS).
- */
-function is_connection_secure(bool $trust_headers): bool {
-	if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
-		return true;
-	} elseif ($trust_headers && isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
-		return true;
-	}
-	return false;
-}

inc/functions/num.php

@@ -1,33 +0,0 @@
-<?php
-namespace Vichan\Functions\Num;
-
-// Highest common factor
-function hcf($a, $b){
-	$gcd = 1;
-
-	if ($a > $b) {
-		$a = $a+$b;
-		$b = $a-$b;
-		$a = $a-$b;
-	}
-	if ($b == (round($b / $a)) * $a) {
-		$gcd = $a;
-	} else {
-		for ($i = round($a / 2); $i; $i--) {
-			if ($a == round($a / $i) * $i && $b == round($b / $i) * $i) {
-				$gcd = $i;
-				$i = false;
-			}
-		}
-	}
-
-	return $gcd;
-}
-
-function fraction($numerator, $denominator, $sep) {
-	$gcf = hcf($numerator, $denominator);
-	$numerator = $numerator / $gcf;
-	$denominator = $denominator / $gcf;
-
-	return "{$numerator}{$sep}{$denominator}";
-}

inc/functions/theme.php

@@ -1,98 +0,0 @@
-<?php
-namespace Vichan\Functions\Theme;
-
-
-function rebuild_themes(string $action, $boardname = false): void {
-	global $config, $board, $current_locale;
-
-	// Save the global variables
-	$_config = $config;
-	$_board = $board;
-
-	// List themes
-	if ($themes = \Cache::get("themes")) {
-		// OK, we already have themes loaded
-	} else {
-		$query = query("SELECT `theme` FROM ``theme_settings`` WHERE `name` IS NULL AND `value` IS NULL") or error(db_error());
-		$themes = $query->fetchAll(\PDO::FETCH_NUM);
-
-		\Cache::set("themes", $themes);
-	}
-
-	foreach ($themes as $theme) {
-		// Restore them
-		$config = $_config;
-		$board = $_board;
-
-		// Reload the locale
-		if ($config['locale'] != $current_locale) {
-			$current_locale = $config['locale'];
-			init_locale($config['locale']);
-		}
-
-		if (PHP_SAPI === 'cli') {
-			echo "Rebuilding theme ".$theme[0]."... ";
-		}
-
-		rebuild_theme($theme[0], $action, $boardname);
-
-		if (PHP_SAPI === 'cli') {
-			echo "done\n";
-		}
-	}
-
-	// Restore them again
-	$config = $_config;
-	$board = $_board;
-
-	// Reload the locale
-	if ($config['locale'] != $current_locale) {
-		$current_locale = $config['locale'];
-		init_locale($config['locale']);
-	}
-}
-
-function load_theme_config($_theme) {
-	global $config;
-
-	if (!file_exists($config['dir']['themes'] . '/' . $_theme . '/info.php')) {
-		return false;
-	}
-
-	// Load theme information into $theme
-	include $config['dir']['themes'] . '/' . $_theme . '/info.php';
-
-	return $theme;
-}
-
-function rebuild_theme($theme, string $action, $board = false) {
-	global $config, $_theme;
-	$_theme = $theme;
-
-	$theme = load_theme_config($_theme);
-
-	if (file_exists($config['dir']['themes'] . '/' . $_theme . '/theme.php')) {
-		require_once $config['dir']['themes'] . '/' . $_theme . '/theme.php';
-
-		$theme['build_function']($action, theme_settings($_theme), $board);
-	}
-}
-
-function theme_settings($theme): array {
-	if ($settings = \Cache::get("theme_settings_" . $theme)) {
-		return $settings;
-	}
-
-	$query = prepare("SELECT `name`, `value` FROM ``theme_settings`` WHERE `theme` = :theme AND `name` IS NOT NULL");
-	$query->bindValue(':theme', $theme);
-	$query->execute() or error(db_error($query));
-
-	$settings = [];
-	while ($s = $query->fetch(\PDO::FETCH_ASSOC)) {
-		$settings[$s['name']] = $s['value'];
-	}
-
-	\Cache::set("theme_settings_".$theme, $settings);
-
-	return $settings;
-}

inc/image.php

@@ -291,7 +291,6 @@ class ImageConvert extends ImageBase {
 		} else {
 			rename($this->temp, $src);
 			chmod($src, 0664);
-			$this->temp = false;
 		}
 	}
 	public function width() {
@@ -301,10 +300,8 @@ class ImageConvert extends ImageBase {
 		return $this->height;
 	}
 	public function destroy() {
-		if ($this->temp !== false) {
-			@unlink($this->temp);
-			$this->temp = false;
-		}
+		@unlink($this->temp);
+		$this->temp = false;
 	}
 	public function resize() {
 		global $config;
@@ -314,7 +311,7 @@ class ImageConvert extends ImageBase {
 			$this->destroy();
 		}
 		
-		$this->temp = tempnam($config['tmp'], 'convert') . ($config['thumb_ext'] == '' ? '' : '.' . $config['thumb_ext']);
+		$this->temp = tempnam($config['tmp'], 'convert');
 				
 		$config['thumb_keep_animation_frames'] = (int)$config['thumb_keep_animation_frames'];
 		
@@ -327,8 +324,12 @@ class ImageConvert extends ImageBase {
 					error(_('Failed to resize image!'), null, $error);
 				}
 			} else {
-				$convert_args = &$config['convert_args'];
-
+				if ($config['convert_manual_orient'] && ($this->format == 'jpg' || $this->format == 'jpeg'))
+					$convert_args = str_replace('-auto-orient', ImageConvert::jpeg_exif_orientation($this->src), $config['convert_args']);
+				elseif ($config['convert_manual_orient'])
+					$convert_args = str_replace('-auto-orient', '', $config['convert_args']);
+				else
+					$convert_args = &$config['convert_args'];
 				if (($error = shell_exec_error(($this->gm ? 'gm ' : '') . 'convert ' .
 					sprintf($convert_args,
 						$this->width,
@@ -346,8 +347,12 @@ class ImageConvert extends ImageBase {
 				}
 			}
 		} else {
-			$convert_args = &$config['convert_args'];
-
+			if ($config['convert_manual_orient'] && ($this->format == 'jpg' || $this->format == 'jpeg'))
+				$convert_args = str_replace('-auto-orient', ImageConvert::jpeg_exif_orientation($this->src), $config['convert_args']);
+			elseif ($config['convert_manual_orient'])
+				$convert_args = str_replace('-auto-orient', '', $config['convert_args']);
+			else
+				$convert_args = &$config['convert_args'];
 			if (($error = shell_exec_error(($this->gm ? 'gm ' : '') . 'convert ' .
 				sprintf($convert_args,
 					$this->width,
@@ -356,17 +361,10 @@ class ImageConvert extends ImageBase {
 					$this->width,
 					$this->height,
 					escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
-
-					if (strpos($error, "known incorrect sRGB profile") === false &&
-                                            strpos($error, "iCCP: Not recognizing known sRGB profile that has been edited") === false &&
-                                            strpos($error, "cHRM chunk does not match sRGB") === false) {
-						$this->destroy();
-						error(_('Failed to resize image!')." "._('Details: ').nl2br(htmlspecialchars($error)), null, array('convert_error' => $error));
-					}
-					if (!file_exists($this->temp)) {
-						$this->destroy();
-						error(_('Failed to resize image!'), null, $error);
-					}
+				if (!file_exists($this->temp)) {
+					$this->destroy();
+					error(_('Failed to resize image!'), null, $error);
+				}
 			}
 			if ($size = $this->get_size($this->temp)) {
 				$this->width = $size[0];
@@ -374,6 +372,69 @@ class ImageConvert extends ImageBase {
 			}
 		}
 	}
+	
+	// For when -auto-orient doesn't exist (older versions)
+	static public function jpeg_exif_orientation($src, $exif = false) {
+		if (!$exif) {
+			$exif = @exif_read_data($src);
+			if (!isset($exif['Orientation']))
+				return false;
+		}
+		switch($exif['Orientation']) {
+			case 1:
+				// Normal
+				return false;
+			case 2:
+				// 888888
+				//     88
+				//   8888
+				//     88
+				//     88
+			
+				return '-flop';
+			case 3:
+			
+				//     88
+				//     88
+				//   8888
+				//     88
+				// 888888
+			
+				return '-flip -flop';
+			case 4:
+				// 88
+				// 88
+				// 8888
+				// 88
+				// 888888
+			
+				return '-flip';
+			case 5:
+				// 8888888888
+				// 88  88
+				// 88
+			
+				return '-rotate 90 -flop';
+			case 6:
+				// 88
+				// 88  88
+				// 8888888888
+			
+				return '-rotate 90';
+			case 7:
+				//         88
+				//     88  88
+				// 8888888888
+			
+				return '-rotate "-90" -flop';
+			case 8:
+				// 8888888888
+				//     88  88
+				//         88
+			
+				return '-rotate "-90"';
+		}
+	}
 }
 
 class ImagePNG extends ImageBase {
@@ -428,11 +489,170 @@ class ImageBMP extends ImageBase {
 	}
 }
 
-class ImageWEBP extends ImageBase {
-	public function from() {
-		$this->image = @imagecreatefromwebp($this->src);
+
+/*********************************************/
+/* Fonction: imagecreatefrombmp              */
+/* Author:   DHKold                          */
+/* Contact:  admin@dhkold.com                */
+/* Date:     The 15th of June 2005           */
+/* Version:  2.0B                            */
+/*********************************************/
+
+function imagecreatefrombmp($filename) {
+   if (! $f1 = fopen($filename,"rb")) return FALSE;
+   $FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
+   if ($FILE['file_type'] != 19778) return FALSE;
+   $BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
+				 '/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
+				 '/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40));
+   $BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
+   if ($BMP['size_bitmap'] == 0) $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
+   $BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
+   $BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
+   $BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
+   $BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
+   $BMP['decal'] = 4-(4*$BMP['decal']);
+   if ($BMP['decal'] == 4) $BMP['decal'] = 0;
+
+   $PALETTE = array();
+   if ($BMP['colors'] < 16777216)
+   {
+	$PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
+   }
+
+   $IMG = fread($f1,$BMP['size_bitmap']);
+   $VIDE = chr(0);
+
+   $res = imagecreatetruecolor($BMP['width'],$BMP['height']);
+   $P = 0;
+   $Y = $BMP['height']-1;
+   while ($Y >= 0)
+   {
+	$X=0;
+	while ($X < $BMP['width'])
+	{
+	 if ($BMP['bits_per_pixel'] == 24)
+		$COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
+	 elseif ($BMP['bits_per_pixel'] == 16)
+	 {  
+		$COLOR = unpack("n",substr($IMG,$P,2));
+		$COLOR[1] = $PALETTE[$COLOR[1]+1];
+	 }
+	 elseif ($BMP['bits_per_pixel'] == 8)
+	 {  
+		$COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
+		$COLOR[1] = $PALETTE[$COLOR[1]+1];
+	 }
+	 elseif ($BMP['bits_per_pixel'] == 4)
+	 {
+		$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
+		if (($P*2)%2 == 0) $COLOR[1] = ($COLOR[1] >> 4) ; else $COLOR[1] = ($COLOR[1] & 0x0F);
+		$COLOR[1] = $PALETTE[$COLOR[1]+1];
+	 }
+	 elseif ($BMP['bits_per_pixel'] == 1)
+	 {
+		$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
+		if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
+		elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
+		elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
+		elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
+		elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
+		elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
+		elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
+		elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
+		$COLOR[1] = $PALETTE[$COLOR[1]+1];
+	 }
+	 else
+		return FALSE;
+	 imagesetpixel($res,$X,$Y,$COLOR[1]);
+	 $X++;
+	 $P += $BMP['bytes_per_pixel'];
 	}
-	public function to($src) {
-		imagewebp($this->image, $src);
+	$Y--;
+	$P+=$BMP['decal'];
+   }
+   fclose($f1);
+
+ return $res;
+}
+
+function imagebmp(&$img, $filename='') {
+	$widthOrig = imagesx($img);
+	$widthFloor = ((floor($widthOrig/16))*16);
+	$widthCeil = ((ceil($widthOrig/16))*16);
+	$height = imagesy($img);
+
+	$size = ($widthCeil*$height*3)+54;
+
+	// Bitmap File Header
+	$result = 'BM';	 // header (2b)
+	$result .= int_to_dword($size); // size of file (4b)
+	$result .= int_to_dword(0); // reserved (4b)
+	$result .= int_to_dword(54); // byte location in the file which is first byte of IMAGE (4b)
+	// Bitmap Info Header
+	$result .= int_to_dword(40); // Size of BITMAPINFOHEADER (4b)
+	$result .= int_to_dword($widthCeil); // width of bitmap (4b)
+	$result .= int_to_dword($height); // height of bitmap (4b)
+	$result .= int_to_word(1);	// biPlanes = 1 (2b)
+	$result .= int_to_word(24); // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b
+	$result .= int_to_dword(0); // RLE COMPRESSION (4b)
+	$result .= int_to_dword(0); // width x height (4b)
+	$result .= int_to_dword(0); // biXPelsPerMeter (4b)
+	$result .= int_to_dword(0); // biYPelsPerMeter (4b)
+	$result .= int_to_dword(0); // Number of palettes used (4b)
+	$result .= int_to_dword(0); // Number of important colour (4b)
+
+	// is faster than chr()
+	$arrChr = array();
+	for ($i=0; $i<256; $i++){
+	$arrChr[$i] = chr($i);
+	}
+
+	// creates image data
+	$bgfillcolor = array('red'=>0, 'green'=>0, 'blue'=>0);
+
+	// bottom to top - left to right - attention blue green red !!!
+	$y=$height-1;
+	for ($y2=0; $y2<$height; $y2++) {
+		for ($x=0; $x<$widthFloor;	) {
+			$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+		}
+		for ($x=$widthFloor; $x<$widthCeil; $x++) {
+			$rgb = ($x<$widthOrig) ? imagecolorsforindex($img, imagecolorat($img, $x, $y)) : $bgfillcolor;
+			$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+		}
+		$y--;
+	}
+
+	// see imagegif
+	if ($filename == '') {
+		echo $result;
+	} else {
+		$file = fopen($filename, 'wb');
+		fwrite($file, $result);
+		fclose($file);
 	}
 }
+// imagebmp helpers
+function int_to_dword($n) {
+	return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255);
+}
+function int_to_word($n) {
+	return chr($n & 255).chr(($n >> 8) & 255);
+}
+

inc/instance-config.php

@@ -19,5 +19,5 @@
 	
 	//$config['root']				= '/';
 	
-	@include('inc/secrets.php');
+	
 ?>

inc/lib/IP/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2013 Jason Morriss
+
+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.
+

inc/lib/IP/Lifo/IP/BC.php

@@ -0,0 +1,293 @@
+<?php
+/**
+ * This file is part of the Lifo\IP PHP Library.
+ *
+ * (c) Jason Morriss <lifo2013@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace Lifo\IP;
+
+/**
+ * BCMath helper class.
+ *
+ * Provides a handful of BCMath routines that are not included in the native
+ * PHP library.
+ *
+ * Note: The Bitwise functions operate on fixed byte boundaries. For example,
+ * comparing the following numbers uses X number of bits:
+ *  0xFFFF and 0xFF will result in comparison of 16 bits.
+ *  0xFFFFFFFF and 0xF will result in comparison of 32 bits.
+ *  etc...
+ *
+ */
+abstract class BC
+{
+    // Some common (maybe useless) constants
+    const MAX_INT_32   = '2147483647';                                  // 7FFFFFFF
+    const MAX_UINT_32  = '4294967295';                                  // FFFFFFFF
+    const MAX_INT_64   = '9223372036854775807';                         // 7FFFFFFFFFFFFFFF
+    const MAX_UINT_64  = '18446744073709551615';                        // FFFFFFFFFFFFFFFF
+    const MAX_INT_96   = '39614081257132168796771975167';               // 7FFFFFFFFFFFFFFFFFFFFFFF
+    const MAX_UINT_96  = '79228162514264337593543950335';               // FFFFFFFFFFFFFFFFFFFFFFFF
+    const MAX_INT_128  = '170141183460469231731687303715884105727';     // 7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+    const MAX_UINT_128 = '340282366920938463463374607431768211455';     // FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+
+    /**
+     * BC Math function to convert a HEX string into a DECIMAL
+     */
+    public static function bchexdec($hex)
+    {
+        if (strlen($hex) == 1) {
+            return hexdec($hex);
+        }
+
+        $remain = substr($hex, 0, -1);
+        $last = substr($hex, -1);
+        return bcadd(bcmul(16, self::bchexdec($remain), 0), hexdec($last), 0);
+    }
+
+    /**
+     * BC Math function to convert a DECIMAL string into a BINARY string
+     */
+    public static function bcdecbin($dec, $pad = null)
+    {
+        $bin = '';
+        while ($dec) {
+            $m = bcmod($dec, 2);
+            $dec = bcdiv($dec, 2, 0);
+            $bin = abs($m) . $bin;
+        }
+        return $pad ? sprintf("%0{$pad}s", $bin) : $bin;
+    }
+
+    /**
+     * BC Math function to convert a BINARY string into a DECIMAL string
+     */
+    public static function bcbindec($bin)
+    {
+        $dec = '0';
+        for ($i=0, $j=strlen($bin); $i<$j; $i++) {
+            $dec = bcmul($dec, '2', 0);
+            $dec = bcadd($dec, $bin[$i], 0);
+        }
+        return $dec;
+    }
+
+    /**
+     * BC Math function to convert a BINARY string into a HEX string
+     */
+    public static function bcbinhex($bin, $pad = 0)
+    {
+        return self::bcdechex(self::bcbindec($bin));
+    }
+
+    /**
+     * BC Math function to convert a DECIMAL into a HEX string
+     */
+    public static function bcdechex($dec)
+    {
+        $last = bcmod($dec, 16);
+        $remain = bcdiv(bcsub($dec, $last, 0), 16, 0);
+        return $remain == 0 ? dechex($last) : self::bcdechex($remain) . dechex($last);
+    }
+
+    /**
+     * Bitwise AND two arbitrarily large numbers together.
+     */
+    public static function bcand($left, $right)
+    {
+        $len = self::_bitwise($left, $right);
+
+        $value = '';
+        for ($i=0; $i<$len; $i++) {
+            $value .= (($left{$i} + 0) & ($right{$i} + 0)) ? '1' : '0';
+        }
+        return self::bcbindec($value != '' ? $value : '0');
+    }
+
+    /**
+     * Bitwise OR two arbitrarily large numbers together.
+     */
+    public static function bcor($left, $right)
+    {
+        $len = self::_bitwise($left, $right);
+
+        $value = '';
+        for ($i=0; $i<$len; $i++) {
+            $value .= (($left{$i} + 0) | ($right{$i} + 0)) ? '1' : '0';
+        }
+        return self::bcbindec($value != '' ? $value : '0');
+    }
+
+    /**
+     * Bitwise XOR two arbitrarily large numbers together.
+     */
+    public static function bcxor($left, $right)
+    {
+        $len = self::_bitwise($left, $right);
+
+        $value = '';
+        for ($i=0; $i<$len; $i++) {
+            $value .= (($left{$i} + 0) ^ ($right{$i} + 0)) ? '1' : '0';
+        }
+        return self::bcbindec($value != '' ? $value : '0');
+    }
+
+    /**
+     * Bitwise NOT two arbitrarily large numbers together.
+     */
+    public static function bcnot($left, $bits = null)
+    {
+        $right = 0;
+        $len = self::_bitwise($left, $right, $bits);
+        $value = '';
+        for ($i=0; $i<$len; $i++) {
+            $value .= $left{$i} == '1' ? '0' : '1';
+        }
+        return self::bcbindec($value);
+    }
+
+    /**
+     * Shift number to the left
+     *
+     * @param integer $bits Total bits to shift
+     */
+    public static function bcleft($num, $bits) {
+        return bcmul($num, bcpow('2', $bits));
+    }
+
+    /**
+     * Shift number to the right
+     *
+     * @param integer $bits Total bits to shift
+     */
+    public static function bcright($num, $bits) {
+        return bcdiv($num, bcpow('2', $bits));
+    }
+
+    /**
+     * Determine how many bits are needed to store the number rounded to the
+     * nearest bit boundary.
+     */
+    public static function bits_needed($num, $boundary = 4)
+    {
+        $bits = 0;
+        while ($num > 0) {
+            $num = bcdiv($num, '2', 0);
+            $bits++;
+        }
+        // round to nearest boundrary
+        return $boundary ? ceil($bits / $boundary) * $boundary : $bits;
+    }
+
+    /**
+     * BC Math function to return an arbitrarily large random number.
+     */
+    public static function bcrand($min, $max = null)
+    {
+        if ($max === null) {
+            $max = $min;
+            $min = 0;
+        }
+
+        // swap values if $min > $max
+        if (bccomp($min, $max) == 1) {
+            list($min,$max) = array($max,$min);
+        }
+
+        return bcadd(
+            bcmul(
+                bcdiv(
+                    mt_rand(0, mt_getrandmax()),
+                    mt_getrandmax(),
+                    strlen($max)
+                ),
+                bcsub(
+                    bcadd($max, '1'),
+                    $min
+                )
+            ),
+            $min
+        );
+    }
+
+    /**
+     * Computes the natural logarithm using a series.
+     * @author Thomas Oldbury.
+     * @license Public domain.
+     */
+    public static function bclog($num, $iter = 10, $scale = 100)
+    {
+        $log = "0.0";
+        for($i = 0; $i < $iter; $i++) {
+            $pow = 1 + (2 * $i);
+            $mul = bcdiv("1.0", $pow, $scale);
+            $fraction = bcmul($mul, bcpow(bcsub($num, "1.0", $scale) / bcadd($num, "1.0", $scale), $pow, $scale), $scale);
+            $log = bcadd($fraction, $log, $scale);
+        }
+        return bcmul("2.0", $log, $scale);
+    }
+
+    /**
+     * Computes the base2 log using baseN log.
+     */
+    public static function bclog2($num, $iter = 10, $scale = 100)
+    {
+        return bcdiv(self::bclog($num, $iter, $scale), self::bclog("2", $iter, $scale), $scale);
+    }
+
+    public static function bcfloor($num)
+    {
+        if (substr($num, 0, 1) == '-') {
+            return bcsub($num, 1, 0);
+        }
+        return bcadd($num, 0, 0);
+    }
+
+    public static function bcceil($num)
+    {
+        if (substr($num, 0, 1) == '-') {
+            return bcsub($num, 0, 0);
+        }
+        return bcadd($num, 1, 0);
+    }
+
+    /**
+     * Compare two numbers and return -1, 0, 1 depending if the LEFT number is
+     * < = > the RIGHT.
+     *
+     * @param string|integer $left Left side operand
+     * @param string|integer $right Right side operand
+     * @return integer Return -1,0,1 for <=> comparison
+     */
+    public static function cmp($left, $right)
+    {
+        // @todo could an optimization be done to determine if a normal 32bit
+        //       comparison could be done instead of using bccomp? But would
+        //       the number verification cause too much overhead to be useful?
+        return bccomp($left, $right, 0);
+    }
+
+    /**
+     * Internal function to prepare for bitwise operations
+     */
+    private static function _bitwise(&$left, &$right, $bits = null)
+    {
+        if ($bits === null) {
+            $bits = max(self::bits_needed($left), self::bits_needed($right));
+        }
+
+        $left  = self::bcdecbin($left);
+        $right = self::bcdecbin($right);
+
+        $len   = max(strlen($left), strlen($right), (int)$bits);
+
+        $left  = sprintf("%0{$len}s", $left);
+        $right = sprintf("%0{$len}s", $right);
+
+        return $len;
+    }
+
+}

inc/lib/IP/Lifo/IP/CIDR.php

@@ -0,0 +1,706 @@
+<?php
+/**
+ * This file is part of the Lifo\IP PHP Library.
+ *
+ * (c) Jason Morriss <lifo2013@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace Lifo\IP;
+
+/**
+ * CIDR Block helper class.
+ *
+ * Most routines can be used statically or by instantiating an object and
+ * calling its methods.
+ *
+ * Provides routines to do various calculations on IP addresses and ranges.
+ * Convert to/from CIDR to ranges, etc.
+ */
+class CIDR
+{
+    const INTERSECT_NO              = 0;
+    const INTERSECT_YES             = 1;
+    const INTERSECT_LOW             = 2;
+    const INTERSECT_HIGH            = 3;
+
+    protected $start;
+    protected $end;
+    protected $prefix;
+    protected $version;
+    protected $istart;
+    protected $iend;
+
+    private $cache;
+
+    /**
+     * Create a new CIDR object.
+     *
+     * The IP range can be arbitrary and does not have to fall on a valid CIDR
+     * range. Some methods will return different values depending if you ignore
+     * the prefix or not. By default all prefix sensitive methods will assume
+     * the prefix is used.
+     *
+     * @param string $cidr An IP address (1.2.3.4), CIDR block (1.2.3.4/24),
+     *                     or range "1.2.3.4-1.2.3.10"
+     * @param string $end Ending IP in range if no cidr/prefix is given
+     */
+    public function __construct($cidr, $end = null)
+    {
+        if ($end !== null) {
+            $this->setRange($cidr, $end);
+        } else {
+            $this->setCidr($cidr);
+        }
+    }
+
+    /**
+     * Returns the string representation of the CIDR block.
+     */
+    public function __toString()
+    {
+        // do not include the prefix if its a single IP
+        try {
+            if ($this->isTrueCidr() && (
+                ($this->version == 4 and $this->prefix != 32) ||
+                ($this->version == 6 and $this->prefix != 128)
+                )
+            ) {
+                return $this->start . '/' . $this->prefix;
+            }
+        } catch (\Exception $e) {
+            // isTrueCidr() calls getRange which can throw an exception
+        }
+        if (strcmp($this->start, $this->end) == 0) {
+            return $this->start;
+        }
+        return $this->start . ' - ' . $this->end;
+    }
+
+    public function __clone()
+    {
+        // do not clone the cache. No real reason why. I just want to keep the
+        // memory foot print as low as possible, even though this is trivial.
+        $this->cache = array();
+    }
+
+    /**
+     * Set an arbitrary IP range.
+     * The closest matching prefix will be calculated but the actual range
+     * stored in the object can be arbitrary.
+     * @param string $start Starting IP or combination "start-end" string.
+     * @param string $end   Ending IP or null.
+     */
+    public function setRange($ip, $end = null)
+    {
+        if (strpos($ip, '-') !== false) {
+            list($ip, $end) = array_map('trim', explode('-', $ip, 2));
+        }
+
+        if (false === filter_var($ip, FILTER_VALIDATE_IP) ||
+            false === filter_var($end, FILTER_VALIDATE_IP)) {
+            throw new \InvalidArgumentException("Invalid IP range \"$ip-$end\"");
+        }
+
+        // determine version (4 or 6)
+        $this->version = (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 6 : 4;
+
+        $this->istart = IP::inet_ptod($ip);
+        $this->iend   = IP::inet_ptod($end);
+
+        // fix order
+        if (bccomp($this->istart, $this->iend) == 1) {
+            list($this->istart, $this->iend) = array($this->iend, $this->istart);
+            list($ip, $end) = array($end, $ip);
+        }
+
+        $this->start = $ip;
+        $this->end = $end;
+
+        // calculate real prefix
+        $len = $this->version == 4 ? 32 : 128;
+        $this->prefix = $len - strlen(BC::bcdecbin(BC::bcxor($this->istart, $this->iend)));
+    }
+
+    /**
+     * Returns true if the current IP is a true cidr block
+     */
+    public function isTrueCidr()
+    {
+        return $this->start == $this->getNetwork() && $this->end == $this->getBroadcast();
+    }
+
+    /**
+     * Set the CIDR block.
+     *
+     * The prefix length is optional and will default to 32 ot 128 depending on
+     * the version detected.
+     *
+     * @param string $cidr CIDR block string, eg: "192.168.0.0/24" or "2001::1/64"
+     * @throws \InvalidArgumentException If the CIDR block is invalid
+     */
+    public function setCidr($cidr)
+    {
+        if (strpos($cidr, '-') !== false) {
+            return $this->setRange($cidr);
+        }
+
+        list($ip, $bits) = array_pad(array_map('trim', explode('/', $cidr, 2)), 2, null);
+        if (false === filter_var($ip, FILTER_VALIDATE_IP)) {
+            throw new \InvalidArgumentException("Invalid IP address \"$cidr\"");
+        }
+
+        // determine version (4 or 6)
+        $this->version = (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 6 : 4;
+
+        $this->start = $ip;
+        $this->istart = IP::inet_ptod($ip);
+
+        if ($bits !== null and $bits !== '') {
+            $this->prefix = $bits;
+        } else {
+            $this->prefix = $this->version == 4 ? 32 : 128;
+        }
+
+        if (($this->prefix < 0)
+            || ($this->prefix > 32 and $this->version == 4)
+            || ($this->prefix > 128 and $this->version == 6)) {
+            throw new \InvalidArgumentException("Invalid IP address \"$cidr\"");
+        }
+
+        $this->end = $this->getBroadcast();
+        $this->iend = IP::inet_ptod($this->end);
+
+        $this->cache = array();
+    }
+
+    /**
+     * Get the IP version. 4 or 6.
+     *
+     * @return integer
+     */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * Get the prefix.
+     *
+     * Always returns the "proper" prefix, even if the IP range is arbitrary.
+     *
+     * @return integer
+     */
+    public function getPrefix()
+    {
+        return $this->prefix;
+    }
+
+    /**
+     * Return the starting presentational IP or Decimal value.
+     *
+     * Ignores prefix
+     */
+    public function getStart($decimal = false)
+    {
+        return $decimal ? $this->istart : $this->start;
+    }
+
+    /**
+     * Return the ending presentational IP or Decimal value.
+     *
+     * Ignores prefix
+     */
+    public function getEnd($decimal = false)
+    {
+        return $decimal ? $this->iend : $this->end;
+    }
+
+    /**
+     * Return the next presentational IP or Decimal value (following the
+     * broadcast address of the current CIDR block).
+     */
+    public function getNext($decimal = false)
+    {
+        $next = bcadd($this->getEnd(true), '1');
+        return $decimal ? $next : new self(IP::inet_dtop($next));
+    }
+
+    /**
+     * Returns true if the IP is an IPv4
+     *
+     * @return boolean
+     */
+    public function isIPv4()
+    {
+        return $this->version == 4;
+    }
+
+    /**
+     * Returns true if the IP is an IPv6
+     *
+     * @return boolean
+     */
+    public function isIPv6()
+    {
+        return $this->version == 6;
+    }
+
+    /**
+     * Get the cidr notation for the subnet block.
+     *
+     * This is useful for when you want a string representation of the IP/prefix
+     * and the starting IP is not on a valid network boundrary (eg: Displaying
+     * an IP from an interface).
+     *
+     * @return string IP in CIDR notation "ipaddr/prefix"
+     */
+    public function getCidr()
+    {
+        return $this->start . '/' . $this->prefix;
+    }
+
+    /**
+     * Get the [low,high] range of the CIDR block
+     *
+     * Prefix sensitive.
+     *
+     * @param boolean $ignorePrefix If true the arbitrary start-end range is
+     *                              returned. default=false.
+     */
+    public function getRange($ignorePrefix = false)
+    {
+        $range = $ignorePrefix
+            ? array($this->start, $this->end)
+            : self::cidr_to_range($this->start, $this->prefix);
+        // watch out for IP '0' being converted to IPv6 '::'
+        if ($range[0] == '::' and strpos($range[1], ':') == false) {
+            $range[0] = '0.0.0.0';
+        }
+        return $range;
+    }
+
+    /**
+     * Return the IP in its fully expanded form.
+     *
+     * For example: 2001::1 == 2007:0000:0000:0000:0000:0000:0000:0001
+     *
+     * @see IP::inet_expand
+     */
+    public function getExpanded()
+    {
+        return IP::inet_expand($this->start);
+    }
+
+    /**
+     * Get network IP of the CIDR block
+     *
+     * Prefix sensitive.
+     *
+     * @param boolean $ignorePrefix If true the arbitrary start-end range is
+     *                              returned. default=false.
+     */
+    public function getNetwork($ignorePrefix = false)
+    {
+        // micro-optimization to prevent calling getRange repeatedly
+        $k = $ignorePrefix ? 1 : 0;
+        if (!isset($this->cache['range'][$k])) {
+            $this->cache['range'][$k] = $this->getRange($ignorePrefix);
+        }
+        return $this->cache['range'][$k][0];
+    }
+
+    /**
+     * Get broadcast IP of the CIDR block
+     *
+     * Prefix sensitive.
+     *
+     * @param boolean $ignorePrefix If true the arbitrary start-end range is
+     *                              returned. default=false.
+     */
+    public function getBroadcast($ignorePrefix = false)
+    {
+        // micro-optimization to prevent calling getRange repeatedly
+        $k = $ignorePrefix ? 1 : 0;
+        if (!isset($this->cache['range'][$k])) {
+            $this->cache['range'][$k] = $this->getRange($ignorePrefix);
+        }
+        return $this->cache['range'][$k][1];
+    }
+
+    /**
+     * Get the network mask based on the prefix.
+     *
+     */
+    public function getMask()
+    {
+        return self::prefix_to_mask($this->prefix, $this->version);
+    }
+
+    /**
+     * Get total hosts within CIDR range
+     *
+     * Prefix sensitive.
+     *
+     * @param boolean $ignorePrefix If true the arbitrary start-end range is
+     *                              returned. default=false.
+     */
+    public function getTotal($ignorePrefix = false)
+    {
+        // micro-optimization to prevent calling getRange repeatedly
+        $k = $ignorePrefix ? 1 : 0;
+        if (!isset($this->cache['range'][$k])) {
+            $this->cache['range'][$k] = $this->getRange($ignorePrefix);
+        }
+        return bcadd(bcsub(IP::inet_ptod($this->cache['range'][$k][1]),
+                           IP::inet_ptod($this->cache['range'][$k][0])), '1');
+    }
+
+    public function intersects($cidr)
+    {
+        return self::cidr_intersect((string)$this, $cidr);
+    }
+
+    /**
+     * Determines the intersection between an IP (with optional prefix) and a
+     * CIDR block.
+     *
+     * The IP will be checked against the CIDR block given and will either be
+     * inside or outside the CIDR completely, or partially.
+     *
+     * NOTE: The caller should explicitly check against the INTERSECT_*
+     * constants because this method will return a value > 1 even for partial
+     * matches.
+     *
+     * @param mixed $ip The IP/cidr to match
+     * @param mixed $cidr The CIDR block to match within
+     * @return integer Returns an INTERSECT_* constant
+     * @throws \InvalidArgumentException if either $ip or $cidr is invalid
+     */
+    public static function cidr_intersect($ip, $cidr)
+    {
+        // use fixed length HEX strings so we can easily do STRING comparisons
+        // instead of using slower bccomp() math.
+        list($lo,$hi)   = array_map(function($v){ return sprintf("%032s", IP::inet_ptoh($v)); }, CIDR::cidr_to_range($ip));
+        list($min,$max) = array_map(function($v){ return sprintf("%032s", IP::inet_ptoh($v)); }, CIDR::cidr_to_range($cidr));
+
+        /** visualization of logic used below
+            lo-hi   = $ip to check
+            min-max = $cidr block being checked against
+            --- --- --- lo  --- --- hi  --- --- --- --- --- IP/prefix to check
+            --- min --- --- max --- --- --- --- --- --- --- Partial "LOW" match
+            --- --- --- --- --- min --- --- max --- --- --- Partial "HIGH" match
+            --- --- --- --- min max --- --- --- --- --- --- No match "NO"
+            --- --- --- --- --- --- --- --- min --- max --- No match "NO"
+            min --- max --- --- --- --- --- --- --- --- --- No match "NO"
+            --- --- min --- --- --- --- max --- --- --- --- Full match "YES"
+         */
+
+        // IP is exact match or completely inside the CIDR block
+        if ($lo >= $min and $hi <= $max) {
+            return self::INTERSECT_YES;
+        }
+
+        // IP is completely outside the CIDR block
+        if ($max < $lo or $min > $hi) {
+            return self::INTERSECT_NO;
+        }
+
+        // @todo is it useful to return LOW/HIGH partial matches?
+
+        // IP matches the lower end
+        if ($max <= $hi and $min <= $lo) {
+            return self::INTERSECT_LOW;
+        }
+
+        // IP matches the higher end
+        if ($min >= $lo and $max >= $hi) {
+            return self::INTERSECT_HIGH;
+        }
+
+        return self::INTERSECT_NO;
+    }
+
+    /**
+     * Converts an IPv4 or IPv6 CIDR block into its range.
+     *
+     * @todo May not be the fastest way to do this.
+     *
+     * @static
+     * @param string       $cidr CIDR block or IP address string.
+     * @param integer|null $bits If /bits is not specified on string they can be
+     *                           passed via this parameter instead.
+     * @return array             A 2 element array with the low, high range
+     */
+    public static function cidr_to_range($cidr, $bits = null)
+    {
+        if (strpos($cidr, '/') !== false) {
+            list($ip, $_bits) = array_pad(explode('/', $cidr, 2), 2, null);
+        } else {
+            $ip = $cidr;
+            $_bits = $bits;
+        }
+
+        if (false === filter_var($ip, FILTER_VALIDATE_IP)) {
+            throw new \InvalidArgumentException("IP address \"$cidr\" is invalid");
+        }
+
+        // force bit length to 32 or 128 depending on type of IP
+        $bitlen = (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 128 : 32;
+
+        if ($bits === null) {
+            // if no prefix is given use the length of the binary string which
+            // will give us 32 or 128 and result in a single IP being returned.
+            $bits = $_bits !== null ? $_bits : $bitlen;
+        }
+
+        if ($bits > $bitlen) {
+            throw new \InvalidArgumentException("IP address \"$cidr\" is invalid");
+        }
+
+        $ipdec = IP::inet_ptod($ip);
+        $ipbin = BC::bcdecbin($ipdec, $bitlen);
+
+        // calculate network
+        $netmask = BC::bcbindec(str_pad(str_repeat('1',$bits), $bitlen, '0'));
+        $ip1 = BC::bcand($ipdec, $netmask);
+
+        // calculate "broadcast" (not technically a broadcast in IPv6)
+        $ip2 = BC::bcor($ip1, BC::bcnot($netmask));
+
+        return array(IP::inet_dtop($ip1), IP::inet_dtop($ip2));
+    }
+
+    /**
+     * Return the CIDR string from the range given
+     */
+    public static function range_to_cidr($start, $end)
+    {
+        $cidr = new CIDR($start, $end);
+        return (string)$cidr;
+    }
+
+    /**
+     * Return the maximum prefix length that would fit the IP address given.
+     *
+     * This is useful to determine how my bit would be needed to store the IP
+     * address when you don't already have a prefix for the IP.
+     *
+     * @example 216.240.32.0 would return 27
+     *
+     * @param string $ip IP address without prefix
+     * @param integer $bits Maximum bits to check; defaults to 32 for IPv4 and 128 for IPv6
+     */
+    public static function max_prefix($ip, $bits = null)
+    {
+        static $mask = array();
+
+        $ver = (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 6 : 4;
+        $max = $ver == 6 ? 128 : 32;
+        if ($bits === null) {
+            $bits = $max;
+
+        }
+
+        $int = IP::inet_ptod($ip);
+        while ($bits > 0) {
+            // micro-optimization; calculate mask once ...
+            if (!isset($mask[$ver][$bits-1])) {
+                // 2^$max - 2^($max - $bits);
+                if ($ver == 4) {
+                    $mask[$ver][$bits-1] = pow(2, $max) - pow(2, $max - ($bits-1));
+                } else {
+                    $mask[$ver][$bits-1] = bcsub(bcpow(2, $max), bcpow(2, $max - ($bits-1)));
+                }
+            }
+
+            $m = $mask[$ver][$bits-1];
+            //printf("%s/%d: %s & %s == %s\n", $ip, $bits-1, BC::bcdecbin($m, 32), BC::bcdecbin($int, 32), BC::bcdecbin(BC::bcand($int, $m)));
+            //echo "$ip/", $bits-1, ": ", IP::inet_dtop($m), " ($m) & $int == ", BC::bcand($int, $m), "\n";
+            if (bccomp(BC::bcand($int, $m), $int) != 0) {
+                return $bits;
+            }
+            $bits--;
+        }
+        return $bits;
+    }
+
+    /**
+     * Return a contiguous list of true CIDR blocks that span the range given.
+     *
+     * Note: It's not a good idea to call this with IPv6 addresses. While it may
+     * work for certain ranges this can be very slow. Also an IPv6 list won't be
+     * as accurate as an IPv4 list.
+     *
+     * @example
+     *  range_to_cidrlist(192.168.0.0, 192.168.0.15) ==
+     *    192.168.0.0/28
+     *  range_to_cidrlist(192.168.0.0, 192.168.0.20) ==
+     *    192.168.0.0/28
+     *    192.168.0.16/30
+     *    192.168.0.20/32
+     */
+    public static function range_to_cidrlist($start, $end)
+    {
+        $ver   = (false === filter_var($start, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 6 : 4;
+        $start = IP::inet_ptod($start);
+        $end   = IP::inet_ptod($end);
+
+        $len = $ver == 4 ? 32 : 128;
+        $log2 = $ver == 4 ? log(2) : BC::bclog(2);
+
+        $list = array();
+        while (BC::cmp($end, $start) >= 0) { // $end >= $start
+            $prefix = self::max_prefix(IP::inet_dtop($start), $len);
+            if ($ver == 4) {
+                $diff = $len - floor( log($end - $start + 1) / $log2 );
+            } else {
+                // this is not as accurate due to the bclog function
+                $diff = bcsub($len, BC::bcfloor(bcdiv(BC::bclog(bcadd(bcsub($end, $start), '1')), $log2)));
+            }
+
+            if ($prefix < $diff) {
+                $prefix = $diff;
+            }
+
+            $list[] = IP::inet_dtop($start) . "/" . $prefix;
+
+            if ($ver == 4) {
+                $start += pow(2, $len - $prefix);
+            } else {
+                $start = bcadd($start, bcpow(2, $len - $prefix));
+            }
+        }
+        return $list;
+    }
+
+    /**
+     * Return an list of optimized CIDR blocks by collapsing adjacent CIDR
+     * blocks into larger blocks.
+     *
+     * @param array $cidrs List of CIDR block strings or objects
+     * @param integer $maxPrefix Maximum prefix to allow
+     * @return array Optimized list of CIDR objects
+     */
+    public static function optimize_cidrlist($cidrs, $maxPrefix = 32)
+    {
+        // all indexes must be a CIDR object
+        $cidrs = array_map(function($o){ return $o instanceof CIDR ? $o : new CIDR($o); }, $cidrs);
+        // sort CIDR blocks in proper order so we can easily loop over them
+        $cidrs = self::cidr_sort($cidrs);
+
+        $list = array();
+        while ($cidrs) {
+            $c = array_shift($cidrs);
+            $start = $c->getStart();
+
+            $max = bcadd($c->getStart(true), $c->getTotal());
+
+            // loop through each cidr block until its ending range is more than
+            // the current maximum.
+            while (!empty($cidrs) and $cidrs[0]->getStart(true) <= $max) {
+                $b = array_shift($cidrs);
+                $newmax = bcadd($b->getStart(true), $b->getTotal());
+                if ($newmax > $max) {
+                    $max = $newmax;
+                }
+            }
+
+            // add the new cidr range to the optimized list
+            $list = array_merge($list, self::range_to_cidrlist($start, IP::inet_dtop(bcsub($max, '1'))));
+        }
+
+        return $list;
+    }
+
+    /**
+     * Sort the list of CIDR blocks, optionally with a custom callback function.
+     *
+     * @param array $cidrs A list of CIDR blocks (strings or objects)
+     * @param Closure $callback Optional callback to perform the sorting.
+     *                          See PHP usort documentation for more details.
+     */
+    public static function cidr_sort($cidrs, $callback = null)
+    {
+        // all indexes must be a CIDR object
+        $cidrs = array_map(function($o){ return $o instanceof CIDR ? $o : new CIDR($o); }, $cidrs);
+
+        if ($callback === null) {
+            $callback = function($a, $b) {
+                if (0 != ($o = BC::cmp($a->getStart(true), $b->getStart(true)))) {
+                    return $o;  // < or >
+                }
+                if ($a->getPrefix() == $b->getPrefix()) {
+                    return 0;
+                }
+                return $a->getPrefix() < $b->getPrefix() ? -1 : 1;
+            };
+        } elseif (!($callback instanceof \Closure) or !is_callable($callback)) {
+            throw new \InvalidArgumentException("Invalid callback in CIDR::cidr_sort, expected Closure, got " . gettype($callback));
+        }
+
+        usort($cidrs, $callback);
+        return $cidrs;
+    }
+
+    /**
+     * Return the Prefix bits from the IPv4 mask given.
+     *
+     * This is only valid for IPv4 addresses since IPv6 addressing does not
+     * have a concept of network masks.
+     *
+     * Example: 255.255.255.0 == 24
+     *
+     * @param string $mask IPv4 network mask.
+     */
+    public static function mask_to_prefix($mask)
+    {
+        if (false === filter_var($mask, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+            throw new \InvalidArgumentException("Invalid IP netmask \"$mask\"");
+        }
+        return strrpos(IP::inet_ptob($mask, 32), '1') + 1;
+    }
+
+    /**
+     * Return the network mask for the prefix given.
+     *
+     * Normally this is only useful for IPv4 addresses but you can generate a
+     * mask for IPv6 addresses as well, only because its mathematically
+     * possible.
+     *
+     * @param integer $prefix CIDR prefix bits (0-128)
+     * @param integer $version IP version. If null the version will be detected
+     *                         based on the prefix length given.
+     */
+    public static function prefix_to_mask($prefix, $version = null)
+    {
+        if ($version === null) {
+            $version = $prefix > 32 ? 6 : 4;
+        }
+        if ($prefix < 0 or $prefix > 128) {
+            throw new \InvalidArgumentException("Invalid prefix length \"$prefix\"");
+        }
+        if ($version != 4 and $version != 6) {
+            throw new \InvalidArgumentException("Invalid version \"$version\". Must be 4 or 6");
+        }
+
+        if ($version == 4) {
+            return long2ip($prefix == 0 ? 0 : (0xFFFFFFFF >> (32 - $prefix)) << (32 - $prefix));
+        } else {
+            return IP::inet_dtop($prefix == 0 ? 0 : BC::bcleft(BC::bcright(BC::MAX_UINT_128, 128-$prefix), 128-$prefix));
+        }
+    }
+
+    /**
+     * Return true if the $ip given is a true CIDR block.
+     *
+     * A true CIDR block is one where the $ip given is the actual Network
+     * address and broadcast matches the prefix appropriately.
+     */
+    public static function cidr_is_true($ip)
+    {
+        $ip = new CIDR($ip);
+        return $ip->isTrueCidr();
+    }
+}

inc/lib/IP/Lifo/IP/IP.php

@@ -0,0 +1,207 @@
+<?php
+/**
+ * This file is part of the Lifo\IP PHP Library.
+ *
+ * (c) Jason Morriss <lifo2013@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace Lifo\IP;
+
+/**
+ * IP Address helper class.
+ *
+ * Provides routines to translate IPv4 and IPv6 addresses between human readable
+ * strings, decimal, hexidecimal and binary.
+ *
+ * Requires BCmath extension and IPv6 PHP support
+ */
+abstract class IP
+{
+    /**
+     * Convert a human readable (presentational) IP address string into a decimal string.
+     */
+    public static function inet_ptod($ip)
+    {
+        // shortcut for IPv4 addresses
+        if (strpos($ip, ':') === false && strpos($ip, '.') !== false) {
+            return sprintf('%u', ip2long($ip));
+        }
+
+        // remove any cidr block notation
+        if (($o = strpos($ip, '/')) !== false) {
+            $ip = substr($ip, 0, $o);
+        }
+
+        // unpack into 4 32bit integers
+        $parts = unpack('N*', inet_pton($ip));
+        foreach ($parts as &$part) {
+            if ($part < 0) {
+                // convert signed int into unsigned
+                $part = sprintf('%u', $part);
+                //$part = bcadd($part, '4294967296');
+            }
+        }
+
+        // add each 32bit integer to the proper bit location in our big decimal
+        $decimal = $parts[4];                                                           // << 0
+        $decimal = bcadd($decimal, bcmul($parts[3], '4294967296'));                     // << 32
+        $decimal = bcadd($decimal, bcmul($parts[2], '18446744073709551616'));           // << 64
+        $decimal = bcadd($decimal, bcmul($parts[1], '79228162514264337593543950336'));  // << 96
+
+        return $decimal;
+    }
+
+    /**
+     * Convert a decimal string into a human readable IP address.
+     */
+    public static function inet_dtop($decimal, $expand = false)
+    {
+        $parts = array();
+        $parts[1] = bcdiv($decimal,                  '79228162514264337593543950336', 0);   // >> 96
+        $decimal  = bcsub($decimal, bcmul($parts[1], '79228162514264337593543950336'));
+        $parts[2] = bcdiv($decimal,                  '18446744073709551616', 0);            // >> 64
+        $decimal  = bcsub($decimal, bcmul($parts[2], '18446744073709551616'));
+        $parts[3] = bcdiv($decimal,                  '4294967296', 0);                      // >> 32
+        $decimal  = bcsub($decimal, bcmul($parts[3], '4294967296'));
+        $parts[4] = $decimal;                                                               // >> 0
+
+        foreach ($parts as &$part) {
+            if (bccomp($part, '2147483647') == 1) {
+                $part = bcsub($part, '4294967296');
+            }
+            $part = (int) $part;
+        }
+
+        // if the first 96bits is all zeros then we can safely assume we
+        // actually have an IPv4 address. Even though it's technically possible
+        // you're not really ever going to see an IPv6 address in the range:
+        // ::0 - ::ffff
+        // It's feasible to see an IPv6 address of "::", in which case the
+        // caller is going to have to account for that on their own.
+        if (($parts[1] | $parts[2] | $parts[3]) == 0) {
+            $ip = long2ip($parts[4]);
+        } else {
+            $packed = pack('N4', $parts[1], $parts[2], $parts[3], $parts[4]);
+            $ip = inet_ntop($packed);
+        }
+
+        // Turn IPv6 to IPv4 if it's IPv4
+        if (preg_match('/^::\d+\./', $ip)) {
+            return substr($ip, 2);
+        }
+
+        return $expand ? self::inet_expand($ip) : $ip;
+    }
+
+    /**
+     * Convert a human readable (presentational) IP address into a HEX string.
+     */
+    public static function inet_ptoh($ip)
+    {
+        return bin2hex(inet_pton($ip));
+        //return BC::bcdechex(self::inet_ptod($ip));
+    }
+
+    /**
+     * Convert a human readable (presentational) IP address into a BINARY string.
+     */
+    public static function inet_ptob($ip, $bits = 128)
+    {
+        return BC::bcdecbin(self::inet_ptod($ip), $bits);
+    }
+
+    /**
+     * Convert a binary string into an IP address (presentational) string.
+     */
+    public static function inet_btop($bin)
+    {
+        return self::inet_dtop(BC::bcbindec($bin));
+    }
+
+    /**
+     * Convert a HEX string into a human readable (presentational) IP address
+     */
+    public static function inet_htop($hex)
+    {
+        return self::inet_dtop(BC::bchexdec($hex));
+    }
+
+    /**
+     * Expand an IP address. IPv4 addresses are returned as-is.
+     *
+     * Example:
+     *      2001::1     expands to 2001:0000:0000:0000:0000:0000:0000:0001
+     *      ::127.0.0.1 expands to 0000:0000:0000:0000:0000:0000:7f00:0001
+     *      127.0.0.1   expands to 127.0.0.1
+     */
+    public static function inet_expand($ip)
+    {
+        // strip possible cidr notation off
+        if (($pos = strpos($ip, '/')) !== false) {
+            $ip = substr($ip, 0, $pos);
+        }
+        $bytes = unpack('n*', inet_pton($ip));
+        if (count($bytes) > 2) {
+            return implode(':', array_map(function ($b) {
+                return sprintf("%04x", $b);
+            }, $bytes));
+        }
+        return $ip;
+    }
+
+    /**
+     * Convert an IPv4 address into an IPv6 address.
+     *
+     * One use-case for this is IP 6to4 tunnels used in networking.
+     *
+     * @example
+     *      to_ipv4("10.10.10.10") == a0a:a0a
+     *
+     * @param string $ip IPv4 address.
+     * @param boolean $mapped If true a Full IPv6 address is returned within the
+     *                        official ipv4to6 mapped space "0:0:0:0:0:ffff:x:x"
+     */
+    public static function to_ipv6($ip, $mapped = false)
+    {
+        if (!self::isIPv4($ip)) {
+            throw new \InvalidArgumentException("Invalid IPv4 address \"$ip\"");
+        }
+
+        $num = IP::inet_ptod($ip);
+        $o1 = dechex($num >> 16);
+        $o2 = dechex($num & 0x0000FFFF);
+
+        return $mapped ? "0:0:0:0:0:ffff:$o1:$o2" : "$o1:$o2";
+    }
+
+    /**
+     * Returns true if the IP address is a valid IPv4 address
+     */
+    public static function isIPv4($ip)
+    {
+        return $ip === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
+    }
+
+    /**
+     * Returns true if the IP address is a valid IPv6 address
+     */
+    public static function isIPv6($ip)
+    {
+        return $ip === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
+    }
+
+    /**
+     * Compare two IP's (v4 or v6) and return -1, 0, 1 if the first is < = >
+     * the second.
+     *
+     * @param string $ip1 IP address
+     * @param string $ip2 IP address to compare against
+     * @return integer Return -1,0,1 depending if $ip1 is <=> $ip2
+     */
+    public static function cmp($ip1, $ip2)
+    {
+        return bccomp(self::inet_ptod($ip1), self::inet_ptod($ip2), 0);
+    }
+}

inc/lib/Twig/Autoloader.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Autoloads Twig classes.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Autoloader
+{
+    /**
+     * Registers Twig_Autoloader as an SPL autoloader.
+     *
+     * @param Boolean $prepend Whether to prepend the autoloader or not.
+     */
+    public static function register($prepend = false)
+    {
+        if (version_compare(phpversion(), '5.3.0', '>=')) {
+            spl_autoload_register(array(new self, 'autoload'), true, $prepend);
+        } else {
+            spl_autoload_register(array(new self, 'autoload'));
+        }
+    }
+
+    /**
+     * Handles autoloading of classes.
+     *
+     * @param string $class A class name.
+     */
+    public static function autoload($class)
+    {
+        if (0 !== strpos($class, 'Twig')) {
+            return;
+        }
+
+        if (is_file($file = dirname(__FILE__).'/../'.str_replace(array('_', "\0"), array('/', ''), $class).'.php')) {
+            require $file;
+        }
+    }
+}

inc/lib/Twig/Compiler.php

@@ -0,0 +1,268 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Compiles a node to PHP code.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Compiler implements Twig_CompilerInterface
+{
+    protected $lastLine;
+    protected $source;
+    protected $indentation;
+    protected $env;
+    protected $debugInfo;
+    protected $sourceOffset;
+    protected $sourceLine;
+    protected $filename;
+
+    /**
+     * Constructor.
+     *
+     * @param Twig_Environment $env The twig environment instance
+     */
+    public function __construct(Twig_Environment $env)
+    {
+        $this->env = $env;
+        $this->debugInfo = array();
+    }
+
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * Returns the environment instance related to this compiler.
+     *
+     * @return Twig_Environment The environment instance
+     */
+    public function getEnvironment()
+    {
+        return $this->env;
+    }
+
+    /**
+     * Gets the current PHP code after compilation.
+     *
+     * @return string The PHP code
+     */
+    public function getSource()
+    {
+        return $this->source;
+    }
+
+    /**
+     * Compiles a node.
+     *
+     * @param Twig_NodeInterface $node        The node to compile
+     * @param integer            $indentation The current indentation
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function compile(Twig_NodeInterface $node, $indentation = 0)
+    {
+        $this->lastLine = null;
+        $this->source = '';
+        $this->sourceOffset = 0;
+        // source code starts at 1 (as we then increment it when we encounter new lines)
+        $this->sourceLine = 1;
+        $this->indentation = $indentation;
+
+        if ($node instanceof Twig_Node_Module) {
+            $this->filename = $node->getAttribute('filename');
+        }
+
+        $node->compile($this);
+
+        return $this;
+    }
+
+    public function subcompile(Twig_NodeInterface $node, $raw = true)
+    {
+        if (false === $raw) {
+            $this->addIndentation();
+        }
+
+        $node->compile($this);
+
+        return $this;
+    }
+
+    /**
+     * Adds a raw string to the compiled code.
+     *
+     * @param string $string The string
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function raw($string)
+    {
+        $this->source .= $string;
+
+        return $this;
+    }
+
+    /**
+     * Writes a string to the compiled code by adding indentation.
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function write()
+    {
+        $strings = func_get_args();
+        foreach ($strings as $string) {
+            $this->addIndentation();
+            $this->source .= $string;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Appends an indentation to the current PHP code after compilation.
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function addIndentation()
+    {
+        $this->source .= str_repeat(' ', $this->indentation * 4);
+
+        return $this;
+    }
+
+    /**
+     * Adds a quoted string to the compiled code.
+     *
+     * @param string $value The string
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function string($value)
+    {
+        $this->source .= sprintf('"%s"', addcslashes($value, "\0\t\"\$\\"));
+
+        return $this;
+    }
+
+    /**
+     * Returns a PHP representation of a given value.
+     *
+     * @param mixed $value The value to convert
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function repr($value)
+    {
+        if (is_int($value) || is_float($value)) {
+            if (false !== $locale = setlocale(LC_NUMERIC, 0)) {
+                setlocale(LC_NUMERIC, 'C');
+            }
+
+            $this->raw($value);
+
+            if (false !== $locale) {
+                setlocale(LC_NUMERIC, $locale);
+            }
+        } elseif (null === $value) {
+            $this->raw('null');
+        } elseif (is_bool($value)) {
+            $this->raw($value ? 'true' : 'false');
+        } elseif (is_array($value)) {
+            $this->raw('array(');
+            $first = true;
+            foreach ($value as $key => $value) {
+                if (!$first) {
+                    $this->raw(', ');
+                }
+                $first = false;
+                $this->repr($key);
+                $this->raw(' => ');
+                $this->repr($value);
+            }
+            $this->raw(')');
+        } else {
+            $this->string($value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds debugging information.
+     *
+     * @param Twig_NodeInterface $node The related twig node
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function addDebugInfo(Twig_NodeInterface $node)
+    {
+        if ($node->getLine() != $this->lastLine) {
+            $this->write("// line {$node->getLine()}\n");
+
+            // when mbstring.func_overload is set to 2
+            // mb_substr_count() replaces substr_count()
+            // but they have different signatures!
+            if (((int) ini_get('mbstring.func_overload')) & 2) {
+                // this is much slower than the "right" version
+                $this->sourceLine += mb_substr_count(mb_substr($this->source, $this->sourceOffset), "\n");
+            } else {
+                $this->sourceLine += substr_count($this->source, "\n", $this->sourceOffset);
+            }
+            $this->sourceOffset = strlen($this->source);
+            $this->debugInfo[$this->sourceLine] = $node->getLine();
+
+            $this->lastLine = $node->getLine();
+        }
+
+        return $this;
+    }
+
+    public function getDebugInfo()
+    {
+        return $this->debugInfo;
+    }
+
+    /**
+     * Indents the generated code.
+     *
+     * @param integer $step The number of indentation to add
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function indent($step = 1)
+    {
+        $this->indentation += $step;
+
+        return $this;
+    }
+
+    /**
+     * Outdents the generated code.
+     *
+     * @param integer $step The number of indentation to remove
+     *
+     * @return Twig_Compiler The current compiler instance
+     */
+    public function outdent($step = 1)
+    {
+        // can't outdent by more steps than the current indentation level
+        if ($this->indentation < $step) {
+            throw new LogicException('Unable to call outdent() as the indentation would become negative');
+        }
+
+        $this->indentation -= $step;
+
+        return $this;
+    }
+}

inc/lib/Twig/CompilerInterface.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Interface implemented by compiler classes.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+interface Twig_CompilerInterface
+{
+    /**
+     * Compiles a node.
+     *
+     * @param Twig_NodeInterface $node The node to compile
+     *
+     * @return Twig_CompilerInterface The current compiler instance
+     */
+    public function compile(Twig_NodeInterface $node);
+
+    /**
+     * Gets the current PHP code after compilation.
+     *
+     * @return string The PHP code
+     */
+    public function getSource();
+}

inc/lib/Twig/Error.php

@@ -0,0 +1,243 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Twig base exception.
+ *
+ * This exception class and its children must only be used when
+ * an error occurs during the loading of a template, when a syntax error
+ * is detected in a template, or when rendering a template. Other
+ * errors must use regular PHP exception classes (like when the template
+ * cache directory is not writable for instance).
+ *
+ * To help debugging template issues, this class tracks the original template
+ * name and line where the error occurred.
+ *
+ * Whenever possible, you must set these information (original template name
+ * and line number) yourself by passing them to the constructor. If some or all
+ * these information are not available from where you throw the exception, then
+ * this class will guess them automatically (when the line number is set to -1
+ * and/or the filename is set to null). As this is a costly operation, this
+ * can be disabled by passing false for both the filename and the line number
+ * when creating a new instance of this class.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Error extends Exception
+{
+    protected $lineno;
+    protected $filename;
+    protected $rawMessage;
+    protected $previous;
+
+    /**
+     * Constructor.
+     *
+     * Set both the line number and the filename to false to
+     * disable automatic guessing of the original template name
+     * and line number.
+     *
+     * Set the line number to -1 to enable its automatic guessing.
+     * Set the filename to null to enable its automatic guessing.
+     *
+     * By default, automatic guessing is enabled.
+     *
+     * @param string    $message  The error message
+     * @param integer   $lineno   The template line where the error occurred
+     * @param string    $filename The template file name where the error occurred
+     * @param Exception $previous The previous exception
+     */
+    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            $this->previous = $previous;
+            parent::__construct('');
+        } else {
+            parent::__construct('', 0, $previous);
+        }
+
+        $this->lineno = $lineno;
+        $this->filename = $filename;
+
+        if (-1 === $this->lineno || null === $this->filename) {
+            $this->guessTemplateInfo();
+        }
+
+        $this->rawMessage = $message;
+
+        $this->updateRepr();
+    }
+
+    /**
+     * Gets the raw message.
+     *
+     * @return string The raw message
+     */
+    public function getRawMessage()
+    {
+        return $this->rawMessage;
+    }
+
+    /**
+     * Gets the filename where the error occurred.
+     *
+     * @return string The filename
+     */
+    public function getTemplateFile()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * Sets the filename where the error occurred.
+     *
+     * @param string $filename The filename
+     */
+    public function setTemplateFile($filename)
+    {
+        $this->filename = $filename;
+
+        $this->updateRepr();
+    }
+
+    /**
+     * Gets the template line where the error occurred.
+     *
+     * @return integer The template line
+     */
+    public function getTemplateLine()
+    {
+        return $this->lineno;
+    }
+
+    /**
+     * Sets the template line where the error occurred.
+     *
+     * @param integer $lineno The template line
+     */
+    public function setTemplateLine($lineno)
+    {
+        $this->lineno = $lineno;
+
+        $this->updateRepr();
+    }
+
+    public function guess()
+    {
+        $this->guessTemplateInfo();
+        $this->updateRepr();
+    }
+
+    /**
+     * For PHP < 5.3.0, provides access to the getPrevious() method.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The parameters to be passed to the method
+     *
+     * @return Exception The previous exception or null
+     *
+     * @throws BadMethodCallException
+     */
+    public function __call($method, $arguments)
+    {
+        if ('getprevious' == strtolower($method)) {
+            return $this->previous;
+        }
+
+        throw new BadMethodCallException(sprintf('Method "Twig_Error::%s()" does not exist.', $method));
+    }
+
+    protected function updateRepr()
+    {
+        $this->message = $this->rawMessage;
+
+        $dot = false;
+        if ('.' === substr($this->message, -1)) {
+            $this->message = substr($this->message, 0, -1);
+            $dot = true;
+        }
+
+        if ($this->filename) {
+            if (is_string($this->filename) || (is_object($this->filename) && method_exists($this->filename, '__toString'))) {
+                $filename = sprintf('"%s"', $this->filename);
+            } else {
+                $filename = json_encode($this->filename);
+            }
+            $this->message .= sprintf(' in %s', $filename);
+        }
+
+        if ($this->lineno && $this->lineno >= 0) {
+            $this->message .= sprintf(' at line %d', $this->lineno);
+        }
+
+        if ($dot) {
+            $this->message .= '.';
+        }
+    }
+
+    protected function guessTemplateInfo()
+    {
+        $template = null;
+        $templateClass = null;
+
+        if (version_compare(phpversion(), '5.3.6', '>=')) {
+            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
+        } else {
+            $backtrace = debug_backtrace();
+        }
+
+        foreach ($backtrace as $trace) {
+            if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
+                $currentClass = get_class($trace['object']);
+                $isEmbedContainer = 0 === strpos($templateClass, $currentClass);
+                if (null === $this->filename || ($this->filename == $trace['object']->getTemplateName() && !$isEmbedContainer)) {
+                    $template = $trace['object'];
+                    $templateClass = get_class($trace['object']);
+                }
+            }
+        }
+
+        // update template filename
+        if (null !== $template && null === $this->filename) {
+            $this->filename = $template->getTemplateName();
+        }
+
+        if (null === $template || $this->lineno > -1) {
+            return;
+        }
+
+        $r = new ReflectionObject($template);
+        $file = $r->getFileName();
+
+        $exceptions = array($e = $this);
+        while (($e instanceof self || method_exists($e, 'getPrevious')) && $e = $e->getPrevious()) {
+            $exceptions[] = $e;
+        }
+
+        while ($e = array_pop($exceptions)) {
+            $traces = $e->getTrace();
+            while ($trace = array_shift($traces)) {
+                if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
+                    continue;
+                }
+
+                foreach ($template->getDebugInfo() as $codeLine => $templateLine) {
+                    if ($codeLine <= $trace['line']) {
+                        // update template line
+                        $this->lineno = $templateLine;
+
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}

inc/lib/Twig/Error/Loader.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Exception thrown when an error occurs during template loading.
+ *
+ * Automatic template information guessing is always turned off as
+ * if a template cannot be loaded, there is nothing to guess.
+ * However, when a template is loaded from another one, then, we need
+ * to find the current context and this is automatically done by
+ * Twig_Template::displayWithErrorHandling().
+ *
+ * This strategy makes Twig_Environment::resolveTemplate() much faster.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Error_Loader extends Twig_Error
+{
+    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
+    {
+        parent::__construct($message, false, false, $previous);
+    }
+}

inc/lib/Twig/Error/Runtime.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Exception thrown when an error occurs at runtime.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Error_Runtime extends Twig_Error
+{
+}

inc/lib/Twig/Error/Syntax.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Exception thrown when a syntax error occurs during lexing or parsing of a template.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Error_Syntax extends Twig_Error
+{
+}

inc/lib/Twig/ExistsLoaderInterface.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Adds an exists() method for loaders.
+ *
+ * @author Florin Patan <florinpatan@gmail.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+interface Twig_ExistsLoaderInterface
+{
+    /**
+     * Check if we have the source code of a template, given its name.
+     *
+     * @param string $name The name of the template to check if we can load
+     *
+     * @return boolean If the template source code is handled by this loader or not
+     */
+    public function exists($name);
+}

inc/lib/Twig/ExpressionParser.php

@@ -0,0 +1,611 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Parses expressions.
+ *
+ * This parser implements a "Precedence climbing" algorithm.
+ *
+ * @see http://www.engr.mun.ca/~theo/Misc/exp_parsing.htm
+ * @see http://en.wikipedia.org/wiki/Operator-precedence_parser
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_ExpressionParser
+{
+    const OPERATOR_LEFT = 1;
+    const OPERATOR_RIGHT = 2;
+
+    protected $parser;
+    protected $unaryOperators;
+    protected $binaryOperators;
+
+    public function __construct(Twig_Parser $parser, array $unaryOperators, array $binaryOperators)
+    {
+        $this->parser = $parser;
+        $this->unaryOperators = $unaryOperators;
+        $this->binaryOperators = $binaryOperators;
+    }
+
+    public function parseExpression($precedence = 0)
+    {
+        $expr = $this->getPrimary();
+        $token = $this->parser->getCurrentToken();
+        while ($this->isBinary($token) && $this->binaryOperators[$token->getValue()]['precedence'] >= $precedence) {
+            $op = $this->binaryOperators[$token->getValue()];
+            $this->parser->getStream()->next();
+
+            if (isset($op['callable'])) {
+                $expr = call_user_func($op['callable'], $this->parser, $expr);
+            } else {
+                $expr1 = $this->parseExpression(self::OPERATOR_LEFT === $op['associativity'] ? $op['precedence'] + 1 : $op['precedence']);
+                $class = $op['class'];
+                $expr = new $class($expr, $expr1, $token->getLine());
+            }
+
+            $token = $this->parser->getCurrentToken();
+        }
+
+        if (0 === $precedence) {
+            return $this->parseConditionalExpression($expr);
+        }
+
+        return $expr;
+    }
+
+    protected function getPrimary()
+    {
+        $token = $this->parser->getCurrentToken();
+
+        if ($this->isUnary($token)) {
+            $operator = $this->unaryOperators[$token->getValue()];
+            $this->parser->getStream()->next();
+            $expr = $this->parseExpression($operator['precedence']);
+            $class = $operator['class'];
+
+            return $this->parsePostfixExpression(new $class($expr, $token->getLine()));
+        } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
+            $this->parser->getStream()->next();
+            $expr = $this->parseExpression();
+            $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'An opened parenthesis is not properly closed');
+
+            return $this->parsePostfixExpression($expr);
+        }
+
+        return $this->parsePrimaryExpression();
+    }
+
+    protected function parseConditionalExpression($expr)
+    {
+        while ($this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '?')) {
+            $this->parser->getStream()->next();
+            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ':')) {
+                $expr2 = $this->parseExpression();
+                if ($this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ':')) {
+                    $this->parser->getStream()->next();
+                    $expr3 = $this->parseExpression();
+                } else {
+                    $expr3 = new Twig_Node_Expression_Constant('', $this->parser->getCurrentToken()->getLine());
+                }
+            } else {
+                $this->parser->getStream()->next();
+                $expr2 = $expr;
+                $expr3 = $this->parseExpression();
+            }
+
+            $expr = new Twig_Node_Expression_Conditional($expr, $expr2, $expr3, $this->parser->getCurrentToken()->getLine());
+        }
+
+        return $expr;
+    }
+
+    protected function isUnary(Twig_Token $token)
+    {
+        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->unaryOperators[$token->getValue()]);
+    }
+
+    protected function isBinary(Twig_Token $token)
+    {
+        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->binaryOperators[$token->getValue()]);
+    }
+
+    public function parsePrimaryExpression()
+    {
+        $token = $this->parser->getCurrentToken();
+        switch ($token->getType()) {
+            case Twig_Token::NAME_TYPE:
+                $this->parser->getStream()->next();
+                switch ($token->getValue()) {
+                    case 'true':
+                    case 'TRUE':
+                        $node = new Twig_Node_Expression_Constant(true, $token->getLine());
+                        break;
+
+                    case 'false':
+                    case 'FALSE':
+                        $node = new Twig_Node_Expression_Constant(false, $token->getLine());
+                        break;
+
+                    case 'none':
+                    case 'NONE':
+                    case 'null':
+                    case 'NULL':
+                        $node = new Twig_Node_Expression_Constant(null, $token->getLine());
+                        break;
+
+                    default:
+                        if ('(' === $this->parser->getCurrentToken()->getValue()) {
+                            $node = $this->getFunctionNode($token->getValue(), $token->getLine());
+                        } else {
+                            $node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
+                        }
+                }
+                break;
+
+            case Twig_Token::NUMBER_TYPE:
+                $this->parser->getStream()->next();
+                $node = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
+                break;
+
+            case Twig_Token::STRING_TYPE:
+            case Twig_Token::INTERPOLATION_START_TYPE:
+                $node = $this->parseStringExpression();
+                break;
+
+            default:
+                if ($token->test(Twig_Token::PUNCTUATION_TYPE, '[')) {
+                    $node = $this->parseArrayExpression();
+                } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
+                    $node = $this->parseHashExpression();
+                } else {
+                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($token->getType(), $token->getLine()), $token->getValue()), $token->getLine(), $this->parser->getFilename());
+                }
+        }
+
+        return $this->parsePostfixExpression($node);
+    }
+
+    public function parseStringExpression()
+    {
+        $stream = $this->parser->getStream();
+
+        $nodes = array();
+        // a string cannot be followed by another string in a single expression
+        $nextCanBeString = true;
+        while (true) {
+            if ($stream->test(Twig_Token::STRING_TYPE) && $nextCanBeString) {
+                $token = $stream->next();
+                $nodes[] = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
+                $nextCanBeString = false;
+            } elseif ($stream->test(Twig_Token::INTERPOLATION_START_TYPE)) {
+                $stream->next();
+                $nodes[] = $this->parseExpression();
+                $stream->expect(Twig_Token::INTERPOLATION_END_TYPE);
+                $nextCanBeString = true;
+            } else {
+                break;
+            }
+        }
+
+        $expr = array_shift($nodes);
+        foreach ($nodes as $node) {
+            $expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getLine());
+        }
+
+        return $expr;
+    }
+
+    public function parseArrayExpression()
+    {
+        $stream = $this->parser->getStream();
+        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
+
+        $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
+        $first = true;
+        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
+            if (!$first) {
+                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'An array element must be followed by a comma');
+
+                // trailing ,?
+                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
+                    break;
+                }
+            }
+            $first = false;
+
+            $node->addElement($this->parseExpression());
+        }
+        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']', 'An opened array is not properly closed');
+
+        return $node;
+    }
+
+    public function parseHashExpression()
+    {
+        $stream = $this->parser->getStream();
+        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
+
+        $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
+        $first = true;
+        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
+            if (!$first) {
+                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'A hash value must be followed by a comma');
+
+                // trailing ,?
+                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
+                    break;
+                }
+            }
+            $first = false;
+
+            // a hash key can be:
+            //
+            //  * a number -- 12
+            //  * a string -- 'a'
+            //  * a name, which is equivalent to a string -- a
+            //  * an expression, which must be enclosed in parentheses -- (1 + 2)
+            if ($stream->test(Twig_Token::STRING_TYPE) || $stream->test(Twig_Token::NAME_TYPE) || $stream->test(Twig_Token::NUMBER_TYPE)) {
+                $token = $stream->next();
+                $key = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
+            } elseif ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
+                $key = $this->parseExpression();
+            } else {
+                $current = $stream->getCurrent();
+
+                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($current->getType(), $current->getLine()), $current->getValue()), $current->getLine(), $this->parser->getFilename());
+            }
+
+            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
+            $value = $this->parseExpression();
+
+            $node->addElement($value, $key);
+        }
+        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '}', 'An opened hash is not properly closed');
+
+        return $node;
+    }
+
+    public function parsePostfixExpression($node)
+    {
+        while (true) {
+            $token = $this->parser->getCurrentToken();
+            if ($token->getType() == Twig_Token::PUNCTUATION_TYPE) {
+                if ('.' == $token->getValue() || '[' == $token->getValue()) {
+                    $node = $this->parseSubscriptExpression($node);
+                } elseif ('|' == $token->getValue()) {
+                    $node = $this->parseFilterExpression($node);
+                } else {
+                    break;
+                }
+            } else {
+                break;
+            }
+        }
+
+        return $node;
+    }
+
+    public function getFunctionNode($name, $line)
+    {
+        switch ($name) {
+            case 'parent':
+                $args = $this->parseArguments();
+                if (!count($this->parser->getBlockStack())) {
+                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden', $line, $this->parser->getFilename());
+                }
+
+                if (!$this->parser->getParent() && !$this->parser->hasTraits()) {
+                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden', $line, $this->parser->getFilename());
+                }
+
+                return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
+            case 'block':
+                return new Twig_Node_Expression_BlockReference($this->parseArguments()->getNode(0), false, $line);
+            case 'attribute':
+                $args = $this->parseArguments();
+                if (count($args) < 2) {
+                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes)', $line, $this->parser->getFilename());
+                }
+
+                return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : new Twig_Node_Expression_Array(array(), $line), Twig_Template::ANY_CALL, $line);
+            default:
+                $args = $this->parseArguments(true);
+                if (null !== $alias = $this->parser->getImportedSymbol('macro', $name)) {
+                    return new Twig_Node_Expression_MacroCall($alias['node'], $alias['name'], $this->createArrayFromArguments($args), $line);
+                }
+
+                try {
+                    $class = $this->getFunctionNodeClass($name, $line);
+                } catch (Twig_Error_Syntax $e) {
+                    if (!$this->parser->hasMacro($name)) {
+                        throw $e;
+                    }
+
+                    return new Twig_Node_Expression_MacroCall(new Twig_Node_Expression_Name('_self', $line), $name, $this->createArrayFromArguments($args), $line);
+                }
+
+                return new $class($name, $args, $line);
+        }
+    }
+
+    public function parseSubscriptExpression($node)
+    {
+        $stream = $this->parser->getStream();
+        $token = $stream->next();
+        $lineno = $token->getLine();
+        $arguments = new Twig_Node_Expression_Array(array(), $lineno);
+        $type = Twig_Template::ANY_CALL;
+        if ($token->getValue() == '.') {
+            $token = $stream->next();
+            if (
+                $token->getType() == Twig_Token::NAME_TYPE
+                ||
+                $token->getType() == Twig_Token::NUMBER_TYPE
+                ||
+                ($token->getType() == Twig_Token::OPERATOR_TYPE && preg_match(Twig_Lexer::REGEX_NAME, $token->getValue()))
+            ) {
+                $arg = new Twig_Node_Expression_Constant($token->getValue(), $lineno);
+            } else {
+                throw new Twig_Error_Syntax('Expected name or number', $lineno, $this->parser->getFilename());
+            }
+
+            if ($node instanceof Twig_Node_Expression_Name && null !== $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {
+                if (!$arg instanceof Twig_Node_Expression_Constant) {
+                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s")', $node->getAttribute('name')), $token->getLine(), $this->parser->getFilename());
+                }
+
+                $arguments = $this->createArrayFromArguments($this->parseArguments(true));
+
+                return new Twig_Node_Expression_MacroCall($node, $arg->getAttribute('value'), $arguments, $lineno);
+            }
+
+            if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
+                $type = Twig_Template::METHOD_CALL;
+                $arguments = $this->createArrayFromArguments($this->parseArguments());
+            }
+        } else {
+            $type = Twig_Template::ARRAY_CALL;
+
+            // slice?
+            $slice = false;
+            if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ':')) {
+                $slice = true;
+                $arg = new Twig_Node_Expression_Constant(0, $token->getLine());
+            } else {
+                $arg = $this->parseExpression();
+            }
+
+            if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ':')) {
+                $slice = true;
+                $stream->next();
+            }
+
+            if ($slice) {
+                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
+                    $length = new Twig_Node_Expression_Constant(null, $token->getLine());
+                } else {
+                    $length = $this->parseExpression();
+                }
+
+                $class = $this->getFilterNodeClass('slice', $token->getLine());
+                $arguments = new Twig_Node(array($arg, $length));
+                $filter = new $class($node, new Twig_Node_Expression_Constant('slice', $token->getLine()), $arguments, $token->getLine());
+
+                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
+
+                return $filter;
+            }
+
+            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
+        }
+
+        return new Twig_Node_Expression_GetAttr($node, $arg, $arguments, $type, $lineno);
+    }
+
+    public function parseFilterExpression($node)
+    {
+        $this->parser->getStream()->next();
+
+        return $this->parseFilterExpressionRaw($node);
+    }
+
+    public function parseFilterExpressionRaw($node, $tag = null)
+    {
+        while (true) {
+            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE);
+
+            $name = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
+            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
+                $arguments = new Twig_Node();
+            } else {
+                $arguments = $this->parseArguments(true);
+            }
+
+            $class = $this->getFilterNodeClass($name->getAttribute('value'), $token->getLine());
+
+            $node = new $class($node, $name, $arguments, $token->getLine(), $tag);
+
+            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '|')) {
+                break;
+            }
+
+            $this->parser->getStream()->next();
+        }
+
+        return $node;
+    }
+
+    /**
+     * Parses arguments.
+     *
+     * @param Boolean $namedArguments Whether to allow named arguments or not
+     * @param Boolean $definition     Whether we are parsing arguments for a function definition
+     *
+     * @return Twig_Node
+     */
+    public function parseArguments($namedArguments = false, $definition = false)
+    {
+        $args = array();
+        $stream = $this->parser->getStream();
+
+        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '(', 'A list of arguments must begin with an opening parenthesis');
+        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ')')) {
+            if (!empty($args)) {
+                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'Arguments must be separated by a comma');
+            }
+
+            if ($definition) {
+                $token = $stream->expect(Twig_Token::NAME_TYPE, null, 'An argument must be a name');
+                $value = new Twig_Node_Expression_Name($token->getValue(), $this->parser->getCurrentToken()->getLine());
+            } else {
+                $value = $this->parseExpression();
+            }
+
+            $name = null;
+            if ($namedArguments && $stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
+                $token = $stream->next();
+                if (!$value instanceof Twig_Node_Expression_Name) {
+                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given', get_class($value)), $token->getLine(), $this->parser->getFilename());
+                }
+                $name = $value->getAttribute('name');
+
+                if ($definition) {
+                    $value = $this->parsePrimaryExpression();
+
+                    if (!$this->checkConstantExpression($value)) {
+                        throw new Twig_Error_Syntax('A default value for an argument must be a constant (a boolean, a string, a number, or an array).', $token->getLine(), $this->parser->getFilename());
+                    }
+                } else {
+                    $value = $this->parseExpression();
+                }
+            }
+
+            if ($definition && null === $name) {
+                $name = $value->getAttribute('name');
+                $value = new Twig_Node_Expression_Constant(null, $this->parser->getCurrentToken()->getLine());
+            }
+
+            if (null === $name) {
+                $args[] = $value;
+            } else {
+                if ($definition && isset($args[$name])) {
+                    throw new Twig_Error_Syntax(sprintf('Arguments cannot contain the same argument name more than once ("%s" is defined twice).', $name), $token->getLine(), $this->parser->getFilename());
+                }
+
+                $args[$name] = $value;
+            }
+        }
+        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis');
+
+        return new Twig_Node($args);
+    }
+
+    public function parseAssignmentExpression()
+    {
+        $targets = array();
+        while (true) {
+            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
+            if (in_array($token->getValue(), array('true', 'false', 'none'))) {
+                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s"', $token->getValue()), $token->getLine(), $this->parser->getFilename());
+            }
+            $targets[] = new Twig_Node_Expression_AssignName($token->getValue(), $token->getLine());
+
+            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
+                break;
+            }
+            $this->parser->getStream()->next();
+        }
+
+        return new Twig_Node($targets);
+    }
+
+    public function parseMultitargetExpression()
+    {
+        $targets = array();
+        while (true) {
+            $targets[] = $this->parseExpression();
+            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
+                break;
+            }
+            $this->parser->getStream()->next();
+        }
+
+        return new Twig_Node($targets);
+    }
+
+    protected function getFunctionNodeClass($name, $line)
+    {
+        $env = $this->parser->getEnvironment();
+
+        if (false === $function = $env->getFunction($name)) {
+            $message = sprintf('The function "%s" does not exist', $name);
+            if ($alternatives = $env->computeAlternatives($name, array_keys($env->getFunctions()))) {
+                $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
+            }
+
+            throw new Twig_Error_Syntax($message, $line, $this->parser->getFilename());
+        }
+
+        if ($function instanceof Twig_SimpleFunction) {
+            return $function->getNodeClass();
+        }
+
+        return $function instanceof Twig_Function_Node ? $function->getClass() : 'Twig_Node_Expression_Function';
+    }
+
+    protected function getFilterNodeClass($name, $line)
+    {
+        $env = $this->parser->getEnvironment();
+
+        if (false === $filter = $env->getFilter($name)) {
+            $message = sprintf('The filter "%s" does not exist', $name);
+            if ($alternatives = $env->computeAlternatives($name, array_keys($env->getFilters()))) {
+                $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
+            }
+
+            throw new Twig_Error_Syntax($message, $line, $this->parser->getFilename());
+        }
+
+        if ($filter instanceof Twig_SimpleFilter) {
+            return $filter->getNodeClass();
+        }
+
+        return $filter instanceof Twig_Filter_Node ? $filter->getClass() : 'Twig_Node_Expression_Filter';
+    }
+
+    // checks that the node only contains "constant" elements
+    protected function checkConstantExpression(Twig_NodeInterface $node)
+    {
+        if (!($node instanceof Twig_Node_Expression_Constant || $node instanceof Twig_Node_Expression_Array)) {
+            return false;
+        }
+
+        foreach ($node as $n) {
+            if (!$this->checkConstantExpression($n)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function createArrayFromArguments(Twig_Node $arguments, $line = null)
+    {
+        $line = null === $line ? $arguments->getLine() : $line;
+        $array = new Twig_Node_Expression_Array(array(), $line);
+        foreach ($arguments as $key => $value) {
+            $array->addElement($value, new Twig_Node_Expression_Constant($key, $value->getLine()));
+        }
+
+        return $array;
+    }
+}

inc/lib/Twig/Extension.php

@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+abstract class Twig_Extension implements Twig_ExtensionInterface
+{
+    /**
+     * Initializes the runtime environment.
+     *
+     * This is where you can load some file that contains filter functions for instance.
+     *
+     * @param Twig_Environment $environment The current Twig_Environment instance
+     */
+    public function initRuntime(Twig_Environment $environment)
+    {
+    }
+
+    /**
+     * Returns the token parser instances to add to the existing list.
+     *
+     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
+     */
+    public function getTokenParsers()
+    {
+        return array();
+    }
+
+    /**
+     * Returns the node visitor instances to add to the existing list.
+     *
+     * @return array An array of Twig_NodeVisitorInterface instances
+     */
+    public function getNodeVisitors()
+    {
+        return array();
+    }
+
+    /**
+     * Returns a list of filters to add to the existing list.
+     *
+     * @return array An array of filters
+     */
+    public function getFilters()
+    {
+        return array();
+    }
+
+    /**
+     * Returns a list of tests to add to the existing list.
+     *
+     * @return array An array of tests
+     */
+    public function getTests()
+    {
+        return array();
+    }
+
+    /**
+     * Returns a list of functions to add to the existing list.
+     *
+     * @return array An array of functions
+     */
+    public function getFunctions()
+    {
+        return array();
+    }
+
+    /**
+     * Returns a list of operators to add to the existing list.
+     *
+     * @return array An array of operators
+     */
+    public function getOperators()
+    {
+        return array();
+    }
+
+    /**
+     * Returns a list of global variables to add to the existing list.
+     *
+     * @return array An array of global variables
+     */
+    public function getGlobals()
+    {
+        return array();
+    }
+}

inc/lib/Twig/Extension/Debug.php

@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2011 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extension_Debug extends Twig_Extension
+{
+    /**
+     * Returns a list of global functions to add to the existing list.
+     *
+     * @return array An array of global functions
+     */
+    public function getFunctions()
+    {
+        // dump is safe if var_dump is overridden by xdebug
+        $isDumpOutputHtmlSafe = extension_loaded('xdebug')
+            // false means that it was not set (and the default is on) or it explicitly enabled
+            && (false === ini_get('xdebug.overload_var_dump') || ini_get('xdebug.overload_var_dump'))
+            // false means that it was not set (and the default is on) or it explicitly enabled
+            // xdebug.overload_var_dump produces HTML only when html_errors is also enabled
+            && (false === ini_get('html_errors') || ini_get('html_errors'))
+            || 'cli' === php_sapi_name()
+        ;
+
+        return array(
+            new Twig_SimpleFunction('dump', 'twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
+        );
+    }
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName()
+    {
+        return 'debug';
+    }
+}
+
+function twig_var_dump(Twig_Environment $env, $context)
+{
+    if (!$env->isDebug()) {
+        return;
+    }
+
+    ob_start();
+
+    $count = func_num_args();
+    if (2 === $count) {
+        $vars = array();
+        foreach ($context as $key => $value) {
+            if (!$value instanceof Twig_Template) {
+                $vars[$key] = $value;
+            }
+        }
+
+        var_dump($vars);
+    } else {
+        for ($i = 2; $i < $count; $i++) {
+            var_dump(func_get_arg($i));
+        }
+    }
+
+    return ob_get_clean();
+}

inc/lib/Twig/Extension/Escaper.php

@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extension_Escaper extends Twig_Extension
+{
+    protected $defaultStrategy;
+
+    public function __construct($defaultStrategy = 'html')
+    {
+        $this->setDefaultStrategy($defaultStrategy);
+    }
+
+    /**
+     * Returns the token parser instances to add to the existing list.
+     *
+     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
+     */
+    public function getTokenParsers()
+    {
+        return array(new Twig_TokenParser_AutoEscape());
+    }
+
+    /**
+     * Returns the node visitor instances to add to the existing list.
+     *
+     * @return array An array of Twig_NodeVisitorInterface instances
+     */
+    public function getNodeVisitors()
+    {
+        return array(new Twig_NodeVisitor_Escaper());
+    }
+
+    /**
+     * Returns a list of filters to add to the existing list.
+     *
+     * @return array An array of filters
+     */
+    public function getFilters()
+    {
+        return array(
+            new Twig_SimpleFilter('raw', 'twig_raw_filter', array('is_safe' => array('all'))),
+        );
+    }
+
+    /**
+     * Sets the default strategy to use when not defined by the user.
+     *
+     * The strategy can be a valid PHP callback that takes the template
+     * "filename" as an argument and returns the strategy to use.
+     *
+     * @param mixed $defaultStrategy An escaping strategy
+     */
+    public function setDefaultStrategy($defaultStrategy)
+    {
+        // for BC
+        if (true === $defaultStrategy) {
+            $defaultStrategy = 'html';
+        }
+
+        $this->defaultStrategy = $defaultStrategy;
+    }
+
+    /**
+     * Gets the default strategy to use when not defined by the user.
+     *
+     * @param string $filename The template "filename"
+     *
+     * @return string The default strategy to use for the template
+     */
+    public function getDefaultStrategy($filename)
+    {
+        // disable string callables to avoid calling a function named html or js,
+        // or any other upcoming escaping strategy
+        if (!is_string($this->defaultStrategy) && is_callable($this->defaultStrategy)) {
+            return call_user_func($this->defaultStrategy, $filename);
+        }
+
+        return $this->defaultStrategy;
+    }
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName()
+    {
+        return 'escaper';
+    }
+}
+
+/**
+ * Marks a variable as being safe.
+ *
+ * @param string $string A PHP variable
+ */
+function twig_raw_filter($string)
+{
+    return $string;
+}

inc/lib/Twig/Extension/Optimizer.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extension_Optimizer extends Twig_Extension
+{
+    protected $optimizers;
+
+    public function __construct($optimizers = -1)
+    {
+        $this->optimizers = $optimizers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNodeVisitors()
+    {
+        return array(new Twig_NodeVisitor_Optimizer($this->optimizers));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'optimizer';
+    }
+}

inc/lib/Twig/Extension/Sandbox.php

@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extension_Sandbox extends Twig_Extension
+{
+    protected $sandboxedGlobally;
+    protected $sandboxed;
+    protected $policy;
+
+    public function __construct(Twig_Sandbox_SecurityPolicyInterface $policy, $sandboxed = false)
+    {
+        $this->policy            = $policy;
+        $this->sandboxedGlobally = $sandboxed;
+    }
+
+    /**
+     * Returns the token parser instances to add to the existing list.
+     *
+     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
+     */
+    public function getTokenParsers()
+    {
+        return array(new Twig_TokenParser_Sandbox());
+    }
+
+    /**
+     * Returns the node visitor instances to add to the existing list.
+     *
+     * @return array An array of Twig_NodeVisitorInterface instances
+     */
+    public function getNodeVisitors()
+    {
+        return array(new Twig_NodeVisitor_Sandbox());
+    }
+
+    public function enableSandbox()
+    {
+        $this->sandboxed = true;
+    }
+
+    public function disableSandbox()
+    {
+        $this->sandboxed = false;
+    }
+
+    public function isSandboxed()
+    {
+        return $this->sandboxedGlobally || $this->sandboxed;
+    }
+
+    public function isSandboxedGlobally()
+    {
+        return $this->sandboxedGlobally;
+    }
+
+    public function setSecurityPolicy(Twig_Sandbox_SecurityPolicyInterface $policy)
+    {
+        $this->policy = $policy;
+    }
+
+    public function getSecurityPolicy()
+    {
+        return $this->policy;
+    }
+
+    public function checkSecurity($tags, $filters, $functions)
+    {
+        if ($this->isSandboxed()) {
+            $this->policy->checkSecurity($tags, $filters, $functions);
+        }
+    }
+
+    public function checkMethodAllowed($obj, $method)
+    {
+        if ($this->isSandboxed()) {
+            $this->policy->checkMethodAllowed($obj, $method);
+        }
+    }
+
+    public function checkPropertyAllowed($obj, $method)
+    {
+        if ($this->isSandboxed()) {
+            $this->policy->checkPropertyAllowed($obj, $method);
+        }
+    }
+
+    public function ensureToStringAllowed($obj)
+    {
+        if (is_object($obj)) {
+            $this->policy->checkMethodAllowed($obj, '__toString');
+        }
+
+        return $obj;
+    }
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName()
+    {
+        return 'sandbox';
+    }
+}

inc/lib/Twig/Extension/Staging.php

@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2012 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Internal class.
+ *
+ * This class is used by Twig_Environment as a staging area and must not be used directly.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Extension_Staging extends Twig_Extension
+{
+    protected $functions = array();
+    protected $filters = array();
+    protected $visitors = array();
+    protected $tokenParsers = array();
+    protected $globals = array();
+    protected $tests = array();
+
+    public function addFunction($name, $function)
+    {
+        $this->functions[$name] = $function;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFunctions()
+    {
+        return $this->functions;
+    }
+
+    public function addFilter($name, $filter)
+    {
+        $this->filters[$name] = $filter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilters()
+    {
+        return $this->filters;
+    }
+
+    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
+    {
+        $this->visitors[] = $visitor;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNodeVisitors()
+    {
+        return $this->visitors;
+    }
+
+    public function addTokenParser(Twig_TokenParserInterface $parser)
+    {
+        $this->tokenParsers[] = $parser;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTokenParsers()
+    {
+        return $this->tokenParsers;
+    }
+
+    public function addGlobal($name, $value)
+    {
+        $this->globals[$name] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGlobals()
+    {
+        return $this->globals;
+    }
+
+    public function addTest($name, $test)
+    {
+        $this->tests[$name] = $test;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTests()
+    {
+        return $this->tests;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'staging';
+    }
+}

inc/lib/Twig/Extension/StringLoader.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2012 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extension_StringLoader extends Twig_Extension
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getFunctions()
+    {
+        return array(
+            new Twig_SimpleFunction('template_from_string', 'twig_template_from_string', array('needs_environment' => true)),
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'string_loader';
+    }
+}
+
+/**
+ * Loads a template from a string.
+ *
+ * <pre>
+ * {{ include(template_from_string("Hello {{ name }}")) }}
+ * </pre>
+ *
+ * @param Twig_Environment $env      A Twig_Environment instance
+ * @param string           $template A template as a string
+ *
+ * @return Twig_Template A Twig_Template instance
+ */
+function twig_template_from_string(Twig_Environment $env, $template)
+{
+    $name = sprintf('__string_template__%s', hash('sha256', uniqid(mt_rand(), true), false));
+
+    $loader = new Twig_Loader_Chain(array(
+        new Twig_Loader_Array(array($name => $template)),
+        $current = $env->getLoader(),
+    ));
+
+    $env->setLoader($loader);
+    try {
+        $template = $env->loadTemplate($name);
+    } catch (Exception $e) {
+        $env->setLoader($current);
+
+        throw $e;
+    }
+    $env->setLoader($current);
+
+    return $template;
+}

inc/lib/Twig/ExtensionInterface.php

@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Interface implemented by extension classes.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface Twig_ExtensionInterface
+{
+    /**
+     * Initializes the runtime environment.
+     *
+     * This is where you can load some file that contains filter functions for instance.
+     *
+     * @param Twig_Environment $environment The current Twig_Environment instance
+     */
+    public function initRuntime(Twig_Environment $environment);
+
+    /**
+     * Returns the token parser instances to add to the existing list.
+     *
+     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
+     */
+    public function getTokenParsers();
+
+    /**
+     * Returns the node visitor instances to add to the existing list.
+     *
+     * @return array An array of Twig_NodeVisitorInterface instances
+     */
+    public function getNodeVisitors();
+
+    /**
+     * Returns a list of filters to add to the existing list.
+     *
+     * @return array An array of filters
+     */
+    public function getFilters();
+
+    /**
+     * Returns a list of tests to add to the existing list.
+     *
+     * @return array An array of tests
+     */
+    public function getTests();
+
+    /**
+     * Returns a list of functions to add to the existing list.
+     *
+     * @return array An array of functions
+     */
+    public function getFunctions();
+
+    /**
+     * Returns a list of operators to add to the existing list.
+     *
+     * @return array An array of operators
+     */
+    public function getOperators();
+
+    /**
+     * Returns a list of global variables to add to the existing list.
+     *
+     * @return array An array of global variables
+     */
+    public function getGlobals();
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName();
+}

inc/lib/Twig/Extensions/Extension/I18n.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extensions_Extension_I18n extends Twig_Extension
+{
+    /**
+     * Returns the token parser instances to add to the existing list.
+     *
+     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
+     */
+    public function getTokenParsers()
+    {
+        return array(new Twig_Extensions_TokenParser_Trans());
+    }
+
+    /**
+     * Returns a list of filters to add to the existing list.
+     *
+     * @return array An array of filters
+     */
+    public function getFilters()
+    {
+        return array(
+           new Twig_SimpleFilter('trans', 'gettext'),
+        );
+    }
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName()
+    {
+        return 'i18n';
+    }
+}
+

inc/lib/Twig/Extensions/Extension/Tinyboard.php

@@ -0,0 +1,102 @@
+<?php
+
+class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
+{
+	/**
+	* Returns a list of filters to add to the existing list.
+	*
+	* @return array An array of filters
+	*/
+	public function getFilters()
+	{
+		return array(
+			new Twig_SimpleFilter('filesize', 'format_bytes'),
+			new Twig_SimpleFilter('truncate', 'twig_truncate_filter'),
+			new Twig_SimpleFilter('truncate_body', 'truncate'),
+			new Twig_SimpleFilter('extension', 'twig_extension_filter'),
+			new Twig_SimpleFilter('sprintf', 'sprintf'),
+			new Twig_SimpleFilter('capcode', 'capcode'),
+			new Twig_SimpleFilter('hasPermission', 'twig_hasPermission_filter'),
+			new Twig_SimpleFilter('date', 'twig_date_filter'),
+			new Twig_SimpleFilter('poster_id', 'poster_id'),
+			new Twig_SimpleFilter('remove_whitespace', 'twig_remove_whitespace_filter'),
+			new Twig_SimpleFilter('count', 'count'),
+			new Twig_SimpleFilter('ago', 'ago'),
+			new Twig_SimpleFilter('until', 'until'),
+			new Twig_SimpleFilter('push', 'twig_push_filter'),
+			new Twig_SimpleFilter('bidi_cleanup', 'bidi_cleanup'),
+			new Twig_SimpleFilter('addslashes', 'addslashes')
+		);
+	}
+	
+	/**
+	* Returns a list of functions to add to the existing list.
+	*
+	* @return array An array of filters
+	*/
+	public function getFunctions()
+	{
+		return array(
+			new Twig_SimpleFunction('time', 'time'),
+			new Twig_SimpleFunction('floor', 'floor'),
+			new Twig_SimpleFunction('timezone', 'twig_timezone_function'),
+			new Twig_SimpleFunction('hiddenInputs', 'hiddenInputs'),
+			new Twig_SimpleFunction('hiddenInputsHash', 'hiddenInputsHash'),
+		);
+	}
+	
+	/**
+	* Returns the name of the extension.
+	*
+	* @return string The extension name
+	*/
+	public function getName()
+	{
+		return 'tinyboard';
+	}
+}
+
+function twig_timezone_function() {
+	return 'Z';
+}
+
+function twig_push_filter($array, $value) {
+	array_push($array, $value);
+	return $array;
+}
+
+function twig_remove_whitespace_filter($data) {
+	return preg_replace('/[\t\r\n]/', '', $data);
+}
+
+function twig_date_filter($date, $format) {
+	return gmstrftime($format, $date);
+}
+
+function twig_hasPermission_filter($mod, $permission, $board = null) {
+	return hasPermission($permission, $board, $mod);
+}
+
+function twig_extension_filter($value, $case_insensitive = true) {
+	$ext = mb_substr($value, mb_strrpos($value, '.') + 1);
+	if($case_insensitive)
+		$ext = mb_strtolower($ext);		
+	return $ext;
+}
+
+function twig_sprintf_filter( $value, $var) {
+	return sprintf($value, $var);
+}
+
+function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '&hellip;') {
+	if (mb_strlen($value) > $length) {
+		if ($preserve) {
+			if (false !== ($breakpoint = mb_strpos($value, ' ', $length))) {
+				$length = $breakpoint;
+			}
+		}
+		return mb_substr($value, 0, $length) . $separator;
+	}
+	return $value;
+}
+

inc/lib/Twig/Extensions/Node/Trans.php

@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a trans node.
+ *
+ * @package    twig
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ */
+class Twig_Extensions_Node_Trans extends Twig_Node
+{
+    public function __construct(Twig_NodeInterface $body, Twig_NodeInterface $plural = null, Twig_Node_Expression $count = null, $lineno, $tag = null)
+    {
+        parent::__construct(array('count' => $count, 'body' => $body, 'plural' => $plural), array(), $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+        list($msg, $vars) = $this->compileString($this->getNode('body'));
+
+        if (null !== $this->getNode('plural')) {
+            list($msg1, $vars1) = $this->compileString($this->getNode('plural'));
+
+            $vars = array_merge($vars, $vars1);
+        }
+
+        $function = null === $this->getNode('plural') ? 'gettext' : 'ngettext';
+
+        if ($vars) {
+            $compiler
+                ->write('echo strtr('.$function.'(')
+                ->subcompile($msg)
+            ;
+
+            if (null !== $this->getNode('plural')) {
+                $compiler
+                    ->raw(', ')
+                    ->subcompile($msg1)
+                    ->raw(', abs(')
+                    ->subcompile($this->getNode('count'))
+                    ->raw(')')
+                ;
+            }
+
+            $compiler->raw('), array(');
+
+            foreach ($vars as $var) {
+                if ('count' === $var->getAttribute('name')) {
+                    $compiler
+                        ->string('%count%')
+                        ->raw(' => abs(')
+                        ->subcompile($this->getNode('count'))
+                        ->raw('), ')
+                    ;
+                } else {
+                    $compiler
+                        ->string('%'.$var->getAttribute('name').'%')
+                        ->raw(' => ')
+                        ->subcompile($var)
+                        ->raw(', ')
+                    ;
+                }
+            }
+
+            $compiler->raw("));\n");
+        } else {
+            $compiler
+                ->write('echo '.$function.'(')
+                ->subcompile($msg)
+            ;
+
+            if (null !== $this->getNode('plural')) {
+                $compiler
+                    ->raw(', ')
+                    ->subcompile($msg1)
+                    ->raw(', abs(')
+                    ->subcompile($this->getNode('count'))
+                    ->raw(')')
+                ;
+            }
+
+            $compiler->raw(");\n");
+        }
+    }
+
+    protected function compileString(Twig_NodeInterface $body)
+    {
+        if ($body instanceof Twig_Node_Expression_Name || $body instanceof Twig_Node_Expression_Constant || $body instanceof Twig_Node_Expression_TempName) {
+            return array($body, array());
+        }
+
+        $vars = array();
+        if (count($body)) {
+            $msg = '';
+
+            foreach ($body as $node) {
+                if (get_class($node) === 'Twig_Node' && $node->getNode(0) instanceof Twig_Node_SetTemp) {
+                    $node = $node->getNode(1);
+                }
+
+                if ($node instanceof Twig_Node_Print) {
+                    $n = $node->getNode('expr');
+                    while ($n instanceof Twig_Node_Expression_Filter) {
+                        $n = $n->getNode('node');
+                    }
+                    $msg .= sprintf('%%%s%%', $n->getAttribute('name'));
+                    $vars[] = new Twig_Node_Expression_Name($n->getAttribute('name'), $n->getLine());
+                } else {
+                    $msg .= $node->getAttribute('data');
+                }
+            }
+        } else {
+            $msg = $body->getAttribute('data');
+        }
+
+        return array(new Twig_Node(array(new Twig_Node_Expression_Constant(trim($msg), $body->getLine()))), $vars);
+    }
+}

inc/lib/Twig/Extensions/TokenParser/Trans.php

@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extensions_TokenParser_Trans extends Twig_TokenParser
+{
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $lineno = $token->getLine();
+        $stream = $this->parser->getStream();
+        $count = null;
+        $plural = null;
+
+        if (!$stream->test(Twig_Token::BLOCK_END_TYPE)) {
+            $body = $this->parser->getExpressionParser()->parseExpression();
+        } else {
+            $stream->expect(Twig_Token::BLOCK_END_TYPE);
+            $body = $this->parser->subparse(array($this, 'decideForFork'));
+            if ('plural' === $stream->next()->getValue()) {
+                $count = $this->parser->getExpressionParser()->parseExpression();
+                $stream->expect(Twig_Token::BLOCK_END_TYPE);
+                $plural = $this->parser->subparse(array($this, 'decideForEnd'), true);
+            }
+        }
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        $this->checkTransString($body, $lineno);
+
+        return new Twig_Extensions_Node_Trans($body, $plural, $count, $lineno, $this->getTag());
+    }
+
+    public function decideForFork(Twig_Token $token)
+    {
+        return $token->test(array('plural', 'endtrans'));
+    }
+
+    public function decideForEnd(Twig_Token $token)
+    {
+        return $token->test('endtrans');
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @param string The tag name
+     */
+    public function getTag()
+    {
+        return 'trans';
+    }
+
+    protected function checkTransString(Twig_NodeInterface $body, $lineno)
+    {
+        foreach ($body as $i => $node) {
+            if (
+                $node instanceof Twig_Node_Text
+                ||
+                ($node instanceof Twig_Node_Print && $node->getNode('expr') instanceof Twig_Node_Expression_Name)
+            ) {
+                continue;
+            }
+
+            throw new Twig_Error_Syntax(sprintf('The text to be translated with "trans" can only contain references to simple variables'), $lineno);
+        }
+    }
+}

inc/lib/Twig/Filter.php

@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a template filter.
+ *
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableInterface
+{
+    protected $options;
+    protected $arguments = array();
+
+    public function __construct(array $options = array())
+    {
+        $this->options = array_merge(array(
+            'needs_environment' => false,
+            'needs_context'     => false,
+            'pre_escape'        => null,
+            'preserves_safety'  => null,
+            'callable'          => null,
+        ), $options);
+    }
+
+    public function setArguments($arguments)
+    {
+        $this->arguments = $arguments;
+    }
+
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    public function needsEnvironment()
+    {
+        return $this->options['needs_environment'];
+    }
+
+    public function needsContext()
+    {
+        return $this->options['needs_context'];
+    }
+
+    public function getSafe(Twig_Node $filterArgs)
+    {
+        if (isset($this->options['is_safe'])) {
+            return $this->options['is_safe'];
+        }
+
+        if (isset($this->options['is_safe_callback'])) {
+            return call_user_func($this->options['is_safe_callback'], $filterArgs);
+        }
+    }
+
+    public function getPreservesSafety()
+    {
+        return $this->options['preserves_safety'];
+    }
+
+    public function getPreEscape()
+    {
+        return $this->options['pre_escape'];
+    }
+
+    public function getCallable()
+    {
+        return $this->options['callable'];
+    }
+}

inc/lib/Twig/Filter/Function.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a function template filter.
+ *
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+class Twig_Filter_Function extends Twig_Filter
+{
+    protected $function;
+
+    public function __construct($function, array $options = array())
+    {
+        $options['callable'] = $function;
+
+        parent::__construct($options);
+
+        $this->function = $function;
+    }
+
+    public function compile()
+    {
+        return $this->function;
+    }
+}

inc/lib/Twig/Filter/Method.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a method template filter.
+ *
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+class Twig_Filter_Method extends Twig_Filter
+{
+    protected $extension;
+    protected $method;
+
+    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
+    {
+        $options['callable'] = array($extension, $method);
+
+        parent::__construct($options);
+
+        $this->extension = $extension;
+        $this->method = $method;
+    }
+
+    public function compile()
+    {
+        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
+    }
+}

inc/lib/Twig/Filter/Node.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2011 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a template filter as a node.
+ *
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+class Twig_Filter_Node extends Twig_Filter
+{
+    protected $class;
+
+    public function __construct($class, array $options = array())
+    {
+        parent::__construct($options);
+
+        $this->class = $class;
+    }
+
+    public function getClass()
+    {
+        return $this->class;
+    }
+
+    public function compile()
+    {
+    }
+}

inc/lib/Twig/FilterCallableInterface.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2012 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a callable template filter.
+ *
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+interface Twig_FilterCallableInterface
+{
+    public function getCallable();
+}

inc/lib/Twig/FilterInterface.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a template filter.
+ *
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+interface Twig_FilterInterface
+{
+    /**
+     * Compiles a filter.
+     *
+     * @return string The PHP code for the filter
+     */
+    public function compile();
+
+    public function needsEnvironment();
+
+    public function needsContext();
+
+    public function getSafe(Twig_Node $filterArgs);
+
+    public function getPreservesSafety();
+
+    public function getPreEscape();
+
+    public function setArguments($arguments);
+
+    public function getArguments();
+}

inc/lib/Twig/Function.php

@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a template function.
+ *
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+abstract class Twig_Function implements Twig_FunctionInterface, Twig_FunctionCallableInterface
+{
+    protected $options;
+    protected $arguments = array();
+
+    public function __construct(array $options = array())
+    {
+        $this->options = array_merge(array(
+            'needs_environment' => false,
+            'needs_context'     => false,
+            'callable'          => null,
+        ), $options);
+    }
+
+    public function setArguments($arguments)
+    {
+        $this->arguments = $arguments;
+    }
+
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    public function needsEnvironment()
+    {
+        return $this->options['needs_environment'];
+    }
+
+    public function needsContext()
+    {
+        return $this->options['needs_context'];
+    }
+
+    public function getSafe(Twig_Node $functionArgs)
+    {
+        if (isset($this->options['is_safe'])) {
+            return $this->options['is_safe'];
+        }
+
+        if (isset($this->options['is_safe_callback'])) {
+            return call_user_func($this->options['is_safe_callback'], $functionArgs);
+        }
+
+        return array();
+    }
+
+    public function getCallable()
+    {
+        return $this->options['callable'];
+    }
+}

inc/lib/Twig/Function/Function.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2010 Arnaud Le Blanc
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a function template function.
+ *
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+class Twig_Function_Function extends Twig_Function
+{
+    protected $function;
+
+    public function __construct($function, array $options = array())
+    {
+        $options['callable'] = $function;
+
+        parent::__construct($options);
+
+        $this->function = $function;
+    }
+
+    public function compile()
+    {
+        return $this->function;
+    }
+}

inc/lib/Twig/Function/Method.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2010 Arnaud Le Blanc
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a method template function.
+ *
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+class Twig_Function_Method extends Twig_Function
+{
+    protected $extension;
+    protected $method;
+
+    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
+    {
+        $options['callable'] = array($extension, $method);
+
+        parent::__construct($options);
+
+        $this->extension = $extension;
+        $this->method = $method;
+    }
+
+    public function compile()
+    {
+        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
+    }
+}

inc/lib/Twig/Function/Node.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2011 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a template function as a node.
+ *
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+class Twig_Function_Node extends Twig_Function
+{
+    protected $class;
+
+    public function __construct($class, array $options = array())
+    {
+        parent::__construct($options);
+
+        $this->class = $class;
+    }
+
+    public function getClass()
+    {
+        return $this->class;
+    }
+
+    public function compile()
+    {
+    }
+}

inc/lib/Twig/FunctionCallableInterface.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2012 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a callable template function.
+ *
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+interface Twig_FunctionCallableInterface
+{
+    public function getCallable();
+}