/installer/3/el/common/jquery/treeview/images/

mary='commit info' class='commit-info'> authorMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200 committerMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200 commit6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch) tree116d2565ac02c40abe0548863c6badf8ec3e1d1e parent8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)parent8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)downloadforums-master.tar
forums-master.tar.gz
forums-master.tar.bz2
forums-master.tar.xz
forums-master.zip
Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster
Diffstat
-rw-r--r--.appveyor.yml13
-rw-r--r--.github/CONTRIBUTING.md2
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md6
-rw-r--r--.gitignore4
-rw-r--r--.travis.yml32
-rw-r--r--build/build.xml38
-rw-r--r--build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php61
-rw-r--r--build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php9
-rw-r--r--build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php9
-rw-r--r--build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php17
-rw-r--r--build/sami-all.conf.php1
-rw-r--r--build/sami-checkout.conf.php2
-rw-r--r--phpBB/.htaccess7
-rw-r--r--phpBB/adm/images/phpbb_logo.svg6
-rw-r--r--phpBB/adm/index.php1
-rw-r--r--phpBB/adm/style/acp_avatar_options_upload.html2
-rw-r--r--phpBB/adm/style/acp_contact.html2
-rw-r--r--phpBB/adm/style/acp_ext_actions.html7
-rw-r--r--phpBB/adm/style/acp_ext_delete_data.html40
-rw-r--r--phpBB/adm/style/acp_ext_disable.html34
-rw-r--r--phpBB/adm/style/acp_ext_enable.html40
-rw-r--r--phpBB/adm/style/acp_ext_list.html21
-rw-r--r--phpBB/adm/style/acp_forums.html5
-rw-r--r--phpBB/adm/style/acp_groups.html2
-rw-r--r--phpBB/adm/style/acp_help_phpbb.html10
-rw-r--r--phpBB/adm/style/acp_language.html2
-rw-r--r--phpBB/adm/style/acp_main.html193
-rw-r--r--phpBB/adm/style/acp_styles.html2
-rw-r--r--phpBB/adm/style/acp_users_signature.html2
-rw-r--r--phpBB/adm/style/admin.css24
-rw-r--r--phpBB/adm/style/admin.js58
-rw-r--r--phpBB/adm/style/ajax.js34
-rw-r--r--phpBB/adm/style/captcha_recaptcha.html3
-rw-r--r--phpBB/adm/style/installer_footer.html2
-rw-r--r--phpBB/adm/style/overall_footer.html2
-rw-r--r--phpBB/adm/style/permission_forum_copy.html2
-rw-r--r--phpBB/adm/style/simple_footer.html2
-rw-r--r--phpBB/assets/cookieconsent/cookieconsent.min.css12
-rw-r--r--phpBB/assets/cookieconsent/cookieconsent.min.js2
-rw-r--r--phpBB/assets/javascript/core.js153
-rw-r--r--phpBB/assets/javascript/jquery-3.4.1.min.js2
-rw-r--r--phpBB/assets/javascript/jquery.min.js5
-rw-r--r--phpBB/common.php4
-rw-r--r--phpBB/composer.json65
-rw-r--r--phpBB/composer.lock2279
-rw-r--r--phpBB/config/default/container/parameters.yml2
-rw-r--r--phpBB/config/default/container/services.yml1
-rw-r--r--phpBB/config/default/container/services_auth.yml22
-rw-r--r--phpBB/config/default/container/services_console.yml8
-rw-r--r--phpBB/config/default/container/services_cron.yml13
-rw-r--r--phpBB/config/default/container/services_password.yml20
-rw-r--r--phpBB/config/default/container/services_routing.yml2
-rw-r--r--phpBB/config/default/container/services_text_formatter.yml5
-rw-r--r--phpBB/config/default/container/services_twig.yml18
-rw-r--r--phpBB/config/default/container/services_ucp.yml17
-rw-r--r--phpBB/config/default/routing/cron.yml3
-rw-r--r--phpBB/config/default/routing/routing.yml8
-rw-r--r--phpBB/config/default/routing/ucp.yml7
-rw-r--r--phpBB/config/development/config.yml8
-rw-r--r--phpBB/config/test/config.yml1
-rw-r--r--phpBB/cron.php67
-rw-r--r--phpBB/develop/add_permissions.php9
-rw-r--r--phpBB/develop/calc_email_hash.php74
-rw-r--r--phpBB/develop/create_schema_files.php1
-rw-r--r--phpBB/develop/mysql_upgrader.php212
-rw-r--r--phpBB/develop/regex.php40
-rw-r--r--phpBB/develop/regex_idn.php41
-rw-r--r--phpBB/develop/update_email_hash.php56
-rw-r--r--phpBB/docs/CHANGELOG.html218
-rw-r--r--phpBB/docs/CREDITS.txt6
-rw-r--r--phpBB/docs/FAQ.html12
-rw-r--r--phpBB/docs/INSTALL.html68
-rw-r--r--phpBB/docs/README.html26
-rw-r--r--phpBB/docs/assets/css/stylesheet.css24
-rw-r--r--phpBB/docs/assets/images/site_logo.gifbin5070 -> 0 bytes
-rw-r--r--phpBB/docs/assets/images/site_logo.svg6
-rw-r--r--phpBB/docs/auth_api.html2
-rw-r--r--phpBB/docs/coding-guidelines.html32
-rw-r--r--phpBB/download/file.php5
-rw-r--r--phpBB/feed.php6
-rwxr-xr-x[-rw-r--r--]phpBB/files/.htaccess0
-rwxr-xr-x[-rw-r--r--]phpBB/files/index.htm0
-rwxr-xr-x[-rw-r--r--]phpBB/images/avatars/upload/.htaccess0
-rwxr-xr-x[-rw-r--r--]phpBB/images/avatars/upload/index.htm0
-rw-r--r--phpBB/images/upload_icons/flash.gifbin254 -> 0 bytes
-rw-r--r--phpBB/includes/acp/acp_attachments.php2
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php183
-rw-r--r--phpBB/includes/acp/acp_board.php63
-rw-r--r--phpBB/includes/acp/acp_database.php2
-rw-r--r--phpBB/includes/acp/acp_extensions.php202
-rw-r--r--phpBB/includes/acp/acp_forums.php14
-rw-r--r--phpBB/includes/acp/acp_help_phpbb.php11
-rw-r--r--phpBB/includes/acp/acp_main.php2
-rw-r--r--phpBB/includes/acp/acp_permissions.php4
-rw-r--r--phpBB/includes/acp/acp_reasons.php2
-rw-r--r--phpBB/includes/acp/acp_users.php11
-rw-r--r--phpBB/includes/acp/auth.php21
-rw-r--r--phpBB/includes/bbcode.php2
-rw-r--r--phpBB/includes/compatibility_globals.php8
-rw-r--r--phpBB/includes/constants.php6
-rw-r--r--phpBB/includes/diff/engine.php6
-rw-r--r--phpBB/includes/functions.php391
-rw-r--r--phpBB/includes/functions_acp.php2
-rw-r--r--phpBB/includes/functions_admin.php45
-rw-r--r--phpBB/includes/functions_compatibility.php190
-rw-r--r--phpBB/includes/functions_compress.php4
-rw-r--r--phpBB/includes/functions_content.php20
-rw-r--r--phpBB/includes/functions_convert.php18
-rw-r--r--phpBB/includes/functions_display.php44
-rw-r--r--phpBB/includes/functions_download.php26
-rw-r--r--phpBB/includes/functions_module.php12
-rw-r--r--phpBB/includes/functions_posting.php34
-rw-r--r--phpBB/includes/functions_transfer.php4
-rw-r--r--phpBB/includes/functions_user.php14
-rw-r--r--phpBB/includes/mcp/mcp_logs.php2
-rw-r--r--phpBB/includes/mcp/mcp_notes.php2
-rw-r--r--phpBB/includes/mcp/mcp_topic.php4
-rw-r--r--phpBB/includes/mcp/mcp_warn.php2
-rw-r--r--phpBB/includes/message_parser.php3
-rw-r--r--phpBB/includes/questionnaire/questionnaire.php8
-rw-r--r--phpBB/includes/startup.php6
-rw-r--r--phpBB/includes/ucp/ucp_groups.php16
-rw-r--r--phpBB/includes/ucp/ucp_profile.php7
-rw-r--r--phpBB/includes/ucp/ucp_register.php34
-rw-r--r--phpBB/includes/ucp/ucp_remind.php174
-rw-r--r--phpBB/includes/ucp/ucp_resend.php2
-rw-r--r--phpBB/index.php5
-rw-r--r--phpBB/install/app.php4
-rw-r--r--phpBB/install/convert/convertor.php23
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php3
-rw-r--r--phpBB/install/convertors/functions_phpbb20.php26
-rwxr-xr-xphpBB/install/phpbbcli.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql20
-rw-r--r--phpBB/install/startup.php1
-rw-r--r--phpBB/language/en/acp/attachments.php2
-rw-r--r--phpBB/language/en/acp/board.php4
-rw-r--r--phpBB/language/en/acp/common.php12
-rw-r--r--phpBB/language/en/acp/forums.php2
-rw-r--r--phpBB/language/en/acp/permissions.php2
-rw-r--r--phpBB/language/en/acp/posting.php3
-rw-r--r--phpBB/language/en/captcha_recaptcha.php10
-rw-r--r--phpBB/language/en/cli.php3
-rw-r--r--phpBB/language/en/common.php17
-rw-r--r--phpBB/language/en/email/user_activate_passwd.txt17
-rw-r--r--phpBB/language/en/email/user_forgot_password.txt13
-rw-r--r--phpBB/language/en/install.php13
-rw-r--r--phpBB/language/en/migrator.php2
-rw-r--r--phpBB/language/en/posting.php1
-rw-r--r--phpBB/language/en/ucp.php19
-rw-r--r--phpBB/mcp.php7
-rw-r--r--phpBB/memberlist.php73
-rw-r--r--phpBB/phpbb/auth/provider/apache.php75
-rw-r--r--phpBB/phpbb/auth/provider/base.php2
-rw-r--r--phpBB/phpbb/auth/provider/db.php61
-rw-r--r--phpBB/phpbb/auth/provider/ldap.php53
-rw-r--r--phpBB/phpbb/auth/provider/oauth/oauth.php966
-rw-r--r--phpBB/phpbb/auth/provider/oauth/service/base.php62
-rw-r--r--phpBB/phpbb/auth/provider/oauth/service/bitly.php107
-rw-r--r--phpBB/phpbb/auth/provider/oauth/service/facebook.php99
-rw-r--r--phpBB/phpbb/auth/provider/oauth/service/google.php107
-rw-r--r--phpBB/phpbb/auth/provider/oauth/service/service_interface.php112
-rw-r--r--phpBB/phpbb/auth/provider/oauth/service/twitter.php113
-rw-r--r--phpBB/phpbb/auth/provider/oauth/token_storage.php346
-rw-r--r--phpBB/phpbb/auth/provider/provider_interface.php4
-rw-r--r--phpBB/phpbb/avatar/driver/upload.php1
-rw-r--r--phpBB/phpbb/cache/driver/apc.php70
-rw-r--r--phpBB/phpbb/cache/driver/eaccelerator.php107
-rw-r--r--phpBB/phpbb/cache/driver/memcache.php122
-rw-r--r--phpBB/phpbb/cache/driver/memcached.php22
-rw-r--r--phpBB/phpbb/cache/driver/memory.php2
-rw-r--r--phpBB/phpbb/cache/driver/xcache.php107
-rw-r--r--phpBB/phpbb/captcha/non_gd.php6
-rw-r--r--phpBB/phpbb/class_loader.php2
-rw-r--r--phpBB/phpbb/config/config.php19
-rw-r--r--phpBB/phpbb/config_php_file.php6
-rw-r--r--phpBB/phpbb/console/command/cron/run.php6
-rw-r--r--phpBB/phpbb/console/command/extension/enable.php6
-rw-r--r--phpBB/phpbb/console/command/fixup/recalculate_email_hash.php76
-rw-r--r--phpBB/phpbb/console/command/update/check.php3
-rw-r--r--phpBB/phpbb/console/command/user/add.php2
-rw-r--r--phpBB/phpbb/content_visibility.php22
-rw-r--r--phpBB/phpbb/controller/helper.php2
-rw-r--r--phpBB/phpbb/cron/controller/cron.php40
-rw-r--r--phpBB/phpbb/cron/event/cron_runner_listener.php103
-rw-r--r--phpBB/phpbb/cron/manager.php21
-rw-r--r--phpBB/phpbb/cron/task/core/update_hashes.php2
-rw-r--r--phpBB/phpbb/cron/task/wrapper.php47
-rw-r--r--phpBB/phpbb/db/driver/driver.php28
-rw-r--r--phpBB/phpbb/db/driver/driver_interface.php14
-rw-r--r--phpBB/phpbb/db/driver/factory.php16
-rw-r--r--phpBB/phpbb/db/driver/mssql_odbc.php11
-rw-r--r--phpBB/phpbb/db/driver/mssqlnative.php11
-rw-r--r--phpBB/phpbb/db/driver/mysql.php503
-rw-r--r--phpBB/phpbb/db/driver/mysqli.php13
-rw-r--r--phpBB/phpbb/db/driver/oracle.php11
-rw-r--r--phpBB/phpbb/db/driver/postgres.php11
-rw-r--r--phpBB/phpbb/db/driver/sqlite3.php11
-rw-r--r--phpBB/phpbb/db/extractor/mysql_extractor.php106
-rw-r--r--phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php2
-rw-r--r--phpBB/phpbb/db/migration/data/v310/softdelete_p1.php2
-rw-r--r--phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php34
-rw-r--r--phpBB/phpbb/db/migration/data/v330/dev.php36
-rw-r--r--phpBB/phpbb/db/migration/data/v330/forums_legend_limit.php49
-rw-r--r--phpBB/phpbb/db/migration/data/v330/jquery_update.php37
-rw-r--r--phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php89
-rw-r--r--phpBB/phpbb/db/migration/data/v330/remove_email_hash.php62
-rw-r--r--phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php43
-rw-r--r--phpBB/phpbb/db/migration/data/v330/reset_password.php48
-rw-r--r--phpBB/phpbb/db/migration/data/v330/v330.php37
-rw-r--r--phpBB/phpbb/db/migration/data/v330/v330b1.php41
-rw-r--r--phpBB/phpbb/db/migration/data/v330/v330b2.php39
-rw-r--r--phpBB/phpbb/db/migration/data/v330/v330rc1.php36
-rw-r--r--phpBB/phpbb/db/migration/tool/module.php2
-rw-r--r--phpBB/phpbb/db/migrator.php2
-rw-r--r--phpBB/phpbb/db/tools/mssql.php2
-rw-r--r--phpBB/phpbb/db/tools/postgres.php2
-rw-r--r--phpBB/phpbb/db/tools/tools.php87
-rw-r--r--phpBB/phpbb/di/container_builder.php9
-rw-r--r--phpBB/phpbb/di/extension/container_configuration.php11
-rw-r--r--phpBB/phpbb/di/extension/core.php8
-rw-r--r--phpBB/phpbb/di/extension/tables.php59
-rw-r--r--phpBB/phpbb/di/service_collection.php50
-rw-r--r--phpBB/phpbb/extension/extension_interface.php3
-rw-r--r--phpBB/phpbb/extension/manager.php150
-rw-r--r--phpBB/phpbb/feed/controller/feed.php7
-rw-r--r--phpBB/phpbb/feed/topics_active.php2
-rw-r--r--phpBB/phpbb/files/filespec.php2
-rw-r--r--phpBB/phpbb/filesystem.php2
-rw-r--r--phpBB/phpbb/filesystem/filesystem.php24
-rw-r--r--phpBB/phpbb/filesystem/filesystem_interface.php2
-rw-r--r--phpBB/phpbb/finder.php4
-rw-r--r--phpBB/phpbb/help/controller/bbcode.php5
-rw-r--r--phpBB/phpbb/help/controller/faq.php5
-rw-r--r--phpBB/phpbb/install/controller/helper.php2
-rw-r--r--phpBB/phpbb/install/helper/container_factory.php2
-rw-r--r--phpBB/phpbb/install/helper/database.php18
-rw-r--r--phpBB/phpbb/install/helper/iohandler/iohandler_interface.php2
-rw-r--r--phpBB/phpbb/install/installer_configuration.php9
-rw-r--r--phpBB/phpbb/install/module/install_database/task/add_config_settings.php1
-rw-r--r--phpBB/phpbb/install/module/install_database/task/create_schema.php9
-rw-r--r--phpBB/phpbb/install/module/install_database/task/set_up_database.php9
-rw-r--r--phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php3
-rw-r--r--phpBB/phpbb/install/module/requirements/task/check_server_environment.php4
-rw-r--r--phpBB/phpbb/install/module_base.php2
-rw-r--r--phpBB/phpbb/language/language_file_loader.php1
-rw-r--r--phpBB/phpbb/lock/db.php7
-rw-r--r--phpBB/phpbb/lock/flock.php5
-rw-r--r--phpBB/phpbb/mimetype/guesser.php2
-rw-r--r--phpBB/phpbb/notification/type/approve_post.php7
-rw-r--r--phpBB/phpbb/notification/type/approve_topic.php7
-rw-r--r--phpBB/phpbb/notification/type/base.php4
-rw-r--r--phpBB/phpbb/notification/type/post.php2
-rw-r--r--phpBB/phpbb/notification/type/topic.php2
-rw-r--r--phpBB/phpbb/notification/type/type_interface.php2
-rw-r--r--phpBB/phpbb/passwords/driver/argon2i.php78
-rw-r--r--phpBB/phpbb/passwords/driver/argon2id.php (renamed from phpBB/phpbb/db/tools.php)22
-rw-r--r--phpBB/phpbb/passwords/driver/base_native.php75
-rw-r--r--phpBB/phpbb/passwords/manager.php2
-rw-r--r--phpBB/phpbb/plupload/plupload.php2
-rw-r--r--phpBB/phpbb/report/report_handler.php2
-rw-r--r--phpBB/phpbb/request/request.php8
-rw-r--r--phpBB/phpbb/request/request_interface.php4
-rw-r--r--phpBB/phpbb/request/type_cast_helper.php3
-rw-r--r--phpBB/phpbb/search/fulltext_mysql.php25
-rw-r--r--phpBB/phpbb/search/fulltext_native.php12
-rw-r--r--phpBB/phpbb/search/fulltext_postgres.php2
-rw-r--r--phpBB/phpbb/search/fulltext_sphinx.php8
-rw-r--r--phpBB/phpbb/session.php185
-rw-r--r--phpBB/phpbb/template/asset.php7
-rw-r--r--phpBB/phpbb/template/context.php4
-rw-r--r--phpBB/phpbb/template/template.php2
-rw-r--r--phpBB/phpbb/template/twig/extension.php30
-rw-r--r--phpBB/phpbb/template/twig/extension/avatar.php80
-rw-r--r--phpBB/phpbb/template/twig/extension/config.php64
-rw-r--r--phpBB/phpbb/template/twig/extension/username.php84
-rw-r--r--phpBB/phpbb/template/twig/lexer.php16
-rw-r--r--phpBB/phpbb/template/twig/loader.php8
-rw-r--r--phpBB/phpbb/template/twig/node/definenode.php2
-rw-r--r--phpBB/phpbb/template/twig/node/includeasset.php20
-rw-r--r--phpBB/phpbb/template/twig/node/includephp.php6
-