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

15332 Commits

Author SHA1 Message Date
Marc Alexander
e841453d03 [feature/avatars] Add note about when compatibility function was added
PHPBB3-10018
2013-01-22 21:05:31 +01:00
Marc Alexander
79356f5441 [feature/avatars] Add compatibility function for get_user_avatar()
PHPBB3-10018
2013-01-22 17:21:49 +01:00
Marc Alexander
84272b1028 [feature/avatars] Move definition of driver_collection to avatars.yml
PHPBB3-10018
2013-01-15 22:13:23 +01:00
Marc Alexander
aeeb85e1cf [feature/avatars] Remove the obsolete request argument for avatar drivers
This should have been removed earlier when the phpbb_request object was
dropped from the arguments to the avatar drivers.

PHPBB3-10018
2013-01-15 22:07:01 +01:00
Marc Alexander
7402add107 [feature/avatars] Add missing @var to docblocks in avatar manager
PHPBB3-10018
2013-01-09 15:50:15 +01:00
Marc Alexander
7ea0376958 [feature/avatars] Remove not needed inline style
PHPBB3-10018
2013-01-08 22:47:05 +01:00
Marc Alexander
caa3516d13 [feature/avatars] Differentiate tests for get drivers functions
Tests for get_all_drivers() and get_enabled_drivers() should be different.

PHPBB3-10018
2013-01-08 21:58:03 +01:00
Marc Alexander
cb08bf3c0c [feature/avatars] Strictly check if avatar list is empty and cache result
PHPBB3-10018
2013-01-08 21:46:43 +01:00
Marc Alexander
9e001153d6 [feature/avatars] Pass phpbb_user object to prepare_form_acp()
The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.

PHPBB3-10018
2013-01-08 15:42:30 +01:00
Marc Alexander
8778c9c945 [feature/avatars] Pass phpbb_user object to get_custom_html()
Pass the phpbb_user object to function get_custom_html(). This object is
used in that method. Also fixed incorrect arguments to get_custom_html()
in phpbb_get_avatar().

PHPBB3-10018
2013-01-08 15:34:20 +01:00
Marc Alexander
023d7a972d [feature/avatars] Remove $request property and pass as argument if needed
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().

PHPBB3-10018
2013-01-07 23:02:07 +01:00
Marc Alexander
8867cb60b1 [feature/avatars] Use empty() instead of sizeof()
PHPBB3-10018
2013-01-07 21:16:39 +01:00
Marc Alexander
41710c745d [feature/avatars] Add function for localizing errors
PHPBB3-10018
2013-01-06 21:09:07 +01:00
Marc Alexander
111e02395c [feature/avatars] Add missing docblocks to avatar manager
PHPBB3-10018
2013-01-05 20:17:53 +01:00
Marc Alexander
a342e47038 [feature/avatars] Change avatar javascript to conform to new coding guidelines
PHPBB3-10018
2013-01-04 18:13:49 +01:00
Marc Alexander
8f8527a416 [feature/avatars] Improve handling of incorrect input for avatars
The upload avatar driver will now inform the user if insufficient data has
been entered for both remote and local avatar uploads.
The local avatar driver (gallery avatar) will also inform the user if he
didn't select a category and/or file before submitting.

PHPBB3-10018
2013-01-04 17:32:04 +01:00
Marc Alexander
7256a2d944 [feature/avatars] Add phpbb prefix to new functions
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.

PHPBB3-10018
2013-01-04 15:10:43 +01:00
Marc Alexander
5d091e2d8f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/includes/ucp/ucp_groups.php
2013-01-04 10:49:57 +01:00
Marc Alexander
4a8b1a6e05 [feature/avatars] Inform user of no available local avatars
Rather than showing the user an empty drop-down list for the local avatar
categories, inform him/her that there are currently no (local) avatars
available.

PHPBB3-10018
2013-01-04 10:25:08 +01:00
Andreas Fischer
228580b674 Merge remote-tracking branch 'erikfrerejean/ticket/11283' into develop
* erikfrerejean/ticket/11283:
  [ticket/11283] Extension manager follow symlinks.
2013-01-03 04:10:04 +01:00
Oleg Pudeyev
300b8236eb Merge PR #1153 branch 'marc1706/ticket/10805' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/10805:
  [ticket/10805] Compare phpbbAlertTimer against null
  [ticket/10805] Clear loading alert timeout after ajax request finished
2013-01-02 16:56:38 -05:00
Oleg Pudeyev
56a7dd2bd5 Merge PR #1176 branch 'marc1706/ticket/11302' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11302:
  [ticket/11302] Correctly select first timezone or selected timezone
2013-01-02 16:48:46 -05:00
Marc Alexander
e211009eb7 [ticket/11302] Correctly select first timezone or selected timezone
While registering, we should default to a given timezone. By selecting the
first timezone by default, this is fulfilled. This doesn't happen
currently, as only the "Select a timezone" selection appears.
If a user selects a timezone during the registration process we should
also make sure that the selected element is still selected; even if we
have to return to the registration page, i.e. if there was an error while
submitting the form. This is currently not the case.
With this patch the javascript code will behave correctly.
Additionally, a duplicate inclusion of timezone.js has been removed as it
was not needed.

PHPBB3-11302
2013-01-02 22:05:14 +01:00
Igor Wiedler
208770d7fd Merge remote-tracking branch 'p/ticket/11305' into develop
* p/ticket/11305:
  [ticket/11305] Mock container for cache driver in functional create_user()
  [ticket/11305] Check for $cache being null before using it in db drivers.
  [ticket/11305] Define hook finder as a service on the container.
  [ticket/11305] Adjust comment.
  [ticket/11305] Use phpbb_create_default_container.
  [ticket/11305] Create a normal container during final installation step.
  [ticket/11305] Retrieve cache driver from container rather than cache service.
  [ticket/11305] Extract hook finder from cache service.
2013-01-02 21:52:57 +01:00
Igor Wiedler
0483971f77 [ticket/11305] Mock container for cache driver in functional create_user()
create_user has calls to fetch the cache driver from the container. This
PR mocks the container and returns a null cache driver in that case.

PHPBB3-11305
2013-01-02 21:44:25 +01:00
Oleg Pudeyev
c8c6eb46ec [ticket/11305] Check for $cache being null before using it in db drivers.
There is no reason why db drivers must have a cache to work.
They query the database, that part works without caches.

PHPBB3-11305
2013-01-02 14:36:14 -05:00
Marc Alexander
48b6e45f7c [ticket/10805] Compare phpbbAlertTimer against null
PHPBB3-10805
2013-01-02 16:44:05 +01:00
Oleg Pudeyev
bc317c49a7 [ticket/11305] Define hook finder as a service on the container.
PHPBB3-11305
2013-01-02 01:36:50 -05:00
Oleg Pudeyev
3360d4cfce [ticket/11305] Adjust comment.
PHPBB3-11305
2013-01-02 01:32:22 -05:00
Oleg Pudeyev
210f627f67 [ticket/11305] Use phpbb_create_default_container.
PHPBB3-11305
2013-01-02 01:31:06 -05:00
Oleg Pudeyev
8d3edd4128 [ticket/11305] Create a normal container during final installation step.
The final step calls a bunch of code which expects a full phpBB
runtime environment. Also, by this step everything should be configured
and database schema set up.

Therefore, in the final step replace installer container with a normal
phpBB container.

PHPBB3-11305
2013-01-02 01:29:32 -05:00
Oleg Pudeyev
b94f9ae302 [ticket/11305] Retrieve cache driver from container rather than cache service.
This only covers some of the call sites.

PHPBB3-11305
2013-01-02 01:29:32 -05:00
Oleg Pudeyev
7adae349a9 [ticket/11305] Extract hook finder from cache service.
Unlike most other things in cache service, hook finder does not need
a database connection.

PHPBB3-11305
2013-01-02 01:29:32 -05:00
Oleg Pudeyev
1ca63fb302 Merge PR #1175 branch 'igorw/ticket/11306' into develop
# By Igor Wiedler
# Via Igor Wiedler
* igorw/ticket/11306:
  [ticket/11306] Add docblocks to all container related functions
  [ticket/11306] Introduce phpbb_create_default_container
2013-01-02 01:24:09 -05:00
Igor Wiedler
21eb8d842b [ticket/11306] Add docblocks to all container related functions
PHPBB3-11306
2013-01-02 06:41:40 +01:00
Igor Wiedler
ea24de8de3 [ticket/11306] Introduce phpbb_create_default_container
Extracts default container construction to factory function, removing
boilerplate duplication for container construction.

PHPBB3-11306
2013-01-02 06:41:35 +01:00
Marc Alexander
5d07ddffaf [ticket/10805] Clear loading alert timeout after ajax request finished
The timeout for the "request timed out" popup should be cleared if it
finished. Since it is currently not cleared, the timeout alert appears as
an extra overlay if another ajaxified function is ran within 5 seconds of
the initial function call. This patch will take care of clearing the
timeout if either the success (function return_handler()) or error
(function error_handler()) functions are called.

PHPBB3-10805
2013-01-01 20:29:30 +01:00
Andreas Fischer
53c4257bfa Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
  [ticket/11037] Fix unit tests.
  [ticket/11037] Update services.yml.
  [ticket/11037] Add/update docblocks.
  [ticket/11037] Eliminate globals from cache service.
2012-12-31 01:11:19 +01:00
Andreas Fischer
01227cdca5 Merge remote-tracking branch 'p/ticket/11188' into develop
* p/ticket/11188:
  [ticket/11188] Reduce waste.
  [ticket/11188] add result count query for author search
  [ticket/11188] add count query to postgres search
2012-12-31 00:56:15 +01:00
Andreas Fischer
3a0e98a3bd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11293] Add a note that mysqli should be in front of mysql.
2012-12-31 00:54:31 +01:00
Andreas Fischer
cbe91e5b50 Merge remote-tracking branch 'p/ticket/11293' into develop-olympus
* p/ticket/11293:
  [ticket/11293] Add a note that mysqli should be in front of mysql.
2012-12-31 00:53:50 +01:00
Oleg Pudeyev
3d27ed13f5 [ticket/11188] Reduce waste.
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
763f2929ba [ticket/11188] add result count query for author search
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
979edc4113 [ticket/11188] add count query to postgres search
PHPBB3-11188
2012-12-30 18:50:05 -05:00
Oleg Pudeyev
9c7772040c [ticket/11037] Fix unit tests.
PHPBB3-11037
2012-12-29 14:23:14 -05:00
Oleg Pudeyev
4dcc8cabae Merge PR #1130 branch 'EXreaction/ticket/11259' into develop
* EXreaction/ticket/11259:
  [ticket/11259] htmlspecialchars($phpbb_admin_path)
  [ticket/11259] adm_relative_path -> phpbb_adm_relative_path
  [ticket/11259] Also make adm_relative_path available in the container
  [ticket/11259] Make phpbb_admin_path available everywhere

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2012-12-29 13:45:40 -05:00
Oleg Pudeyev
f9354b98d8 Merge PR #1162 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
2012-12-29 07:47:23 -05:00
Oleg Pudeyev
51138d3f3a Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11291:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
2012-12-29 07:47:10 -05:00
Andreas Fischer
6951356a87 [ticket/11291] phing: Also add checkreturn="true" to composer execution.
PHPBB3-11291
2012-12-29 13:38:40 +01:00
Andreas Fischer
b36050983d [ticket/11291] phing: Add checkreturn="true" to all new commands.
PHPBB3-11291
2012-12-29 13:30:25 +01:00