aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-291-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11259: [ticket/11259] htmlspecialchars($phpbb_admin_path) [ticket/11259] adm_relative_path -> phpbb_adm_relative_path [ticket/11259] Also make adm_relative_path available in the container [ticket/11259] Make phpbb_admin_path available everywhere Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| * [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-091-2/+2
| | | | | | | | PHPBB3-11259
* | [ticket/11015] Move comment in the right place.Oleg Pudeyev2012-12-131-7/+7
| | | | | | | | PHPBB3-11015
* | [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31Andreas Fischer2012-12-131-0/+9
| | | | | | | | PHPBB3-11015
* | [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.Oleg Pudeyev2012-12-131-5/+21
| | | | | | | | PHPBB3-11015
* | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-131-1/+99
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (101 commits) [ticket/10491] Make recreate_database static. [ticket/11088] Pass required objects in as arguments [ticket/11088] Globalize objects in new permission function [ticket/11088] Move permission creation to a function [ticket/11088] Copy a_styles permission for a_extensions [ticket/11088] Remove extraneous word from sentence in comment [ticket/11088] Changed "file extensions" to "attachment extensions" [ticket/11088] Fix the database updater to correctly manipulate the modules [ticket/11088] Put language pack module move below extension module creation [ticket/11088] Untested, progress on update script [ticket/11088] Fix typo (period instead of comma) [ticket/11088] Untested progress for update script [ticket/11088] Added missing comma [ticket/11088] Removed added space [ticket/11088] Move style, extension and language pack management to customise [ticket/11243] Show download all link on all pages of topic with attachments [feature/template-events] Pass arguments in correct order. [feature/template-events] Pass arguments in correct order. [ticket/10491] Install board once per test run. [ticket/11257] Do not require set_name() method to exist ...
| * Merge remote-tracking branch 'p/ticket/11095-develop' into developAndreas Fischer2012-12-081-1/+99
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11095-develop: [ticket/11095] Restore brace on previous line. [ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params. [ticket/11095] Forward GET parameters into hidden fields for jumpbox. [ticket/11095] Python quoteattr port. [ticket/11095] Use get method in jumpboxes.
| | * [ticket/11095] Restore brace on previous line.Oleg Pudeyev2012-11-291-2/+1
| | | | | | | | | | | | PHPBB3-11095
| | * [ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params.Oleg Pudeyev2012-11-291-0/+14
| | | | | | | | | | | | PHPBB3-11095
| | * [ticket/11095] Forward GET parameters into hidden fields for jumpbox.Oleg Pudeyev2012-11-291-2/+40
| | | | | | | | | | | | PHPBB3-11095
| | * [ticket/11095] Python quoteattr port.Oleg Pudeyev2012-11-291-0/+47
| | | | | | | | | | | | PHPBB3-11095
* | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-061-17/+101
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (196 commits) [ticket/11219] Coding guidelines and naming consistency changes [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP [ticket/11247] Fix wrong property reference in flock class. [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10103] New and improved wording. [ticket/10716] Only lint on php 5.3+. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. ... Conflicts: phpBB/includes/functions.php tests/cache/cache_test.php
| * | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-291-2/+2
| |\ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/11227] @return void -> @return null in develop-olympus.
| | * [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-291-2/+2
| | | | | | | | | | | | PHPBB3-11227
| * | Merge remote-tracking branch 'imkingdavid/feature/controller-new' into developIgor Wiedler2012-11-191-3/+62
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/feature/controller-new: (67 commits) [feature/controller] Fix misnamed route for functional test [feature/controller] Fix comments, check against more general HttpException [feature/controller] Check for proper status codes from controllers [feature/controller] Correctly create Symfony object from globals [feature/controller] Add documentation about input being HTML-escaped [feature/controller] Create Symfony Request in new function [feature/controller] Remove unused language strings [feature/controller] Don't use $user->lang() before container compilation [feature/controller] Update routing documentation for using query string [feature/controller] Remove now-unused code [feature/controller] Remove url rewriting until we use pathinfo in controllers [feature/controller] Fix functional tests to use query string for controllers [feature/controller] Allow injecting Symfony Request into controllers [feature/controller] Use query string, not path info, for controller access [feature/controller] Fix line endings and permissions, and check responses [feature/controller] Remove URL rewriting by default [feature/controller] Add controller functional test with template [feature/controller] Use warning instead of echo for copy() and unlink() [feature/controller] Flip method parameters, require $message [feature/controller] Rename $root_path class property to $phpbb_root_path ...
| | * | [feature/controller] Correctly create Symfony object from globalsDavid King2012-11-191-32/+38
| | | | | | | | | | | | | | | | PHPBB3-10864
| | * | [feature/controller] Add documentation about input being HTML-escapedDavid King2012-11-181-0/+3
| | | | | | | | | | | | | | | | PHPBB3-10864
| | * | [feature/controller] Create Symfony Request in new functionDavid King2012-11-181-0/+39
| | | | | | | | | | | | | | | | PHPBB3-10864
| | * | [feature/controller] Remove now-unused codeDavid King2012-11-181-4/+1
| | | | | | | | | | | | | | | | PHPBB3-10864
| | * | [feature/controller] Use query string, not path info, for controller accessDavid King2012-11-171-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is hopefully just temporary until we can fix the relative path issue. PHPBB3-10864
| | * | [feature/controller] Move new functions to their own fileDavid King2012-11-161-49/+0
| | | | | | | | | | | | | | | | PHPBB3-10864
| | * | [feature/controller] Use a dumped url matcher class to improve performanceDavid King2012-11-161-0/+52
| | | | | | | | | | | | | | | | PHPBB3-10864
| | * | [feature/controller] Implement a front controllerDavid King2012-11-161-5/+30
| | | | | | | | | | | | | | | | PHPBB3-10864
| * | | [ticket/11212] Cosmetic surgery done rightIgor Wiedler2012-11-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11212
| * | | [ticket/11212] CosmeticsIgor Wiedler2012-11-171-2/+3
| | | | | | | | | | | | | | | | PHPBB3-11212
| * | | [ticket/11212] Rename get_http_version to phpbb_request_http_version()Igor Wiedler2012-11-171-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11212
| * | | [ticket/11212] Allow dispatcher to be absent during garbage_collection()Igor Wiedler2012-11-171-1/+3
| | | | | | | | | | | | | | | | PHPBB3-11212
| * | | [ticket/11212] Do not rely on $request in send_status_line()Igor Wiedler2012-11-171-10/+25
| |/ / | | | | | | | | | PHPBB3-11212
| * | Merge PR #1074 branch 'develop-olympus' into developOleg Pudeyev2012-11-161-1/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11192] Merge dataProvider arrays because the test is the same now. [ticket/11192] Update $value parameter description to support other types. [ticket/11192] Mark negative byte numbers as unsupported. [ticket/11192] Test strings not converted to int/float before. [ticket/11192] Also test strings, e.g. sums returned by the database. [ticket/11192] Also test powers of 10 / 1000. [ticket/11192] Add tests. [ticket/11192] Add Tebibyte to get_formatted_filesize().
| | * [ticket/11192] Update $value parameter description to support other types.Andreas Fischer2012-11-161-1/+2
| | | | | | | | | | | | PHPBB3-11192
| | * [ticket/11192] Mark negative byte numbers as unsupported.Andreas Fischer2012-11-161-1/+1
| | | | | | | | | | | | PHPBB3-11192
| | * [ticket/11192] Add Tebibyte to get_formatted_filesize().Andreas Fischer2012-11-111-0/+6
| | | | | | | | | | | | PHPBB3-11192
* | | [ticket/11015] Include dbms name in exception message.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | PHPBB3-11015
* | | [ticket/11015] Make phpbb_convert_30_dbms_to_31 more future proofIgor Wiedler2012-11-171-3/+8
| | | | | | | | | | | | | | | | | | | | | It should allow any class name in the future, as long as that class exists. And it should give a useful error message otherwise. PHPBB3-11015
* | | [ticket/11015] Move db driver class name fixing to functionIgor Wiedler2012-11-171-0/+16
|/ / | | | | | | PHPBB3-11015
* | [ticket/11189] Replace DEBUG_EXTRA with DEBUGNathaniel Guse2012-11-101-3/+3
| | | | | | | | PHPBB3-11189
* | [ticket/11189] Always log critical errors when in cron or in image outputNathaniel Guse2012-11-101-1/+1
| | | | | | | | PHPBB3-11189
* | Merge PR #971 branch 'nickvergessen/ticket/11018' into developOleg Pudeyev2012-10-221-9/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11018: [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination [ticket/11014] Fix text for previous/next links in Subsilver2 [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 [ticket/11018] Always display previous/next links if we can display one [ticket/11014] Restore template vars for next/previous links [ticket/11018] Swap prev/next links on pagination to the old order [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same [ticket/11018] Fix minor issues with CSS in prosilver [ticket/11018] Attempt to fix li.pagination alignment issue
| * | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-171-1/+0
| | | | | | | | | | | | PHPBB3-11023
| * | [ticket/11014] Restore template vars for next/previous linksJoas Schilling2012-10-171-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were dropped while the function was refactored: If the block_var_name is a nested block, we will use the last (most inner) block as a prefix for the template variables. If the last block name is pagination, the prefix is empty. If the rest of the block_var_name is not empty, we will modify the last row of that block and add our pagination items. PHPBB3-11014
| * | [ticket/11018] Swap prev/next links on pagination to the old orderJoas Schilling2012-10-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the old pagination Prev was left of the pagination and Next right of the pagination. While moving these blocks, I also removed the whitespaces, which were introduced. PHPBB3-11023 PHPBB3-11018
* | | Merge remote-tracking branch 'EXreaction/ticket/8796' into developAndreas Fischer2012-10-181-18/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/8796: [ticket/8796] Prevent setting post_time greater than time() in markread [ticket/8796] Fix a few issues with the previous commits [ticket/8796] Mark read links updated to include time() in url [ticket/8796] Revert changes to $user->data['lastmark'] [ticket/8796] Make function markread obey the $post_time argument
| * | | [ticket/8796] Prevent setting post_time greater than time() in markreadNathan Guse2012-09-301-30/+30
| | | | | | | | | | | | | | | | PHPBB3-8796
| * | | [ticket/8796] Fix a few issues with the previous commitsNathaniel Guse2012-09-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix an SQL error and the redirect url generated PHPBB3-8796
| * | | [ticket/8796] Revert changes to $user->data['lastmark']Nathaniel Guse2012-09-031-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier change might change the way some things work (after looking at viewtopic) and I'd rather not risk introducing new bugs, so I'm going to revert those changes to be safe. PHPBB3-8796
| * | | [ticket/8796] Make function markread obey the $post_time argumentNathaniel Guse2012-09-031-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | Also do a little cleanup of the markread function PHPBB3-8796
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-181-0/+30
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly. Conflicts: phpBB/includes/functions.php
| * | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-171-1/+1
| | | | | | | | | | | | PHPBB3-10848
| * | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-171-0/+30
| | | | | | | | | | | | PHPBB3-10848
* | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/8713: [ticket/8713] Update untrimmed_variable() doc block. [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users. [ticket/8713] Trim password in auth_db to keep compatibility. [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. [ticket/8713] Rename untrimed_variable() to untrimmed_variable(). [ticket/8713] DRY: variable() and untrimed_variable() into a protected method. [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc. [ticket/8713] Always trim array keys. [ticket/8713] Add simple (non-nested) test case for untrimmed set_var(). [ticket/8713] Use \t in double quotes instead of tabs. [ticket/8713] Use correct parameter for nested data. [ticket/8713] Adjust test method name to other recursive_set_var() tests. [ticket/8713] Do not trim login inputs