1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Commit Graph

219 Commits

Author SHA1 Message Date
c7b88ee1d1 [ticket/11923] Attempt to translate errors only if user can change avatar.
PHPBB3-11923
2013-10-17 21:29:02 -07:00
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-16 01:24:05 +02:00
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
ca07be9c57 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
2013-07-31 23:40:35 +02:00
866e475f96 [ticket/10037] Apply attached patch with a few changes
PHPBB3-10037
2013-07-25 15:47:55 +02:00
da2752e400 [ticket/11700] Modify all code to use the new interface names
PHPBB3-11700
2013-07-14 13:30:52 -04:00
fcdfe748b8 [ticket/11454] Use set_addresses in other applicable areas
This should fix some other bugs that may not have yet been recognized--some
areas only set to(), but sent according to user_notify_type, which is not
necessarily email.

PHPBB3-11454
2013-04-24 15:34:12 -05:00
a9e0aea4b1 [feature/avatars] Remove trailing whitespace from avatar code
PHPBB3-10018
2013-02-19 12:30:14 +01:00
2302cd7a42 [feature/avatars] Pass phpbb_user to prepare and process form functions
The phpbb_user object might be used for language variables and other
things.

PHPBB3-10018
2013-02-19 12:24:21 +01:00
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
41710c745d [feature/avatars] Add function for localizing errors
PHPBB3-10018
2013-01-06 21:09:07 +01:00
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
c865f98dcf [feature/avatars] Some more miscellaneous changes
PHPBB3-10018
2012-12-27 20:42:05 +01:00
2f47c99432 [feature/avatars] Add more consistency to codebase
PHPBB3-10018
2012-12-11 21:02:37 +01:00
1aae72961a Merge branch 'develop' into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2012-12-09 21:02:31 +01:00
4103c99a86 [ticket/10679] Add new permission for changing profile field information
The setting is copied from "Can use signature"

PHPBB3-10679
2012-12-06 15:10:29 +01:00
b42ca792fd [feature/avatars] Minor variable naming fixes
PHPBB3-10018
2012-12-04 00:49:37 +01:00
d439f47710 [feature/avatars] Fix docblocks and minor cosmetic issues
PHPBB3-10018
2012-12-01 00:27:52 +01:00
33b98dc5ba [feature/avatars] Fix variable names
PHPBB3-10018
2012-11-30 16:46:11 +01:00
f4ad60e2cf [feature/avatars] Get list of enabled drivers from avatar manager
This shouldn't be done in the avatar drivers. We need to force the
display all avatar drivers in the ACP or it won't be possible to enable
avatars after they have been disabled.

PHPBB3-10018
2012-11-30 01:07:10 +01:00
cb1d98ab7f [feature/avatars] Check for existing functions rather than using _once
PHPBB3-10018
2012-11-26 23:06:38 +01:00
a77fcdb5f9 [feature/avatars] Implement better treatment of avatar errors
PHPBB3-10018
2012-11-25 17:01:21 +01:00
f8256ed00f [feature/avatars] Small cosmetic changes
PHPBB3-10018
2012-11-25 16:18:51 +01:00
06639729ea [feature/avatars] Add static methods for handling driver names
PHPBB3-10018
2012-11-25 16:05:57 +01:00
67c2e48d15 [feature/avatars] Only create avatar objects if necessary
PHPBB3-10018
2012-11-25 14:33:13 +01:00
ce5e2f1677 [feature/avatars] Miscellaneous fixes
PHPBB3-10018
2012-11-25 01:18:27 +01:00
ce44e3908e [feature/avatars] Remove unnecessary abbreviations
PHPBB3-10018
2012-11-25 00:54:34 +01:00
959bc183bf [feature/avatars] Handle deletion of avatars
Previously this wasn't handled correctly if at all.

PHPBB3-10018
2012-11-18 23:09:09 +01:00
c70cbfac43 [feature/avatars] Fix acp front-end of user and group avatars
Due to the changes to the avatar manager etc. these had to be updated.

PHPBB3-10018
2012-11-17 00:50:23 +01:00
517d3f56ac [feature/avatars] Use correct names of input fields
The name of the avatar input fields seem to have been copied from the local
avatar (gallery avatar). Since the input fields have different names in
the template files of the remote and gravatar avatars this will not
properly default to the entered values.
Additionally, the focused driver wasn't correctly filtered causing use to
always default to no avatar.

PHPBB3-10018
2012-11-16 17:39:32 +01:00
0a5d54cc9b [feature/avatars] Shorten avatar driver's class name
The addition of "core_" that was used until now would require additional
avatar drivers (e.g. in extensions) to also include that in their class
name which would be incorrect.

PHPBB3-10018
2012-11-16 17:19:04 +01:00
cc86bd9267 [feature/avatars] Shorten needed language variable for avatar title
PHPBB3-10018
2012-11-16 14:29:35 +01:00
60b4c907b2 [feature/avatars] Add service containers for avatars
PHPBB3-10018
2012-11-15 18:10:54 +01:00
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +01:00
73a75fc3d3 [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
Currently only auth_db is supported there and the password needs to be trimmed
for compatibility because user_password stores

  phpbb_hash(htmlspecialchars(trim($password)))

Setting passwords for other auth modules is currently not supported.

Once setting/changing passwords is supported by auth plugins, the
untrimmed_variable() should be used here and the result should be passed
to the auth plugin.

PHPBB3-8713
2012-09-09 21:10:29 +02:00
f2607fc9e8 [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
PHPBB3-8713
2012-09-08 14:15:56 +02:00
b3cd5a649b [ticket/8713] Do not trim login inputs
Create a function to request variables which are not trimmed.

All requests for passwords (except forum passwords) now use the
untrimmed request function.

PHPBB3-8713
2012-09-03 13:32:33 -05:00
df16bd1c49 [feature/avatars] Rewrite drivers to use full class name
* Use full driver class name as avatar_type value
* Move avatar drivers to core namespace
* Make avatars installable through extensions

PHPBB3-10018
2012-06-27 21:02:07 +02:00
1b3cb68c2f Merge remote-tracking branch 'upstream/develop' into feature/avatars
* upstream/develop: (255 commits)
  [ticket/10935] Limit number of PM rules per user to 5000
  [ticket/10801] Fixed quickmod tools.
  [ticket/9551] uncomment line and change length to 255
  [ticket/10925] Clarify installation requirements for SQLite
  [ticket/10938] Serve subforum listing on forumlist from template loop
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
  [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
  [ticket/10829] $style_name -> $style_path in style class.
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
  [ticket/10882] Fix test name - oops.
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10932] Use included composer.phar in build process
  ...

Conflicts:
	phpBB/includes/mcp/mcp_warn.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-06-27 14:47:13 +02:00
71f8416480 [feature/delete-auto-logins] improved styling and fixes language
Table ahs been styled. Date is now formatted properly instead of
the unix timestamp being displayed earlier. fixes small mistake in language
entry

PHPBB3-9647
2012-05-17 14:02:28 +05:30
bdf66b27ab [feature/delete-auto-logins] using loop for errors
instead of hardcoding html code into ERROR variable, we use errors array
and use loop in template file.

PHPBB3-9647
2012-05-17 14:02:25 +05:30
4129711e9f [feature/delete-auto-logins] checks form key
The form key is checked after submission if not correct error is returned.

PHPBB3-9647
2012-05-17 14:02:17 +05:30
79ef960435 [feature/delete-auto-logins] Fixes language entries and redirection.
The user is redirected after deleting auto login session keys.

PHPBB3-9647
2012-05-17 14:02:14 +05:30
5ce46cc960 [feature/delete-auto-logins] User can view/delete auto logins.
User has an extra option in UCP->Profile to view the auto logins and
clear them.

PHPBB3-9647
2012-05-17 14:02:12 +05:30
3b71e81cfb [feature/avatars] Simplify clean_row, move it to avatar manager
PHPBB3-10018
2012-04-08 21:29:52 +02:00
81fb4268cd [feature/avatars] Introduce an avatar driver interface
PHPBB3-10018
2012-04-08 16:40:19 +02:00
eea2ec5052 [feature/avatars] Introduce global phpbb_avatar_manager
PHPBB3-10018
2012-04-08 16:27:09 +02:00
e861bb0e04 [feature/avatars] Use request object in avatar drivers
PHPBB3-10018
2012-04-07 19:20:11 +02:00
a06380c69a [feature/avatars] Make avatars generic
Adding a cleaning function for data coming from the users/groups
tables so drivers only deal with clean data (ideally). Refactored
get_user_avatar() and get_group_avatar() to use an underlying
get_avatar() function.

PHPBB3-10018
2012-03-18 22:21:36 +00:00
d0bb14ded1 [feature/avatars] Update ACP manage users, fix gallery focus issue
Updated ACP to match UCP with dropdown. Correctly determe which
avatar to focus on by checking if the form was submitted and
avatar_driver is set.

PHPBB3-10018
2012-03-18 22:21:36 +00:00