* develop-olympus:
[ticket/9117] Wrong redirection after login.
[ticket/9772] Unify permissions for sending email when board_email_form is off
[ticket/7369] CPF date should always render the users selection.
[ticket/7296] Exporting styles to tar creates corrupted archives.
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
* develop-olympus:
[ticket/7260] Don't delete poll if one exists and editing user lacks permission
[ticket/9646] Honor CSS comments in @import statements
* develop-olympus: (57 commits)
Revert "[ticket/7716] Data too long for column 'message_subject'"
[ticket/7716] Data too long for column 'message_subject'
[ticket/9780] Adding unit tests for gen_rand_string().
[ticket/9780] Add length check back to gen_rand_string().
[ticket/7972] Copying topics in the MCP now indexes the new topic.
[ticket/9782] Board disable radio set on when server load high
[ticket/9635] Useless parameter $data['post_time'] in function submit_post.
[ticket/9104] Safari does not display box headers correctly in the ACP.
[ticket/9777] Print error message in pre-commit hook when php is not installed.
[ticket/7716] Data too long for column 'message_subject'
[task/git-tools] Ignore git commit message comments
[task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
[task/git-tools] Vastly expanded commit-msg hook.
[task/git-tools] Beginnings of a syntax checking hook.
[task/git-tools] Append ticket identifier to commit message prior to editing.
[ticket/7332] Redirect users back to post details when performing actions.
[ticket/7332] Collapse post details content down to a maximum of 300px heigh
[ticket/9771] Remove query string parameters that have no name.
[ticket/9760] Remove unrestricted wildcards from search terms.
[ticket/9599] Reimplement phpbb_checkdnsrr() function.
...
Conflicts:
tests/template/template.php
[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
When quoting from the topic-review the statement "Author wrote:" is missing. The fix for this was not complete: Now it's backwards compatibile and uses the LA_ for the language variables.
PHPBB3-9531
PHPBB3-9783
[ticket/9665] Allow preview of signature when it is the string "0".
Since only the SIGNATURE_PREVIEW parameter is evaluated in the templates
<!-- IF SIGNATURE_PREVIEW --> will not allow the signature to be "0".
<!-- IF SIGNATURE_PREVIEW != '' --> however does allow "0".
PHPBB3-9665
PHPBB3-9783
[ticket/9135] Fix report-icon for moderators in PM folders.
There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users.
PHPBB3-9135
PHPBB3-9783
* develop-olympus:
[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
[ticket/9012] Adjust shadow topic title to the title at the time it was moved.
Conflicts:
phpBB/styles/subsilver2/template/editor.js
phpBB/styles/subsilver2/template/posting_topic_review.html
phpBB/styles/subsilver2/template/ucp_pm_history.html
* develop-olympus:
[ticket/9637] Do not cache SQL server version in all cases
[ticket/9629] Allow style.php to retrieve its session ID from cookies
[ticket/9678] Flash attachments are not displayed in subsilver2.
[ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
[ticket/9650] Do not allow banning the anonymous user by username
Conflicts:
phpBB/styles/subsilver2/template/attachment.html
phpBB/styles/subsilver2/template/posting_buttons.html
* develop-olympus:
[ticket/9704] Fix minor typo in coding guidelines.
[ticket/9690] Add forthcoming Bing Bot to list of recognized bots
[ticket/9451] Add optional $can_upload parameter to avatar_process_user().
[ticket/9593] A readme file for unit tests and running unit tests.
[ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
[ticket/9589] Added sample nginx configuration file for phpbb.
* develop-olympus:
[ticket/9712] Future dates can be formatted as 'less than one minute ago'
[ticket/9659] Signature options in set_user_options
[ticket/9703] Correct database leak where deleting user did not rm some PM data
[ticket/9697] Backlink broken when the select parent forum does not exist.
[ticket/9695] Correct the improper display of user input in mcp_ban.php
[ticket/9628] _add_module 'after'-parameter does not work correctly.
[ticket/9578] ACP Posting tab is missing "Post settings" module.
The autoloader is registered in install without caching, since caching is set
up during installation. This provides the same functionality, performance is
not a concern during installation anyway.
In common.php the autoloader is instantiated after the cache is initialised and
is started with the standard cache backend used for other cached values.
A few places in the code using class_exists had to be updated to explicitly
avoid autoloading, since they are used to check whether a file needs to be
included which does not (yet) follow the naming scheme the autoloader follows.
PHPBB3-9682
phpBB class name lookups follow these rules:
- All classes are prefixed with phpbb_
- All classes reside in includes/ or a subdirectory thereof
- Directories must not contain underscores
- The class name is separated into parts by underscores, the parts
are checked from first to last, until one is found which is not
a directory, all remaining parts make up the file name. If no parts
are left, the last directory name is used.
Examples:
directory structure:
includes/
class_name.php
dir/
class_name.php
dir.php
subdir/
class_name.php
lookups:
phpbb_class_name -> includes/class_name.php
phpbb_dir_class_name -> includes/dir/class_name.php
phpbb_dir -> includes/dir/dir.php
phpbb_dir_subdir_class_name -> includes/dir/subdir/class_name.php
Optionally the class can be supplied with a cache instance, either in the
constructor or via set_cache() at a later time. This allows for the lookups to
be cached, so the directories do not have to be traveresed on every request.
This makes it necessary for the cache and its dependency to continue to be
loaded the old way - without autoloading.
The code will not be changed to use autoloading, but it will rather only be
used for new classes where applicable.
PHPBB3-9682
* task/coding-guidelines:
[task/coding-guidelines] Class member qualifier guidelines
[task/coding-guidelines] Added a section about class names.
[task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOF
- Class names need to be prefixed with phpbb_
- eval should not be used in any form
- there should be newlines at the end of file
- the closing php tag should be ommited
- array elements should always have a trailing comma
- the phpBB VCS is now git
- removed the coding guidelines changelog
PHPBB3-9557
* develop-olympus:
[ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
[ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
[ticket/9665] Allow preview of signature when it is the string "0".
[ticket/9112] Make sure current user can see most active forum/topic.
[ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
[ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
Conflicts:
phpBB/styles/subsilver2/template/ucp_profile_signature.html
phpBB/styles/subsilver2/template/viewtopic_body.html
* develop-olympus:
[ticket/9626] Adding tests for the URL regular expression.
[ticket/9626] Add missing class prefix.
[ticket/9626] A few tests for the email regular expression.
[ticket/9626] More IPv6 regex tests.
[ticket/9626] Adding tests for the IPv4 regular expression.
[ticket/9626] Adding tests for regular expressions.
* develop-olympus:
[feature/dbal-tests] Follow the coding guidelines and ...
[feature/dbal-tests] Update data
[feature/dbal-tests] Multi insert
[feature/dbal-tests] Delete data
[feature/dbal-tests] Insert data
[feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
[ticket/9587] Prosilver overrides reCaptcha class.
[ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
* develop-olympus:
[ticket/9094] Hide "Copy permissions" message, when permissions were copied.
[ticket/9135] Fix report-icon for moderators in PM folders.
[ticket/8936] Subsilver2 missing reply-to-all feature.
[ticket/7782] Return 404 HTTP status code for nonexistent attachments.
[ticket/7782] Added spaces.
[ticket/7782] Added phpdoc comment for send_status_line function.
[ticket/7782] Send status line using refactored download/file.php logic.
[ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
* develop-olympus: (21 commits)
[feature/notify_status] Define'd constants for notify_status
[ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
[ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
[ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
[ticket/9547] Use separate constants for display/enable active topics.
[ticket/9535] Also fix the margin in the install_update.html
[ticket/9535] Fix some more rtl margin issues.
[ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
[ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
[ticket/9510] Unable to copy permissions from and to forums you cannot see
[ticket/9510] Unable to copy permissions from and to forums you cannot see
[ticket/9545] Initial forum should display active topics by default.
[ticket/9546] Also delete bookmarks, when a topic is deleted.
[ticket/9529] Topic review is not showing all selected posts.
[ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
[ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
[ticket/9119] Respect language selection on automated update.
[ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
[ticket/9567] Newly registered users group description rewording.
...
Removed View Forum, View Topic, added pagination to forum and topic page
titles, also moved the Site Name to the end of title for forum and topic
view pages.
PHPBB3-9532
* develop-olympus:
[ticket/7717] Localise default extension groups for attachments
[ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or later. Change if block order to always call checkdnsrr() if the function is available.
[ticket/9173] No longer limit scope of numbers we store in the config table on
[ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
[ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists.
[ticket/9518] Correctly create new connection on PostgreSQL when new connection is forced.
[ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
[ticket/6726] Added localhost/127.0.0.1 note to database server hostname explanation in install language.
[feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer.
[feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded.
[ticket/9176] Take current board timezone settings into account when setting board date format.
* develop-olympus:
[ticket/9582] MSSQL native backups can now be restored.
[ticket/9582] Advanced search cannot be accessed using MSSQL native.
[ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native.
[ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.
[ticket/9582] Custom profile fields cannot be created under MSSQL native.
[ticket/9520] Additionally filter requests for {common,config}.php
[ticket/9520] New web.config file as suggested by Microsoft using request filter
[ticket/9520] Removed per directory web.config files.
[ticket/9520] Add suggested web.config for root files as suggested by Microsoft.
[ticket/9520] Add some default web.config files for IIS.
[develop-olympus] Basic gitignore file for cache files and backups.
[ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters.
[feature/webpi] Validate inline with MSSQL password policy.
* develop-olympus:
[git-tools] Use @ instead of : in sed command in pre-commit hook for wider compatibility.
[git-tools] Adjusted pre-commit hook to run under freebsd /bin/sh.
[git-tools] Changed pre-commit hook to use sh instead of bash
[feature/webpi] Web PI supports UNIX line endings so we'll remove them
[feature/webpi] Hopefully finally fix this
[feature/webpi] Fix messed up line endings
[feature/webpi] Add WebPI support to the build script.
[feature/webpi] Package files for Microsoft Web Platform Installer
[feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
[feature/dbal-tests] Fix mysql (not mysqli) dbal test.
* develop-olympus:
[bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)
[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)
[feature/unapproved-posts-in-feed] Little changelog correction
[feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
[feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed
[bug/58745] Correct changelog message
[bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)
[bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
[bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
[bug/59465] Remove start=0 from topic pagination links.
[bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
* develop-olympus: (26 commits)
[git-tools] add note about PHP_BIN using env
[git-tools] do not display stderr
[git-tools] Prepend the branch to the commit message for all branches.
[git-tools] Use env to find the correct paths to binaries.
[git-tools] Display what parse errors were found.
[git-tools] This script requires bash to run, so point directly to bash.
[feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
[feature/dbal-tests] Fix mysql (not mysqli) dbal test.
[feature/dbal-tests] Only output the missing config error message once.
[feature/dbal-tests] Make the PDO prefix depend on the dbms.
[feature/dbal-tests] Fix whitespace and line endings.
[bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425)
[bug/59425] Correctly check for double inclusion in captcha garbage collection
[bug/58465] The redirect hidden field is now XHTML conform
[feature/dbal-tests] Make some tests for build_array_data on SELECT
[feature/dbal-tests] Make some tests for return_on_error on SELECT-queries
[feature/dbal-tests] Tests for $db->sql_query_limit()
[feature/dbal-tests] Load phpbb-schema after creating the connection to the database
[feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.
[feature/dbal-tests] Added database test & refactored test framework
...
* develop-olympus:
[develop-olympus] Make this test run on windows with backslash-paths.
[bug/56965] Redirect fails with directory traversal
[bug/58685] Correct spelling errors in append_sid() comments.
[bug/58025] Search robots are now redirected if they send a SID in the request
* develop-olympus:
[feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes.
[feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
Allow setting parent forums regardless of permission settings. (Bug #58415)
The feature branch for the new template engine should probably
contain all the deleted tests as well. We should look into the
incompatibilities and try to stay backwards compatible.
