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

412 Commits

Author SHA1 Message Date
Oleg Pudeyev
bbc531061f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
2011-02-26 08:05:55 -05:00
Andreas Fischer
3b15fe0a5b [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
This also moves the code up to the point where we know that the user is a bot.

Regression from d07e152ea7e820c5a0e47aeb8004fa0b5621a314

PHPBB3-9912
2011-02-25 22:24:34 -05:00
Andreas Fischer
f50d74506a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9949] Unit tests for user::lang()
  [ticket/9949] $user->lang() uses last int-value to get the key not first
2011-02-07 16:32:25 +01:00
Joas Schilling
92f99c97f4 [ticket/9949] $user->lang() uses last int-value to get the key not first
The comment in the code says: "We now get the first number passed and will
select the key based upon this number". But the loop over the arguments is not
left and therefore it uses the last int-value not the first one.

PHPBB3-9949
2011-01-29 17:22:55 +01:00
Andreas Fischer
6a32724400 [ticket/9746] Adding calls to phpbb_ip_normalise() from session management.
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Igor Wiedler
d4a685abc1 [feature/update-session-api] Add update_session method
PHPBB3-9688
2010-12-29 13:32:37 +01:00
Andreas Fischer
442fc61be7 Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
  [feature/request-class] Convert some remaining cookies
  [feature/request-class] Adjust misleading comment
  [feature/request-class] Remove direct access to _REQUEST in acp_search
  [feature/request-class] Special case of direct access to _REQUEST
2010-12-16 02:22:17 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Igor Wiedler
b08e0d1772 [feature/request-class] Convert some remaining cookies
Convert some remaining accesses to cookie to use the
request class instead. Thanks to bantu for the note.

PHPBB3-9716
2010-10-17 13:56:16 +02:00
Nils Adermann
6beeda79eb [feature/request-class] Replace direct use of GET/REQUEST with request_var.
Now with $_VARs causing fatal errors we should really be able to find and
delete all of these occurances.

PHPBB3-9716
2010-09-17 14:00:01 +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
Andreas Fischer
bef108a5cc [ticket/9609] Change header() calls setting HTTP status to send_status_line().
PHPBB3-9609
2010-09-11 22:01:31 +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
Joas Schilling
932b35ab7a [ticket/9782] Board disable radio set on when server load high
PHPBB3-9782
2010-08-20 13:41:06 -04: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
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
Chris Smith
9764a32138 [ticket/9712] Future dates can be formatted as 'less than one minute ago'
PHPBB3-9712
2010-07-07 23:04:46 +01: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
Nils Adermann
382354925d Merge branch 'develop-olympus' into develop
* develop-olympus: (26 commits)
  [git-tools] add note about PHP_BIN using env
  [git-tools] do not display stderr
  [git-tools] Prepend the branch to the commit message for all branches.
  [git-tools] Use env to find the correct paths to binaries.
  [git-tools] Display what parse errors were found.
  [git-tools] This script requires bash to run, so point directly to bash.
  [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
  [feature/dbal-tests] Fix mysql (not mysqli) dbal test.
  [feature/dbal-tests] Only output the missing config error message once.
  [feature/dbal-tests] Make the PDO prefix depend on the dbms.
  [feature/dbal-tests] Fix whitespace and line endings.
  [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425)
  [bug/59425] Correctly check for double inclusion in captcha garbage collection
  [bug/58465] The redirect hidden field is now XHTML conform
  [feature/dbal-tests] Make some tests for build_array_data on SELECT
  [feature/dbal-tests] Make some tests for return_on_error on SELECT-queries
  [feature/dbal-tests] Tests for $db->sql_query_limit()
  [feature/dbal-tests] Load phpbb-schema after creating the connection to the database
  [feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.
  [feature/dbal-tests] Added database test & refactored test framework
  ...
2010-04-04 15:04:56 +02:00
U-H-PC\H
9be61f9e53 [bug/59425] Correctly check for double inclusion in captcha garbage collection
The check to avoid the double inclusion of the captcha factory class in the
garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory".
TerryE pointed the problem out, thanks!
2010-03-28 14:37:31 +02:00
Nils Adermann
d702dba75e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Make this test run on windows with backslash-paths.
  [bug/56965] Redirect fails with directory traversal
  [bug/58685] Correct spelling errors in append_sid() comments.
  [bug/58025] Search robots are now redirected if they send a SID in the request
2010-03-26 18:28:48 +01:00
Chris Smith
d07e152ea7 [bug/58025] Search robots are now redirected if they send a SID in the request
Previously search robots could stumble upon a board link somewhere on the web
containing a SID they'd follow it and end up indexing that page with the SID
in the request URI, this fix prevents that by redirecting them to the same URI
just without the SID.
2010-03-13 02:15:39 +00:00
Nils Adermann
8d3cdd5dae Merge branch 'develop-olympus' into develop 2010-03-08 00:56:28 +01:00
David Ward
865123ffda [bug/58755] Fix a redirection bug that can occur after login
This issue affects any forum (i.e. https://myforum/phpBB3/) where:
 - the forum is located in a directory underneath the web root (i.e., NOT https://myforum/)
 - a user accesses the forum with a URI pointing to a directory rather than a script (i.e., NOT https://myforum/phpBB3/index.php)
 - the URI used ends in a slash (i.e., NOT https://myforum/phpBB3)

If these conditions are met, after successful login the user is redirected to an invalid URI (i.e., https://myforum/phpBB3/phpBB3?sid=).

This change fixes extract_current_page() to handle the case correctly where the URI ends in a slash and is not the web root. So after successful login, the redirection back to the main page will work (i.e., https://myforum/phpBB3/?sid=)
2010-03-07 13:56:24 -05:00
Nils Adermann
9d28bcd308 Make a few functions truly static to fix the tests. 2010-03-06 04:41:49 +01:00
Cullen Walsh
fe98d43bb5 [Fix] Don't send activation email when user tries to change email without permission (fix by nrohler). (Bug #56335)
Authorised by: naderman


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10443 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 18:19:18 +00:00
Andreas Fischer
c80f98ea10 Fix Bug #54125 - Correctly reset login keys if passed value is the current user.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10279 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-19 09:54:38 +00:00
Meik Sievertsen
782d680b54 Fix getting host for situations where the name/IP is not resolvable. Related to Bug #41025
Related revisions: r9387 and r10158

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10178 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-22 15:09:09 +00:00
Meik Sievertsen
223b9ed0d6 extend r9387 - check for existance of all functions we use...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10158 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-17 13:39:50 +00:00
Jim Wigginton
295fb5373a - fixed bug #44975
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10103 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 14:53:35 +00:00
Meik Sievertsen
d8a76b1442 Add some very basic checks to the users ip - related to bug #48995
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10020 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-20 08:43:10 +00:00
Meik Sievertsen
bec4b11b64 Because we store forwarded_for if the check is activated we need a better check
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10019 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-20 08:37:06 +00:00
Meik Sievertsen
f7009291e2 Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...
This feature does not change anything for those not using the constant and this feature is also quite in-flux. We need to test this with some applications and bridges and there may be other locations able to benefit from it.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10008 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-17 14:45:14 +00:00
Joas Schilling
c8daec7c82 Fix Bug #49035 - Fix general error while registration, through undefined variable $config in validate_referer (Patch by wjvriend)
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9917 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-04 10:04:54 +00:00
Meik Sievertsen
3461eaf828 Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9901 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-01 11:01:18 +00:00
Joas Schilling
f84cbee47c Fix bug #18005 - Do not add style-parameter to URL again, after admin re-authentification - Patch by leviatan21
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9841 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-24 08:52:56 +00:00
Ruslan Uzdenov
adaeec1ec9 Fixed Bug #45115 - Signature parsing flags are not stored in DB
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9696 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-27 08:36:40 +00:00
Gabriel Vazquez
19e2dcd5db Fixed Bug #47145 - [Fix] Correctly check banned users when force password change
Authorised by: AcydBurn 

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9665 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-24 02:56:05 +00:00
Ruslan Uzdenov
b1584a8d5c Fix bug #46965 - File named install in php directory
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9654 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-22 16:16:04 +00:00
Henry Sudhof
794e122cfa add quicktool to remove users from the newly registered special group.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9646 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-21 14:31:00 +00:00
Meik Sievertsen
afc0ef93c5 add check to newly registered function to not execute this more than once
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9644 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-21 11:13:20 +00:00
Meik Sievertsen
433de350c0 - [Feature] New "Newly Registered Users" group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts.
- [Feature] Ability to define if the "Newly Registered Users" group will be assigned as the default group to newly registered users.

As a coincidence also Bug #46535 got fixed.
Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-20 18:45:16 +00:00
Henry Sudhof
be81ae9e46 should fix garbage collection
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9627 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 12:38:08 +00:00
Meik Sievertsen
a539fca62b some corrections, only very minor things.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9554 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-07 11:34:01 +00:00
Henry Sudhof
b776d02682 Okay, a first ci of the new captcha plugins. We'll add dynamic template includes later, as well as documentation on how to use this. I'm prepared to get yelled at for bugs (oh, I know that there are plenty); but please blame spammers for broken styles and MODs.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9524 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-02 14:12:23 +00:00
Meik Sievertsen
7c418dee55 #44485 - we only send a 503 header if it is a search engine.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9490 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-28 08:34:30 +00:00
Meik Sievertsen
6816cf292f do not use spamhaus XBL list - it has too much false positives due to the dynamic IPs
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9484 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-25 08:52:11 +00:00
Henry Sudhof
696aff3169 #41575
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9480 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-22 13:11:13 +00:00