1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

11868 Commits

Author SHA1 Message Date
Matt Friedman
2dca3c3c27 [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
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
2011-09-27 11:12:11 -07:00
Matt Friedman
2a28b6fc40 [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
HTML5 styles (ACP / Prosilver) do not need to use escaped javascript
wrapped in an unescape function, so we can simplify it! Only subsilver2 will
use the escaped version of the fallback code, because it is still XHTML.

PHPBB3-10390
2011-09-27 11:11:42 -07:00
Matt Friedman
c6a2d81bd3 [ticket/10390] Drop http protocol for Microsoft's CDN option
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
2011-09-27 11:11:30 -07:00
Matt Friedman
81e8faecbc [ticket/10390] Reword the language for jQuery host/server options
Reword some of the language used for the description and pull-down options
to try and make it more clear to users that they have the option to use
jQuery from their own server with the copy included with phpBB, or from one
of the remote CDN servers.

PHPBB3-10390
2011-09-27 11:10:43 -07:00
Matt Friedman
d4fe81f8f0 [ticket/10390] Fix a type-o - captialize AJAX
AJAX should be capitalized where it appears in the ACP as the
option: "Google AJAX API CDN"

PHPBB3-10390
2011-09-26 11:16:38 -07:00
Matt Friedman
abb0f3f96d [ticket/10390] Improve the jQuery CDN url generation function
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
2011-09-26 11:16:10 -07:00
Matt Friedman
39840ef36d [ticket/10390] Move jQuery version definition
Move jQuery version definition to its own block

PHPBB3-10390
2011-09-26 11:15:47 -07:00
Matt Friedman
56c6476233 [ticket/10390] Allow option for jQuery to be hosted by a remote CDN
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
2011-09-26 11:15:22 -07:00
Andreas Fischer
5e768036f7 Merge remote-tracking branch 'cs278/ticket/10375' into develop
* cs278/ticket/10375:
  [ticket/10375] Rework $source_file setting.
  [ticket/10375] Make _tpl_load() a little leaner.
  [ticket/10375] Use existing method to generate cache file name.
2011-09-23 03:40:02 +02:00
Igor Wiedler
6c038d0499 Merge remote-tracking branch 'cs278/ticket/10152' into develop
* cs278/ticket/10152:
  [ticket/10152] Remove end '?>' from generated config.php.
2011-09-21 18:13:09 +02:00
Igor Wiedler
e41f9c9329 Merge branch 'develop' of github.com:phpbb/phpbb3 into develop
* 'develop' of github.com:phpbb/phpbb3: (44 commits)
  [ticket/10374] Remove 'custom template' cache prefix.
  [feature/remove-db-styles] Remove forgotten template variables.
  [feature/remove-db-styles] Removed style.php!
  [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
  [feature/remove-db-styles] Update language to reflect removal of db storage.
  [feature/remove-db-styles] Mark log entrys as deprecated.
  [feature/remove-db-styles] Add error if template/theme file is unwritable.
  [feature/remove-db-styles] Add schema changes sinces 3.0.x.
  [feature/remove-db-styles] Readd table constant for upgrades etc.
  [feature/remove-db-styles] Update database schemas.
  [feature/remove-db-styles] Remove style.php DB storage.
  [feature/remove-db-styles] Remove parse_css_file option from themes.
  [feature/remove-db-styles] Remove DB theme handling code from session.
  [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
  [feature/remove-db-styles] Missed a few template DB bits in acp_styles.
  [feature/remove-db-styles] Removing unused methods from acp_style.
  [feature/remove-db-styles] Removed database storage of style components.
  [ticket/10371] Removing last mentions of imageset
  [ticket/10370] Add function documentation for get_stacktrace().
  [ticket/10370] Explain that we are not the ones hiding backtrace pieces.
  ...
2011-09-21 18:12:07 +02:00
Chris Smith
95d24e6fb7 [ticket/10375] Rework $source_file setting.
Only set the file if an mtime check or recompile are required.

PHPBB3-10375
2011-09-21 13:24:04 +01:00
Chris Smith
9d5e9af54b [ticket/10375] Make _tpl_load() a little leaner.
- Removed duplicate variables
- Set $source_file earlier for cache checks
- Fixed useless mtime check

PHPBB3-10375
2011-09-21 13:17:51 +01:00
Chris Smith
25aee49ca5 [ticket/10375] Use existing method to generate cache file name.
PHPBB3-10375
2011-09-21 13:17:10 +01:00
Chris Smith
e95aec1637 [ticket/10152] Remove end '?>' from generated config.php.
PHPBB3-10152
2011-09-21 08:36:53 +01:00
Nils Adermann
fab0ec64b3 Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into develop
* github-cs278/feature/remove-db-styles:
  [feature/remove-db-styles] Remove forgotten template variables.
  [feature/remove-db-styles] Removed style.php!
  [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
  [feature/remove-db-styles] Update language to reflect removal of db storage.
  [feature/remove-db-styles] Mark log entrys as deprecated.
  [feature/remove-db-styles] Add error if template/theme file is unwritable.
  [feature/remove-db-styles] Add schema changes sinces 3.0.x.
  [feature/remove-db-styles] Readd table constant for upgrades etc.
  [feature/remove-db-styles] Update database schemas.
  [feature/remove-db-styles] Remove style.php DB storage.
  [feature/remove-db-styles] Remove parse_css_file option from themes.
  [feature/remove-db-styles] Remove DB theme handling code from session.
  [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
  [feature/remove-db-styles] Missed a few template DB bits in acp_styles.
  [feature/remove-db-styles] Removing unused methods from acp_style.
  [feature/remove-db-styles] Removed database storage of style components.
2011-09-21 01:09:18 +02:00
Nils Adermann
207f249521 Merge remote-tracking branch 'github-cs278/ticket/10374' into develop
* github-cs278/ticket/10374:
  [ticket/10374] Remove 'custom template' cache prefix.
2011-09-21 00:41:17 +02:00
Chris Smith
903bc5b78a [ticket/10374] Remove 'custom template' cache prefix.
PHPBB3-10374
2011-09-20 23:33:08 +01:00
Chris Smith
7b7a56dc4a [feature/remove-db-styles] Remove forgotten template variables.
PHPBB3-9741
2011-09-20 23:15:30 +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
ee994b2968 [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
PHPBB3-9741
2011-09-20 23:01:55 +01:00
Chris Smith
8b21983222 [feature/remove-db-styles] Update language to reflect removal of db storage.
PHPBB3-9741
2011-09-20 22:42:52 +01:00
Chris Smith
58c3556e19 [feature/remove-db-styles] Mark log entrys as deprecated.
PHPBB3-9741
2011-09-20 22:42:17 +01:00
Chris Smith
6d24a7191f [feature/remove-db-styles] Add error if template/theme file is unwritable.
PHPBB3-9741
2011-09-20 22:18:06 +01:00
Chris Smith
cb245f5d04 [feature/remove-db-styles] Add schema changes sinces 3.0.x.
PHPBB3-9741
2011-09-20 21:06:53 +01:00
Chris Smith
364a69adc2 [feature/remove-db-styles] Readd table constant for upgrades etc.
Removed in f23b224b946b37c171add5953e832641bbb3a5c3.

PHPBB3-9741
2011-09-20 21:06:53 +01:00
Chris Smith
270cd839a6 [feature/remove-db-styles] Update database schemas.
Removes:
* styles_template_data table
* template_storedb on styles_template table
* On styles_theme table:
  - theme_storedb
  - theme_mtime
  - theme_data

PHPBB3-9741
2011-09-20 21:06:52 +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
Chris Smith
b1df91db80 [feature/remove-db-styles] Remove parse_css_file option from themes.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
267daf0c39 [feature/remove-db-styles] Remove DB theme handling code from session.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
c2d6c613d3 [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
ad11565ace [feature/remove-db-styles] Missed a few template DB bits in acp_styles.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
23415170cb [feature/remove-db-styles] Removing unused methods from acp_style.
These got left behind in 6854d47.

PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
9e4349e7fa [feature/remove-db-styles] Removed database storage of style components.
The bulk of database storage of templates is removed, rendering template
stored in the database as useless.

Theme database storage is reduced to a skeleton for full removal soon.

This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.

PHPBB3-9741
2011-09-20 21:06:51 +01:00
Nils Adermann
57451a2014 Merge remote-tracking branch 'github-cyberalien/ticket/10371' into develop
* github-cyberalien/ticket/10371:
  [ticket/10371] Removing last mentions of imageset
2011-09-20 22:03:42 +02: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
Nils Adermann
cc2ecc9171 Merge remote-tracking branch 'github-bantu/ticket/10370' into develop-olympus
* github-bantu/ticket/10370:
  [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:53:55 +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
d0f5b527fe Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
2011-09-18 23:25:57 +02:00
Nils Adermann
410028eecf Merge remote-tracking branch 'github-bantu/ticket/10245' into develop-olympus
* github-bantu/ticket/10245:
  [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
2011-09-18 23:25:04 +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