1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1321 Commits

Author SHA1 Message Date
Nils Adermann
0ae7df8a51 [feature/request-class] Request class test now uses a type cast helper mock.
Removed the dependency of the request class test on having an actual
phpbb_type_cast_helper instance, by replacing it with an object mocking
the phpbb_type_cast_helper_interface.

PHPBB3-9716
2010-09-17 14:03:47 +02:00
Nils Adermann
76e530196b [feature/request-class] Use the request class in the installer & updater.
Just like common.php database_update.php and install/index.php need to
include the request class files and create an instance for use in
request_var.

PHPBB3-9716
2010-09-17 13:59:57 +02:00
Igor Wiedler
cdadda3554 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
2010-09-16 23:39:01 +02:00
Igor Wiedler
41245f9f7a Merge branch 'ticket/bantu/9091' into develop-olympus
* ticket/bantu/9091:
  [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
2010-09-16 23:38:50 +02:00
Igor Wiedler
e35711ddde Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9609] Change header() calls setting HTTP status to send_status_line().
  [ticket/9613] Slightly update language strings.
  [ticket/9613] Fix missing database part for unread posts search load switch.
  [ticket/9613] Implement a load switch for unread posts search feature.
  [ticket/9785] Allow users to request new passwords when board is disabled.
  [ticket/9644] Check $mode before calling user_notification() from submit_post()
2010-09-16 22:42:32 +02:00
Igor Wiedler
9015e03d05 Merge branch 'ticket/bantu/9613' into develop-olympus
* ticket/bantu/9613:
  [ticket/9613] Slightly update language strings.
  [ticket/9613] Fix missing database part for unread posts search load switch.
  [ticket/9613] Implement a load switch for unread posts search feature.
2010-09-16 22:34:48 +02:00
Igor Wiedler
3e8d45910d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9754] Populate S_USER_POSTED variable with correct value in search.php
  [ticket/9748] Replace <br /> before converting < and > to their entities.
  [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
2010-09-12 15:01:17 +02:00
Igor Wiedler
161be96c66 Merge branch 'ticket/bantu/9748' into develop-olympus
* ticket/bantu/9748:
  [ticket/9748] Replace <br /> before converting < and > to their entities.
2010-09-12 14:59:59 +02:00
Igor Wiedler
2baa8c61d1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/git-tools] Change the GNU --lines argument to the POSIX -l
  [task/git-tools] Solve dependency on the GNU wc --max-line-length option
  [ticket/8944] Patch db_tools to support index length for MySQL4
  [ticket/9039] Make mssqlnative.php non-executable
  [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
  [ticket/9800] Update tracker URL in docs/README.html
2010-09-09 00:23:33 +02:00
Igor Wiedler
bb191a1d69 [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
Fixes following SQL error when updating the database to 3.0.6.

BLOB column 'post_username' used in key specification without a key length

PHPBB3-8944
2010-09-03 22:26:06 +02:00
rxu
b83163634f [ticket/9613] Fix missing database part for unread posts search load switch.
A record for load_unreads_search parameter had to be added to CONFIG_TABLE.

PHPBB3-9613
2010-08-29 16:09:41 +02:00
Andreas Fischer
e4ff780c13 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9117] Wrong redirection after login.
  [ticket/9772] Unify permissions for sending email when board_email_form is off
  [ticket/7369] CPF date should always render the users selection.
  [ticket/7296] Exporting styles to tar creates corrupted archives.
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:34:18 +02:00
Andreas Fischer
dfd3c4a5df Merge branch 'ticket/nickvergessen/9519' into develop-olympus
* ticket/nickvergessen/9519:
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:25:05 +02:00
Nils Adermann
2e787fa836 Merge branch 'develop-olympus' into develop
* develop-olympus: (57 commits)
  Revert "[ticket/7716] Data too long for column 'message_subject'"
  [ticket/7716] Data too long for column 'message_subject'
  [ticket/9780] Adding unit tests for gen_rand_string().
  [ticket/9780] Add length check back to gen_rand_string().
  [ticket/7972] Copying topics in the MCP now indexes the new topic.
  [ticket/9782] Board disable radio set on when server load high
  [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
  [ticket/9104] Safari does not display box headers correctly in the ACP.
  [ticket/9777] Print error message in pre-commit hook when php is not installed.
  [ticket/7716] Data too long for column 'message_subject'
  [task/git-tools] Ignore git commit message comments
  [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
  [task/git-tools] Vastly expanded commit-msg hook.
  [task/git-tools] Beginnings of a syntax checking hook.
  [task/git-tools] Append ticket identifier to commit message prior to editing.
  [ticket/7332] Redirect users back to post details when performing actions.
  [ticket/7332] Collapse post details content down to a maximum of 300px heigh
  [ticket/9771] Remove query string parameters that have no name.
  [ticket/9760] Remove unrestricted wildcards from search terms.
  [ticket/9599] Reimplement phpbb_checkdnsrr() function.
  ...

Conflicts:
	tests/template/template.php
2010-08-21 23:35:43 +02:00
Josh Woody
68744484c8 Merge branch 'ticket/bantu/9167' into develop-olympus
* ticket/bantu/9167:
  [ticket/9167] Detect and remove any dead left over shadow topics on update.
  [ticket/9167] Remove shadow topics from remaining forums when deleting a forum

Conflicts:
	phpBB/install/database_update.php
2010-08-19 10:09:32 -05:00
Joas Schilling
884cc2ac9b [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
includes/functions_convert.php and install/install_convert.php tested by Dicky.

PHPBB3-9519
2010-08-13 16:40:56 +02:00
Joas Schilling
4c95ed0eeb [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.

PHPBB3-9519
2010-08-10 16:11:39 +02:00
Richard Foote
66fc086742 [ticket/9748] Replace <br /> before converting < and > to their entities.
PHPBB3-9748
2010-07-24 11:48:47 +02:00
Andreas Fischer
e5d5d58172 [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
PHPBB3-9091
2010-07-23 12:48:01 +02:00
Andreas Fischer
eb7254a0c4 Merge branch 'ticket/naderman/9140' into develop-olympus
* ticket/naderman/9140:
  [ticket/9140] Check current board version in incremental update packages
2010-07-12 01:38:39 +02:00
Gabriel Vazquez
2ba6360e43 [ticket/9140] Check current board version in incremental update packages
Since we do not want to limit the updater functionality we only display
a prominent warning when the current board version does not match the
version the update files are meant to update from.

PHPBB3-9140
2010-07-12 01:37:05 +02:00
Andreas Fischer
eeb65d2958 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9637] Do not cache SQL server version in all cases
  [ticket/9629] Allow style.php to retrieve its session ID from cookies
  [ticket/9678] Flash attachments are not displayed in subsilver2.
  [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
  [ticket/9650] Do not allow banning the anonymous user by username

Conflicts:
	phpBB/styles/subsilver2/template/attachment.html
	phpBB/styles/subsilver2/template/posting_buttons.html
2010-07-11 01:54:03 +02:00
Andreas Fischer
2d9aa45aef Merge branch 'ticket/jellydoughnut/9637' into develop-olympus
* ticket/jellydoughnut/9637:
  [ticket/9637] Do not cache SQL server version in all cases
2010-07-11 01:44:59 +02:00
Josh Woody
9c61455d26 [ticket/9637] Do not cache SQL server version in all cases
Because the existing cache is global, there is no way to differentiate between
each of two databases which may be two different DBAL objects pointing to
servers with wildly different versions of an RDBMS. phpBB only has this
situation in the UCF, thus only one file changed outside the DBAL. I have
added a second optional parameter, $use_cache to each of the implementations
of dbal::sql_server_info()

PHPBB3-9637
2010-07-11 01:41:38 +02:00
Andreas Fischer
a2918fd98e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9704] Fix minor typo in coding guidelines.
  [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
  [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
  [ticket/9593] A readme file for unit tests and running unit tests.
  [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
  [ticket/9589] Added sample nginx configuration file for phpbb.
2010-07-08 20:10:17 +02:00
Andreas Fischer
f92c96d424 Merge branch 'ticket/jellydoughnut/9690' into develop-olympus
* ticket/jellydoughnut/9690:
  [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
2010-07-08 19:49:22 +02:00
Andreas Fischer
31b221ae91 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9712] Future dates can be formatted as 'less than one minute ago'
  [ticket/9659] Signature options in set_user_options
  [ticket/9703] Correct database leak where deleting user did not rm some PM data
  [ticket/9697] Backlink broken when the select parent forum does not exist.
  [ticket/9695] Correct the improper display of user input in mcp_ban.php
  [ticket/9628] _add_module 'after'-parameter does not work correctly.
  [ticket/9578] ACP Posting tab is missing "Post settings" module.
2010-07-08 03:06:41 +02:00
Andreas Fischer
c79df9700d Merge branch 'ticket/nickvergessen/9578' into develop-olympus
* ticket/nickvergessen/9578:
  [ticket/9578] ACP Posting tab is missing "Post settings" module.
2010-07-08 02:20:25 +02:00
Josh Woody
d00f2ec183 [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
Microsoft will rename MSN Bot to Bing Bot later this year, and change its user agent.  This updates phpBB to be aware of Bing Bot

PHPBB3-9690
2010-07-07 15:51:31 -05:00
Nils Adermann
dea1d660fb [feature/auto-loading] Added autoloader to common and ensured compatability
The autoloader is registered in install without caching, since caching is set
up during installation. This provides the same functionality, performance is
not a concern during installation anyway.

In common.php the autoloader is instantiated after the cache is initialised and
is started with the standard cache backend used for other cached values.

A few places in the code using class_exists had to be updated to explicitly
avoid autoloading, since they are used to check whether a file needs to be
included which does not (yet) follow the naming scheme the autoloader follows.

PHPBB3-9682
2010-07-05 15:40:46 +02:00
Andreas Fischer
38fc35a497 [ticket/9167] Detect and remove any dead left over shadow topics on update.
PHPBB3-9167
2010-06-11 21:52:04 +02:00
Joas Schilling
4637709f0a [ticket/9628] _add_module 'after'-parameter does not work correctly.
The modules were grouped by left_id so num_modules is always one (hopefully), but the number of rows is the actual value we'd like to know. Removing the GROUP BY resolves the issue.

PHPBB3-9628
2010-05-28 13:13:53 +02:00
Joas Schilling
160d1bfd07 [ticket/9578] ACP Posting tab is missing "Post settings" module.
PHPBB3-9578
2010-05-28 13:03:56 +02:00
Nils Adermann
591217a903 Merge branch 'develop-olympus' into develop
* develop-olympus: (21 commits)
  [feature/notify_status] Define'd constants for notify_status
  [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
  [ticket/9547] Use separate constants for display/enable active topics.
  [ticket/9535] Also fix the margin in the install_update.html
  [ticket/9535] Fix some more rtl margin issues.
  [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
  [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9545] Initial forum should display active topics by default.
  [ticket/9546] Also delete bookmarks, when a topic is deleted.
  [ticket/9529] Topic review is not showing all selected posts.
  [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
  [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
  [ticket/9119] Respect language selection on automated update.
  [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
  [ticket/9567] Newly registered users group description rewording.
  ...
2010-05-16 19:52:36 +02:00
Nils Adermann
63d172e379 Merge branch 'ticket/bantu/9545' into develop-olympus
* ticket/bantu/9545:
  [ticket/9545] Initial forum should display active topics by default.
2010-05-16 17:50:36 +02:00
Andreas Fischer
36c1986986 [ticket/9545] Initial forum should display active topics by default.
The initial forum 'Your first forum' should show topics
(especially the 'Welcome to phpBB3' topic) in the active topics list after
installing phpBB because this is the default setting for new forums
(but not categories).

The default database column value for forum_flags is 32 =
FORUM_FLAG_POST_REVIEW, we therefore have to explicitly set forum_flags to
FORUM_FLAG_POST_REVIEW + FORUM_FLAG_ACTIVE_TOPICS = 48 for this forum.

PHPBB3-9545
2010-05-16 17:49:06 +02:00
Nils Adermann
0f35101c49 Merge branch 'ticket/nickvergessen/9119' into develop-olympus
* ticket/nickvergessen/9119:
  [ticket/9119] Respect language selection on automated update.
2010-05-16 16:56:29 +02:00
Joas Schilling
d8b5594c14 [ticket/9119] Respect language selection on automated update.
PHPBB3-9119
2010-05-16 16:54:29 +02:00
Nils Adermann
cf89952106 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7717] Localise default extension groups for attachments
  [ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or later. Change if block order to always call checkdnsrr() if the function is available.
  [ticket/9173] No longer limit scope of numbers we store in the config table on
  [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
  [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists.
  [ticket/9518] Correctly create new connection on PostgreSQL when new connection is forced.
  [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
  [ticket/6726] Added localhost/127.0.0.1 note to database server hostname explanation in install language.
  [feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer.
  [feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded.
  [ticket/9176] Take current board timezone settings into account when setting board date format.
2010-05-14 02:51:56 +02:00
Joas Schilling
58dc5a191c [ticket/7717] Localise default extension groups for attachments
PHPBB3-7717
2010-05-14 02:42:21 +02:00
Nils Adermann
797a9ed28c Merge branch 'develop-olympus' into develop 2010-03-06 03:33:16 +01:00
Nils Adermann
568fb83373 Merge branch 'master' into develop-olympus 2010-03-06 02:29:04 +01:00
Nils Adermann
39490abfff Incrementing the version number to 3.0.7-PL1 2010-03-05 21:09:37 +01:00
Nils Adermann
693a2dc99b Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
2010-03-03 23:32:09 +01:00
Nils Adermann
872ad322ec Increment version number to 3.0.7
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10555 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 19:30:58 +00:00
Nils Adermann
82219d51c2 Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-24 00:08:13 +00:00
Nils Adermann
4c2421dc1e Previous version bump commit r10506 was missing schema_data.sql so that has been updated to 3.0.7-RC2 as well now
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10532 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:59:08 +00:00
Nils Adermann
47ce0f2a93 Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]
If you were trying to update from 3.0.5 to 3.0.6 but were presented with a dialogue
suggesting to merge the same file over and over take the install/install_update.php
from 3.0.7-RC2 or current svn, and replace your 3.0.5 one with it. It works fine in
3.0.5.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10528 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:35:48 +00:00
Andreas Fischer
4f439593ce Merge r10520 into 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10521 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-22 19:37:09 +00:00
Andreas Fischer
e8f01ff74b We have to use a 'snapshot' of the function there, because it might not be available yet. - Bug #57755
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10520 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-22 19:33:27 +00:00