diff options
Diffstat (limited to 'phpBB')
60 files changed, 834 insertions, 4165 deletions
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index bf0c80bcd9..39f06319f9 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -14,7 +14,7 @@ <legend>{L_RESTORE_OPTIONS}</legend> <dl> <dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt> - <dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd> + <dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_FIRST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd> </dl> <p class="submit-buttons"> diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 4af3f1a62c..efcb25cb68 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,7 +14,11 @@ <p>{L_ADMIN_INTRO}</p> - <!-- IF S_VERSIONCHECK_FAIL --> + <!-- IF S_UPDATE_INCOMPLETE --> + <div class="errorbox"> + <p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p> + </div> + <!-- ELSEIF S_VERSIONCHECK_FAIL --> <div class="errorbox notice"> <p>{L_VERSIONCHECK_FAIL}</p> <p>{VERSIONCHECK_FAIL_REASON}</p> diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index 0cc995959b..351a3ba26c 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -6,11 +6,16 @@ <p>{L_VERSION_CHECK_EXPLAIN}</p> +<!-- IF S_UPDATE_INCOMPLETE --> + <div class="errorbox"> + <p>{L_UPDATE_INCOMPLETE} {L_UPDATE_INCOMPLETE_MORE}</p> + </div> +<!-- ENDIF --> <!-- IF S_UP_TO_DATE --> <div class="successbox"> <p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> </div> -<!-- ELSE --> +<!-- ELSEIF not S_UPDATE_INCOMPLETE --> <div class="errorbox"> <p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> </div> @@ -18,10 +23,21 @@ <fieldset> <legend></legend> + <!-- IF not S_UPDATE_INCOMPLETE --> <dl> <dt><label>{L_CURRENT_VERSION}</label></dt> <dd><strong>{CURRENT_VERSION}</strong></dd> </dl> + <!-- ELSE --> + <dl> + <dt><label>{L_FILES_VERSION}</label></dt> + <dd><strong>{FILES_VERSION}</strong></dd> + </dl> + <dl> + <dt><label>{L_DATABASE_VERSION}</label></dt> + <dd><strong>{CURRENT_VERSION}</strong></dd> + </dl> + <!-- ENDIF --> </fieldset> <!-- BEGIN updates_available --> @@ -38,6 +54,11 @@ </fieldset> <!-- END updates_available --> +<!-- IF S_UPDATE_INCOMPLETE --> + {INCOMPLETE_INSTRUCTIONS} + <br> +<!-- ENDIF --> + <!-- IF not S_UP_TO_DATE --> {UPDATE_INSTRUCTIONS} <br /><br /> diff --git a/phpBB/composer.json b/phpBB/composer.json index 3fe1c90718..4f7a86e9bb 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -33,7 +33,7 @@ "marc1706/fast-image-size": "1.1.*", "paragonie/random_compat": "^1.2", "patchwork/utf8": "1.1.*", - "s9e/text-formatter": "^0.4.2", + "s9e/text-formatter": "^0.5.4", "symfony/config": "2.8.*", "symfony/console": "2.8.*", "symfony/debug": "2.8.*", @@ -52,6 +52,7 @@ "require-dev": { "fabpot/goutte": "~2.0", "facebook/webdriver": "~1.1", + "laravel/homestead": "~2.2", "phing/phing": "2.4.*", "phpunit/dbunit": "1.3.*", "phpunit/phpunit": "4.1.*", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index c6a0c3e854..98f3b9bd04 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "b82925c74b2b12ce589973243a9fab68", - "content-hash": "fee6d87604f3053b51c0947ded841cfe", + "hash": "b0bb6560f0982ecfc8867e762faa3847", + "content-hash": "322b621681118fa67925d35030625dae", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -84,16 +84,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "5.3.0", + "version": "5.3.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "f3c8c22471cb55475105c14769644a49c3262b93" + "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f3c8c22471cb55475105c14769644a49c3262b93", - "reference": "f3c8c22471cb55475105c14769644a49c3262b93", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/70f1fa53b71c4647bf2762c09068a95f77e12fb8", + "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8", "shasum": "" }, "require": { @@ -102,15 +102,9 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0", - "psr/log": "^1.0" + "phpunit/phpunit": "^4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, "autoload": { "psr-4": { "GuzzleHttp\\": "src/" @@ -138,7 +132,7 @@ "rest", "web service" ], - "time": "2015-05-20 03:47:55" + "time": "2016-07-15 19:28:39" }, { "name": "guzzlehttp/ringphp", @@ -466,16 +460,16 @@ }, { "name": "paragonie/random_compat", - "version": "v1.2.2", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "b3313b618f4edd76523572531d5d7e22fe747430" + "reference": "c7e26a21ba357863de030f0b9e701c7d04593774" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b3313b618f4edd76523572531d5d7e22fe747430", - "reference": "b3313b618f4edd76523572531d5d7e22fe747430", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774", + "reference": "c7e26a21ba357863de030f0b9e701c7d04593774", "shasum": "" }, "require": { @@ -510,7 +504,7 @@ "pseudorandom", "random" ], - "time": "2016-03-11 19:54:08" + "time": "2016-03-18 20:34:03" }, { "name": "patchwork/utf8", @@ -603,16 +597,16 @@ }, { "name": "react/promise", - "version": "v2.2.2", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "3aacad8bf10c7d83e6fa2089d413529888c2bedf" + "reference": "8025426794f1944de806618671d4fa476dc7626f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/3aacad8bf10c7d83e6fa2089d413529888c2bedf", - "reference": "3aacad8bf10c7d83e6fa2089d413529888c2bedf", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8025426794f1944de806618671d4fa476dc7626f", + "reference": "8025426794f1944de806618671d4fa476dc7626f", "shasum": "" }, "require": { @@ -643,20 +637,20 @@ } ], "description": "A lightweight implementation of CommonJS Promises/A for PHP", - "time": "2016-02-26 19:09:02" + "time": "2016-05-03 17:50:52" }, { "name": "s9e/text-formatter", - "version": "0.4.11", + "version": "0.5.4", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "e6dc4615081b1668742076aa05d11aa0f7b00103" + "reference": "e9363a0d2d6ddef40200854207557c648d36d925" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/e6dc4615081b1668742076aa05d11aa0f7b00103", - "reference": "e6dc4615081b1668742076aa05d11aa0f7b00103", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/e9363a0d2d6ddef40200854207557c648d36d925", + "reference": "e9363a0d2d6ddef40200854207557c648d36d925", "shasum": "" }, "require": { @@ -703,20 +697,20 @@ "parser", "shortcodes" ], - "time": "2016-02-21 20:38:42" + "time": "2016-07-08 05:19:02" }, { "name": "symfony/config", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19" + "reference": "0926e69411eba491803dbafb9f1f233e2ced58d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19", - "reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19", + "url": "https://api.github.com/repos/symfony/config/zipball/0926e69411eba491803dbafb9f1f233e2ced58d0", + "reference": "0926e69411eba491803dbafb9f1f233e2ced58d0", "shasum": "" }, "require": { @@ -756,20 +750,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2016-02-22 16:12:45" + "time": "2016-06-29 05:31:50" }, { "name": "symfony/console", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "56cc5caf051189720b8de974e4746090aaa10d44" + "reference": "c392a6ec72f2122748032c2ad6870420561ffcfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/56cc5caf051189720b8de974e4746090aaa10d44", - "reference": "56cc5caf051189720b8de974e4746090aaa10d44", + "url": "https://api.github.com/repos/symfony/console/zipball/c392a6ec72f2122748032c2ad6870420561ffcfa", + "reference": "c392a6ec72f2122748032c2ad6870420561ffcfa", "shasum": "" }, "require": { @@ -816,20 +810,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-02-28 16:20:50" + "time": "2016-06-29 07:02:14" }, { "name": "symfony/debug", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "8e255a0c551d443a8159e3da95b5f99997d100fd" + "reference": "2477199ad1dd1c43fe18a84d7907fffa025eff10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/8e255a0c551d443a8159e3da95b5f99997d100fd", - "reference": "8e255a0c551d443a8159e3da95b5f99997d100fd", + "url": "https://api.github.com/repos/symfony/debug/zipball/2477199ad1dd1c43fe18a84d7907fffa025eff10", + "reference": "2477199ad1dd1c43fe18a84d7907fffa025eff10", "shasum": "" }, "require": { @@ -873,20 +867,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-01-27 05:14:19" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/dependency-injection", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "62251761a7615435b22ccf562384c588b431be44" + "reference": "2dd85de8216079d1360b2b14988cd5cdbbb49063" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/62251761a7615435b22ccf562384c588b431be44", - "reference": "62251761a7615435b22ccf562384c588b431be44", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2dd85de8216079d1360b2b14988cd5cdbbb49063", + "reference": "2dd85de8216079d1360b2b14988cd5cdbbb49063", "shasum": "" }, "require": { @@ -902,6 +896,7 @@ }, "suggest": { "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", "symfony/yaml": "" }, @@ -935,20 +930,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2016-02-28 16:34:46" + "time": "2016-06-29 05:31:50" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3" + "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/78c468665c9568c3faaa9c416a7134308f2d85c3", - "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b180b70439dca70049b6b9b7e21d75e6e5d7aca9", + "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9", "shasum": "" }, "require": { @@ -995,20 +990,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-01-27 05:14:19" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/filesystem", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "65cb36b6539b1d446527d60457248f30d045464d" + "reference": "7258ddd6f987053f21fa43d03430580ba54e6096" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/65cb36b6539b1d446527d60457248f30d045464d", - "reference": "65cb36b6539b1d446527d60457248f30d045464d", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7258ddd6f987053f21fa43d03430580ba54e6096", + "reference": "7258ddd6f987053f21fa43d03430580ba54e6096", "shasum": "" }, "require": { @@ -1044,20 +1039,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2016-02-22 15:02:30" + "time": "2016-06-29 05:31:50" }, { "name": "symfony/finder", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "877bb4b16ea573cc8c024e9590888fcf7eb7e0f7" + "reference": "bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/877bb4b16ea573cc8c024e9590888fcf7eb7e0f7", - "reference": "877bb4b16ea573cc8c024e9590888fcf7eb7e0f7", + "url": "https://api.github.com/repos/symfony/finder/zipball/bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d", + "reference": "bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d", "shasum": "" }, "require": { @@ -1093,24 +1088,25 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-02-22 16:12:45" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/http-foundation", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b" + "reference": "7a55440a2bebd37b8bd06f99f5def1ddf0aa9249" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b", - "reference": "6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7a55440a2bebd37b8bd06f99f5def1ddf0aa9249", + "reference": "7a55440a2bebd37b8bd06f99f5def1ddf0aa9249", "shasum": "" }, "require": { "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.1", "symfony/polyfill-php54": "~1.0", "symfony/polyfill-php55": "~1.0" }, @@ -1147,20 +1143,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-02-28 16:20:50" + "time": "2016-06-29 07:02:14" }, { "name": "symfony/http-kernel", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "67ca6a98d8d7cf243ccb4b716deab2342f409a4d" + "reference": "2e887a1196c961a0e441f5be87908a5425be015c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/67ca6a98d8d7cf243ccb4b716deab2342f409a4d", - "reference": "67ca6a98d8d7cf243ccb4b716deab2342f409a4d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2e887a1196c961a0e441f5be87908a5425be015c", + "reference": "2e887a1196c961a0e441f5be87908a5425be015c", "shasum": "" }, "require": { @@ -1168,7 +1164,7 @@ "psr/log": "~1.0", "symfony/debug": "~2.6,>=2.6.2", "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0", - "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0" + "symfony/http-foundation": "~2.7.15|~2.8.8|~3.0.8" }, "conflict": { "symfony/config": "<2.7" @@ -1229,20 +1225,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-02-28 21:06:17" + "time": "2016-06-30 15:42:15" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "1289d16209491b584839022f29257ad859b8532d" + "reference": "dff51f72b0706335131b00a7f49606168c582594" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", - "reference": "1289d16209491b584839022f29257ad859b8532d", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", + "reference": "dff51f72b0706335131b00a7f49606168c582594", "shasum": "" }, "require": { @@ -1254,7 +1250,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -1288,20 +1284,20 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php54", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb" + "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/9ba741ca01c77282ecf5796c2c1d667f03454ffb", - "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", + "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", "shasum": "" }, "require": { @@ -1310,7 +1306,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -1346,20 +1342,20 @@ "portable", "shim" ], - "time": "2016-01-25 19:13:00" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php55", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" + "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", - "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d", + "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d", "shasum": "" }, "require": { @@ -1369,7 +1365,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -1402,20 +1398,20 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/proxy-manager-bridge", - "version": "v2.8.4", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "713ed53cf1da3f41288c608d2d0ddb44d6b07304" + "reference": "812f98dabdb72a3a9b3986657fde5a686de5d1da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/713ed53cf1da3f41288c608d2d0ddb44d6b07304", - "reference": "713ed53cf1da3f41288c608d2d0ddb44d6b07304", + "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/812f98dabdb72a3a9b3986657fde5a686de5d1da", + "reference": "812f98dabdb72a3a9b3986657fde5a686de5d1da", "shasum": "" }, "require": { @@ -1456,20 +1452,20 @@ ], "description": "Symfony ProxyManager Bridge", "homepage": "https://symfony.com", - "time": "2016-03-04 07:54:35" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/routing", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab" + "reference": "cdd298b1d45b9882de0905856e89171bf487c6d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab", - "reference": "ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab", + "url": "https://api.github.com/repos/symfony/routing/zipball/cdd298b1d45b9882de0905856e89171bf487c6d5", + "reference": "cdd298b1d45b9882de0905856e89171bf487c6d5", "shasum": "" }, "require": { @@ -1531,20 +1527,20 @@ "uri", "url" ], - "time": "2016-02-04 13:53:00" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/twig-bridge", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "ba898e4714734948dc00c4d776e1d6be165ff8c4" + "reference": "b2db0187b7b805bb349ffe2714fbc846124c71ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/ba898e4714734948dc00c4d776e1d6be165ff8c4", - "reference": "ba898e4714734948dc00c4d776e1d6be165ff8c4", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/b2db0187b7b805bb349ffe2714fbc846124c71ba", + "reference": "b2db0187b7b805bb349ffe2714fbc846124c71ba", "shasum": "" }, "require": { @@ -1556,7 +1552,7 @@ "symfony/console": "~2.8|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", "symfony/finder": "~2.3|~3.0.0", - "symfony/form": "~2.8", + "symfony/form": "~2.8.4", "symfony/http-kernel": "~2.8|~3.0.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/routing": "~2.2|~3.0.0", @@ -1612,20 +1608,20 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2016-02-22 15:02:30" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/yaml", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995" + "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/2a4ee40acb880c56f29fb1b8886e7ffe94f3b995", - "reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995", + "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8", + "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8", "shasum": "" }, "require": { @@ -1661,20 +1657,20 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-02-23 07:41:20" + "time": "2016-06-29 05:29:29" }, { "name": "twig/twig", - "version": "v1.24.0", + "version": "v1.24.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8" + "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", - "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512", + "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512", "shasum": "" }, "require": { @@ -1722,7 +1718,7 @@ "keywords": [ "templating" ], - "time": "2016-01-25 21:22:18" + "time": "2016-05-30 09:11:59" }, { "name": "zendframework/zend-code", @@ -1973,6 +1969,47 @@ "time": "2015-12-31 15:58:49" }, { + "name": "laravel/homestead", + "version": "v2.2.1", + "source": { + "type": "git", + "url": "https://github.com/laravel/homestead.git", + "reference": "5008339af93bbb73efee53cbef9374c5d443c708" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/homestead/zipball/5008339af93bbb73efee53cbef9374c5d443c708", + "reference": "5008339af93bbb73efee53cbef9374c5d443c708", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "symfony/console": "~2.0", + "symfony/process": "~2.0" + }, + "bin": [ + "homestead" + ], + "type": "library", + "autoload": { + "psr-4": { + "Laravel\\Homestead\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + } + ], + "description": "A virtual machine for web artisans.", + "time": "2016-01-05 19:19:26" + }, + { "name": "michelf/php-markdown", "version": "1.6.0", "source": { @@ -2104,7 +2141,8 @@ "authors": [ { "name": "Michiel Rook", - "email": "mrook@php.net" + "email": "mrook@php.net", + "role": "Lead" }, { "name": "Phing Community", @@ -2329,21 +2367,24 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.7", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "~4|~5" + }, "type": "library", "autoload": { "classmap": [ @@ -2366,7 +2407,7 @@ "keywords": [ "timer" ], - "time": "2015-06-21 08:01:12" + "time": "2016-05-12 18:03:57" }, { "name": "phpunit/php-token-stream", @@ -2583,9 +2624,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" } ], "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", @@ -2771,16 +2810,16 @@ }, { "name": "sebastian/environment", - "version": "1.3.5", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", "shasum": "" }, "require": { @@ -2817,20 +2856,20 @@ "environment", "hhvm" ], - "time": "2016-02-26 18:40:46" + "time": "2016-05-17 03:18:57" }, { "name": "sebastian/exporter", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e" + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", "shasum": "" }, "require": { @@ -2838,12 +2877,13 @@ "sebastian/recursion-context": "~1.0" }, "require-dev": { + "ext-mbstring": "*", "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -2883,7 +2923,7 @@ "export", "exporter" ], - "time": "2015-06-21 07:55:53" + "time": "2016-06-17 09:04:28" }, { "name": "sebastian/recursion-context", @@ -2975,19 +3015,20 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.5.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8" + "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6731851d6aaf1d0d6c58feff1065227b7fda3ba8", - "reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4edb770cb853def6e60c93abb088ad5ac2010c83", + "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83", "shasum": "" }, "require": { + "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", "php": ">=5.1.2" @@ -3048,25 +3089,25 @@ "phpcs", "standards" ], - "time": "2016-01-19 23:39:10" + "time": "2016-07-13 23:29:13" }, { "name": "symfony/browser-kit", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2" + "reference": "7be191464d63441382db763c53907a8eebe9a259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2", - "reference": "6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/7be191464d63441382db763c53907a8eebe9a259", + "reference": "7be191464d63441382db763c53907a8eebe9a259", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0" + "symfony/dom-crawler": "~2.1|~3.0.0" }, "require-dev": { "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", @@ -3105,20 +3146,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2016-01-27 11:34:40" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/css-selector", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "8d83ff9777cdbd83e7f90d9c48f4729823791a5e" + "reference": "9da4c615ba303850986e0480cc472bf704cfdb64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/8d83ff9777cdbd83e7f90d9c48f4729823791a5e", - "reference": "8d83ff9777cdbd83e7f90d9c48f4729823791a5e", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/9da4c615ba303850986e0480cc472bf704cfdb64", + "reference": "9da4c615ba303850986e0480cc472bf704cfdb64", "shasum": "" }, "require": { @@ -3158,20 +3199,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2016-01-27 05:14:19" + "time": "2016-06-29 05:31:50" }, { "name": "symfony/dom-crawler", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "e1a4b4c83f5ee6f5902f1d53035e3718909a0c11" + "reference": "f8c304f5715081c949043902d311480d71adb1e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e1a4b4c83f5ee6f5902f1d53035e3718909a0c11", - "reference": "e1a4b4c83f5ee6f5902f1d53035e3718909a0c11", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f8c304f5715081c949043902d311480d71adb1e0", + "reference": "f8c304f5715081c949043902d311480d71adb1e0", "shasum": "" }, "require": { @@ -3214,20 +3255,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2016-02-28 16:20:50" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/process", - "version": "v2.8.3", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe" + "reference": "89f33c16796415ccfd8bb3cf8d520cbb79899bfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe", - "reference": "7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe", + "url": "https://api.github.com/repos/symfony/process/zipball/89f33c16796415ccfd8bb3cf8d520cbb79899bfe", + "reference": "89f33c16796415ccfd8bb3cf8d520cbb79899bfe", "shasum": "" }, "require": { @@ -3263,7 +3304,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-02-02 13:33:15" + "time": "2016-06-29 05:29:29" } ], "aliases": [], diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml index bec8649672..d3e7924f2f 100644 --- a/phpBB/config/default/container/services_feed.yml +++ b/phpBB/config/default/container/services_feed.yml @@ -11,6 +11,7 @@ services: - '@feed.helper' - '@user' - '@auth' + - '@dispatcher' - '%core.php_ext%' feed.helper: @@ -32,6 +33,7 @@ services: - '@user' - '@auth' - '@content.visibility' + - '@dispatcher' - '%core.php_ext%' feed.forums: @@ -45,6 +47,7 @@ services: - '@user' - '@auth' - '@content.visibility' + - '@dispatcher' - '%core.php_ext%' feed.news: @@ -58,6 +61,7 @@ services: - '@user' - '@auth' - '@content.visibility' + - '@dispatcher' - '%core.php_ext%' feed.overall: @@ -71,6 +75,7 @@ services: - '@user' - '@auth' - '@content.visibility' + - '@dispatcher' - '%core.php_ext%' feed.topic: @@ -84,6 +89,7 @@ services: - '@user' - '@auth' - '@content.visibility' + - '@dispatcher' - '%core.php_ext%' feed.topics: @@ -97,6 +103,7 @@ services: - '@user' - '@auth' - '@content.visibility' + - '@dispatcher' - '%core.php_ext%' feed.topics_active: @@ -110,4 +117,5 @@ services: - '@user' - '@auth' - '@content.visibility' + - '@dispatcher' - '%core.php_ext%' diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f8f63245df..34bc8a8703 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@ <ol> <li><a href="#changelog">Changelog</a> <ul> + <li><a href="#v320b2">Changes since 3.2.0-b2</a></li> <li><a href="#v320b1">Changes since 3.2.0-b1</a></li> <li><a href="#v320a2">Changes since 3.2.0-a2</a></li> <li><a href="#v320a1">Changes since 3.2.0-a1</a></li> @@ -121,6 +122,60 @@ <div class="inner"> <div class="content"> + <a name="v320b2"></a><h3>Changes since 3.2.0-b2</h3> + <h4>Bug</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9435">PHPBB3-9435</a>] - "magic numbers" in message_parser.php/bbcode.php</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13616">PHPBB3-13616</a>] - Pass lexer directly to TWIG environment</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13972">PHPBB3-13972</a>] - 3.1.5 - Waiting time conflict</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14136">PHPBB3-14136</a>] - IE compatibility meta is missing in overall_header.html</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14198">PHPBB3-14198</a>] - Container cache filename doesn't depend on the build options</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14260">PHPBB3-14260</a>] - Right parenthesis breaks (some?) magic URLs</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14318">PHPBB3-14318</a>] - Board Notifications Config Migration Not Working</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14329">PHPBB3-14329</a>] - Updater Cannot remove files</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14381">PHPBB3-14381</a>] - Text Reparser fails with empty sql fields</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14393">PHPBB3-14393</a>] - Update 3.2.0a1 to 3.2.0a2 --> Error: CANNOT_DELETE_FILES </li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14426">PHPBB3-14426</a>] - viewtopic error posts bbcode pregmatch</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14481">PHPBB3-14481</a>] - phpBB does not obey HTTP_X_FORWARDED_PORT header</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14497">PHPBB3-14497</a>] - Update nginx sample config for new installer</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14527">PHPBB3-14527</a>] - Dataloss caused by link shortening</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14528">PHPBB3-14528</a>] - Structured data - breadcrumbs error</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14530">PHPBB3-14530</a>] - Signature parsing inconsistant</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14532">PHPBB3-14532</a>] - Database column default incorrectly escaped on MSSQL</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14550">PHPBB3-14550</a>] - function unique_id()</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14555">PHPBB3-14555</a>] - Inconsistent usage of the cache directory</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14559">PHPBB3-14559</a>] - Attachments' behaviour in quotes</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14562">PHPBB3-14562</a>] - Extension's permissions don't have language fallback</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14564">PHPBB3-14564</a>] - config cookie domain is empty</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14569">PHPBB3-14569</a>] - Add a method for console progress bar initialisation</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14572">PHPBB3-14572</a>] - Quote notifications deleted on edit</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14576">PHPBB3-14576</a>] - Functional Test Framework should include functions.php</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14577">PHPBB3-14577</a>] - Stop using sizeof() inside for() loop</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14589">PHPBB3-14589</a>] - Requirements test showing required text for "yellow/amber" (optional) requirements</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14590">PHPBB3-14590</a>] - Installer gets stuck at sending notification e-mail</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14591">PHPBB3-14591</a>] - Some installation data not being inserted when running under MS SQL Server</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14607">PHPBB3-14607</a>] - Missing Auto Increment in Report Table</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14619">PHPBB3-14619</a>] - docs/ folder need work to change 3.1.x to 3.2.x in readme, install, changelog etc</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14648">PHPBB3-14648</a>] - Users don't receive default notifications if another setting is set.</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14649">PHPBB3-14649</a>] - Missing variable within event</li> + </ul> + <h4>Improvement</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13502">PHPBB3-13502</a>] - controller resolver should handle callable functions and objects</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14540">PHPBB3-14540</a>] - Adjust class recursive_dot_prefix_filter_iterator to increase performance</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14561">PHPBB3-14561</a>] - Add additional commands for user actions</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14664">PHPBB3-14664</a>] - Fix PHPDoc comment in cron manager</li> + </ul> + <h4>New Feature</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12684">PHPBB3-12684</a>] - Add a command to add a user from the CLI</li> + </ul> + <h4>Task</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13969">PHPBB3-13969</a>] - Remove old help_* language files</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14565">PHPBB3-14565</a>] - Updates composer to 1.0.0-b2</li> + </ul> + <a name="v320b1"></a><h3>Changes since 3.2.0-b1</h3> <h4>Bug</h4> <ul> diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index 1160e8c131..09ee6c1ddd 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -249,7 +249,7 @@ I want to sue you because i think you host an illegal board!</h2> <div class="content"> -<p>Please read the paragraph about permissions in our extensive <a href="https://www.phpbb.com/support/docs/en/3.1/ug/">online documentation</a>.</p> +<p>Please read the paragraph about permissions in our extensive <a href="https://www.phpbb.com/support/docs/en/3.2/ug/">online documentation</a>.</p> </div> @@ -305,7 +305,7 @@ I want to sue you because i think you host an illegal board!</h2> <div class="content"> -<p>Please read our <a href="https://www.phpbb.com/support/docs/en/3.1/ug/">extensive user documentation</a> first, it may just explain what you want to know.</p> +<p>Please read our <a href="https://www.phpbb.com/support/docs/en/3.2/ug/">extensive user documentation</a> first, it may just explain what you want to know.</p> <p>Feel free to search our community forum for the information you require. <strong>PLEASE DO NOT</strong> post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:</p> diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 62af05c735..69e4e4e202 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -59,7 +59,7 @@ <li><a href="#quickinstall">Quick install</a></li> <li><a href="#require">Requirements</a></li> <li><a href="#install">New installation</a></li> - <li><a href="#update">Updating from stable releases of phpBB 3.1.x</a> + <li><a href="#update">Updating from stable releases of phpBB 3.2.x</a> <ol style="list-style-type: lower-roman;"> <li><a href="#update_full">Full package</a></li> <li><a href="#update_files">Changed files</a></li> @@ -68,8 +68,8 @@ <li><a href="#update_all">All package types</a></li> </ol> </li> - <li><a href="#update30">Updating from phpBB 3.0.x to phpBB 3.1.x</a></li> - <li><a href="#convert">Conversion from phpBB 2.0.x to phpBB 3.1.x</a> + <li><a href="#update30_31">Updating from phpBB 3.0.x/3.1.x to phpBB 3.2.x</a></li> + <li><a href="#convert">Conversion from phpBB 2.0.x to phpBB 3.2.x</a> <ol style="list-style-type: lower-roman;"> <li><a href="#prereq">Requirements before converting</a></li> <li><a href="#conversion">Converting</a></li> @@ -109,7 +109,7 @@ <li>Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)</li> <li>Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):<br /> <code>store/</code>, <code>cache/</code>, <code>files/</code> and <code>images/avatars/upload/</code>.</li> - <li>Point your web browser to the location where you uploaded the phpBB3 files with the addition of <code>install/index.php</code> or simply <code>install/</code>, e.g. <code>http://www.example.com/phpBB3/install/index.php</code>, <code>http://www.example.com/forum/install/</code>.</li> + <li>Point your web browser to the location where you uploaded the phpBB3 files with the addition of <code>install/app.php</code> or simply <code>install/</code>, e.g. <code>http://www.example.com/phpBB3/install/app.php</code>, <code>http://www.example.com/forum/install/</code>.</li> <li>Click the <strong><em>INSTALL</em></strong> tab, follow the steps and fill out all the requested information.</li> <li>Change the permissions on config.php to be writable only by yourself (644 or -rw-r--r-- within your FTP Client)</li> <li>phpBB3 should now be available, please <strong>MAKE SURE</strong> you read at least <a href="#postinstall">Section 6</a> below for important, security related post-installation instructions, and also take note of <a href="#anti_spam">Section 7</a> regarding anti-spam measures.</li> @@ -160,7 +160,7 @@ <li>zlib Compression support</li> <li>Remote FTP support</li> <li>XML support</li> - <li>Imagemagick support</li> + <li>ImageMagick support</li> <li>GD Support</li> </ul> </li> @@ -192,7 +192,7 @@ <p>phpBB comes supplied with British English as its standard language. However, a number of separate packs for different languages are available. If you are not a native English speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can, of course, change this default at a later stage). For more details on language packs, where to obtain them and how to install them please see the <a href="README.html#i18n">README</a>.</p> - <p>Once all the files have been uploaded to your site, you should point your browser at this location with the addition of <code>/install/</code>. For example, if your domain name is <code>www.example.com</code> and you placed the phpBB files in the directory <code>/phpBB3</code> off your web root you would enter <code>http://www.example.com/phpBB3/install/</code> or (alternatively) <code>http://www.example.com/phpBB3/install/index.php</code> into your browser. When you have done this, you should see the <strong><em>phpBB Introduction</em></strong> screen appear.</p> + <p>Once all the files have been uploaded to your site, you should point your browser at this location with the addition of <code>/install/</code>. For example, if your domain name is <code>www.example.com</code> and you placed the phpBB files in the directory <code>/phpBB3</code> off your web root you would enter <code>http://www.example.com/phpBB3/install/</code> or (alternatively) <code>http://www.example.com/phpBB3/install/app.php</code> into your browser. When you have done this, you should see the <strong><em>phpBB Introduction</em></strong> screen appear.</p> <h4>Introduction:</h4> @@ -272,11 +272,11 @@ <p>The full package is normally meant for new installations only, but if you want to replace all source files, this package comes in handy.</p> - <p>First, you should make a copy of your existing <code>config.php</code> file; keep it in a safe place! Next, delete all the existing phpBB files, you may want to leave your <code>files/</code> and <code>images/</code> directories in place. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see <a href="#install">New installation</a> for details if necessary). Once complete, copy back your saved <code>config.php</code>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p> + <p>First, you should make a copy of your existing <code>config.php</code> file; keep it in a safe place! Next, delete all the existing phpBB files, you may want to leave your <code>files/</code>, <code>images/</code> and <code>ext/</code> directories in place, otherwise you will lose your file attachments, uploaded images and get error due to missing extension files. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see <a href="#install">New installation</a> for details if necessary). Once complete, copy back your saved <code>config.php</code>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p> - <p>You should now run <code>install/database_update.php</code> which, depending on your previous version, will make a number of database changes. You may receive <em>FAILURES</em> during this procedure. They should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p> + <p>You should now got to <code>/install/app.php/update</code> which will display a warning: <strong>No valid update directory was found, please make sure you uploaded the relevant files</strong>. Beneath that warning you will see a radion button <em>Update database only</em>, just click <strong>Submit</strong>. Depending on your previous version this will make a number of database changes. You may receive <em>FAILURES</em> during this procedure. They should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p> - <p>Once <code>install/database_update.php</code> has completed, you may proceed to the Administration Control Panel and then remove the install directory as advised.</p> + <p>Once <code>/install/app.php/update</code> has completed, it displays the success message: <strong>The database update was successful</strong>. You may proceed to the Administration Control Panel and then remove the install directory as advised.</p> <a name="update_files"></a><h3>4.ii. Changed files</h3> @@ -292,9 +292,9 @@ <p>The patch file package is for those wanting to update through the patch application, and should only be used by those who are comfortable with it.</p> - <p>The patch file is one solution for those with many Modifications (MODs) or other changes and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p> + <p>The patch file is one solution for those with changes in to the phpBB core files and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p> - <p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <strong>3.1.0</strong>, you need the <code>phpBB-3.1.1-patch.zip/tar.bz2</code> file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <code>patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME]</code> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p> + <p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <strong>3.2.0</strong>, you need the <code>phpBB-3.2.1-patch.zip/tar.bz2</code> file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <code>patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME]</code> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p> <p>If you do get failures, you should look at using the <a href="#update_files">Changed Files</a> package to replace the files which failed to patch. Please note that you will need to manually re-add any MODs to these particular files. Alternatively, if you know how, you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p> @@ -304,7 +304,7 @@ <p>This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.</p> - <p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.1.5</strong>, you need the <code>phpBB-3.1.5_to_3.1.6.zip/tar.bz2</code> file.</p> + <p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.2.0</strong>, you need the <code>phpBB-3.2.0_to_3.2.1.zip/tar.bz2</code> file.</p> <p>To perform the update, either follow the instructions from the <strong>Administration Control Panel->System</strong> Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.</p> @@ -333,16 +333,16 @@ <hr /> - <a name="update30"></a><h2>5. Updating from phpBB 3.0.x to phpBB 3.1.x</h2> + <a name="update30_31"></a><h2>5. Updating from phpBB 3.0.x/3.1x to phpBB 3.2.x</h2> <div class="paragraph"> <div class="inner"><span class="corners-top"><span></span></span> <div class="content"> - <p>Updating from phpBB 3.0.x to 3.1.x is just the same as <a href="#update">updating from stable releases of phpBB 3.1.x</a></p> + <p>Updating from phpBB 3.0.x or 3.1.x to 3.2.x is just the same as <a href="#update">updating from stable releases of phpBB 3.2.x</a></p> - <p>However you can also start with a new set of phpBB 3.1.x files.</p> + <p>However you can also start with a new set of phpBB 3.2.x files.</p> <ol> <li>Delete all files <strong>EXCEPT</strong> for the following: @@ -352,10 +352,12 @@ <li>The <code>images/</code> directory</li> <li>The <code>files/</code> directory</li> <li>The <code>store/</code> directory</li> + <li>(The <code>ext/</code> directory</li> </ul></li> - <li>Upload the contents of the 3.1.x Full Package into your forum's directory. Make sure the root level .htaccess file is included in the upload.</li> - <li>Browse to install/database_update.php</li> + <li>Upload the contents of the 3.2.x Full Package into your forum's directory. Make sure the root level .htaccess file is included in the upload.</li> + <li>Browse to <code>/install/app.php/update</code></li> + <li>Read the notice <em>Update database only</em> and press <strong>Submit</strong></li> <li>Delete the <code>install/</code> directory</li> </ol> </div> @@ -367,7 +369,7 @@ <hr /> - <a name="convert"></a><h2>6. Conversion from phpBB 2.0.x to phpBB 3.1.x</h2> + <a name="convert"></a><h2>6. Conversion from phpBB 2.0.x to phpBB 3.2.x</h2> <div class="paragraph"> <div class="inner"> diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index a7906ac802..3a4ca02d20 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -91,24 +91,23 @@ <div class="content"> <p>Installation, update and conversion instructions can be found in the <a href="INSTALL.html">INSTALL</a> document in this directory. If you are intending on converting from a phpBB 2.0.x or 3.0.x installation we highly recommend that you backup any existing data before proceeding!</p> - <p>Users of phpBB 3.0 and 3.1 Beta versions cannot directly update.</p> + <p>Users of phpBB 3.0, 3.1 and 3.2 Beta versions cannot directly update.</p> <p>Please note that we don't support the following installation types:</p> <ul> - <li>Updates from phpBB 3.0 Beta versions to phpBB 3.0 RC1 and higher</li> - <li>Updates from phpBB 3.1 Beta versions to phpBB 3.1 RC1 and higher</li> - <li>Conversions from phpBB 2.0.x to phpBB 3.0 or 3.1 Beta versions</li> - <li>phpBB 3.0 or 3.1 Beta installations</li> + <li>Updates from phpBB Beta versions and lower to phpBB Release Candidates and higher</li> + <li>Conversions from phpBB 2.0.x to phpBB 3.0 Beta, 3.1 Beta and 3.2 Beta versions</li> + <li>phpBB 3.0 Beta, 3.1 Beta or 3.2 beta installations</li> </ul> <p>We give support for the following installation types:</p> <ul> - <li>Updates from phpBB 3.0 RC1 and 3.1 RC1 to the latest version</li> + <li>Updates from phpBB 3.0 RC1, 3.1 RC1 and 3.2 RC1 to the latest version</li> <li>Note: if using the <em>Automatic Update Package</em>, updates are supported from phpBB 3.0.2 onward. To update a pre-3.0.2 installation, first update to 3.0.2 and then update to the current version.</li> <li>Conversions from phpBB 2.0.x to the latest version</li> - <li>New installations of phpBB 3.0.x - only the latest released version</li> <li>New installations of phpBB 3.1.x - only the latest released version</li> + <li>New installations of phpBB 3.2.x - only the latest released version</li> </ul> </div> @@ -131,7 +130,7 @@ <a name="i18n"></a><h3>2.i. Languages (Internationalisation - i18n)</h3> - <p>A number of language packs with included style localisations are available. You can find them listed in the <a href="https://www.phpbb.com/languages/">Language Packs</a> pages of our downloads section or from the <a href="https://www.phpbb.com/customise/db/language_packs-25/">Language Packs</a> section of the <a href="https://www.phpbb.com/customise/db/">Customisation Database</a>.</p> + <p>A number of language packs with included style localisations are available. You can find them listed in the <a href="https://www.phpbb.com/languages/">Language Packs</a> pages of our downloads section or from the <a href="https://www.phpbb.com/customise/db/language_packs-25">Language Packs</a> section of the <a href="https://www.phpbb.com/customise/db/">Customisation Database</a>.</p> <p>For more information about language packs, please see: <a href="https://www.phpbb.com/languages/">https://www.phpbb.com/languages/</a></p> @@ -139,7 +138,7 @@ <p>Installation of these packages is straightforward: simply download the required language pack, uncompress (unzip) it and via FTP transfer the included <code>language</code> and <code>styles</code> folders to the root of your board installation. The language can then be installed via the Administration Control Panel of your board: <code>Customise tab -> Language management -> Language packs</code>. A more detailed description of the process is in the Knowledge Base article, <a href="https://www.phpbb.com/kb/article/how-to-install-a-language-pack/">How to Install a Language Pack</a>.</p> - <p>If your language is not available, please visit our <a href="https://www.phpbb.com/community/viewforum.php?f=491">[3.1.x] Translations</a> forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can <a href="https://www.phpbb.com/languages/apply.php">Apply to become a translator</a>.</p> + <p>If your language is not available, please visit our <a href="https://www.phpbb.com/community/viewforum.php?f=566">[3.2.x] Translations</a> forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can <a href="https://www.phpbb.com/languages/apply.php">Apply to become a translator</a>.</p> <a name="styles"></a><h3>2.ii. Styles</h3> @@ -185,7 +184,7 @@ <p>Comprehensive documentation is now available on the phpBB website:</p> - <p><a href="https://www.phpbb.com/support/docs/en/3.1/ug/">https://www.phpbb.com/support/docs/en/3.1/ug/</a></p> + <p><a href="https://www.phpbb.com/support/docs/en/3.2/ug/">https://www.phpbb.com/support/docs/en/3.2/ug/</a></p> <p>This covers everything from installation to setting permissions and managing users.</p> @@ -274,7 +273,7 @@ <p>Please be as detailed as you can in your report, and if possible, list the steps required to duplicate the problem. If you have a patch that fixes the issue, please attach it to the ticket or submit a pull request to our repository <a href="https://github.com/phpbb/phpbb">on GitHub</a>.</p> - <p>If you create a patch, it is very much appreciated (but not required) if you follow the phpBB coding guidelines. Please note that the coding guidelines are somewhat different between different versions of phpBB. For phpBB 3.1.x the coding guidelines may be found here: <a href="http://area51.phpbb.com/docs/31x/coding-guidelines.html">http://area51.phpbb.com/docs/31x/coding-guidelines.html</a></p> + <p>If you create a patch, it is very much appreciated (but not required) if you follow the phpBB coding guidelines. Please note that the coding guidelines are somewhat different between different versions of phpBB. For phpBB 3.2.x the coding guidelines may be found here: <a href="http://area51.phpbb.com/docs/32x/coding-guidelines.html">http://area51.phpbb.com/docs/32x/coding-guidelines.html</a></p> <p>Once a bug has been submitted you will be emailed any follow up comments added to it. <strong>Please</strong> if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.</p> @@ -328,7 +327,7 @@ <p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p> - <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and SQLite 3. Versions of PHP used range from 5.4.x to 5.6.x without problem.</p> + <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and SQLite 3. Versions of PHP used range from 5.4.x above 5.6.x to 7.0.x without problem.</p> <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 410ae2ad7d..9a002fa15c 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -807,6 +807,13 @@ mcp_front_latest_unapproved_before * Since: 3.1.3-RC1 * Purpose: Add content before latest unapproved posts list +mcp_move_before +=== +* Locations: + + styles/prosilver/template/mcp_move.html +* Since: 3.1.10-RC1 +* Purpose: Add content before move topic/post form + mcp_post_additional_options === * Locations: @@ -1694,6 +1701,15 @@ topiclist_row_append * Changed: 3.1.6-RC1 Added event to mcp_forum.html * Purpose: Add content into topic rows (inside the elements containing topic titles) +topiclist_row_topic_title_after +=== +* Locations: + + styles/prosilver/template/search_results.html + + styles/prosilver/template/viewforum_body.html + + styles/prosilver/template/mcp_forum.html +* Since: 3.1.10-RC1 +* Purpose: Add content into topic rows (after the elements containing the topic titles) + ucp_agreement_terms_after === * Locations: diff --git a/phpBB/docs/vagrant.md b/phpBB/docs/vagrant.md new file mode 100644 index 0000000000..ac318270c1 --- /dev/null +++ b/phpBB/docs/vagrant.md @@ -0,0 +1,123 @@ +## Using Vagrant with phpBB + +phpBB includes support for Vagrant. This allows developers and contributors to run phpBB without the need to set up their own local web server with traditional WAMP/MAMP stacks. It also provides a consistent environment between developers for writing and debugging code changes more productively. + +phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.1/homestead) Vagrant box. It runs a Linux server with Ubuntu 14.04, PHP 5.6, Nginx, SQLite3, MySQL, and a whole lot more (complete specs below). + +## Get Started + +* Download and Install [Vagrant](https://www.vagrantup.com/downloads.html) +* Download and Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) +* Run `vagrant up` from the root of your cloned fork of the phpBB Git repository + +```sh +$ vagrant up +``` + +* Access phpBB at `http://192.168.10.10/` +* Username: **admin** +* Password: **adminadmin** + +## Additional commands: +* Access your Linux server from the command line: + +```sh +$ vagrant ssh +``` + +* Pause your server: + +```sh +$ vagrant suspend +``` + +* Shut down your server: + +```sh +$ vagrant halt +``` + +* Delete and remove your server: + +```sh +$ vagrant destroy +``` + +> Note: destroying the vagrant server will remove all traces of the VM from your computer, reclaiming any disk space used by it. However, it also means the next time you vagrant up, you will be creating a brand new VM with a fresh install of phpBB and a new database. + +## Customising the phpBB configuration + +By default, phpBB is pre-configured to install with a MySQL database. You can, however, switch to PostegreSQL or SQLite3 by editing the `phpbb-install-config.yml` file in the vagrant directory. The next time you run `vagrant up` (or `vagrant provision`) it will be installed under the new configuration. + +If you prefer to access phpBB from the more friendly URL `http://phpbb.app` then you must update your computer's hosts file. This file is typically located at `/etc/hosts` for Mac/Linux or `C:\Windows\System32\drivers\etc\hosts` for Windows. Open this file and add the following line to it, at the very bottom, and save. + +``` +192.168.10.10 phpbb.app +``` + +## How it all works + +When you vagrant up, the Laravel/Homestead box is transparently loaded as a Virtual Machine on your computer (this may take several minutes the very first time while it downloads the VM image to your computer). Your local phpBB repository clone is mirrored/shared with the VM, so you can work on the phpBB code on your computer, and see the changes immediately when you browse to phpBB at the URL provided by the VM. + +This is very similar to traditional methods of working with a local WAMP/MAMP stack, except the webserver is now being provided by a VM of a Linux server. The advantages here are the exact same Linux server environment is being used by everybody who uses Vagrant with phpBB, so there will be consist behaviour unlike when everybody is developing on different versions of PHP, server configurations, etc. + +The environment is also "sandboxed" from your system. This means you don't need to worry about adjusting your own computer's internal PHP settings, setting up databases, or doing damage to your system or to phpBB. Other than the phpBB codebase, which lives on your computer, all execution is taking place within the VM and you can at any time, halt or destroy the VM and start a brand new one. + +There are some caveats, however. You can only run one vagrant VM for the phpBB repository. And of course, the database will be destroyed when you vagrant destroy. If the database is important, you should SSH into your vagrant VM and export/import the DB as needed using SSH commands. + +For example, to export/import a MySQL database (using phpBB's `store` directory): + +SSH into the VM + +```sh +$ vagrant ssh +``` + +Export MySQL: + +```sh +$ mysqldump -uhomestead -psecret phpbb > /home/vagrant/phpbb/phpBB/store/phpbb.sql +``` + +Import MySQL: + +```sh +$ mysql -uhomestead -psecret phpbb < /home/vagrant/phpbb/phpBB/store/phpbb.sql +``` + +--- + +## About the Laravel/Homestead box + +### Included Software + +* Ubuntu 14.04 +* Git +* PHP 5.6 +* HHVM +* Nginx +* MySQL +* Sqlite3 +* Postgres +* Composer +* Node (With PM2, Bower, Grunt, and Gulp) +* Redis +* Memcached +* Beanstalkd +* Blackfire Profiler + +### MySQL Access + +- Hostname: 127.0.0.1 +- Username: homestead +- Password: secret +- Database: phpbb +- Port: 3306 + +### PostgreSQL Access + +- Hostname: 127.0.0.1 +- Username: homestead +- Password: secret +- Database: phpbb +- Port: 5432 diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index f08f5356c8..f487662da5 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -452,7 +452,7 @@ class acp_board 'legend2' => 'SMTP_SETTINGS', 'smtp_delivery' => array('lang' => 'USE_SMTP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'smtp_host' => array('lang' => 'SMTP_SERVER', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => false), + 'smtp_host' => array('lang' => 'SMTP_SERVER', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => true), 'smtp_port' => array('lang' => 'SMTP_PORT', 'validate' => 'int:0:99999', 'type' => 'number:0:99999', 'explain' => true), 'smtp_auth_method' => array('lang' => 'SMTP_AUTH_METHOD', 'validate' => 'string', 'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true), 'smtp_username' => array('lang' => 'SMTP_USERNAME', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true), @@ -642,6 +642,9 @@ class acp_board $messenger->template('test'); $messenger->set_addresses($user->data); $messenger->anti_abuse_headers($config, $user); + $messenger->assign_vars(array( + 'USERNAME' => htmlspecialchars_decode($user->data['username']), + )); $messenger->send(NOTIFY_EMAIL); trigger_error($user->lang('TEST_EMAIL_SENT') . adm_back_link($this->u_action)); diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 529c3a1835..f44bbbc88d 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -459,6 +459,12 @@ class acp_main $template->assign_var('S_VERSION_UP_TO_DATE', true); } + // Incomplete update? + if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<')) + { + $template->assign_var('S_UPDATE_INCOMPLETE', true); + } + /** * Notice admin * diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index 52897e1043..e42367d8a1 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -63,5 +63,17 @@ class acp_update 'UPDATE_INSTRUCTIONS' => sprintf($user->lang['UPDATE_INSTRUCTIONS'], $update_link), )); + + // Incomplete update? + if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<')) + { + $database_update_link = append_sid($phpbb_root_path . 'install/database_update.' . $phpEx); + + $template->assign_vars(array( + 'S_UPDATE_INCOMPLETE' => true, + 'FILES_VERSION' => PHPBB_VERSION, + 'INCOMPLETE_INSTRUCTIONS' => $user->lang('UPDATE_INCOMPLETE_EXPLAIN', $database_update_link), + )); + } } } diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index b3792dd8b9..38017255b4 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -@define('PHPBB_VERSION', '3.2.0-b3-dev'); +@define('PHPBB_VERSION', '3.2.0-RC2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 497403b1e5..588a717f0e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3669,6 +3669,30 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum' } } } + + /** + * Modify online userlist data + * + * @event core.obtain_users_online_string_before_modify + * @var array online_users Array with online users data + * from obtain_users_online() + * @var int item_id Restrict online users to item id + * @var string item Restrict online users to a certain + * session item, e.g. forum for + * session_forum_id + * @var array rowset Array with online users data + * @var array user_online_link Array with online users items (usernames) + * @since 3.1.10-RC1 + */ + $vars = array( + 'online_users', + 'item_id', + 'item', + 'rowset', + 'user_online_link', + ); + extract($phpbb_dispatcher->trigger_event('core.obtain_users_online_string_before_modify', compact($vars))); + $online_userlist = implode(', ', $user_online_link); if (!$online_userlist) diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index a84cbd9311..5cf65e04ba 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -204,7 +204,7 @@ function group_select_options($group_id, $exclude_ids = false, $manage_founder = */ function get_forum_list($acl_list = 'f_list', $id_only = true, $postable_only = false, $no_cache = false) { - global $db, $auth; + global $db, $auth, $phpbb_dispatcher; static $forum_rows; if (!isset($forum_rows)) @@ -259,6 +259,16 @@ function get_forum_list($acl_list = 'f_list', $id_only = true, $postable_only = } } + /** + * Modify the forum list data + * + * @event core.get_forum_list_modify_data + * @var array rowset Array with the forum list data + * @since 3.1.10-RC1 + */ + $vars = array('rowset'); + extract($phpbb_dispatcher->trigger_event('core.get_forum_list_modify_data', compact($vars))); + return $rowset; } @@ -2221,7 +2231,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, /** * Prune function */ -function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync = true) +function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync = true, $prune_limit = 0) { global $db, $phpbb_dispatcher; @@ -2273,9 +2283,19 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync * @var int prune_flags The prune flags * @var bool auto_sync Whether or not to perform auto sync * @var string sql_and SQL text appended to where clause + * @var int prune_limit The prune limit * @since 3.1.3-RC1 + * @changed 3.1.10-RC1 Added prune_limit */ - $vars = array('forum_id', 'prune_mode', 'prune_date', 'prune_flags', 'auto_sync', 'sql_and'); + $vars = array( + 'forum_id', + 'prune_mode', + 'prune_date', + 'prune_flags', + 'auto_sync', + 'sql_and', + 'prune_limit', + ); extract($phpbb_dispatcher->trigger_event('core.prune_sql', compact($vars))); $sql = 'SELECT topic_id @@ -2283,7 +2303,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync WHERE ' . $db->sql_in_set('forum_id', $forum_id) . " AND poll_start = 0 $sql_and"; - $result = $db->sql_query($sql); + $result = $db->sql_query_limit($sql, $prune_limit); $topic_list = array(); while ($row = $db->sql_fetchrow($result)) @@ -2300,7 +2320,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync AND poll_start > 0 AND poll_last_vote < $prune_date $sql_and"; - $result = $db->sql_query($sql); + $result = $db->sql_query_limit($sql, $prune_limit); while ($row = $db->sql_fetchrow($result)) { @@ -2333,12 +2353,15 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr $prune_date = time() - ($prune_days * 86400); $next_prune = time() + ($prune_freq * 86400); - prune($forum_id, $prune_mode, $prune_date, $prune_flags, true); + $result = prune($forum_id, $prune_mode, $prune_date, $prune_flags, true, 300); - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET prune_next = $next_prune - WHERE forum_id = $forum_id"; - $db->sql_query($sql); + if ($result['topics'] == 0 && $result['posts'] == 0) + { + $sql = 'UPDATE ' . FORUMS_TABLE . " + SET prune_next = $next_prune + WHERE forum_id = $forum_id"; + $db->sql_query($sql); + } $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_AUTO_PRUNE', false, array($row['forum_name'])); } diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index fd7fc478bd..173ea49acc 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -150,7 +150,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, */ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false, $force_display = false) { - global $config, $auth, $template, $user, $db, $phpbb_path_helper; + global $config, $auth, $template, $user, $db, $phpbb_path_helper, $phpbb_dispatcher; // We only return if the jumpbox is not forced to be displayed (in case it is needed for functionality) if (!$config['load_jumpbox'] && $force_display === false) @@ -205,20 +205,21 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list continue; } + $tpl_ary = array(); if (!$display_jumpbox) { - $template->assign_block_vars('jumpbox_forums', array( + $tpl_ary[] = array( 'FORUM_ID' => ($select_all) ? 0 : -1, 'FORUM_NAME' => ($select_all) ? $user->lang['ALL_FORUMS'] : $user->lang['SELECT_FORUM'], 'S_FORUM_COUNT' => $iteration, 'LINK' => $phpbb_path_helper->append_url_params($action, array('f' => $forum_id)), - )); + ); $iteration++; $display_jumpbox = true; } - $template->assign_block_vars('jumpbox_forums', array( + $tpl_ary[] = array( 'FORUM_ID' => $row['forum_id'], 'FORUM_NAME' => $row['forum_name'], 'SELECTED' => ($row['forum_id'] == $forum_id) ? ' selected="selected"' : '', @@ -227,7 +228,25 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list 'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false, 'S_IS_POST' => ($row['forum_type'] == FORUM_POST) ? true : false, 'LINK' => $phpbb_path_helper->append_url_params($action, array('f' => $row['forum_id'])), - )); + ); + + /** + * Modify the jumpbox before it is assigned to the template + * + * @event core.make_jumpbox_modify_tpl_ary + * @var array row The data of the forum + * @var array tpl_ary Template data of the forum + * @since 3.1.10-RC1 + */ + $vars = array( + 'row', + 'tpl_ary', + ); + extract($phpbb_dispatcher->trigger_event('core.make_jumpbox_modify_tpl_ary', compact($vars))); + + $template->assign_block_vars_array('jumpbox_forums', $tpl_ary); + + unset($tpl_ary); for ($i = 0; $i < $padding; $i++) { diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index b295d4cd1e..1659d4b252 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -166,7 +166,7 @@ function send_file_to_browser($attachment, $upload_dir, $category) } // Make sure the database record for the filesize is correct - if ($size > 0 && $size != $attachment['filesize']) + if ($size > 0 && $size != $attachment['filesize'] && strpos($attachment['physical_filename'], 'thumb_') === false) { // Update database record $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 3fa96afb29..fa9ed84a34 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -624,31 +624,34 @@ class messenger */ protected function setup_template() { - global $phpbb_extension_manager, $phpbb_container, $phpbb_filesystem; + global $phpbb_container; if ($this->template instanceof \phpbb\template\template) { return; } + $template_environment = new \phpbb\template\twig\environment( + $phpbb_container->get('config'), + $phpbb_container->get('filesystem'), + $phpbb_container->get('path_helper'), + $phpbb_container->getParameter('core.template.cache_path'), + $phpbb_container->get('ext.manager'), + new \phpbb\template\twig\loader( + $phpbb_container->get('filesystem') + ) + ); + $template_environment->setLexer($phpbb_container->get('template.twig.lexer')); + $this->template = new \phpbb\template\twig\twig( $phpbb_container->get('path_helper'), $phpbb_container->get('config'), new \phpbb\template\context(), - new \phpbb\template\twig\environment( - $phpbb_container->get('config'), - $phpbb_container->get('filesystem'), - $phpbb_container->get('path_helper'), - $phpbb_container->getParameter('core.cache_dir'), - $phpbb_container->get('ext.manager'), - new \phpbb\template\twig\loader( - $phpbb_filesystem - ) - ), - $phpbb_container->getParameter('core.cache_dir'), + $template_environment, + $phpbb_container->getParameter('core.template.cache_path'), $phpbb_container->get('user'), $phpbb_container->get('template.twig.extensions.collection'), - $phpbb_extension_manager + $phpbb_container->get('ext.manager') ); } @@ -684,10 +687,10 @@ class queue */ function queue() { - global $phpEx, $phpbb_root_path, $phpbb_filesystem; + global $phpEx, $phpbb_root_path, $phpbb_filesystem, $phpbb_container; $this->data = array(); - $this->cache_file = "{$phpbb_root_path}cache/queue.$phpEx"; + $this->cache_file = $phpbb_container->getParameter('core.cache_dir') . "queue.$phpEx"; $this->filesystem = $phpbb_filesystem; } diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 2bc7ed471e..48d30a9341 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -544,7 +544,7 @@ function create_thumbnail($source, $destination, $mimetype) $used_imagick = false; - // Only use imagemagick if defined and the passthru function not disabled + // Only use ImageMagick if defined and the passthru function not disabled if ($config['img_imagick'] && function_exists('passthru')) { if (substr($config['img_imagick'], -1) !== '/') diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 9702056d7b..d5ed5522f2 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -1012,6 +1012,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '', $approve_log[] = array( 'forum_id' => $post_data['forum_id'], 'topic_id' => $post_data['topic_id'], + 'post_id' => $post_id, 'post_subject' => $post_data['post_subject'], 'poster_id' => $post_data['poster_id'], 'post_username' => $post_data['post_username'], diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index bf93593c74..1ccced7a2f 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -104,7 +104,7 @@ class mcp_queue if (!empty($topic_id_list) && $mode == 'deleted_topics') { - if (!function_exists('mcp_delete_topics')) + if (!function_exists('mcp_delete_topic')) { global $phpbb_root_path, $phpEx; include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx); diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index 60e63eddc4..6350f4bc5a 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -190,7 +190,6 @@ class phpbb_questionnaire_system_data_provider // - 192.168.0.0/16 if ($ip_address_ary[0] == '10' || ($ip_address_ary[0] == '172' && intval($ip_address_ary[1]) > 15 && intval($ip_address_ary[1]) < 32) || - ($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168') || ($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168')) { return true; diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 1132271689..ad9a99204f 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -739,6 +739,34 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $enable_urls = (isset($_POST['disable_magic_url'])) ? 0 : 1; $enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : ((isset($_POST['attach_sig'])) ? true : false); + /** + * Modify private message + * + * @event core.ucp_pm_compose_modify_parse_before + * @var bool enable_bbcode Whether or not bbcode is enabled + * @var bool enable_smilies Whether or not smilies are enabled + * @var bool enable_urls Whether or not urls are enabled + * @var bool enable_sig Whether or not signature is enabled + * @var string subject PM subject text + * @var object message_parser The message parser object + * @var bool submit Whether or not the form has been sumitted + * @var bool preview Whether or not the signature is being previewed + * @var array error Any error strings + * @since 3.1.10-RC1 + */ + $vars = array( + 'enable_bbcode', + 'enable_smilies', + 'enable_urls', + 'enable_sig', + 'subject', + 'message_parser', + 'submit', + 'preview', + 'error', + ); + extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_parse_before', compact($vars))); + // Parse Attachments - before checksum is calculated $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 64c49e17ac..a9f8e10eef 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -558,6 +558,16 @@ class ucp_profile 'user_sig_bbcode_bitfield' => $bbcode_bitfield ); + /** + * Modify user registration data before submitting it to the database + * + * @event core.ucp_profile_modify_signature_sql_ary + * @var array sql_ary Array with user signature data to submit to the database + * @since 3.1.10-RC1 + */ + $vars = array('sql_ary'); + extract($phpbb_dispatcher->trigger_event('core.ucp_profile_modify_signature_sql_ary', compact($vars))); + $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $user->data['user_id']; diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 977670c94c..e5866add7d 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.2.0-b3-dev', + 'phpbb_version' => '3.2.0-RC1', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 87eab84b5a..3803fe7034 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-b3-dev'); +define('PHPBB_VERSION', '3.2.0-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json deleted file mode 100644 index 9c278e5ff7..0000000000 --- a/phpBB/install/schemas/schema.json +++ /dev/null @@ -1,3390 +0,0 @@ -{ - "phpbb_acl_groups": { - "COLUMNS": { - "group_id": [ - "UINT", - 0 - ], - "forum_id": [ - "UINT", - 0 - ], - "auth_option_id": [ - "UINT", - 0 - ], - "auth_role_id": [ - "UINT", - 0 - ], - "auth_setting": [ - "TINT:2", - 0 - ] - }, - "KEYS": { - "group_id": [ - "INDEX", - "group_id" - ], - "auth_opt_id": [ - "INDEX", - "auth_option_id" - ], - "auth_role_id": [ - "INDEX", - "auth_role_id" - ] - } - }, - "phpbb_acl_options": { - "COLUMNS": { - "auth_option_id": [ - "UINT", - null, - "auto_increment" - ], - "auth_option": [ - "VCHAR:50", - "" - ], - "is_global": [ - "BOOL", - 0 - ], - "is_local": [ - "BOOL", - 0 - ], - "founder_only": [ - "BOOL", - 0 - ] - }, - "PRIMARY_KEY": "auth_option_id", - "KEYS": { - "auth_option": [ - "UNIQUE", - [ - "auth_option" - ] - ] - } - }, - "phpbb_acl_roles": { - "COLUMNS": { - "role_id": [ - "UINT", - null, - "auto_increment" - ], - "role_name": [ - "VCHAR_UNI", - "" - ], - "role_description": [ - "TEXT_UNI", - "" - ], - "role_type": [ - "VCHAR:10", - "" - ], - "role_order": [ - "USINT", - 0 - ] - }, - "PRIMARY_KEY": "role_id", - "KEYS": { - "role_type": [ - "INDEX", - "role_type" - ], - "role_order": [ - "INDEX", - "role_order" - ] - } - }, - "phpbb_acl_roles_data": { - "COLUMNS": { - "role_id": [ - "UINT", - 0 - ], - "auth_option_id": [ - "UINT", - 0 - ], - "auth_setting": [ - "TINT:2", - 0 - ] - }, - "PRIMARY_KEY": [ - "role_id", - "auth_option_id" - ], - "KEYS": { - "ath_op_id": [ - "INDEX", - "auth_option_id" - ] - } - }, - "phpbb_acl_users": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "forum_id": [ - "UINT", - 0 - ], - "auth_option_id": [ - "UINT", - 0 - ], - "auth_role_id": [ - "UINT", - 0 - ], - "auth_setting": [ - "TINT:2", - 0 - ] - }, - "KEYS": { - "user_id": [ - "INDEX", - "user_id" - ], - "auth_option_id": [ - "INDEX", - "auth_option_id" - ], - "auth_role_id": [ - "INDEX", - "auth_role_id" - ] - } - }, - "phpbb_attachments": { - "COLUMNS": { - "attach_id": [ - "ULINT", - null, - "auto_increment" - ], - "post_msg_id": [ - "ULINT", - 0 - ], - "topic_id": [ - "ULINT", - 0 - ], - "in_message": [ - "BOOL", - 0 - ], - "poster_id": [ - "ULINT", - 0 - ], - "is_orphan": [ - "BOOL", - 1 - ], - "physical_filename": [ - "VCHAR", - "" - ], - "real_filename": [ - "VCHAR", - "" - ], - "download_count": [ - "UINT", - 0 - ], - "attach_comment": [ - "TEXT_UNI", - "" - ], - "extension": [ - "VCHAR:100", - "" - ], - "mimetype": [ - "VCHAR:100", - "" - ], - "filesize": [ - "UINT:20", - 0 - ], - "filetime": [ - "TIMESTAMP", - 0 - ], - "thumbnail": [ - "BOOL", - 0 - ] - }, - "PRIMARY_KEY": "attach_id", - "KEYS": { - "filetime": [ - "INDEX", - "filetime" - ], - "post_msg_id": [ - "INDEX", - "post_msg_id" - ], - "topic_id": [ - "INDEX", - "topic_id" - ], - "poster_id": [ - "INDEX", - "poster_id" - ], - "is_orphan": [ - "INDEX", - "is_orphan" - ] - } - }, - "phpbb_banlist": { - "COLUMNS": { - "ban_id": [ - "ULINT", - null, - "auto_increment" - ], - "ban_userid": [ - "ULINT", - 0 - ], - "ban_ip": [ - "VCHAR:40", - "" - ], - "ban_email": [ - "VCHAR_UNI:100", - "" - ], - "ban_start": [ - "TIMESTAMP", - 0 - ], - "ban_end": [ - "TIMESTAMP", - 0 - ], - "ban_exclude": [ - "BOOL", - 0 - ], - "ban_reason": [ - "VCHAR_UNI", - "" - ], - "ban_give_reason": [ - "VCHAR_UNI", - "" - ] - }, - "PRIMARY_KEY": "ban_id", - "KEYS": { - "ban_end": [ - "INDEX", - "ban_end" - ], - "ban_user": [ - "INDEX", - [ - "ban_userid", - "ban_exclude" - ] - ], - "ban_email": [ - "INDEX", - [ - "ban_email", - "ban_exclude" - ] - ], - "ban_ip": [ - "INDEX", - [ - "ban_ip", - "ban_exclude" - ] - ] - } - }, - "phpbb_bbcodes": { - "COLUMNS": { - "bbcode_id": [ - "USINT", - 0 - ], - "bbcode_tag": [ - "VCHAR:16", - "" - ], - "bbcode_helpline": [ - "VCHAR_UNI", - "" - ], - "display_on_posting": [ - "BOOL", - 0 - ], - "bbcode_match": [ - "TEXT_UNI", - "" - ], - "bbcode_tpl": [ - "MTEXT_UNI", - "" - ], - "first_pass_match": [ - "MTEXT_UNI", - "" - ], - "first_pass_replace": [ - "MTEXT_UNI", - "" - ], - "second_pass_match": [ - "MTEXT_UNI", - "" - ], - "second_pass_replace": [ - "MTEXT_UNI", - "" - ] - }, - "PRIMARY_KEY": "bbcode_id", - "KEYS": { - "display_on_post": [ - "INDEX", - "display_on_posting" - ] - } - }, - "phpbb_bookmarks": { - "COLUMNS": { - "topic_id": [ - "ULINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ] - }, - "PRIMARY_KEY": [ - "topic_id", - "user_id" - ] - }, - "phpbb_bots": { - "COLUMNS": { - "bot_id": [ - "ULINT", - null, - "auto_increment" - ], - "bot_active": [ - "BOOL", - 1 - ], - "bot_name": [ - "STEXT_UNI", - "" - ], - "user_id": [ - "ULINT", - 0 - ], - "bot_agent": [ - "VCHAR", - "" - ], - "bot_ip": [ - "VCHAR", - "" - ] - }, - "PRIMARY_KEY": "bot_id", - "KEYS": { - "bot_active": [ - "INDEX", - "bot_active" - ] - } - }, - "phpbb_config": { - "COLUMNS": { - "config_name": [ - "VCHAR", - "" - ], - "config_value": [ - "VCHAR_UNI", - "" - ], - "is_dynamic": [ - "BOOL", - 0 - ] - }, - "PRIMARY_KEY": "config_name", - "KEYS": { - "is_dynamic": [ - "INDEX", - "is_dynamic" - ] - } - }, - "phpbb_config_text": { - "COLUMNS": { - "config_name": [ - "VCHAR", - "" - ], - "config_value": [ - "MTEXT", - "" - ] - }, - "PRIMARY_KEY": "config_name" - }, - "phpbb_confirm": { - "COLUMNS": { - "confirm_id": [ - "CHAR:32", - "" - ], - "session_id": [ - "CHAR:32", - "" - ], - "confirm_type": [ - "TINT:3", - 0 - ], - "code": [ - "VCHAR:8", - "" - ], - "seed": [ - "UINT:10", - 0 - ], - "attempts": [ - "UINT", - 0 - ] - }, - "PRIMARY_KEY": [ - "session_id", - "confirm_id" - ], - "KEYS": { - "confirm_type": [ - "INDEX", - "confirm_type" - ] - } - }, - "phpbb_disallow": { - "COLUMNS": { - "disallow_id": [ - "UINT", - null, - "auto_increment" - ], - "disallow_username": [ - "VCHAR_UNI:255", - "" - ] - }, - "PRIMARY_KEY": "disallow_id" - }, - "phpbb_drafts": { - "COLUMNS": { - "draft_id": [ - "ULINT", - null, - "auto_increment" - ], - "user_id": [ - "ULINT", - 0 - ], - "topic_id": [ - "ULINT", - 0 - ], - "forum_id": [ - "UINT", - 0 - ], - "save_time": [ - "TIMESTAMP", - 0 - ], - "draft_subject": [ - "STEXT_UNI", - "" - ], - "draft_message": [ - "MTEXT_UNI", - "" - ] - }, - "PRIMARY_KEY": "draft_id", - "KEYS": { - "save_time": [ - "INDEX", - "save_time" - ] - } - }, - "phpbb_ext": { - "COLUMNS": { - "ext_name": [ - "VCHAR", - "" - ], - "ext_active": [ - "BOOL", - 0 - ], - "ext_state": [ - "TEXT", - "" - ] - }, - "KEYS": { - "ext_name": [ - "UNIQUE", - "ext_name" - ] - } - }, - "phpbb_extension_groups": { - "COLUMNS": { - "group_id": [ - "UINT", - null, - "auto_increment" - ], - "group_name": [ - "VCHAR_UNI", - "" - ], - "cat_id": [ - "TINT:2", - 0 - ], - "allow_group": [ - "BOOL", - 0 - ], - "download_mode": [ - "BOOL", - 1 - ], - "upload_icon": [ - "VCHAR", - "" - ], - "max_filesize": [ - "UINT:20", - 0 - ], - "allowed_forums": [ - "TEXT", - "" - ], - "allow_in_pm": [ - "BOOL", - 0 - ] - }, - "PRIMARY_KEY": "group_id" - }, - "phpbb_extensions": { - "COLUMNS": { - "extension_id": [ - "UINT", - null, - "auto_increment" - ], - "group_id": [ - "UINT", - 0 - ], - "extension": [ - "VCHAR:100", - "" - ] - }, - "PRIMARY_KEY": "extension_id" - }, - "phpbb_forums": { - "COLUMNS": { - "forum_id": [ - "UINT", - null, - "auto_increment" - ], - "parent_id": [ - "UINT", - 0 - ], - "left_id": [ - "UINT", - 0 - ], - "right_id": [ - "UINT", - 0 - ], - "forum_parents": [ - "MTEXT", - "" - ], - "forum_name": [ - "STEXT_UNI", - "" - ], - "forum_desc": [ - "TEXT_UNI", - "" - ], - "forum_desc_bitfield": [ - "VCHAR:255", - "" - ], - "forum_desc_options": [ - "UINT:11", - 7 - ], - "forum_desc_uid": [ - "VCHAR:8", - "" - ], - "forum_link": [ - "VCHAR_UNI", - "" - ], - "forum_password": [ - "VCHAR:255", - "" - ], - "forum_style": [ - "UINT", - 0 - ], - "forum_image": [ - "VCHAR", - "" - ], - "forum_rules": [ - "TEXT_UNI", - "" - ], - "forum_rules_link": [ - "VCHAR_UNI", - "" - ], - "forum_rules_bitfield": [ - "VCHAR:255", - "" - ], - "forum_rules_options": [ - "UINT:11", - 7 - ], - "forum_rules_uid": [ - "VCHAR:8", - "" - ], - "forum_topics_per_page": [ - "TINT:4", - 0 - ], - "forum_type": [ - "TINT:4", - 0 - ], - "forum_status": [ - "TINT:4", - 0 - ], - "forum_last_post_id": [ - "ULINT", - 0 - ], - "forum_last_poster_id": [ - "ULINT", - 0 - ], - "forum_last_post_subject": [ - "STEXT_UNI", - "" - ], - "forum_last_post_time": [ - "TIMESTAMP", - 0 - ], - "forum_last_poster_name": [ - "VCHAR_UNI", - "" - ], - "forum_last_poster_colour": [ - "VCHAR:6", - "" - ], - "forum_flags": [ - "TINT:4", - 32 - ], - "display_on_index": [ - "BOOL", - 1 - ], - "enable_indexing": [ - "BOOL", - 1 - ], - "enable_icons": [ - "BOOL", - 1 - ], - "enable_prune": [ - "BOOL", - 0 - ], - "prune_next": [ - "TIMESTAMP", - 0 - ], - "prune_days": [ - "UINT", - 0 - ], - "prune_viewed": [ - "UINT", - 0 - ], - "prune_freq": [ - "UINT", - 0 - ], - "display_subforum_list": [ - "BOOL", - 1 - ], - "forum_options": [ - "UINT:20", - 0 - ], - "enable_shadow_prune": [ - "BOOL", - 0 - ], - "prune_shadow_days": [ - "UINT", - 7 - ], - "prune_shadow_freq": [ - "UINT", - 1 - ], - "prune_shadow_next": [ - "INT:11", - 0 - ], - "forum_posts_approved": [ - "UINT", - 0 - ], - "forum_posts_unapproved": [ - "UINT", - 0 - ], - "forum_posts_softdeleted": [ - "UINT", - 0 - ], - "forum_topics_approved": [ - "UINT", - 0 - ], - "forum_topics_unapproved": [ - "UINT", - 0 - ], - "forum_topics_softdeleted": [ - "UINT", - 0 - ] - }, - "PRIMARY_KEY": "forum_id", - "KEYS": { - "left_right_id": [ - "INDEX", - [ - "left_id", - "right_id" - ] - ], - "forum_lastpost_id": [ - "INDEX", - "forum_last_post_id" - ] - } - }, - "phpbb_forums_access": { - "COLUMNS": { - "forum_id": [ - "UINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "session_id": [ - "CHAR:32", - "" - ] - }, - "PRIMARY_KEY": [ - "forum_id", - "user_id", - "session_id" - ] - }, - "phpbb_forums_track": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "forum_id": [ - "UINT", - 0 - ], - "mark_time": [ - "TIMESTAMP", - 0 - ] - }, - "PRIMARY_KEY": [ - "user_id", - "forum_id" - ] - }, - "phpbb_forums_watch": { - "COLUMNS": { - "forum_id": [ - "UINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "notify_status": [ - "BOOL", - 0 - ] - }, - "KEYS": { - "forum_id": [ - "INDEX", - "forum_id" - ], - "user_id": [ - "INDEX", - "user_id" - ], - "notify_stat": [ - "INDEX", - "notify_status" - ] - } - }, - "phpbb_groups": { - "COLUMNS": { - "group_id": [ - "UINT", - null, - "auto_increment" - ], - "group_type": [ - "TINT:4", - 1 - ], - "group_founder_manage": [ - "BOOL", - 0 - ], - "group_skip_auth": [ - "BOOL", - 0 - ], - "group_name": [ - "VCHAR_CI", - "" - ], - "group_desc": [ - "TEXT_UNI", - "" - ], - "group_desc_bitfield": [ - "VCHAR:255", - "" - ], - "group_desc_options": [ - "UINT:11", - 7 - ], - "group_desc_uid": [ - "VCHAR:8", - "" - ], - "group_display": [ - "BOOL", - 0 - ], - "group_avatar": [ - "VCHAR", - "" - ], - "group_avatar_type": [ - "VCHAR:255", - "" - ], - "group_avatar_width": [ - "USINT", - 0 - ], - "group_avatar_height": [ - "USINT", - 0 - ], - "group_rank": [ - "UINT", - 0 - ], - "group_colour": [ - "VCHAR:6", - "" - ], - "group_sig_chars": [ - "UINT", - 0 - ], - "group_receive_pm": [ - "BOOL", - 0 - ], - "group_message_limit": [ - "UINT", - 0 - ], - "group_legend": [ - "UINT", - 0 - ], - "group_max_recipients": [ - "UINT", - 0 - ] - }, - "PRIMARY_KEY": "group_id", - "KEYS": { - "group_legend_name": [ - "INDEX", - [ - "group_legend", - "group_name" - ] - ] - } - }, - "phpbb_icons": { - "COLUMNS": { - "icons_id": [ - "UINT", - null, - "auto_increment" - ], - "icons_url": [ - "VCHAR", - "" - ], - "icons_width": [ - "TINT:4", - 0 - ], - "icons_height": [ - "TINT:4", - 0 - ], - "icons_alt": [ - "VCHAR", - "" - ], - "icons_order": [ - "UINT", - 0 - ], - "display_on_posting": [ - "BOOL", - 1 - ] - }, - "PRIMARY_KEY": "icons_id", - "KEYS": { - "display_on_posting": [ - "INDEX", - "display_on_posting" - ] - } - }, - "phpbb_lang": { - "COLUMNS": { - "lang_id": [ - "TINT:4", - null, - "auto_increment" - ], - "lang_iso": [ - "VCHAR:30", - "" - ], - "lang_dir": [ - "VCHAR:30", - "" - ], - "lang_english_name": [ - "VCHAR_UNI:100", - "" - ], - "lang_local_name": [ - "VCHAR_UNI:255", - "" - ], - "lang_author": [ - "VCHAR_UNI:255", - "" - ] - }, - "PRIMARY_KEY": "lang_id", - "KEYS": { - "lang_iso": [ - "INDEX", - "lang_iso" - ] - } - }, - "phpbb_log": { - "COLUMNS": { - "log_id": [ - "ULINT", - null, - "auto_increment" - ], - "log_type": [ - "TINT:4", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "forum_id": [ - "UINT", - 0 - ], - "topic_id": [ - "ULINT", - 0 - ], - "post_id": [ - "ULINT", - 0 - ], - "reportee_id": [ - "ULINT", - 0 - ], - "log_ip": [ - "VCHAR:40", - "" - ], - "log_time": [ - "TIMESTAMP", - 0 - ], - "log_operation": [ - "TEXT_UNI", - "" - ], - "log_data": [ - "MTEXT_UNI", - "" - ] - }, - "PRIMARY_KEY": "log_id", - "KEYS": { - "log_type": [ - "INDEX", - "log_type" - ], - "forum_id": [ - "INDEX", - "forum_id" - ], - "topic_id": [ - "INDEX", - "topic_id" - ], - "reportee_id": [ - "INDEX", - "reportee_id" - ], - "user_id": [ - "INDEX", - "user_id" - ] - } - }, - "phpbb_login_attempts": { - "COLUMNS": { - "attempt_ip": [ - "VCHAR:40", - "" - ], - "attempt_browser": [ - "VCHAR:150", - "" - ], - "attempt_forwarded_for": [ - "VCHAR:255", - "" - ], - "attempt_time": [ - "TIMESTAMP", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "username": [ - "VCHAR_UNI:255", - 0 - ], - "username_clean": [ - "VCHAR_CI", - 0 - ] - }, - "KEYS": { - "att_ip": [ - "INDEX", - [ - "attempt_ip", - "attempt_time" - ] - ], - "att_for": [ - "INDEX", - [ - "attempt_forwarded_for", - "attempt_time" - ] - ], - "att_time": [ - "INDEX", - [ - "attempt_time" - ] - ], - "user_id": [ - "INDEX", - "user_id" - ] - } - }, - "phpbb_migrations": { - "COLUMNS": { - "migration_name": [ - "VCHAR", - "" - ], - "migration_depends_on": [ - "TEXT", - "" - ], - "migration_schema_done": [ - "BOOL", - 0 - ], - "migration_data_done": [ - "BOOL", - 0 - ], - "migration_data_state": [ - "TEXT", - "" - ], - "migration_start_time": [ - "TIMESTAMP", - 0 - ], - "migration_end_time": [ - "TIMESTAMP", - 0 - ] - }, - "PRIMARY_KEY": "migration_name" - }, - "phpbb_moderator_cache": { - "COLUMNS": { - "forum_id": [ - "UINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "username": [ - "VCHAR_UNI:255", - "" - ], - "group_id": [ - "UINT", - 0 - ], - "group_name": [ - "VCHAR_UNI", - "" - ], - "display_on_index": [ - "BOOL", - 1 - ] - }, - "KEYS": { - "disp_idx": [ - "INDEX", - "display_on_index" - ], - "forum_id": [ - "INDEX", - "forum_id" - ] - } - }, - "phpbb_modules": { - "COLUMNS": { - "module_id": [ - "UINT", - null, - "auto_increment" - ], - "module_enabled": [ - "BOOL", - 1 - ], - "module_display": [ - "BOOL", - 1 - ], - "module_basename": [ - "VCHAR", - "" - ], - "module_class": [ - "VCHAR:10", - "" - ], - "parent_id": [ - "UINT", - 0 - ], - "left_id": [ - "UINT", - 0 - ], - "right_id": [ - "UINT", - 0 - ], - "module_langname": [ - "VCHAR", - "" - ], - "module_mode": [ - "VCHAR", - "" - ], - "module_auth": [ - "VCHAR", - "" - ] - }, - "PRIMARY_KEY": "module_id", - "KEYS": { - "left_right_id": [ - "INDEX", - [ - "left_id", - "right_id" - ] - ], - "module_enabled": [ - "INDEX", - "module_enabled" - ], - "class_left_id": [ - "INDEX", - [ - "module_class", - "left_id" - ] - ] - } - }, - "phpbb_notification_types": { - "COLUMNS": { - "notification_type_id": [ - "USINT", - null, - "auto_increment" - ], - "notification_type_name": [ - "VCHAR:255", - "" - ], - "notification_type_enabled": [ - "BOOL", - 1 - ] - }, - "PRIMARY_KEY": [ - "notification_type_id" - ], - "KEYS": { - "type": [ - "UNIQUE", - [ - "notification_type_name" - ] - ] - } - }, - "phpbb_notifications": { - "COLUMNS": { - "notification_id": [ - "UINT:10", - null, - "auto_increment" - ], - "notification_type_id": [ - "USINT", - 0 - ], - "item_id": [ - "UINT", - 0 - ], - "item_parent_id": [ - "UINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "notification_read": [ - "BOOL", - 0 - ], - "notification_time": [ - "TIMESTAMP", - 1 - ], - "notification_data": [ - "TEXT_UNI", - "" - ] - }, - "PRIMARY_KEY": "notification_id", - "KEYS": { - "item_ident": [ - "INDEX", - [ - "notification_type_id", - "item_id" - ] - ], - "user": [ - "INDEX", - [ - "user_id", - "notification_read" - ] - ] - } - }, - "phpbb_oauth_accounts": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "provider": [ - "VCHAR", - "" - ], - "oauth_provider_id": [ - "TEXT_UNI", - "" - ] - }, - "PRIMARY_KEY": [ - "user_id", - "provider" - ] - }, - "phpbb_oauth_states": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "session_id": [ - "CHAR:32", - "" - ], - "provider": [ - "VCHAR", - "" - ], - "oauth_state": [ - "VCHAR", - "" - ] - }, - "KEYS": { - "user_id": [ - "INDEX", - "user_id" - ], - "provider": [ - "INDEX", - "provider" - ] - } - }, - "phpbb_oauth_tokens": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "session_id": [ - "CHAR:32", - "" - ], - "provider": [ - "VCHAR", - "" - ], - "oauth_token": [ - "MTEXT", - "" - ] - }, - "KEYS": { - "user_id": [ - "INDEX", - "user_id" - ], - "provider": [ - "INDEX", - "provider" - ] - } - }, - "phpbb_poll_options": { - "COLUMNS": { - "poll_option_id": [ - "TINT:4", - 0 - ], - "topic_id": [ - "ULINT", - 0 - ], - "poll_option_text": [ - "TEXT_UNI", - "" - ], - "poll_option_total": [ - "UINT", - 0 - ] - }, - "KEYS": { - "poll_opt_id": [ - "INDEX", - "poll_option_id" - ], - "topic_id": [ - "INDEX", - "topic_id" - ] - } - }, - "phpbb_poll_votes": { - "COLUMNS": { - "topic_id": [ - "ULINT", - 0 - ], - "poll_option_id": [ - "TINT:4", - 0 - ], - "vote_user_id": [ - "ULINT", - 0 - ], - "vote_user_ip": [ - "VCHAR:40", - "" - ] - }, - "KEYS": { - "topic_id": [ - "INDEX", - "topic_id" - ], - "vote_user_id": [ - "INDEX", - "vote_user_id" - ], - "vote_user_ip": [ - "INDEX", - "vote_user_ip" - ] - } - }, - "phpbb_posts": { - "COLUMNS": { - "post_id": [ - "ULINT", - null, - "auto_increment" - ], - "topic_id": [ - "ULINT", - 0 - ], - "forum_id": [ - "UINT", - 0 - ], - "poster_id": [ - "ULINT", - 0 - ], - "icon_id": [ - "UINT", - 0 - ], - "poster_ip": [ - "VCHAR:40", - "" - ], - "post_time": [ - "TIMESTAMP", - 0 - ], - "post_reported": [ - "BOOL", - 0 - ], - "enable_bbcode": [ - "BOOL", - 1 - ], - "enable_smilies": [ - "BOOL", - 1 - ], - "enable_magic_url": [ - "BOOL", - 1 - ], - "enable_sig": [ - "BOOL", - 1 - ], - "post_username": [ - "VCHAR_UNI:255", - "" - ], - "post_subject": [ - "STEXT_UNI", - "", - "true_sort" - ], - "post_text": [ - "MTEXT_UNI", - "" - ], - "post_checksum": [ - "VCHAR:32", - "" - ], - "post_attachment": [ - "BOOL", - 0 - ], - "bbcode_bitfield": [ - "VCHAR:255", - "" - ], - "bbcode_uid": [ - "VCHAR:8", - "" - ], - "post_postcount": [ - "BOOL", - 1 - ], - "post_edit_time": [ - "TIMESTAMP", - 0 - ], - "post_edit_reason": [ - "STEXT_UNI", - "" - ], - "post_edit_user": [ - "ULINT", - 0 - ], - "post_edit_count": [ - "USINT", - 0 - ], - "post_edit_locked": [ - "BOOL", - 0 - ], - "post_visibility": [ - "TINT:3", - 0 - ], - "post_delete_time": [ - "TIMESTAMP", - 0 - ], - "post_delete_reason": [ - "STEXT_UNI", - "" - ], - "post_delete_user": [ - "ULINT", - 0 - ] - }, - "PRIMARY_KEY": "post_id", - "KEYS": { - "forum_id": [ - "INDEX", - "forum_id" - ], - "topic_id": [ - "INDEX", - "topic_id" - ], - "poster_ip": [ - "INDEX", - "poster_ip" - ], - "poster_id": [ - "INDEX", - "poster_id" - ], - "tid_post_time": [ - "INDEX", - [ - "topic_id", - "post_time" - ] - ], - "post_username": [ - "INDEX", - [ - "post_username:255" - ] - ], - "post_visibility": [ - "INDEX", - [ - "post_visibility" - ] - ] - } - }, - "phpbb_privmsgs": { - "COLUMNS": { - "msg_id": [ - "ULINT", - null, - "auto_increment" - ], - "root_level": [ - "UINT", - 0 - ], - "author_id": [ - "ULINT", - 0 - ], - "icon_id": [ - "UINT", - 0 - ], - "author_ip": [ - "VCHAR:40", - "" - ], - "message_time": [ - "TIMESTAMP", - 0 - ], - "enable_bbcode": [ - "BOOL", - 1 - ], - "enable_smilies": [ - "BOOL", - 1 - ], - "enable_magic_url": [ - "BOOL", - 1 - ], - "enable_sig": [ - "BOOL", - 1 - ], - "message_subject": [ - "STEXT_UNI", - "" - ], - "message_text": [ - "MTEXT_UNI", - "" - ], - "message_edit_reason": [ - "STEXT_UNI", - "" - ], - "message_edit_user": [ - "ULINT", - 0 - ], - "message_attachment": [ - "BOOL", - 0 - ], - "bbcode_bitfield": [ - "VCHAR:255", - "" - ], - "bbcode_uid": [ - "VCHAR:8", - "" - ], - "message_edit_time": [ - "TIMESTAMP", - 0 - ], - "message_edit_count": [ - "USINT", - 0 - ], - "to_address": [ - "TEXT_UNI", - "" - ], - "bcc_address": [ - "TEXT_UNI", - "" - ], - "message_reported": [ - "BOOL", - 0 - ] - }, - "PRIMARY_KEY": "msg_id", - "KEYS": { - "author_ip": [ - "INDEX", - "author_ip" - ], - "message_time": [ - "INDEX", - "message_time" - ], - "author_id": [ - "INDEX", - "author_id" - ], - "root_level": [ - "INDEX", - "root_level" - ] - } - }, - "phpbb_privmsgs_folder": { - "COLUMNS": { - "folder_id": [ - "UINT", - null, - "auto_increment" - ], - "user_id": [ - "ULINT", - 0 - ], - "folder_name": [ - "VCHAR_UNI", - "" - ], - "pm_count": [ - "UINT", - 0 - ] - }, - "PRIMARY_KEY": "folder_id", - "KEYS": { - "user_id": [ - "INDEX", - "user_id" - ] - } - }, - "phpbb_privmsgs_rules": { - "COLUMNS": { - "rule_id": [ - "UINT", - null, - "auto_increment" - ], - "user_id": [ - "ULINT", - 0 - ], - "rule_check": [ - "UINT", - 0 - ], - "rule_connection": [ - "UINT", - 0 - ], - "rule_string": [ - "VCHAR_UNI", - "" - ], - "rule_user_id": [ - "ULINT", - 0 - ], - "rule_group_id": [ - "UINT", - 0 - ], - "rule_action": [ - "UINT", - 0 - ], - "rule_folder_id": [ - "INT:11", - 0 - ] - }, - "PRIMARY_KEY": "rule_id", - "KEYS": { - "user_id": [ - "INDEX", - "user_id" - ] - } - }, - "phpbb_privmsgs_to": { - "COLUMNS": { - "msg_id": [ - "ULINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "author_id": [ - "ULINT", - 0 - ], - "pm_deleted": [ - "BOOL", - 0 - ], - "pm_new": [ - "BOOL", - 1 - ], - "pm_unread": [ - "BOOL", - 1 - ], - "pm_replied": [ - "BOOL", - 0 - ], - "pm_marked": [ - "BOOL", - 0 - ], - "pm_forwarded": [ - "BOOL", - 0 - ], - "folder_id": [ - "INT:11", - 0 - ] - }, - "KEYS": { - "msg_id": [ - "INDEX", - "msg_id" - ], - "author_id": [ - "INDEX", - "author_id" - ], - "usr_flder_id": [ - "INDEX", - [ - "user_id", - "folder_id" - ] - ] - } - }, - "phpbb_profile_fields": { - "COLUMNS": { - "field_id": [ - "UINT", - null, - "auto_increment" - ], - "field_name": [ - "VCHAR_UNI", - "" - ], - "field_type": [ - "VCHAR:100", - "" - ], - "field_ident": [ - "VCHAR:20", - "" - ], - "field_length": [ - "VCHAR:20", - "" - ], - "field_minlen": [ - "VCHAR", - "" - ], - "field_maxlen": [ - "VCHAR", - "" - ], - "field_novalue": [ - "VCHAR_UNI", - "" - ], - "field_default_value": [ - "VCHAR_UNI", - "" - ], - "field_validation": [ - "VCHAR_UNI:64", - "" - ], - "field_required": [ - "BOOL", - 0 - ], - "field_show_on_reg": [ - "BOOL", - 0 - ], - "field_hide": [ - "BOOL", - 0 - ], - "field_no_view": [ - "BOOL", - 0 - ], - "field_active": [ - "BOOL", - 0 - ], - "field_order": [ - "UINT", - 0 - ], - "field_show_profile": [ - "BOOL", - 0 - ], - "field_show_on_vt": [ - "BOOL", - 0 - ], - "field_show_novalue": [ - "BOOL", - 0 - ], - "field_show_on_pm": [ - "BOOL", - 0 - ], - "field_show_on_ml": [ - "BOOL", - 0 - ], - "field_is_contact": [ - "BOOL", - 0 - ], - "field_contact_desc": [ - "VCHAR", - "" - ], - "field_contact_url": [ - "VCHAR", - "" - ] - }, - "PRIMARY_KEY": "field_id", - "KEYS": { - "fld_type": [ - "INDEX", - "field_type" - ], - "fld_ordr": [ - "INDEX", - "field_order" - ] - } - }, - "phpbb_profile_fields_data": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "pf_phpbb_interests": [ - "MTEXT", - "" - ], - "pf_phpbb_occupation": [ - "MTEXT", - "" - ], - "pf_phpbb_icq": [ - "VCHAR", - "" - ], - "pf_phpbb_location": [ - "VCHAR", - "" - ], - "pf_phpbb_twitter": [ - "VCHAR", - "" - ], - "pf_phpbb_website": [ - "VCHAR", - "" - ], - "pf_phpbb_youtube": [ - "VCHAR", - "" - ], - "pf_phpbb_googleplus": [ - "VCHAR", - "" - ], - "pf_phpbb_facebook": [ - "VCHAR", - "" - ], - "pf_phpbb_skype": [ - "VCHAR", - "" - ], - "pf_phpbb_yahoo": [ - "VCHAR", - "" - ], - "pf_phpbb_aol": [ - "VCHAR", - "" - ] - }, - "PRIMARY_KEY": "user_id" - }, - "phpbb_profile_fields_lang": { - "COLUMNS": { - "field_id": [ - "UINT", - 0 - ], - "lang_id": [ - "UINT", - 0 - ], - "option_id": [ - "UINT", - 0 - ], - "field_type": [ - "VCHAR:100", - "" - ], - "lang_value": [ - "VCHAR_UNI", - "" - ] - }, - "PRIMARY_KEY": [ - "field_id", - "lang_id", - "option_id" - ] - }, - "phpbb_profile_lang": { - "COLUMNS": { - "field_id": [ - "UINT", - 0 - ], - "lang_id": [ - "UINT", - 0 - ], - "lang_name": [ - "VCHAR_UNI", - "" - ], - "lang_explain": [ - "TEXT_UNI", - "" - ], - "lang_default_value": [ - "VCHAR_UNI", - "" - ] - }, - "PRIMARY_KEY": [ - "field_id", - "lang_id" - ] - }, - "phpbb_ranks": { - "COLUMNS": { - "rank_id": [ - "UINT", - null, - "auto_increment" - ], - "rank_title": [ - "VCHAR_UNI", - "" - ], - "rank_min": [ - "UINT", - 0 - ], - "rank_special": [ - "BOOL", - 0 - ], - "rank_image": [ - "VCHAR", - "" - ] - }, - "PRIMARY_KEY": "rank_id" - }, - "phpbb_reports": { - "COLUMNS": { - "report_id": [ - "ULINT", - null, - "auto_increment" - ], - "reason_id": [ - "USINT", - 0 - ], - "post_id": [ - "ULINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "user_notify": [ - "BOOL", - 0 - ], - "report_closed": [ - "BOOL", - 0 - ], - "report_time": [ - "TIMESTAMP", - 0 - ], - "report_text": [ - "MTEXT_UNI", - "" - ], - "pm_id": [ - "ULINT", - 0 - ], - "reported_post_enable_bbcode": [ - "BOOL", - 1 - ], - "reported_post_enable_smilies": [ - "BOOL", - 1 - ], - "reported_post_enable_magic_url": [ - "BOOL", - 1 - ], - "reported_post_text": [ - "MTEXT_UNI", - "" - ], - "reported_post_uid": [ - "VCHAR:8", - "" - ], - "reported_post_bitfield": [ - "VCHAR:255", - "" - ] - }, - "PRIMARY_KEY": "report_id", - "KEYS": { - "post_id": [ - "INDEX", - [ - "post_id" - ] - ], - "pm_id": [ - "INDEX", - [ - "pm_id" - ] - ] - } - }, - "phpbb_reports_reasons": { - "COLUMNS": { - "reason_id": [ - "USINT", - null, - "auto_increment" - ], - "reason_title": [ - "VCHAR_UNI", - "" - ], - "reason_description": [ - "MTEXT_UNI", - "" - ], - "reason_order": [ - "USINT", - 0 - ] - }, - "PRIMARY_KEY": "reason_id" - }, - "phpbb_search_results": { - "COLUMNS": { - "search_key": [ - "VCHAR:32", - "" - ], - "search_time": [ - "TIMESTAMP", - 0 - ], - "search_keywords": [ - "MTEXT_UNI", - "" - ], - "search_authors": [ - "MTEXT", - "" - ] - }, - "PRIMARY_KEY": "search_key" - }, - "phpbb_search_wordlist": { - "COLUMNS": { - "word_id": [ - "ULINT", - null, - "auto_increment" - ], - "word_text": [ - "VCHAR_UNI", - "" - ], - "word_common": [ - "BOOL", - 0 - ], - "word_count": [ - "UINT", - 0 - ] - }, - "PRIMARY_KEY": "word_id", - "KEYS": { - "wrd_txt": [ - "UNIQUE", - "word_text" - ], - "wrd_cnt": [ - "INDEX", - "word_count" - ] - } - }, - "phpbb_search_wordmatch": { - "COLUMNS": { - "post_id": [ - "ULINT", - 0 - ], - "word_id": [ - "ULINT", - 0 - ], - "title_match": [ - "BOOL", - 0 - ] - }, - "KEYS": { - "word_id": [ - "INDEX", - "word_id" - ], - "post_id": [ - "INDEX", - "post_id" - ], - "un_mtch": [ - "UNIQUE", - [ - "word_id", - "post_id", - "title_match" - ] - ] - } - }, - "phpbb_sessions": { - "COLUMNS": { - "session_id": [ - "CHAR:32", - "" - ], - "session_user_id": [ - "ULINT", - 0 - ], - "session_last_visit": [ - "TIMESTAMP", - 0 - ], - "session_start": [ - "TIMESTAMP", - 0 - ], - "session_time": [ - "TIMESTAMP", - 0 - ], - "session_ip": [ - "VCHAR:40", - "" - ], - "session_browser": [ - "VCHAR:150", - "" - ], - "session_forwarded_for": [ - "VCHAR:255", - "" - ], - "session_page": [ - "VCHAR_UNI", - "" - ], - "session_viewonline": [ - "BOOL", - 1 - ], - "session_autologin": [ - "BOOL", - 0 - ], - "session_admin": [ - "BOOL", - 0 - ], - "session_forum_id": [ - "UINT", - 0 - ] - }, - "PRIMARY_KEY": "session_id", - "KEYS": { - "session_time": [ - "INDEX", - "session_time" - ], - "session_user_id": [ - "INDEX", - "session_user_id" - ], - "session_fid": [ - "INDEX", - [ - "session_forum_id" - ] - ] - } - }, - "phpbb_sessions_keys": { - "COLUMNS": { - "key_id": [ - "CHAR:32", - "" - ], - "user_id": [ - "ULINT", - 0 - ], - "last_ip": [ - "VCHAR:40", - "" - ], - "last_login": [ - "TIMESTAMP", - 0 - ] - }, - "PRIMARY_KEY": [ - "key_id", - "user_id" - ], - "KEYS": { - "last_login": [ - "INDEX", - "last_login" - ] - } - }, - "phpbb_sitelist": { - "COLUMNS": { - "site_id": [ - "UINT", - null, - "auto_increment" - ], - "site_ip": [ - "VCHAR:40", - "" - ], - "site_hostname": [ - "VCHAR", - "" - ], - "ip_exclude": [ - "BOOL", - 0 - ] - }, - "PRIMARY_KEY": "site_id" - }, - "phpbb_smilies": { - "COLUMNS": { - "smiley_id": [ - "UINT", - null, - "auto_increment" - ], - "code": [ - "VCHAR_UNI:50", - "" - ], - "emotion": [ - "VCHAR_UNI:50", - "" - ], - "smiley_url": [ - "VCHAR:50", - "" - ], - "smiley_width": [ - "USINT", - 0 - ], - "smiley_height": [ - "USINT", - 0 - ], - "smiley_order": [ - "UINT", - 0 - ], - "display_on_posting": [ - "BOOL", - 1 - ] - }, - "PRIMARY_KEY": "smiley_id", - "KEYS": { - "display_on_post": [ - "INDEX", - "display_on_posting" - ] - } - }, - "phpbb_styles": { - "COLUMNS": { - "style_id": [ - "UINT", - null, - "auto_increment" - ], - "style_name": [ - "VCHAR_UNI:255", - "" - ], - "style_copyright": [ - "VCHAR_UNI", - "" - ], - "style_active": [ - "BOOL", - 1 - ], - "style_path": [ - "VCHAR:100", - "" - ], - "bbcode_bitfield": [ - "VCHAR:255", - "kNg=" - ], - "style_parent_id": [ - "UINT:4", - 0 - ], - "style_parent_tree": [ - "TEXT", - "" - ] - }, - "PRIMARY_KEY": "style_id", - "KEYS": { - "style_name": [ - "UNIQUE", - "style_name" - ] - } - }, - "phpbb_teampage": { - "COLUMNS": { - "teampage_id": [ - "UINT", - null, - "auto_increment" - ], - "group_id": [ - "UINT", - 0 - ], - "teampage_name": [ - "VCHAR_UNI:255", - "" - ], - "teampage_position": [ - "UINT", - 0 - ], - "teampage_parent": [ - "UINT", - 0 - ] - }, - "PRIMARY_KEY": "teampage_id" - }, - "phpbb_topics": { - "COLUMNS": { - "topic_id": [ - "ULINT", - null, - "auto_increment" - ], - "forum_id": [ - "UINT", - 0 - ], - "icon_id": [ - "UINT", - 0 - ], - "topic_attachment": [ - "BOOL", - 0 - ], - "topic_reported": [ - "BOOL", - 0 - ], - "topic_title": [ - "STEXT_UNI", - "", - "true_sort" - ], - "topic_poster": [ - "ULINT", - 0 - ], - "topic_time": [ - "TIMESTAMP", - 0 - ], - "topic_time_limit": [ - "TIMESTAMP", - 0 - ], - "topic_views": [ - "UINT", - 0 - ], - "topic_status": [ - "TINT:3", - 0 - ], - "topic_type": [ - "TINT:3", - 0 - ], - "topic_first_post_id": [ - "ULINT", - 0 - ], - "topic_first_poster_name": [ - "VCHAR_UNI:255", - "", - "true_sort" - ], - "topic_first_poster_colour": [ - "VCHAR:6", - "" - ], - "topic_last_post_id": [ - "ULINT", - 0 - ], - "topic_last_poster_id": [ - "ULINT", - 0 - ], - "topic_last_poster_name": [ - "VCHAR_UNI", - "" - ], - "topic_last_poster_colour": [ - "VCHAR:6", - "" - ], - "topic_last_post_subject": [ - "STEXT_UNI", - "" - ], - "topic_last_post_time": [ - "TIMESTAMP", - 0 - ], - "topic_last_view_time": [ - "TIMESTAMP", - 0 - ], - "topic_moved_id": [ - "ULINT", - 0 - ], - "topic_bumped": [ - "BOOL", - 0 - ], - "topic_bumper": [ - "UINT", - 0 - ], - "poll_title": [ - "STEXT_UNI", - "" - ], - "poll_start": [ - "TIMESTAMP", - 0 - ], - "poll_length": [ - "TIMESTAMP", - 0 - ], - "poll_max_options": [ - "TINT:4", - 1 - ], - "poll_last_vote": [ - "TIMESTAMP", - 0 - ], - "poll_vote_change": [ - "BOOL", - 0 - ], - "topic_visibility": [ - "TINT:3", - 0 - ], - "topic_delete_time": [ - "TIMESTAMP", - 0 - ], - "topic_delete_reason": [ - "STEXT_UNI", - "" - ], - "topic_delete_user": [ - "ULINT", - 0 - ], - "topic_posts_approved": [ - "UINT", - 0 - ], - "topic_posts_unapproved": [ - "UINT", - 0 - ], - "topic_posts_softdeleted": [ - "UINT", - 0 - ] - }, - "PRIMARY_KEY": "topic_id", - "KEYS": { - "forum_id": [ - "INDEX", - "forum_id" - ], - "forum_id_type": [ - "INDEX", - [ - "forum_id", - "topic_type" - ] - ], - "last_post_time": [ - "INDEX", - "topic_last_post_time" - ], - "fid_time_moved": [ - "INDEX", - [ - "forum_id", - "topic_last_post_time", - "topic_moved_id" - ] - ], - "topic_visibility": [ - "INDEX", - [ - "topic_visibility" - ] - ], - "forum_vis_last": [ - "INDEX", - [ - "forum_id", - "topic_visibility", - "topic_last_post_id" - ] - ] - } - }, - "phpbb_topics_posted": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "topic_id": [ - "ULINT", - 0 - ], - "topic_posted": [ - "BOOL", - 0 - ] - }, - "PRIMARY_KEY": [ - "user_id", - "topic_id" - ] - }, - "phpbb_topics_track": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "topic_id": [ - "ULINT", - 0 - ], - "forum_id": [ - "UINT", - 0 - ], - "mark_time": [ - "TIMESTAMP", - 0 - ] - }, - "PRIMARY_KEY": [ - "user_id", - "topic_id" - ], - "KEYS": { - "forum_id": [ - "INDEX", - "forum_id" - ], - "topic_id": [ - "INDEX", - [ - "topic_id" - ] - ] - } - }, - "phpbb_topics_watch": { - "COLUMNS": { - "topic_id": [ - "ULINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "notify_status": [ - "BOOL", - 0 - ] - }, - "KEYS": { - "topic_id": [ - "INDEX", - "topic_id" - ], - "user_id": [ - "INDEX", - "user_id" - ], - "notify_stat": [ - "INDEX", - "notify_status" - ] - } - }, - "phpbb_user_group": { - "COLUMNS": { - "group_id": [ - "UINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "group_leader": [ - "BOOL", - 0 - ], - "user_pending": [ - "BOOL", - 1 - ] - }, - "KEYS": { - "group_id": [ - "INDEX", - "group_id" - ], - "user_id": [ - "INDEX", - "user_id" - ], - "group_leader": [ - "INDEX", - "group_leader" - ] - } - }, - "phpbb_user_notifications": { - "COLUMNS": { - "item_type": [ - "VCHAR:255", - "" - ], - "item_id": [ - "ULINT", - 0 - ], - "user_id": [ - "ULINT", - 0 - ], - "method": [ - "VCHAR:255", - "" - ], - "notify": [ - "BOOL", - 1 - ] - } - }, - "phpbb_users": { - "COLUMNS": { - "user_id": [ - "ULINT", - null, - "auto_increment" - ], - "user_type": [ - "TINT:2", - 0 - ], - "group_id": [ - "UINT", - 3 - ], - "user_permissions": [ - "MTEXT", - "" - ], - "user_perm_from": [ - "UINT", - 0 - ], - "user_ip": [ - "VCHAR:40", - "" - ], - "user_regdate": [ - "TIMESTAMP", - 0 - ], - "username": [ - "VCHAR_CI", - "" - ], - "username_clean": [ - "VCHAR_CI", - "" - ], - "user_password": [ - "VCHAR:255", - "" - ], - "user_passchg": [ - "TIMESTAMP", - 0 - ], - "user_email": [ - "VCHAR_UNI:100", - "" - ], - "user_email_hash": [ - "BINT", - 0 - ], - "user_birthday": [ - "VCHAR:10", - "" - ], - "user_lastvisit": [ - "TIMESTAMP", - 0 - ], - "user_lastmark": [ - "TIMESTAMP", - 0 - ], - "user_lastpost_time": [ - "TIMESTAMP", - 0 - ], - "user_lastpage": [ - "VCHAR_UNI:200", - "" - ], - "user_last_confirm_key": [ - "VCHAR:10", - "" - ], - "user_last_search": [ - "TIMESTAMP", - 0 - ], - "user_warnings": [ - "TINT:4", - 0 - ], - "user_last_warning": [ - "TIMESTAMP", - 0 - ], - "user_login_attempts": [ - "TINT:4", - 0 - ], - "user_inactive_reason": [ - "TINT:2", - 0 - ], - "user_inactive_time": [ - "TIMESTAMP", - 0 - ], - "user_posts": [ - "UINT", - 0 - ], - "user_lang": [ - "VCHAR:30", - "" - ], - "user_timezone": [ - "VCHAR:100", - "" - ], - "user_dateformat": [ - "VCHAR_UNI:64", - "d M Y H:i" - ], - "user_style": [ - "UINT", - 0 - ], - "user_rank": [ - "UINT", - 0 - ], - "user_colour": [ - "VCHAR:6", - "" - ], - "user_new_privmsg": [ - "INT:4", - 0 - ], - "user_unread_privmsg": [ - "INT:4", - 0 - ], - "user_last_privmsg": [ - "TIMESTAMP", - 0 - ], - "user_message_rules": [ - "BOOL", - 0 - ], - "user_full_folder": [ - "INT:11", - -3 - ], - "user_emailtime": [ - "TIMESTAMP", - 0 - ], - "user_topic_show_days": [ - "USINT", - 0 - ], - "user_topic_sortby_type": [ - "VCHAR:1", - "t" - ], - "user_topic_sortby_dir": [ - "VCHAR:1", - "d" - ], - "user_post_show_days": [ - "USINT", - 0 - ], - "user_post_sortby_type": [ - "VCHAR:1", - "t" - ], - "user_post_sortby_dir": [ - "VCHAR:1", - "a" - ], - "user_notify": [ - "BOOL", - 0 - ], - "user_notify_pm": [ - "BOOL", - 1 - ], - "user_notify_type": [ - "TINT:4", - 0 - ], - "user_allow_pm": [ - "BOOL", - 1 - ], - "user_allow_viewonline": [ - "BOOL", - 1 - ], - "user_allow_viewemail": [ - "BOOL", - 1 - ], - "user_allow_massemail": [ - "BOOL", - 1 - ], - "user_options": [ - "UINT:11", - 230271 - ], - "user_avatar": [ - "VCHAR", - "" - ], - "user_avatar_type": [ - "VCHAR:255", - "" - ], - "user_avatar_width": [ - "USINT", - 0 - ], - "user_avatar_height": [ - "USINT", - 0 - ], - "user_sig": [ - "MTEXT_UNI", - "" - ], - "user_sig_bbcode_uid": [ - "VCHAR:8", - "" - ], - "user_sig_bbcode_bitfield": [ - "VCHAR:255", - "" - ], - "user_jabber": [ - "VCHAR_UNI", - "" - ], - "user_actkey": [ - "VCHAR:32", - "" - ], - "user_newpasswd": [ - "VCHAR:255", - "" - ], - "user_form_salt": [ - "VCHAR_UNI:32", - "" - ], - "user_new": [ - "BOOL", - 1 - ], - "user_reminded": [ - "TINT:4", - 0 - ], - "user_reminded_time": [ - "TIMESTAMP", - 0 - ] - }, - "PRIMARY_KEY": "user_id", - "KEYS": { - "user_birthday": [ - "INDEX", - "user_birthday" - ], - "user_email_hash": [ - "INDEX", - "user_email_hash" - ], - "user_type": [ - "INDEX", - "user_type" - ], - "username_clean": [ - "UNIQUE", - "username_clean" - ] - } - }, - "phpbb_warnings": { - "COLUMNS": { - "warning_id": [ - "UINT", - null, - "auto_increment" - ], - "user_id": [ - "ULINT", - 0 - ], - "post_id": [ - "ULINT", - 0 - ], - "log_id": [ - "ULINT", - 0 - ], - "warning_time": [ - "TIMESTAMP", - 0 - ] - }, - "PRIMARY_KEY": "warning_id" - }, - "phpbb_words": { - "COLUMNS": { - "word_id": [ - "ULINT", - null, - "auto_increment" - ], - "word": [ - "VCHAR_UNI", - "" - ], - "replacement": [ - "VCHAR_UNI", - "" - ] - }, - "PRIMARY_KEY": "word_id" - }, - "phpbb_zebra": { - "COLUMNS": { - "user_id": [ - "ULINT", - 0 - ], - "zebra_id": [ - "ULINT", - 0 - ], - "friend": [ - "BOOL", - 0 - ], - "foe": [ - "BOOL", - 0 - ] - }, - "PRIMARY_KEY": [ - "user_id", - "zebra_id" - ] - } -}
\ No newline at end of file diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9791174e0f..0cff26977e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -276,7 +276,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-b3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-RC2-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 5ff904f9fc..20264536ff 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -111,7 +111,7 @@ $lang = array_merge($lang, array( 'IMAGE_LINK_SIZE' => 'Image link dimensions', 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', - 'IMAGICK_PATH' => 'Imagemagick path', + 'IMAGICK_PATH' => 'ImageMagick path', 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.', 'MAX_ATTACHMENTS' => 'Maximum number of attachments per post', @@ -147,7 +147,7 @@ $lang = array_merge($lang, array( 'REMOVE_DISALLOWED_IPS' => 'Remove or un-exclude <em>disallowed</em> IPs/hostnames', 'RESYNC_FILES_STATS_CONFIRM' => 'Are you sure you wish to resynchronise file statistics?', - 'SEARCH_IMAGICK' => 'Search for Imagemagick', + 'SEARCH_IMAGICK' => 'Search for ImageMagick', 'SECURE_ALLOW_DENY' => 'Allow/Deny list', 'SECURE_ALLOW_DENY_EXPLAIN' => 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).', 'SECURE_DOWNLOADS' => 'Enable secure downloads', diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 462d66a04a..e3d8e6742f 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -575,6 +575,7 @@ $lang = array_merge($lang, array( 'SMTP_PORT' => 'SMTP server port', 'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different port.', 'SMTP_SERVER' => 'SMTP server address', + 'SMTP_SERVER_EXPLAIN' => 'Note that you have to provide the protocol that your server uses. If you are using SSL, this has to be "ssl://your.mailserver.com"', 'SMTP_SETTINGS' => 'SMTP settings', 'SMTP_USERNAME' => 'SMTP username', 'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.', diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index a05be5fd96..ccae82c862 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. {U_NEWEST_POST} diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index 5089e7dcb8..b9416d8e40 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. {U_FORUM} diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt index 5089e7dcb8..b9416d8e40 100644 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. {U_FORUM} diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt index 529478eae2..b1ed65727c 100644 --- a/phpBB/language/en/email/short/topic_notify.txt +++ b/phpBB/language/en/email/short/topic_notify.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. If you want to view the newest post made since your last visit, click the following link: {U_NEWEST_POST} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index d5272d7416..20b86ee729 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. No more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. No more notifications will be sent until you visit the topic. If you want to view the newest post made since your last visit, click the following link: {U_NEWEST_POST} diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 88cbaf1533..86755c46f5 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -178,6 +178,7 @@ $lang = array_merge($lang, array( 'DB_PASSWORD' => 'Database password', 'DB_NAME' => 'Database name', 'DB_USERNAME' => 'Database username', + 'DATABASE_VERSION' => 'Database version', 'TABLE_PREFIX' => 'Prefix for tables in database', 'TABLE_PREFIX_EXPLAIN' => 'The prefix must start with a letter and must only contain letters, numbers and underscores.', @@ -213,6 +214,14 @@ $lang = array_merge($lang, array( // 'EMAIL_CONFIG' => 'E-mail configuration', + // Package info + 'PACKAGE_VERSION' => 'Package version installed', + 'UPDATE_INCOMPLETE' => 'Your phpBB installation has not been correctly updated.', + 'UPDATE_INCOMPLETE_MORE' => 'Please read the information below in order to fix this error.', + 'UPDATE_INCOMPLETE_EXPLAIN' => '<h1>Incomplete update</h1> + + <p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script</a>.</p>', + // // Server data // @@ -432,6 +441,7 @@ $lang = array_merge($lang, array( 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files are not modified and represent the original phpBB files from the version you want to update from.', 'FILES_UP_TO_DATE' => 'Already updated files', 'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.', + 'FILES_VERSION' => 'Files Version', 'TOGGLE_DISPLAY' => 'View/Hide file list', // File updater @@ -527,7 +537,7 @@ $lang = array_merge($lang, array( // Finish conversion 'CONVERT_COMPLETE' => 'Conversion completed', - 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.2. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.3/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.', + 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.2. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.2/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.', 'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.', 'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.', diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php deleted file mode 100644 index 3db209d120..0000000000 --- a/phpBB/language/en/search_ignore_words.php +++ /dev/null @@ -1,271 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -if (!defined('IN_PHPBB')) -{ - exit; -} - -$words = array( - 'a', - 'about', - 'after', - 'ago', - 'all', - 'almost', - 'along', - 'alot', - 'also', - 'am', - 'an', - 'and', - 'answer', - 'any', - 'anybody', - 'anybodys', - 'anywhere', - 'are', - 'arent', - 'around', - 'as', - 'ask', - 'askd', - 'at', - 'bad', - 'be', - 'because', - 'been', - 'before', - 'being', - 'best', - 'better', - 'between', - 'big', - 'btw', - 'but', - 'by', - 'can', - 'cant', - 'come', - 'could', - 'couldnt', - 'day', - 'days', - 'days', - 'did', - 'didnt', - 'do', - 'does', - 'doesnt', - 'dont', - 'down', - 'each', - 'etc', - 'either', - 'else', - 'even', - 'ever', - 'every', - 'everybody', - 'everybodys', - 'everyone', - 'far', - 'find', - 'for', - 'found', - 'from', - 'get', - 'go', - 'going', - 'gone', - 'good', - 'got', - 'gotten', - 'had', - 'has', - 'have', - 'havent', - 'having', - 'her', - 'here', - 'hers', - 'him', - 'his', - 'home', - 'how', - 'hows', - 'href', - 'I', - 'Ive', - 'if', - 'in', - 'ini', - 'into', - 'is', - 'isnt', - 'it', - 'its', - 'its', - 'just', - 'know', - 'large', - 'less', - 'like', - 'liked', - 'little', - 'looking', - 'look', - 'looked', - 'looking', - 'lot', - 'maybe', - 'many', - 'me', - 'more', - 'most', - 'much', - 'must', - 'mustnt', - 'my', - 'near', - 'need', - 'never', - 'new', - 'news', - 'no', - 'none', - 'not', - 'nothing', - 'now', - 'of', - 'off', - 'often', - 'old', - 'on', - 'once', - 'only', - 'oops', - 'or', - 'other', - 'our', - 'ours', - 'out', - 'over', - 'page', - 'please', - 'put', - 'question', - 'questions', - 'questioned', - 'quote', - 'rather', - 'really', - 'recent', - 'said', - 'saw', - 'say', - 'says', - 'she', - 'see', - 'sees', - 'should', - 'sites', - 'small', - 'so', - 'some', - 'something', - 'sometime', - 'somewhere', - 'soon', - 'take', - 'than', - 'true', - 'thank', - 'that', - 'thatd', - 'thats', - 'the', - 'their', - 'theirs', - 'theres', - 'theirs', - 'them', - 'then', - 'there', - 'these', - 'they', - 'theyll', - 'theyd', - 'theyre', - 'this', - 'those', - 'though', - 'through', - 'thus', - 'time', - 'times', - 'to', - 'too', - 'under', - 'until', - 'untrue', - 'up', - 'upon', - 'use', - 'users', - 'version', - 'very', - 'via', - 'want', - 'was', - 'way', - 'we', - 'well', - 'went', - 'were', - 'werent', - 'what', - 'when', - 'where', - 'which', - 'who', - 'whom', - 'whose', - 'why', - 'wide', - 'will', - 'with', - 'within', - 'without', - 'wont', - 'world', - 'worse', - 'worst', - 'would', - 'wrote', - 'www', - 'yes', - 'yet', - 'you', - 'youd', - 'youll', - 'your', - 'youre', - 'yours', - 'AFAIK', - 'IIRC', - 'LOL', - 'ROTF', - 'ROTFLMAO', - 'YMMV', -); diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php deleted file mode 100644 index 6a8c257f0b..0000000000 --- a/phpBB/language/en/search_synonyms.php +++ /dev/null @@ -1,191 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -if (!defined('IN_PHPBB')) -{ - exit; -} - -$synonyms = array( - 'abcense' => 'absence', - 'abridgement' => 'abridgment', - 'accomodate' => 'accommodate', - 'acknowledgment' => 'acknowledgement', - 'airplane' => 'aeroplane', - 'allright' => 'alright ', - 'andy' => 'andrew', - 'anemia' => 'anaemia', - 'anemic' => 'anaemic', - 'anesthesia' => 'anaesthesia', - 'apologize' => 'apologise', - 'archean' => 'archaean', - 'archeology' => 'archaeology', - 'archeozoic' => 'archaeozoic', - 'armor' => 'armour', - 'artic' => 'arctic', - 'attachment' => 'attachement', - 'attendence' => 'attendance', - - 'barbecue' => 'barbeque', - 'behavior' => 'behaviour', - 'biassed' => 'biased', - 'biol' => 'biology', - 'buletin' => 'bulletin', - - 'calender' => 'calendar', - 'canceled' => 'cancelled', - 'car' => 'automobile', - 'catalog' => 'catalogue', - 'cenozoic' => 'caenozoic', - 'center' => 'centre', - 'check' => 'cheque', - 'color' => 'colour', - 'comission' => 'commission', - 'comittee' => 'committee', - 'commitee' => 'committee', - 'conceed' => 'concede', - 'creating' => 'createing', - 'curiculum' => 'curriculum', - - 'defense' => 'defence', - 'develope' => 'develop', - 'discription' => 'description', - 'dulness' => 'dullness', - - 'encyclopedia' => 'encyclopaedia', - 'enroll' => 'enrol', - 'esthetic' => 'aesthetic', - 'etiology' => 'aetiology', - 'exhorbitant' => 'exorbitant', - 'exhuberant' => 'exuberant', - 'existance' => 'existence', - - 'favorite' => 'favourite', - 'fetus' => 'foetus', - 'ficticious' => 'fictitious', - 'flavor' => 'flavour', - 'flourescent' => 'fluorescent', - 'foriegn' => 'foreign', - 'fourty' => 'forty', - - 'gage' => 'gauge', - 'geneology' => 'genealogy', - 'grammer' => 'grammar', - 'gray' => 'grey', - 'guerilla' => 'guerrilla', - 'gynecology' => 'gynaecology', - - 'harbor' => 'harbour', - 'heighth' => 'height', - 'hemaglobin' => 'haemaglobin', - 'hematin' => 'haematin', - 'hematite' => 'haematite', - 'hematology' => 'haematology', - 'honor' => 'honour', - - 'innoculate' => 'inoculate', - 'installment' => 'instalment', - 'irrelevent' => 'irrelevant', - 'irrevelant' => 'irrelevant', - - 'jeweler' => 'jeweller', - 'judgment' => 'judgement', - - 'labeled' => 'labelled', - 'labor' => 'labour', - 'laborer' => 'labourer', - 'laborers' => 'labourers', - 'laboring' => 'labouring', - 'licence' => 'license', - 'liesure' => 'leisure', - 'liquify' => 'liquefy', - - 'maintainance' => 'maintenance', - 'maintenence' => 'maintenance', - 'medieval' => 'mediaeval', - 'meter' => 'metre', - 'milage' => 'mileage', - 'millipede' => 'millepede', - 'miscelaneous' => 'miscellaneous', - 'morgage' => 'mortgage', - - 'noticable' => 'noticeable', - - 'occurence' => 'occurrence', - 'offense' => 'offence', - 'ommision' => 'omission', - 'ommission' => 'omission', - 'optimize' => 'optimise', - 'organize' => 'organise', - - 'pajamas' => 'pyjamas', - 'paleography' => 'palaeography', - 'paleolithic' => 'palaeolithic', - 'paleontological' => 'palaeontological', - 'paleontologist' => 'palaeontologist', - 'paleontology' => 'palaeontology', - 'paleozoic' => 'palaeozoic', - 'pamplet' => 'pamphlet', - 'paralell' => 'parallel', - 'parl' => 'parliament', - 'parlt' => 'parliament', - 'pediatric' => 'paediatric', - 'pediatrician' => 'paediatrician', - 'pediatrics' => 'paediatrics', - 'pedodontia' => 'paedodontia', - 'pedodontics' => 'paedodontics', - 'personel' => 'personnel', - 'practise' => 'practice', - 'program' => 'programme', - 'psych' => 'psychology', - - 'questionaire' => 'questionnaire', - - 'rarify' => 'rarefy', - 'reccomend' => 'recommend', - 'recieve' => 'receive', - 'resistence' => 'resistance', - 'restaraunt' => 'restaurant', - - 'savior' => 'saviour', - 'sep' => 'september', - 'seperate' => 'separate', - 'sept' => 'september', - 'sieze' => 'seize', - 'summarize' => 'summarise', - 'summerize' => 'summarise', - 'superceed' => 'supercede', - 'superintendant' => 'superintendent', - 'supersede' => 'supercede', - 'suprise' => 'surprise', - 'surprize' => 'surprise', - 'synchronise' => 'synchronize', - - 'temperary' => 'temporary', - 'theater' => 'theatre', - 'threshhold' => 'threshold', - 'transfered' => 'transferred', - 'truely' => 'truly', - 'truley' => 'truly', - - 'useable' => 'usable', - - 'valor' => 'valour', - 'vigor' => 'vigour', - 'vol' => 'volume', - - 'whack' => 'wack', - 'withold' => 'withhold', - - 'yeild' => 'yield', -); diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php index b8cf84424a..3e4e7ff98b 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -52,8 +52,8 @@ class gravatar extends \phpbb\avatar\driver\driver public function prepare_form($request, $template, $user, $row, &$error) { $template->assign_vars(array( - 'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', 0), - 'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_width', 0), + 'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', ''), + 'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_width', ''), 'AVATAR_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '', )); diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 0526b9184e..3a88a432d1 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -36,8 +36,8 @@ class remote extends \phpbb\avatar\driver\driver public function prepare_form($request, $template, $user, $row, &$error) { $template->assign_vars(array( - 'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_remote_width', 0), - 'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_remote_width', 0), + 'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_remote_width', ''), + 'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_remote_width', ''), 'AVATAR_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '', )); diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php index 0ba0489cb7..147b8ebbff 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -417,6 +417,11 @@ class content_visibility return array(); } + if (!function_exists('truncate_string')) + { + include($this->phpbb_root_path . 'includes/functions_content.' . $this->php_ext); + } + $data = array( 'post_visibility' => (int) $visibility, 'post_delete_user' => (int) $user_id, @@ -628,6 +633,11 @@ class content_visibility } } + if (!function_exists('truncate_string')) + { + include($this->phpbb_root_path . 'includes/functions_content.' . $this->php_ext); + } + // Note, we do not set a reason for the posts, just for the topic $data = array( 'topic_visibility' => (int) $visibility, diff --git a/phpBB/phpbb/cron/manager.php b/phpBB/phpbb/cron/manager.php index 079ce8107e..9bd30a0a5b 100644 --- a/phpBB/phpbb/cron/manager.php +++ b/phpBB/phpbb/cron/manager.php @@ -110,7 +110,7 @@ class manager * Web runner uses this method to resolve names to tasks. * * @param string $name Name of the task to look up. - * @return \phpbb\cron\task\task A task corresponding to the given name, or null. + * @return \phpbb\cron\task\wrapper A wrapped task corresponding to the given name, or null. */ public function find_task($name) { diff --git a/phpBB/phpbb/db/migration/data/v320/report_id_auto_increment.php b/phpBB/phpbb/db/migration/data/v320/report_id_auto_increment.php index c40504051e..6e81baefb9 100644 --- a/phpBB/phpbb/db/migration/data/v320/report_id_auto_increment.php +++ b/phpBB/phpbb/db/migration/data/v320/report_id_auto_increment.php @@ -38,8 +38,9 @@ class report_id_auto_increment extends \phpbb\db\migration\migration return array( 'change_columns' => array( $this->table_prefix . 'reports' => array( - 'report_id' => array('ULINT', 0), 0), + 'report_id' => array('ULINT', 0), ), + ), ); } } diff --git a/phpBB/phpbb/db/migration/data/v320/v320rc1.php b/phpBB/phpbb/db/migration/data/v320/v320rc1.php new file mode 100644 index 0000000000..a04a2abb19 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v320/v320rc1.php @@ -0,0 +1,40 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v320; + +use phpbb\db\migration\migration; + +class v320rc1 extends migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.2.0-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v319', + '\phpbb\db\migration\data\v320\report_id_auto_increment', + '\phpbb\db\migration\data\v320\v320b2', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.0-RC1')), + ); + } +} diff --git a/phpBB/phpbb/feed/base.php b/phpBB/phpbb/feed/base.php index 188d229515..d4be0dc592 100644 --- a/phpBB/phpbb/feed/base.php +++ b/phpBB/phpbb/feed/base.php @@ -39,6 +39,12 @@ abstract class base implements feed_interface /** @var \phpbb\auth\auth */ protected $auth; + /** @var \phpbb\content_visibility */ + protected $content_visibility; + + /** @var \phpbb\event\dispatcher_interface */ + protected $phpbb_dispatcher; + /** @var string */ protected $phpEx; @@ -80,9 +86,20 @@ abstract class base implements feed_interface * @param \phpbb\user $user User object * @param \phpbb\auth\auth $auth Auth object * @param \phpbb\content_visibility $content_visibility Auth object + * @param \phpbb\event\dispatcher_interface $phpbb_dispatcher Event dispatcher object * @param string $phpEx php file extension */ - public function __construct(\phpbb\feed\helper $helper, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\cache\driver\driver_interface $cache, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\content_visibility $content_visibility, $phpEx) + public function __construct( + \phpbb\feed\helper $helper, + \phpbb\config\config $config, + \phpbb\db\driver\driver_interface $db, + \phpbb\cache\driver\driver_interface $cache, + \phpbb\user $user, + \phpbb\auth\auth $auth, + \phpbb\content_visibility $content_visibility, + \phpbb\event\dispatcher_interface $phpbb_dispatcher, + $phpEx + ) { $this->config = $config; $this->helper = $helper; @@ -91,6 +108,7 @@ abstract class base implements feed_interface $this->user = $user; $this->auth = $auth; $this->content_visibility = $content_visibility; + $this->phpbb_dispatcher = $phpbb_dispatcher; $this->phpEx = $phpEx; $this->set_keys(); @@ -161,6 +179,21 @@ abstract class base implements feed_interface return false; } + $sql_ary = $this->sql; + + /** + * Event to modify the feed item sql + * + * @event core.feed_base_modify_item_sql + * @var array sql_ary The SQL array to get the feed item data + * + * @since 3.1.10-RC1 + */ + $vars = array('sql_ary'); + extract($this->phpbb_dispatcher->trigger_event('core.feed_base_modify_item_sql', compact($vars))); + $this->sql = $sql_ary; + unset($sql_ary); + // Query database $sql = $this->db->sql_build_query('SELECT', $this->sql); $this->result = $this->db->sql_query_limit($sql, $this->num_items); diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php index 31476b7317..c0d7bc72ec 100644 --- a/phpBB/phpbb/feed/controller/feed.php +++ b/phpBB/phpbb/feed/controller/feed.php @@ -16,6 +16,7 @@ namespace phpbb\feed\controller; use phpbb\auth\auth; use phpbb\config\config; use phpbb\db\driver\driver_interface; +use \phpbb\event\dispatcher_interface; use phpbb\exception\http_exception; use phpbb\feed\feed_interface; use phpbb\feed\exception\feed_unavailable_exception; @@ -76,6 +77,11 @@ class feed protected $auth; /** + * @var dispatcher_interface + */ + protected $phpbb_dispatcher; + + /** * @var string */ protected $php_ext; @@ -92,9 +98,10 @@ class feed * @param feed_helper $feed_helper * @param user $user * @param auth $auth + * @param dispatcher_interface $phpbb_dispatcher * @param string $php_ext */ - public function __construct(\Twig_Environment $twig, symfony_request $request, controller_helper $controller_helper, config $config, driver_interface $db, ContainerInterface $container, feed_helper $feed_helper, user $user, auth $auth, $php_ext) + public function __construct(\Twig_Environment $twig, symfony_request $request, controller_helper $controller_helper, config $config, driver_interface $db, ContainerInterface $container, feed_helper $feed_helper, user $user, auth $auth, dispatcher_interface $phpbb_dispatcher, $php_ext) { $this->request = $request; $this->controller_helper = $controller_helper; @@ -106,6 +113,7 @@ class feed $this->auth = $auth; $this->php_ext = $php_ext; $this->template = $twig; + $this->phpbb_dispatcher = $phpbb_dispatcher; } /** @@ -296,6 +304,20 @@ class feed // Iterate through items while ($row = $feed->get_item()) { + /** + * Event to modify the feed row + * + * @event core.feed_modify_feed_row + * @var int forum_id Forum ID + * @var string mode Feeds mode (forums|topics|topics_new|topics_active|news) + * @var array row Array with feed data + * @var int topic_id Topic ID + * + * @since 3.1.10-RC1 + */ + $vars = array('forum_id', 'mode', 'row', 'topic_id'); + extract($this->phpbb_dispatcher->trigger_event('core.feed_modify_feed_row', compact($vars))); + // BBCode options to correctly disable urls, smilies, bbcode... if ($feed->get('options') === null) { diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php index 9f74b61770..377d96ed1a 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php @@ -37,7 +37,7 @@ class obtain_imagick_path extends \phpbb\install\task_base implements \phpbb\ins */ public function run() { - // Can we find Imagemagick anywhere on the system? + // Can we find ImageMagick anywhere on the system? $exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : ''; $magic_home = getenv('MAGICK_HOME'); diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php index 30781975d8..d9313dddab 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -37,52 +37,6 @@ class base } /** - * Retrieves a language dependend list of words that should be ignored by the search - */ - function get_ignore_words() - { - if (!sizeof($this->ignore_words)) - { - global $user, $phpEx; - - $words = array(); - - if (file_exists("{$user->lang_path}{$user->lang_name}/search_ignore_words.$phpEx")) - { - // include the file containing ignore words - include("{$user->lang_path}{$user->lang_name}/search_ignore_words.$phpEx"); - } - - $this->ignore_words = $words; - unset($words); - } - } - - /** - * Stores a list of synonyms that should be replaced in $this->match_synonym and $this->replace_synonym and caches them - */ - function get_synonyms() - { - if (!sizeof($this->match_synonym)) - { - global $user, $phpEx; - - $synonyms = array(); - - if (file_exists("{$user->lang_path}{$user->lang_name}/search_synonyms.$phpEx")) - { - // include the file containing synonyms - include("{$user->lang_path}{$user->lang_name}/search_synonyms.$phpEx"); - } - - $this->match_synonym = array_keys($synonyms); - $this->replace_synonym = array_values($synonyms); - - unset($synonyms); - } - } - - /** * Retrieves cached search results * * @param string $search_key an md5 string generated from all the passed search options to identify the results diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php index 8c273c342e..8d1c0fabfe 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -82,7 +82,7 @@ class factory implements \phpbb\textformatter\cache_interface 'flash' => '[FLASH={NUMBER1},{NUMBER2} width={NUMBER1;postFilter=#flashwidth} height={NUMBER2;postFilter=#flashheight} url={URL;useContent} /]', 'i' => '[I]{TEXT}[/I]', 'img' => '[IMG src={IMAGEURL;useContent}]', - 'list' => '[LIST type={HASHMAP=1:decimal,a:lower-alpha,A:upper-alpha,i:lower-roman,I:upper-roman;optional;postFilter=#simpletext}]{TEXT}[/LIST]', + 'list' => '[LIST type={HASHMAP=1:decimal,a:lower-alpha,A:upper-alpha,i:lower-roman,I:upper-roman;optional;postFilter=#simpletext} #createChild=LI]{TEXT}[/LIST]', 'li' => '[* $tagName=LI]{TEXT}[/*]', 'quote' => "[QUOTE diff --git a/phpBB/search.php b/phpBB/search.php index d9e5d0557a..3d8c05fed9 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -323,7 +323,10 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @var array ex_fid_ary Array of excluded forum ids * @var array author_id_ary Array of exclusive author ids * @var string search_id The id of the search request + * @var array id_ary Array of post or topic ids for search result + * @var string show_results 'posts' or 'topics' type of ids * @since 3.1.3-RC1 + * @changed 3.1.10-RC1 Added id_ary, show_results */ $vars = array( 'keywords', @@ -331,6 +334,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'ex_fid_ary', 'author_id_ary', 'search_id', + 'id_ary', + 'show_results', ); extract($phpbb_dispatcher->trigger_event('core.search_modify_param_before', compact($vars))); @@ -1252,6 +1257,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) } // Search forum +$rowset = array(); $s_forums = ''; $sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id, f.forum_password, f.enable_indexing, fa.user_id FROM ' . FORUMS_TABLE . ' f @@ -1260,11 +1266,27 @@ $sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f ORDER BY f.left_id ASC"; $result = $db->sql_query($sql); +while ($row = $db->sql_fetchrow($result)) +{ + $rowset[(int) $row['forum_id']] = $row; +} +$db->sql_freeresult($result); + $right = $cat_right = $padding_inc = 0; $padding = $forum_list = $holding = ''; $pad_store = array('0' => ''); -while ($row = $db->sql_fetchrow($result)) +/** +* Modify the forum select list for advanced search page +* +* @event core.search_modify_forum_select_list +* @var array rowset Array with the forums list data +* @since 3.1.10-RC1 +*/ +$vars = array('rowset'); +extract($phpbb_dispatcher->trigger_event('core.search_modify_forum_select_list', compact($vars))); + +foreach ($rowset as $row) { if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id'])) { @@ -1336,8 +1358,8 @@ if ($holding) $s_forums .= $holding; } -$db->sql_freeresult($result); unset($pad_store); +unset($rowset); if (!$s_forums) { diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 690c35ca7a..895ee49dc4 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.2.0-b3-dev -phpbb_version = 3.2.0-b3-dev +style_version = 3.2.0-RC1 +phpbb_version = 3.2.0-RC1 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html index ed68085484..f7874ab90b 100644 --- a/phpBB/styles/prosilver/template/mcp_approve.html +++ b/phpBB/styles/prosilver/template/mcp_approve.html @@ -39,7 +39,7 @@ <fieldset> <!-- IF S_NOTIFY_POSTER --> - <dl class="panel"> + <dl class="fields2 nobg"> <dt> </dt> <dd><label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd> </dl> diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index da0d3a4ddf..acef09dc47 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -62,7 +62,7 @@ <!-- ENDIF --> <!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE --> <a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF --> <br /> - + <!-- EVENT topiclist_row_topic_title_after --> <div class="responsive-show" style="display: none;"> <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « {topicrow.LAST_POST_TIME}<br /> diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html index 876829a088..45a9ae83bc 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -31,6 +31,8 @@ <!-- INCLUDE overall_header.html --> +<!-- EVENT mcp_move_before --> + <form id="confirm" action="{S_CONFIRM_ACTION}" method="post"> <div class="panel"> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index ea558fd7ae..8dc91555dc 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -134,6 +134,7 @@ </ul> </div> <!-- ENDIF --> + <!-- EVENT topiclist_row_topic_title_after --> <!-- EVENT topiclist_row_append --> </div> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 05f57ee8a6..446a9906dd 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -180,6 +180,7 @@ </a> <!-- ENDIF --> <br /> + <!-- EVENT topiclist_row_topic_title_after --> <!-- IF not S_IS_BOT --> <div class="responsive-show" style="display: none;"> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 7db5b8759c..812df396fa 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -495,6 +495,28 @@ if ($forum_data['forum_type'] == FORUM_POST) 'ORDER_BY' => 't.topic_time DESC', ); + + /** + * Event to modify the SQL query before the announcement topic ids data is retrieved + * + * @event core.viewforum_get_announcement_topic_ids_data + * @var array forum_data Data about the forum + * @var array g_forum_ary Global announcement forums array + * @var array sql_anounce_array SQL announcement array + * @var array sql_ary SQL query array to get the announcement topic ids data + * @var int forum_id The forum ID + * + * @since 3.1.10-RC1 + */ + $vars = array( + 'forum_data', + 'g_forum_ary', + 'sql_anounce_array', + 'sql_ary', + 'forum_id', + ); + extract($phpbb_dispatcher->trigger_event('core.viewforum_get_announcement_topic_ids_data', compact($vars))); + $sql = $db->sql_build_query('SELECT', $sql_ary); $result = $db->sql_query($sql); @@ -920,11 +942,15 @@ if (sizeof($topic_list)) * Modify the topic data before it is assigned to the template * * @event core.viewforum_modify_topicrow - * @var array row Array with topic data - * @var array topic_row Template array with topic data + * @var array row Array with topic data + * @var array topic_row Template array with topic data + * @var bool s_type_switch Flag indicating if the topic type is [global] announcement + * @var bool s_type_switch_test Flag indicating if the test topic type is [global] announcement * @since 3.1.0-a1 + * + * @changed 3.1.10-RC1 Added s_type_switch, s_type_switch_test */ - $vars = array('row', 'topic_row'); + $vars = array('row', 'topic_row', 's_type_switch', 's_type_switch_test'); extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_topicrow', compact($vars))); $template->assign_block_vars('topicrow', $topic_row); |