aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-0/+9
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too Conflicts: phpBB/includes/auth/auth_db.php
| * [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users tooNils Adermann2011-10-141-1/+10
| | | | | | | | PHPBB3-10212
* | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10074] Change default value of 'Set as special rank' to No
| * Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into ↵Nils Adermann2011-10-141-1/+1
| |\ | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10074: [ticket/10074] Change default value of 'Set as special rank' to No
| | * [ticket/10074] Change default value of 'Set as special rank' to NoJoas Schilling2011-10-141-1/+1
| | | | | | | | | | | | PHPBB3-10074
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-142-2/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| * | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-142-2/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10278: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| | * | [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.Andreas Fischer2011-10-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10278
| | * | [ticket/10278] Also timeout when receiving data over a slow connection.Andreas Fischer2011-10-131-1/+2
| | | | | | | | | | | | | | | | PHPBB3-10278
| | * | [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.Andreas Fischer2011-08-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10278
| | * | [ticket/10278] Return with a timeout error when fread() or fgets() time out.Andreas Fischer2011-08-251-0/+8
| | | | | | | | | | | | | | | | PHPBB3-10278
| | * | [ticket/10278] Also set timeout on stream in get_remote_file().Andreas Fischer2011-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the PHP manual for fsockopen(): If you need to set a timeout for reading/writing data over the socket, use stream_set_timeout(), as the timeout parameter to fsockopen() only applies while connecting the socket. http://www.php.net/manual/en/function.fsockopen.php PHPBB3-10278
* | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usageNils Adermann2011-10-142-10/+6
| | | | | | | | | | | | | | | | PHPBB3-10412
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10300' into developAndreas Fischer2011-10-131-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10300: [ticket/10300] Always set group attributes for teampage and legend
| * | | | [ticket/10300] Always set group attributes for teampage and legendJoas Schilling2011-08-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in acp_groups.php removes unchanged attributes from the group_attributes array, to prevent issues with reapplying avatar/rank and more. This code causes problems with the new teampage/legend feature, because when the attribute is not set, the group is removed from the feature. Therefore I added an array with the keys that need to be set, when calling the function. PHPBB3-10300
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| * | | | Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympusAndreas Fischer2011-10-131-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10307: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| | * | | | [ticket/10307] Return false in mysqli sql_fetchrow on empty resultIgor Wiedler2011-10-131-1/+7
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-10307
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10304] Fix URL for ICQ while view private messages
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10304: [ticket/10304] Fix URL for ICQ while view private messages
| | * | | | [ticket/10304] Fix URL for ICQ while view private messagesJoas Schilling2011-10-131-1/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-10304
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10400] Allow forum name to be '0'
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10400: [ticket/10400] Allow forum name to be '0'
| | * | | | [ticket/10400] Allow forum name to be '0'Joas Schilling2011-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10400
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-132-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| * | | | | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing topic_generate_pagination() PHPBB3-10397
| * | | | | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixing inconsistency in code generated by generate_pagination() PHPBB3-10397
* | | | | Merge remote-tracking branch 'ckwalsh/ticket/9661' into developIgor Wiedler2011-10-101-33/+78
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ckwalsh/ticket/9661: [ticket/9661] Remove eval() from functions_privmsgs.php
| * | | | | [ticket/9661] Remove eval() from functions_privmsgs.phpCullen Walsh2011-09-251-33/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested by sending messages to myself on a test board. PHPBB3-9661
* | | | | | Merge remote-tracking branch 'cs278/ticket/10387' into developAndreas Fischer2011-09-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10387: [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
| * | | | | | [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.Chris Smith2011-09-251-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10387
* | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2011-09-271-5/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of git://github.com/phpbb/phpbb3: [ticket/10392] Alter parent namespace stripping. [ticket/10392] Test for magic loop variables with nested namespaces. [ticket/10392] Missed fix for S_BLOCK_NAME. [ticket/10392] Fix access to nested special block variables.
| * | | | | | [ticket/10392] Alter parent namespace stripping.Chris Smith2011-09-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10392
| * | | | | | [ticket/10392] Missed fix for S_BLOCK_NAME.Chris Smith2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10392
| * | | | | | [ticket/10392] Fix access to nested special block variables.Chris Smith2011-09-261-4/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10392
* | | | | | Merge remote-tracking branch 'cs278/ticket/10384' into developAndreas Fischer2011-09-241-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10384: [ticket/10384] Language variable replacements should not check for var prefix. [ticket/10384] Update unit tests to test for failing variable.
| * | | | | [ticket/10384] Language variable replacements should not check for var prefix.Chris Smith2011-09-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10384
* | | | | | [ticket/10375] Rework $source_file setting.Chris Smith2011-09-211-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only set the file if an mtime check or recompile are required. PHPBB3-10375
* | | | | | [ticket/10375] Make _tpl_load() a little leaner.Chris Smith2011-09-211-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed duplicate variables - Set $source_file earlier for cache checks - Fixed useless mtime check PHPBB3-10375
* | | | | | [ticket/10375] Use existing method to generate cache file name.Chris Smith2011-09-211-2/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10375
* | | | | Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into ↵Nils Adermann2011-09-213-750/+106
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | [feature/remove-db-styles] Remove forgotten template variables.Chris Smith2011-09-201-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | [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] Rework filesystem permission checks from 6d24a71.Chris Smith2011-09-201-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | [feature/remove-db-styles] Add error if template/theme file is unwritable.Chris Smith2011-09-201-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | [feature/remove-db-styles] Readd table constant for upgrades etc.Chris Smith2011-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed in f23b224b946b37c171add5953e832641bbb3a5c3. PHPBB3-9741
| * | | | | [feature/remove-db-styles] Remove style.php DB storage.Chris Smith2011-09-202-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [feature/remove-db-styles] Remove DB theme handling code from session.Chris Smith2011-09-201-49/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.Chris Smith2011-09-201-120/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | [feature/remove-db-styles] Missed a few template DB bits in acp_styles.Chris Smith2011-09-201-23/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-28 01:03:05 +0000