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

17163 Commits

Author SHA1 Message Date
Joas Schilling
a5c971176b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-21 17:12:58 +02:00
Joas Schilling
4828cb21cf Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympus
* dhruvgoel92/ticket/10776:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.
2013-06-21 16:32:59 +02:00
Dhruv
6cbb2d6136 [ticket/10776] update min php version 5.3.3 in readme
PHPBB3-10776
2013-06-21 18:24:06 +05:30
Joas Schilling
4ac5028d24 Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into develop
* dhruvgoel92/ticket/11503:
  [ticket/11503] similar implementation for mssql_native and odbc
2013-06-21 13:08:11 +02:00
Joseph Warner
95f38b457e [feature/auth-refactor] Create an auth.provider_collector service
Creates an auth.provider_collector service for all auth providers.

PHPBB3-9734
2013-06-20 22:50:35 -04:00
Joseph Warner
c9062fc1ee [feature/auth-refactor] Convert provider_apache to a service
Removes globals from provider_apache and turns it into a service.

PHPBB3-9734
2013-06-20 22:21:22 -04:00
Joseph Warner
c253189e85 [feature/auth-refactor] Convert provider_ldap to a service
Removes globals from provider_ldap and converts it into a service.

PHPBB3-9734
2013-06-20 22:11:53 -04:00
Joseph Warner
24825b9dc8 [feature/auth-refactor] Turn provider_db into a service
Removes globals from provider_db and turns it into a service.

PHPBB3-9734
2013-06-20 21:56:01 -04:00
Joseph Warner
6601c3d64e [feature/auth-refactor] Start turning auth providers into services
Creates auth_provider.yml and includes auth_providers.yml in
services.yml.

PHPBB3-9734
2013-06-20 21:30:35 -04:00
Joseph Warner
0633666e2b [feature/auth-refactor] Fix LDAP conversion error
I messed up when converting over auth_ldap this commit fixes that
error. I have not been able to extensively test ldap due to not
having ldap set up on this computer yet.
Apache authentication appears to work.

PHPBB3-9734
2013-06-20 16:47:55 -04:00
Dhruv
116888f567 Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ticket/10776
# By Callum Macrae
# Via Callum Macrae
* 'ticket/10776' of git://github.com/callumacrae/phpbb3:
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-20 21:39:13 +05:30
Dhruv
3eeeaababd [ticket/11503] similar implementation for mssql_native and odbc
mssql_native and mssql_odbc db drivers varied at some places
where they should have been similar.

PHPBB3-11503
2013-06-20 19:16:21 +05:30
Joas Schilling
bb59875236 Merge branch 'develop-olympus' into develop
Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-06-20 12:03:50 +02:00
Joas Schilling
b9afc6f1a5 Merge remote-tracking branch 'bantu/ticket/11604' into develop-olympus 2013-06-20 11:46:00 +02:00
Andreas Fischer
a72bf329d9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
2013-06-20 11:41:53 +02:00
Andreas Fischer
47241878d0 Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympus
* nickvergessen/ticket/11603:
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
2013-06-20 11:41:46 +02:00
Andreas Fischer
1e4ad4c368 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
2013-06-20 11:34:54 +02:00
Andreas Fischer
f365c99f14 Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympus
* nickvergessen/ticket/11603:
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
2013-06-20 11:29:21 +02:00
Joas Schilling
b362fb44d2 [ticket/11603] Fix out dated comment
PHPBB3-11603
2013-06-20 10:59:43 +02:00
Joas Schilling
5f4daba160 [ticket/11603] Fix usage note
PHPBB3-11603
2013-06-20 10:57:56 +02:00
Andreas Fischer
da958ccb4f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11094] Add textbox for jabber while memberlist search
2013-06-20 01:21:34 +02:00
Andreas Fischer
e47e36266d Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympus
* dhruvgoel92/ticket/11094:
  [ticket/11094] Add textbox for jabber while memberlist search
2013-06-20 01:16:21 +02:00
Joseph Warner
8214e6e837 [feature/auth-refactor] Finish refactoring auth plugins
I believe that this commit should have final minimal changes needed
to replace the old auth plugins with the refactored auth plugins.
Added a few more elements to the interface based on the old auth
plugins. Documentation is not complete and need works on these new
elements.

PHPBB3-9734
2013-06-19 15:33:59 -04:00
Joseph Warner
f4def220ce [feature/auth-refactor] Refactor session for new auth interface
Refactors phpbb_session to use the new auth interface.

PHPBB3-9734
2013-06-19 15:12:50 -04:00
Joseph Warner
2445766b92 [feature/auth-refactor] Refactor acp_board for new auth interface
Partially refactors acp_board for the new authentication interface.
Leaves some questionable if statements in the file.
Modifies the interface to correctly impletment the acp() method.
Modifies each provider to comply with the above mentioned interface
modification.

PHPBB3-9734
2013-06-19 15:02:34 -04:00
Joseph Warner
553c300688 [feature/auth-refactor] Fix typos causing changes to not work
Replaces short tags with long tags.
Fixes the interface to be an interface and not class in the file.
Removes unnecessary include_once from auth.php.

PHPBB-9734
2013-06-19 14:25:58 -04:00
Andreas Fischer
1af6dc22e2 [ticket/11604] Skip installer step where config.php is created.
PHPBB3-11604
2013-06-19 17:03:41 +02:00
Joas Schilling
99e486dc82 [ticket/11603] Throw RuntimeExceptions instead of using exit()
PHPBB3-11603
2013-06-19 13:45:42 +02:00
Joas Schilling
1516ae7e7e [ticket/11603] Avoid using cURL
PHPBB3-11603
2013-06-19 13:38:03 +02:00
Joseph Warner
7bdab205a1 [feature/auth-refactor] Refactor login to use new interface
Refactors auth.php to use the provider_interface during login.

PHPBB-9734
2013-06-18 16:57:59 -04:00
Dhruv
ffed3d109e [ticket/11437] avoid $start becoming negative when no search results are found
When search returns no results there is no need to go inside the if
statement. Since $result_count becomes zero, $start becomes negative
which leads to failed assertion.

PHPBB3-11437
2013-06-19 02:14:04 +05:30
Joseph Warner
0432c32739 [feature/auth-refactor] Make DB auth consistent with interface
Makes provider_db consistent with provider_interface.
Removes $ip, $browser, and $forwarded_for from the arguments of
phpbb_auth_provider_db::login() as these are provided by the global
variable $user.

PHPBB3-9734
2013-06-18 16:07:23 -04:00
Joseph Warner
204c640c77 [feature/auth-refactor] Make LDAP consistent with interface
Makes the provider_ldap consistent with the provider_interface
except for the acp() method which has not yet been finalized.
Renames phpbb_auth_provider_ldap::user_filter to
phpbb_auth_provider_ldap::ldap_user_filter to maintain the original
name of the function from auth_ldap.

PHPBB3-9734
2013-06-18 15:59:33 -04:00
Joseph Warner
57689948e2 [feature/auth-refactor] Make Apache consistent with interface
Makes the provider_apache consistent with the provider_interface
by removing the pass-by-reference of $username and $password.

PHPBB3-9734
2013-06-18 15:41:07 -04:00
Joseph Warner
db27a8c67a [feature/auth-refactor] Fix comment block indentation
Comment block indentation was off by one space on the provider_*
files due to being incorrectly copied over from the auth_* files.

PHPBB3-9734
2013-06-18 15:32:18 -04:00
Joseph Warner
e64abea999 [feature/auth-refactor] Document the provider interface
Provides basic documentation of the auth_provideR_interface.
Changes the login method to login($username, $password) for
consistency with the providers.
acp() is not fully documented. It appears that it is meant to
return an array of some sort and take in a variable by reference.

PHPBB3-9734
2013-06-18 15:20:41 -04:00
Dhruv
d72b5aaf1b Merge remote-tracking branch 'nickvergessen/ticket/11561' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11561:
  [ticket/11561] Specify used tables in notification fixture, so they are emptied
2013-06-18 21:42:07 +05:30
Andreas Fischer
21f839494d [ticket/11604] Fix case where config.php is not generated by phpBB.
PHPBB3-11604
2013-06-18 16:02:33 +02:00
Andreas Fischer
516581c41e [ticket/11604] Use variables for config.php filesnames.
PHPBB3-11604
2013-06-18 15:04:48 +02:00
Joas Schilling
b8678f4678 [ticket/11561] Specify used tables in notification fixture, so they are emptied
PHPBB3-11561
2013-06-18 10:41:52 +02:00
Joseph Warner
8178130340 [feature/auth-refactor] LDAP Auth Provider Skeleton
Creates a ldap auth provider using code taken verbatim from
auth_ldap.php.

PHPBB3-9734
2013-06-17 16:51:51 -04:00
Joseph Warner
4917fd9ca7 [feature/auth-refactor] Database Auth Provider Skeleton
Creates a skeleton of the database auth provider from auth_db.php.
The functions are copied verbatim complete with globals and any
existing errors.

PHPBB3-9734
2013-06-17 16:45:23 -04:00
Joseph Warner
49a5d99ec5 [feature/auth-refactor] Auth Apache Provider Skeleton
Creates a skeleton for Apache based authentication using the
phpbb_auth_provider_interface named phpbb_auth_provider_apache.
This brings over all code in auth_apache.php verbatim complete with
all global variables currently in use.

PHPBB3-9734
2013-06-17 16:38:04 -04:00
Joseph Warner
e2c049c997 [feature/auth-refactor] Provider Interface Skeleton
Creates a skeleton of the authentication provider interface.

PHPBB3-9734
2013-06-17 16:11:23 -04:00
Dhruv
50828e6d39 [ticket/11094] Add textbox for jabber while memberlist search
PHPBB3-11094
2013-06-15 18:41:43 +05:30
Joas Schilling
80747a0530 Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-06-13 21:19:02 +02:00
Joas Schilling
7edd70d6df Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10820-develop' into develop
* remotes/dhruvgoel92/ticket/10820-develop: (34 commits)
  [ticket/10820] fix if condition to check for IE
  [ticket/10820] Add additional check for IE in condition
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8
  [ticket/10820] Fix function docblock
  [ticket/10820] Add test cases More test cases to check against different versions
  [ticket/10820] Rename function
  [ticket/10820] Fix copyright
  [ticket/10820] Change function call in tests
  ...
2013-06-13 21:18:52 +02:00
Joas Schilling
e19ed7d8b9 Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10820' into develop-olympus
* remotes/dhruvgoel92/ticket/10820:
  [ticket/10820] fix if condition to check for IE
  [ticket/10820] Add additional check for IE in condition
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8
2013-06-13 21:06:37 +02:00
Dhruv
4e8f1bf894 Merge branch 'ticket/10820' into ticket/10820-develop
* ticket/10820:
  [ticket/10820] fix if condition to check for IE

Conflicts:
	phpBB/download/file.php
2013-06-14 00:32:23 +05:30
Dhruv
de150cb4ad [ticket/10820] fix if condition to check for IE
PHPBB3-10820
2013-06-14 00:29:06 +05:30