1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00

963 Commits

Author SHA1 Message Date
Joas Schilling
367bc23009 Merge branch 'develop-olympus' into develop
Conflicts:
	phpBB/includes/functions.php
2011-10-13 14:46:16 +02:00
Vjacheslav Trushkin
12882084d4 [ticket/10397] Pagination inconsistency fix
Fixing inconsistency in code generated by generate_pagination()

PHPBB3-10397
2011-10-04 11:55:25 +03:00
Chris Smith
ee5d585fe9 [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
PHPBB3-10387
2011-09-25 13:11:24 +01:00
Chris Smith
c184fb86c9 [feature/remove-db-styles] Removed style.php!
Finally sanity has arrived! No more delivering CSS through PHP. Better
3 years late than never.

PHPBB3-9741
2011-09-20 23:12:07 +01:00
Chris Smith
934a9da313 [feature/remove-db-styles] Remove style.php DB storage.
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
2011-09-20 21:06:52 +01:00
Vjacheslav Trushkin
e38fd2b9f2 [ticket/10371] Removing last mentions of imageset
Removing last mentions of imageset

PHPBB3-10371
2011-09-20 22:56:53 +03:00
Nils Adermann
4e8e31c10b Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' 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
2011-09-20 21:26:37 +02:00
Nils Adermann
f31d32dd89 Merge branch 'develop-olympus' into develop
* 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().
2011-09-19 17:54:53 +02:00
Andreas Fischer
79ad3a3f32 [ticket/10370] Add function documentation for get_stacktrace().
PHPBB3-10370
2011-09-19 17:45:32 +02:00
Andreas Fischer
fc2af460ee [ticket/10370] Explain that we are not the ones hiding backtrace pieces.
Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d.

PHPBB3-10370
2011-09-19 17:37:16 +02:00
Andreas Fischer
19ce73c884 [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path().
PHPBB3-10370
2011-09-19 17:37:16 +02:00
Andreas Fischer
8a84f42f7d [ticket/10370] Add require_once to whitelisted functions.
PHPBB3-10370
2011-09-19 17:37:15 +02:00
Andreas Fischer
7965387201 [ticket/10370] Use single string instead of an array for arguments.
PHPBB3-10370
2011-09-19 17:37:15 +02:00
Andreas Fischer
0df7e5eefa [ticket/10370] Ease up code checking for arguments of include etc.
PHPBB3-10370
2011-09-19 17:37:10 +02:00
Andreas Fischer
12530a763b [ticket/10370] Use unset() on the first backtrace instead of checking in loop.
PHPBB3-10370
2011-09-19 16:58:25 +02:00
Andreas Fischer
9c0f75fd65 [ticket/10370] Use phpbb_filter_root_path() in get_backtrace().
PHPBB3-10370
2011-09-19 16:57:09 +02:00
Nils Adermann
2731e5a456 Merge branch 'develop-olympus' into develop
* 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().
2011-09-18 23:24:13 +02:00
Andreas Fischer
1b390f0b49 [ticket/10369] Replace root path with "[ROOT]" as per IRC.
PHPBB3-10369
2011-09-18 23:03:28 +02:00
Andreas Fischer
c8564e6ce9 [ticket/10369] Add warning about paths outside of phpBB root not being filtered
PHPBB3-10369
2011-09-18 22:41:02 +02:00
Andreas Fischer
1ad97424a4 [ticket/10369] Rename filter_errfile() to filter_root_path().
PHPBB3-10369
2011-09-18 22:32:25 +02:00
Andreas Fischer
9006984d5a [ticket/10369] DRY code to remove phpbb path from errfile.
PHPBB3-10369
2011-09-18 22:24:14 +02:00
Oleg Pudeyev
145bc23044 Merge remote-tracking branch 'igorw/ticket/10155' into develop
* 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
2011-09-05 06:03:19 -04:00
Oleg Pudeyev
dce62b5271 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
2011-09-05 02:48:54 -04:00
Oleg Pudeyev
cf5f0cce83 Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympus
* nickvergessen/ticket/10321:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
2011-09-05 02:42:41 -04:00
Vjacheslav Trushkin
830c3f4047 [feature/remove-imagesets] Adjustments to php files
Removing imagesets. Adjustments to php files

PHPBB3-10336
2011-09-04 01:08:00 +03:00
Nils Adermann
2219193096 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
2011-08-26 05:59:34 -04:00
Andreas Fischer
7a36c3b34b [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
PHPBB3-10335
2011-08-24 14:51:37 +02:00
Andreas Fischer
ac11806bf4 [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
Introduced by 6b4d0a254218e8d40151ca1bdff8c439f89502e9.

PHPBB3-10329
2011-08-21 14:34:34 +02:00
Joas Schilling
dc149a43e4 [ticket/10321] Do not append the ? if the param-list is empty anyway.
PHPBB3-10321
2011-08-21 13:16:05 +02:00
Igor Wiedler
c5cef773c4 [feature/request-class] Adjust code base to do html decoding manually
PHPBB3-9716
2011-08-18 23:44:30 +02:00
Igor Wiedler
38c65da553 Merge branch 'develop' into feature/request-class
* 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
2011-08-18 22:31:25 +02:00
Igor Wiedler
f84460c710 [feature/request-class] Make use of the is_secure() method
PHPBB3-9716
2011-08-18 22:26:30 +02:00
Nils Adermann
6fa83ba876 Merge remote-tracking branch 'github-p/feature/template-engine' into develop
* 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
2011-08-13 23:59:15 -04:00
Oleg Pudeyev
0bfd4639ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
2011-08-04 23:05:35 -04:00
Chris Smith
cc87d553d0 [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
PHPBB3-10303
2011-08-05 01:17:57 +01:00
Andreas Fischer
366b14b6c5 Merge remote-tracking branch 'igorw/ticket/10258' into develop
* igorw/ticket/10258:
  [ticket/10258] Add HTML5 meta charset tag
2011-07-30 16:49:39 +02:00
Andreas Fischer
9fd849b3fd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10263] Fix comment about return value of phpbb_version_compare().
2011-07-30 16:44:08 +02:00
Andreas Fischer
bd2fd4ec1d Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympus
* bantu/ticket/10263:
  [ticket/10263] Fix comment about return value of phpbb_version_compare().
2011-07-30 16:43:37 +02:00
Igor Wiedler
681c4a478d [ticket/10258] Add HTML5 meta charset tag
This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.

PHPBB3-10258
2011-07-29 16:32:22 +02:00
Andreas Fischer
65ec47abfa [ticket/10263] Fix comment about return value of phpbb_version_compare().
PHPBB3-10263
2011-07-27 00:13:23 +02:00
Oleg Pudeyev
e116561348 [feature/template-engine] Rename is_absolute to phpbb_is_absolute.
PHPBB3-9726
2011-07-24 13:37:46 -04:00
Nils Adermann
ddbad5551d Merge remote-tracking branch 'github-igorw/ticket/10258' into develop
* 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
2011-07-20 09:21:16 -04:00
Nils Adermann
8da1d5e187 Merge branch 'develop-olympus' into develop
* 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.
2011-07-16 22:52:36 -04:00
Nils Adermann
afa377d028 Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympus
* 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.
2011-07-16 22:48:58 -04:00
Nils Adermann
6923069e0e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php
  [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php
  [ticket/10263] Adding unit tests for phpbb_version_compare().
  [ticket/10263] Add wrapper for version_compare() that allows the use of A and B
2011-07-16 22:22:35 -04:00
Nils Adermann
82fa4eff7e Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympus
* github-bantu/ticket/10263:
  [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php
  [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php
  [ticket/10263] Adding unit tests for phpbb_version_compare().
  [ticket/10263] Add wrapper for version_compare() that allows the use of A and B
2011-07-16 22:21:49 -04:00
Nils Adermann
a33b67fd1a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().
  [ticket/10243] Call phpbb_gmgetdate() from various places.
  [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
2011-07-16 22:06:49 -04:00
Igor Wiedler
0bf6966c52 [feature/request-class] Add server(), header() and is_ajax() to request
Extend the request class with helpers for reading server vars (server())
and HTTP request headers (header()). Refactor the existing code base
to make use of these helpers, make $_SERVER a deactivated super global.

Also introduce an is_ajax() method, which checks the X-Requested-With
header for the value 'XMLHttpRequest', which is sent by JavaScript
libraries, such as jQuery.

PHPBB3-9716
2011-07-15 22:34:24 +02:00
Andreas Fischer
f926acf1b8 [ticket/10263] Add wrapper for version_compare() that allows the use of A and B
Add wrapper function for version_compare() that allows using uppercase A and B
for alpha and beta release version strings.

PHPBB3-10263
2011-07-13 02:33:29 +02:00
Andreas Fischer
271c277ecc [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.
PHPBB3-10257
2011-07-13 01:06:32 +02:00