1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

10102 Commits

Author SHA1 Message Date
Andreas Fischer
091119605a [ticket/10278] Also timeout when receiving data over a slow connection.
PHPBB3-10278
2011-10-13 18:03:02 +02:00
Andreas Fischer
c0507c6a9e [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
PHPBB3-10278
2011-08-25 20:39:35 +02:00
Andreas Fischer
29a23ae217 [ticket/10278] Return with a timeout error when fread() or fgets() time out.
PHPBB3-10278
2011-08-25 20:34:01 +02:00
Andreas Fischer
2ffdf56bfe [ticket/10278] Also set timeout on stream in get_remote_file().
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
2011-08-25 20:14:49 +02:00
Andreas Fischer
540ca1a8d8 Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympus
* nickvergessen/ticket/8177:
  [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
2011-08-21 15:17:51 +02:00
Callum Macrae
4592076366 [ticket/10240] Reverted a commit which added buggy code.
This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888.

The code which was added also removed new lines and tabs.

PHPBB3-10240
2011-08-21 13:16:50 +01:00
Joas Schilling
3c7dfc7e19 [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
PHPBB3-8177
2011-08-21 01:46:47 +02:00
Oleg Pudeyev
1680b3a2a7 Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympus
* callumacrae/ticket/9978:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
2011-08-20 14:17:31 -04:00
Callum Macrae
b18b3363e9 [ticket/9978] Added semicolons to JavaScript in overall_header.
Semicolons have been added to the anonymous functions in the javascript
in overall_header.html. This makes JSLint happier, and also makes the
code easier to minify.

PHPBB3-9978
2011-08-20 11:20:30 +01:00
Nils Adermann
6330153937 Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympus
* github-bantu/ticket/8571:
  [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
  [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
  [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
2011-08-18 17:43:24 -04:00
Andreas Fischer
a91131c55e Merge remote-tracking branch 'p/ticket/9976' into develop-olympus
* p/ticket/9976:
  [ticket/9976] Fix link to post when two posts have the same post_time.
2011-08-16 18:09:21 +02:00
Oleg Pudeyev
a6dd3d0c65 Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympus
* bantu/ticket/9297:
  [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/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.
  [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.
2011-08-14 15:52:01 -04:00
Andreas Fischer
66553fb857 [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
PHPBB3-9297
2011-08-11 23:15:25 +02:00
Oleg Pudeyev
cad3e4cb45 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus
* callumacrae/ticket/10240:
  [ticket/10240] Added code to strip control characters from messages.
2011-08-09 21:30:37 -04:00
Callum Macrae
f9dbe33fa7 [ticket/10240] Added code to strip control characters from messages.
It is possible to evade the word filter using control characters.

Seeing as control characters have no practical application in a bulletin
board software, it doesn't do any harm to remove them entirely. That is
what this commit does.

PHPBB3-10240
2011-08-08 17:43:28 +01:00
Oleg Pudeyev
04e8468d28 Merge remote-tracking branch 'bantu/ticket/10298' into develop-olympus
* bantu/ticket/10298:
  [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
2011-08-07 16:35:31 -04:00
Oleg Pudeyev
eb4660f4ef Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympus
* naderman/ticket/8937:
  [ticket/8937] Keep space characters in front of [code] bbcode content
2011-08-07 16:23:26 -04:00
Oleg Pudeyev
ec3f4db425 Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympus
* bantu/ticket/10299:
  [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
2011-08-04 23:07:06 -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
08ca84a3e7 [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
PHPBB3-10299
2011-07-31 15:34:45 +02:00
Joas Schilling
bb7e8bb424 [ticket/9976] Fix link to post when two posts have the same post_time.
When two posts have the same post_time, a link to the first post being on
page 1, leads you to the second post with the same timestamp on page two.
So in case the post_times are equal, we need to use the post_id to correctly
order the posts.

PHPBB3-9976
2011-07-30 23:46:53 -04:00
Oleg Pudeyev
edb745e951 Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus
* callumacrae/ticket/8173:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.

Conflicts:
	phpBB/adm/style/acp_users_signature.html
2011-07-30 19:33:41 -04:00
Oleg Pudeyev
5653be8e16 Merge remote-tracking branch 'callumacrae/ticket/9645' into develop-olympus
* callumacrae/ticket/9645:
  [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
2011-07-30 18:47:54 -04:00
Oleg Pudeyev
7ebec68616 Merge remote-tracking branch 'callumacrae/ticket/10293' into develop-olympus
* callumacrae/ticket/10293:
  [ticket/10293] Fixed the JavaScript in the jumpbox.
2011-07-30 18:36:04 -04:00
Andreas Fischer
d59a894cd3 [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
PHPBB3-10298
2011-07-30 16:58:33 +02:00
Andreas Fischer
25902c3bfc Merge remote-tracking branch 'p/ticket/10199' into develop-olympus
* p/ticket/10199:
  [ticket/10199] Delete a useless join in viewtopic.
2011-07-30 16:44:27 +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
Callum Macrae
9c6339fb57 [ticket/8173] Removed some redundant code in the BBCode JavaScript.
The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
2011-07-30 08:57:17 +01:00
Oleg Pudeyev
b960dd4e0d Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:48:03 -04:00
Callum Macrae
381ebcf195 [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
Some of the anchor tags produced by php_info had names like "module_Zend
Optimizer", which is obviously invalid. This commit adds some code that
repairs the names by replacing all spaces found in the names with
underscores.

PHPBB3-9645
2011-07-28 16:41:04 +01: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
Callum Macrae
7e01850a42 [ticket/10293] Fixed the JavaScript in the jumpbox.
The current code is invalid, and results in an critical error which
aborts the script before it gets to return false, thus allowing the form
to submit with an invalid forum ID. This commit fixes that by
referencing "this" instead of "document.jumpbox", which didn't exist
because the form had no name.

PHPBB3-10293
2011-07-26 13:43:52 +01:00
Callum Macrae
f51b2f8fec [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
There is no space between the first radio button and "Yes", while there
is a space between the second radio button and "No". This commit fixes
that.

PHPBB3-10292
2011-07-25 21:08:26 +01:00
Oleg Pudeyev
0648923b19 [ticket/10199] Delete a useless join in viewtopic.
PHPBB3-10199
2011-07-24 04:39:00 -04:00
Andreas Fischer
49c89023fc [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
PHPBB3-8571
2011-07-20 00:53:28 +02:00
Andreas Fischer
106cf14d27 [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
PHPBB3-8571
2011-07-20 00:32:00 +02:00
Andreas Fischer
b4949675bf [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
PHPBB3-8571
2011-07-20 00:31:45 +02:00
Nils Adermann
627e2644a2 [ticket/8937] Keep space characters in front of [code] bbcode content
PHPBB3-8937
2011-07-17 00:44:39 -04:00
Nils Adermann
13ca659f1f Merge remote-tracking branch 'github-nickvergessen/ticket/6632' into develop-olympus
* github-nickvergessen/ticket/6632:
  [ticket/6632] Better viewing of topics for wide screen displays
2011-07-16 23:08:31 -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
7c84cb5f5f Merge remote-tracking branch 'github-bantu/ticket/10274' into develop-olympus
* github-bantu/ticket/10274:
  [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
2011-07-16 22:45:56 -04:00
Nils Adermann
d80be455b9 Merge remote-tracking branch 'github-nickvergessen/ticket/10266' into develop-olympus
* github-nickvergessen/ticket/10266:
  [ticket/10266] Add "Return to forum" link after reporting a post
2011-07-16 22:26:46 -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
825d44fcc2 Merge remote-tracking branch 'github-rxu/ticket/10226' into develop-olympus
* github-rxu/ticket/10226:
  [ticket/10226] Use is_numeric() instead of preg_replace()
  [ticket/10226] Allow mysqli connections via local sockets/pipes
2011-07-16 22:18:48 -04:00
Nils Adermann
03b1f500e7 Merge remote-tracking branch 'github-nickvergessen/ticket/10252' into develop-olympus
* github-nickvergessen/ticket/10252:
  [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission
2011-07-16 22:10:57 -04:00
Nils Adermann
0f86034f03 Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympus
* github-bantu/ticket/10243:
  [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:05:03 -04:00
Nils Adermann
b3cdd1d169 Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into develop-olympus
* github-nickvergessen/ticket/10237:
  [ticket/10237] Also display login-box on subscribing
  [ticket/10237] Handle watching and unwatching the same way.
  [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
2011-07-16 21:43:17 -04:00
Nils Adermann
dcceeb8012 Merge remote-tracking branch 'github-nickvergessen/ticket/7291' into develop-olympus
* github-nickvergessen/ticket/7291:
  [ticket/7291] Use template loop for character list, to avoid double &first_char
2011-07-16 21:05:04 -04:00
Nils Adermann
83f955a2c5 Merge remote-tracking branch 'github-nickvergessen/ticket/5506' into develop-olympus
* github-nickvergessen/ticket/5506:
  [ticket/5506] Do not display an empty last page after deleting logs.
2011-07-16 20:53:30 -04:00
Tabitha Backoff
2bba22e9d3 [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
PHPBB3-10208
2011-07-16 01:16:46 +02:00