aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-261-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to the ACP so admins can choose to host jQuery from the local version shipped with phpBB, or via a popular CDN. PHPBB3-10390
* | | | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usageNils Adermann2011-10-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10412
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-131-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | Conflicts: phpBB/includes/functions.php
| * | | | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Fixing inconsistency in code generated by generate_pagination() PHPBB3-10397
* | | | [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.Chris Smith2011-09-251-0/+1
| |/ / |/| | | | | | | | PHPBB3-10387
* | | [feature/remove-db-styles] Removed style.php!Chris Smith2011-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Finally sanity has arrived! No more delivering CSS through PHP. Better 3 years late than never. PHPBB3-9741
* | | [feature/remove-db-styles] Remove style.php DB storage.Chris Smith2011-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed all use of the DB for serving/caching the theme from style.php, acp_style no longer stores the theme modified time either. As a consequence currently all stylesheets will be served through style.php (with no caching) until imagesets are removed [PHPBB3-10336], then they can we served as static files by HTTPd. PHPBB3-9741
* | | [ticket/10371] Removing last mentions of imagesetVjacheslav Trushkin2011-09-201-4/+1
| | | | | | | | | | | | | | | | | | Removing last mentions of imageset PHPBB3-10371
* | | Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' ↵Nils Adermann2011-09-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * github-cyberalien/feature/remove-imagesets: [feature/remove-imagesets] Script for converting imageset to css [feature/remove-imagesets] Changing subsilver [feature/remove-imagesets] Changing prosilver [feature/remove-imagesets] Adjustments to php files [feature/remove-imagesets] Changing admin control panel styles module [feature/remove-imagesets] Changing database structure [feature/remove-imagesets] Removing imageset files [feature/remove-imagesets] Moving images
| * | | [feature/remove-imagesets] Adjustments to php filesVjacheslav Trushkin2011-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Adjustments to php files PHPBB3-10336
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-09-191-37/+20
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10370] Add function documentation for get_stacktrace(). [ticket/10370] Explain that we are not the ones hiding backtrace pieces. [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path(). [ticket/10370] Add require_once to whitelisted functions. [ticket/10370] Use single string instead of an array for arguments. [ticket/10370] Ease up code checking for arguments of include etc. [ticket/10370] Use unset() on the first backtrace instead of checking in loop. [ticket/10370] Use phpbb_filter_root_path() in get_backtrace().
| * | | [ticket/10370] Add function documentation for get_stacktrace().Andreas Fischer2011-09-191-1/+6
| | | | | | | | | | | | | | | | PHPBB3-10370
| * | | [ticket/10370] Explain that we are not the ones hiding backtrace pieces.Andreas Fischer2011-09-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d. PHPBB3-10370
| * | | [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path().Andreas Fischer2011-09-191-2/+1
| | | | | | | | | | | | | | | | PHPBB3-10370
| * | | [ticket/10370] Add require_once to whitelisted functions.Andreas Fischer2011-09-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10370
| * | | [ticket/10370] Use single string instead of an array for arguments.Andreas Fischer2011-09-191-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10370
| * | | [ticket/10370] Ease up code checking for arguments of include etc.Andreas Fischer2011-09-191-14/+7
| | | | | | | | | | | | | | | | PHPBB3-10370
| * | | [ticket/10370] Use unset() on the first backtrace instead of checking in loop.Andreas Fischer2011-09-191-7/+4
| | | | | | | | | | | | | | | | PHPBB3-10370
| * | | [ticket/10370] Use phpbb_filter_root_path() in get_backtrace().Andreas Fischer2011-09-191-14/+2
| | | | | | | | | | | | | | | | PHPBB3-10370
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-09-181-3/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10369] Replace root path with "[ROOT]" as per IRC. [ticket/10369] Add warning about paths outside of phpBB root not being filtered [ticket/10369] Rename filter_errfile() to filter_root_path(). [ticket/10369] DRY code to remove phpbb path from errfile. [ticket/10369] Always include errfile and errline in format_errors().
| * | | [ticket/10369] Replace root path with "[ROOT]" as per IRC.Andreas Fischer2011-09-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10369
| * | | [ticket/10369] Add warning about paths outside of phpBB root not being filteredAndreas Fischer2011-09-181-0/+2
| | | | | | | | | | | | | | | | PHPBB3-10369
| * | | [ticket/10369] Rename filter_errfile() to filter_root_path().Andreas Fischer2011-09-181-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10369
| * | | [ticket/10369] DRY code to remove phpbb path from errfile.Andreas Fischer2011-09-181-3/+23
| | |/ | |/| | | | | | | PHPBB3-10369
* | | Merge remote-tracking branch 'igorw/ticket/10155' into developOleg Pudeyev2011-09-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10155: [ticket/10155] Briefly explain assets in coding-guidelines [ticket/10155] Move jQuery inclusion to footer [ticket/10155] Update to jQuery 1.6.2 [ticket/10155] Add jQuery to AUTHORS [ticket/10155] Add jQuery, introduce global assets path
| * | | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the jQuery JavaScript library to all pages, giving modifications instant access and allowing for any future core JavaScript to take advantage of it. Also introduce a global /assets directory for assets that are shared between styles. PHPBB3-10155
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-09-051-0/+6
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | * develop-olympus: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| * | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-051-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10321: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| | * | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-211-0/+6
| | | | | | | | | | | | | | | | PHPBB3-10321
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-261-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| * | | [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-241-0/+6
| |/ / | | | | | | | | | PHPBB3-10335
* | | [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.Andreas Fischer2011-08-211-2/+2
| | | | | | | | | | | | | | | | | | Introduced by 6b4d0a254218e8d40151ca1bdff8c439f89502e9. PHPBB3-10329
* | | [feature/request-class] Adjust code base to do html decoding manuallyIgor Wiedler2011-08-181-3/+4
| | | | | | | | | | | | PHPBB3-9716
* | | Merge branch 'develop' into feature/request-classIgor Wiedler2011-08-181-15/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (157 commits) [ticket/10316] Resolve inconsistent move topic behavior [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9608] Remove use of references in topic_review [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class. [ticket/10312] Un-check the shadow option while moving. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. ... Conflicts: phpBB/includes/functions.php
| * \ \ Merge remote-tracking branch 'github-p/feature/template-engine' into developNils Adermann2011-08-131-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php
| | * | | [feature/template-engine] Rename is_absolute to phpbb_is_absolute.Oleg Pudeyev2011-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-041-6/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * develop-olympus: [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
| | * | | [ticket/10303] Removed HTTP_VERSION code path from send_status_line().Chris Smith2011-08-051-6/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10303
| * | | | Merge remote-tracking branch 'igorw/ticket/10258' into developAndreas Fischer2011-07-301-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10258: [ticket/10258] Add HTML5 meta charset tag
| | * | | | [ticket/10258] Add HTML5 meta charset tagIgor Wiedler2011-07-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows knowing the charset when saving web pages to disk. Also, this is supported by all browsers. PHPBB3-10258
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-301-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | * develop-olympus: [ticket/10263] Fix comment about return value of phpbb_version_compare().
| | * | | Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympusAndreas Fischer2011-07-301-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10263: [ticket/10263] Fix comment about return value of phpbb_version_compare().
| | | * | | [ticket/10263] Fix comment about return value of phpbb_version_compare().Andreas Fischer2011-07-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10263
| * | | | | Merge remote-tracking branch 'github-igorw/ticket/10258' into developNils Adermann2011-07-201-6/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/ticket/10258: [ticket/10258] Remove the meta charset tag [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines [ticket/10258] Remove copyright meta tag from docs [ticket/10258] Remove resource-type and distribution meta tags [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags [ticket/10258] Change the DOCTYPE to HTML5
| | * | | | | [ticket/10258] Remove the meta charset tagIgor Wiedler2011-07-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The charset tag is useless, because if a charset content-type header is present it takes precedence. And phpBB always sends such a header. PHPBB3-10258
| | * | | | | [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tagsIgor Wiedler2011-07-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These meta tags are IE specific and do not validate as HTML5. PHPBB3-10258
| | * | | | | [ticket/10258] Change the DOCTYPE to HTML5Igor Wiedler2011-07-091-6/+8
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-10258
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-1/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003. [ticket/10257] Fix AAAA record parsing for old versions of Windows [ticket/10257] Add missing break statement after CNAME block.
| | * | | | Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympusNils Adermann2011-07-161-1/+10
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10257: [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003. [ticket/10257] Fix AAAA record parsing for old versions of Windows [ticket/10257] Add missing break statement after CNAME block.
| | | * | | | [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.Andreas Fischer2011-07-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10257