1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

4544 Commits

Author SHA1 Message Date
Andreas Fischer
4f8bb02a57 [ticket/10320] Exclude passworded forums when determining "Most active topic".
PHPBB3-10320
2011-08-25 17:33:39 +02:00
Andreas Fischer
4491746c73 [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
PHPBB3-10320
2011-08-25 17:12:42 +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
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
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
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
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
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
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
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
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
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
Joas Schilling
2231488543 [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission
Be careful when using this function with permissions a_, m_, u_ and f_ ! It may not work correctly. When a user group grants an a_* permission, e.g. a_foo, but the user's a_foo permission is set to "Never", then the user does not in fact have the a_ permission. But the user will still be listed as having the a_ permission.

PHPBB3-10252
2011-07-15 10:23:06 +02:00
Andreas Fischer
0690e9f103 [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
PHPBB3-10274
2011-07-15 00:06:25 +02:00
Andreas Fischer
7f56c05f24 [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php
PHPBB3-10263
2011-07-14 23:58:51 +02:00
Andreas Fischer
b0940f52e5 [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php
PHPBB3-10263
2011-07-14 23:53:41 +02:00
Joas Schilling
8ebc8ec182 [ticket/5506] Do not display an empty last page after deleting logs.
The fix is copied from view_inactive_users().
Also add keywords and sort parameters to url for deleting logs and inactive users.
And finally save some queries if there are no logs/users to display anyway
2011-07-14 04:05:20 +02:00
Andreas Fischer
b1608ae860 [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.
PHPBB3-10267
2011-07-14 02:09:22 +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
Patrick Webster
ae8eee16cc [ticket/10257] Fix AAAA record parsing for old versions of Windows
Older versions of Windows use a different output format for AAAA records.

PHPBB3-10257
2011-07-13 01:06:26 +02:00
Andreas Fischer
99db533524 [ticket/10257] Add missing break statement after CNAME block.
PHPBB3-10257
2011-07-13 00:55:26 +02:00
Andreas Fischer
db352c17f8 [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
PHPBB3-10243
2011-07-12 23:46:20 +02:00
Joas Schilling
d60ffdd55c [ticket/10237] Also display login-box on subscribing
PHPBB3-10237
2011-07-11 19:31:11 +02:00
Joas Schilling
773561f862 [ticket/10237] Handle watching and unwatching the same way.
Also add some information to the confirm-box (forum_name / topic title)

PHPBB3-10237
2011-07-11 19:24:40 +02:00
Andreas Fischer
71df03960c Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
2011-07-07 20:06:11 +02:00
Andreas Fischer
5fefdecc50 Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9
* naderman/ticket/10250:
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
2011-07-07 20:05:47 +02:00
Joas Schilling
b2a65ac76d [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
PHPBB3-10237
2011-07-07 12:40:35 +02:00
Nils Adermann
cf4e6d8a3e Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
2011-07-06 21:51:33 -04:00
Yuriy Rusko
a275d17625 [ticket/9859] Changing all phpBB footers to match the new credit line
PHPBB3-9859
2011-07-06 21:46:33 -04:00
Nils Adermann
b261a1a31a [ticket/10250] The site_logo hash is different depending on imageset & language
PHPBB3-10250
2011-07-06 17:53:57 -04:00
Nils Adermann
8ec737e9c4 [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
PHPBB3-10250
2011-07-05 19:38:15 -04:00
Nils Adermann
f610f44a4e [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
The new logo is slightly wider than the old logo. If we changed the size in the
imageset.cfg we would cause a conflict for everyone who replaced the logo with
their own and modified the size. Instead we overwrite the width and height in
the img() function in session.php only if its contents are that of the stock
phpbb logo.

PHPBB3-10250
2011-07-05 19:09:09 -04:00
Andreas Fischer
7e4460dbc9 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
2011-07-05 02:09:47 +02:00
Andreas Fischer
c916d49ddd Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9
* naderman/ticket/10247:
  [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
2011-07-05 02:09:29 +02:00
Nils Adermann
0d602e1722 [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
attempt_id column was deleted

PHPBB3-10247
2011-07-04 19:57:54 -04:00
Andreas Fischer
d8ac2cc5f0 [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. 2011-07-05 00:40:45 +02:00
Andreas Fischer
fe0932fdf0 [prep-release-3.0.9] Bumping version number for 3.0.9-RC3. 2011-06-26 20:47:33 +02:00