aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * shibulijack/ticket/10688: [ticket/10688] Update install.html for 3.1 and current practices. [ticket/10688] Update readme for 3.1 and current practices. [ticket/10688] Changed version 3.0 to 3.1 [ticket/10688] Updated version to 3.1 [ticket/10688] Changed 3.0 to 3.1 in docs Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * [ticket/10688] Updated version to 3.1Shibu Lijack2012-04-111-1/+1
| | | | | | | | | | | | Replace phpBB 3.0.x to phpBB 3.1.x PHPBB-10688
* | [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-111-3/+4
| | | | | | | | PHPBB3-10783
* | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-041-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10607] Added 'Powered by' translation string. Conflicts: phpBB/adm/index.php phpBB/language/en/common.php
| * | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | | Added POWERED_BY line to common.php and modified the templates to use it. PHPBB3-10607
* | | [ticket/10665] Solution for T_SUPER_TEMPLATE_PATHVjacheslav Trushkin2012-04-011-1/+1
| | | | | | | | | | | | | | | | | | Temporary solution for T_SUPER_TEMPLATE_PATH pointing to wrong directory, variable will be completely removed later because it will be obsolete PHPBB3-10665
* | | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | PHPBB-10609
* | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-311-9/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * | | [ticket/10328] Renamed the JSON class, also now using autoloading.Callum Macrae2012-03-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is no longer static, and uses autoloading. It has also been renamed from JSON to phpbb_json_response. PHPBB3-10328
| * | | [ticket/10328] Added a JSON class.Callum Macrae2012-03-311-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The JSON class adds a consistent way to send JSON to the client, making it perfect for AJAX (jQuery automatically parses it). PHPBB3-10328
| * | | [ticket/10271] Changed AJAX functions to $request->is_ajax().Callum Macrae2012-03-311-6/+6
| | | | | | | | | | | | | | | | PHPBB3-10271
| * | | [ticket/10270] Added JavaScript popups and basic AJAX functionality to PHP.Callum Macrae2012-03-311-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the phpbb object (JavaScript), and alert and confirm box methods. It also adds the first basic AJAX functionality, to deleting posts in viewtopic. PHPBB3-10270
| * | | [feature/event-dispatcher] Update core.page_header eventMichael Cullum2012-03-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update it to the new correct format. PHPBB3-9550
| * | | [feature/event-dispatcher] Implement mutation for page_header ledge.Oleg Pudeyev2012-03-181-2/+3
| | | | | | | | | | | | | | | | PHPBB3-9550
| * | | Merge branch 'develop' into feature/event-dispatcherIgor Wiedler2012-03-111-2/+19
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (95 commits) [ticket/9084] Explain the logic. [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count [ticket/9813] Only get posts table row count if we detected a fulltext index. [feature/append_var] Adding test case [ticket/7432] Delete redundant reference to "appropriate menu item". [ticket/10618] Change phpBB 3 to phpBB 3.1. [ticket/10685] Refactor template test defaults for php 5.4 compatibility. [feature/append_var] Adding append_var template class function [ticket/9813] Also use estimated row count of posts table for fulltext mysql. [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1. [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count(). [ticket/10653] Add ability to count table rows to database abstraction layer. [ticket/9813] Use table status row count only if greater than 100000 or exact. [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL. [ticket/8652] Comment for also updating forum watch table in user_notification. [ticket/8652] Sending 2 emails on 2 replies [ticket/10680] Add /phpBB/ext/* to .gitignore [ticket/10672] Fix total post count language string in statistics and feed [ticket/9220] Remove margin on table.table1 so it's centered in the blue box. [ticket/10453] Fixing spacing ... Conflicts: tests/bootstrap.php
| * | | [feature/event-dispatcher] Prefix event name with 'core.'Igor Wiedler2012-01-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9550
| * | | [feature/event-dispatcher] Support setting data on an eventIgor Wiedler2012-01-071-1/+2
| | | | | | | | | | | | | | | | PHPBB3-9550
| * | | [feature/event-dispatcher] Add a sample hook in page_headerIgor Wiedler2012-01-071-0/+4
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | [feature/merging-style-components] Updating PHP filesVjacheslav Trushkin2012-03-141-11/+11
| |/ / |/| | | | | | | | | | | | | | Removing theme and template entries in all files, except for acp styles section PHPBB3-10632
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-111-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | * develop-olympus: [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header().
| * | [ticket/10606] Fix incorrect hidden fields array name in page_header().James King2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649. PHPBB3-10606
* | | Merge branch 'develop-olympus' into developIgor Wiedler2012-02-071-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles
| * | [ticket/10616] Ignore template inheritance that points to selfVjacheslav Trushkin2012-02-031-0/+5
| | | | | | | | | | | | | | | | | | Ignore template inheritance if it points to self PHPBB3-10616
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-121-1/+13
|\ \ \ | |/ / | | / | |/ |/| | | * develop-olympus: [ticket/9079] Always log backtrace to error log when logging errors. [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
| * [ticket/9079] Always log backtrace to error log when logging errors.Oleg Pudeyev2011-12-241-4/+9
| | | | | | | | PHPBB3-9079
| * [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errorsAndreas Fischer2011-12-241-0/+7
| | | | | | | | PHPBB3-9079
| * Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympusOleg Pudeyev2011-12-221-10/+10
| |\ | | | | | | | | | | | | | | | * cyberalien/ticket/10399: [ticket/10399] Correctly encoding template component urls (3.0) [ticket/10399] Correctly encoding template component urls (3.0)
| | * [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-011-10/+10
| | | | | | | | | | | | | | | | | | Correctly encoding template component urls PHPBB3-10399
* | | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-021-2/+1
|\ \ \ | | | | | | | | | | | | | | | | * unknownbliss/ticket/9916: [ticket/9916] Updating header license and removing Version $Id$
| * | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | | | | | | | | | PHPBB3-9916
* | | | Merge remote-tracking branch 'cyberalien/ticket/develop/10399' into developOleg Pudeyev2011-12-221-7/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * cyberalien/ticket/develop/10399: [ticket/10399] Correctly encoding template component urls (3.1)
| * | | [ticket/10399] Correctly encoding template component urls (3.1)Vjacheslav Trushkin2011-12-011-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Correctly encoding template component urls PHPBB3-10399
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-12-091-1/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10319] Missing hidden fields in search form
| * | | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Missing hidden fields in search form (bug added in 3.0.9) PHPBB3-10319
* | | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into developOleg Pudeyev2011-12-031-49/+185
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/develop/10345: (21 commits) [ticket/10345] Check directly whether the key to use exists [ticket/10345] Return the language key when the key has an empty array [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form [ticket/10345] Remove doubled check for valid plural rule [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes [ticket/10345] Fix parsing error in language/en/viewtopic.php [ticket/10345] Move rule determination code into a new function [ticket/10345] Fix little type in unit test [ticket/10345] Remove more useless 0-cases [ticket/10345] Make the use of the 0-case optional [ticket/10345] Remove some unused 0 cases [ticket/10345] Fix some last use cases of sprintf() to use $user->lang() [ticket/10345] Add tests for array() as first parameter on call to $user->lang() [ticket/10345] Fix some documentation issues. [ticket/10345] Allow float as array key and add some tests [ticket/10345] Use the plural function in some more places. [ticket/10345] Make use of the plural function in some basic places [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules [ticket/10345] Fix documentation on the new function and the switch ...
| * | | | [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_formJoas Schilling2011-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The numbers are floored by casting to int. PHPBB3-10345
| * | | | [ticket/10345] Move rule determination code into a new functionJoas Schilling2011-11-251-0/+172
| | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-49/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-10345
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-5/+5
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * develop-olympus: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| * | | [ticket/10497] Fix SQL error when guest visits forum with unread topicrxu2011-11-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from the ticket PHPBB3-9008 fix. When topic marking was enabled for guests, and a guest visited a forum with a new topic which is marked unread, the built SQL missed an alias for a TOPICS_TABLE which resulted in the following error: Unknown column 't.topic_approved' in 'where clause' [1054] The fix is to add an alias for the table. PHPBB3-10497 PHPBB3-9008
* | | | Merge branch 'develop-olympus' into developJoas Schilling2011-11-181-3/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| * | | Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympusJoas Schilling2011-11-181-3/+9
| |\ \ \
| | * | | [ticket/9008] Incorrect unread topic tracking for unapproved topicsrxu2011-09-251-3/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9008
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/9066] Disallow some database prefix to prevent same errors and problems
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-141-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9066: [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/9066] Disallow some database prefix to prevent same errors and problems
| | * | | | [ticket/9066] Move regex into get_preg_expression function and add testsJoas Schilling2011-11-141-0/+4
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-9066
* | | | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-201-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/10390: [ticket/10390] Revert back to escaped script tags inside document.write [ticket/10390] Fix wording: fallback should be fall back [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback [ticket/10390] Drop http protocol for Microsoft's CDN option [ticket/10390] Reword the language for jQuery host/server options [ticket/10390] Fix a type-o - captialize AJAX [ticket/10390] Improve the jQuery CDN url generation function [ticket/10390] Move jQuery version definition [ticket/10390] Allow option for jQuery to be hosted by a remote CDN Conflicts: phpBB/install/database_update.php
| * | | | | [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACPMatt Friedman2011-09-271-33/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jQuery will now be available via remote CDN from Google. Microsoft and jQuery CDNs have been removed, so we can simplify this option for the user. Default mode is NO so the copy of jQuery included with phpBB is served by default. PHPBB3-10390
| * | | | | [ticket/10390] Drop http protocol for Microsoft's CDN optionMatt Friedman2011-09-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like Google, Microsoft supports both http and https protocols, so we can drop the protocol alltogether from the url so the Microsoft CDN will work on both HTTP or HTTPS sites without issue. Also I cleaned up some of the comments here. PHPBB3-10390
| * | | | | [ticket/10390] Improve the jQuery CDN url generation functionMatt Friedman2011-09-261-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per p's comments, return the remote url from a variable instead of using multiple returns. Also put the logic for creating Google's version on its own line, and count the version number's dots instead of length so it will be less likely to break if jQuery goes to version 1.10. PHPBB3-10390
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-11 06:16:32 +0000