1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-19 14:00:59 +02:00

201 Commits

Author SHA1 Message Date
Marc Alexander
373e26ca74 [ticket/11538] Merge calls to validate_data() in acp_groups
PHPBB3-11538
2013-05-19 11:38:11 +02:00
Marc Alexander
b49ce5eb3a [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
PHPBB3-11538
2013-05-19 11:29:11 +02:00
Marc Alexander
1715619fda [ticket/11538] Add function phpbb_validate_colour for validating colours
It will be possible to use this function via the validate_data() function
interface that has already been used previously. Thus, this new function
will extend the capabilities of validate_data() to checking hex color
values.

PHPBB3-11538
2013-05-16 13:22:43 +02:00
Marc Alexander
204cdb2164 [ticket/11538] Make sure regex doesn't allow multiple color values
This will now make sure that 'AAFF00' will be matched but strings like
'AAFF00 AABB00' will not.

PHPBB3-11538
2013-05-15 12:30:05 +02:00
Marc Alexander
deefe5c0e4 [ticket/11538] Simplify colour value check and remove support for '#'
The input length for the hex color is now limited to 6 characters and
the support for colors starting with a '#' has been dropped. The allowed
input length of 7 in prosilver seems to have been a relict from old ages
of phpBB3. In order to have proper support for correct checking of the
colour value, the new code was also ported to the ACP groups manage page.
The tests have been modified to reflect the changes to the behavior of
the color check. Tests for the ACP will follow.

PHPBB3-11538
2013-05-14 22:39:33 +02:00
Marc Alexander
6890bf9f8d [ticket/11535] Correctly merge avatar_errors array into primary error array
The $avatar_errors array needs to be merged into the primary $error array
before the group settings get applied. This is currently not the case.
Functional tests for this will be provided by PR #1401.

PHPBB3-11535
2013-05-13 12:17:31 +02:00
Nils Adermann
653666c76e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11358] Removed all trailing white spaces.
  [ticket/11358] Fixed the code according to coding guidlines.
2013-04-12 14:03:56 +02:00
erangamapa
7d8bbcd596 [ticket/11358] Removed all trailing white spaces.
Removed all trailing white spaces with new lines.

PHPBB3-11358
2013-04-12 14:03:06 +02:00
erangamapa
00b45fa4dc [ticket/11358] Fixed the code according to coding guidlines.
Added proper indentation and new line after break in switch
statement.

PHPBB3-11358
2013-04-12 14:02:51 +02:00
Nathaniel Guse
941b7287b7 Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop
# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [feature/avatars] Use "Main" as category for avatars in root of gallery
  [feature/avatars] Remove trailing whitespace from avatar code
  [feature/avatars] Pass phpbb_user to prepare and process form functions
  [feature/avatars] Document the use of the allowed extensions array
  [feature/avatars] Use array for allowed extensions and implode if needed
  [feature/avatars] Use deprecated for compatibility function
  [feature/avatars] Correct license, copyright and package info
  [feature/avatars] Move list of supported formats to avatar driver class
  [feature/avatars] Add include of functions_display.php in BC function
  [feature/avatars] Add note about when compatibility function was added
  [feature/avatars] Add compatibility function for get_user_avatar()
  [feature/avatars] Move definition of driver_collection to avatars.yml
  [feature/avatars] Remove the obsolete request argument for avatar drivers
  [feature/avatars] Add missing @var to docblocks in avatar manager
  [feature/avatars] Remove not needed inline style
  [feature/avatars] Differentiate tests for get drivers functions
  ...
2013-03-04 13:33:42 -06:00
Marc Alexander
d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2013-03-04 00:22:15 +01:00
Joas Schilling
9e70f7a4e0 [ticket/10411] Catch exceptions from grouppositions
PHPBB3-10411
2013-02-26 16:53:51 +01:00
Joas Schilling
8c6a1e50f5 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3: (497 commits)
  [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
  [ticket/11358] Changed the name of post parameter.
  [ticket/11358] Changed the action parameter value to represent the link.
  [ticket/11358] Enabled link making all users default for a group.
  [ticket/11358] Removed redundant code and referred proper variable.
  [ticket/11358] Success message even without selecting a user.
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.
  [ticket/10896] Add missing email validation lost in develop merge
  [ticket/7262] Add note about set_config() not updating is_dynamic.
  [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
  [ticket/7262] Backport set_config() and set_config_count() docs from develop.
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
  [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
  [ticket/11342] Fix "unexpected token" syntax error
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/includes/functions_user.php
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
2013-02-25 21:03:34 +01:00
Joas Schilling
9ea48dbd45 [ticket/10411] Use template loops instead of defining the html in php files
PHPBB3-10411
2013-02-25 20:24:11 +01:00
Joas Schilling
12cc64e715 [ticket/10411] Ensure we only get services that do exist
PHPBB3-10411
2013-02-25 19:01:35 +01:00
Nils Adermann
465ab7ab92 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11358] Changed the name of post parameter.
  [ticket/11358] Changed the action parameter value to represent the link.
  [ticket/11358] Enabled link making all users default for a group.
  [ticket/11358] Removed redundant code and referred proper variable.
  [ticket/11358] Success message even without selecting a user.
2013-02-24 18:17:42 +01:00
erangamapa
1b39d6d65e [ticket/11358] Changed the name of post parameter.
Replaced the parameter name 'defaultbylink' to a meaningful name
'set_default_on_all'. Parameter is used for making all users
default for selected group in acp_groups.php.

PHPBB3-11358
2013-02-24 18:12:50 +01:00
erangamapa
c0a39537e3 [ticket/11358] Changed the action parameter value to represent the link.
Changed the action parameter value to recognize whether 'Make default
group for every member' is clicked. If so execute a seperate code block
under switch statement for $action and add all the users as default
for the group.

PHPBB3-11358
2013-02-24 18:12:45 +01:00
erangamapa
538b09ba61 [ticket/11358] Enabled link making all users default for a group.
Detect whether link is clicked or form is posted for making users
default for a group. If form is posted and no users are selected,
validation happens and displays an error message. When the link is
clicked, all the users will be default users for that group.

PHPBB3-11358
2013-02-24 18:12:40 +01:00
erangamapa
880786d686 [ticket/11358] Removed redundant code and referred proper variable.
Error was thrown when no users are selected before executing the code
chunk which manually adds all the user to make the group default.
Removed this code and referred $mark_ary instead of $name_ary which
will not have selected user ids.

PHPBB3-11358
2013-02-24 18:12:35 +01:00
erangamapa
373c9a3f4e [ticket/11358] Success message even without selecting a user.
In group membership management, if you perform the action
'Make group default for member' without selecting any user,
a confirm box will be displayed and will show a success
message after confirming. Added a new condition to fix this
issue in acp_groups.php. It will check weather any users are
selected before performing above action.

PHPBB3-11358
2013-02-24 18:12:28 +01:00
Nils Adermann
b964d17564 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.

Conflicts:
	phpBB/includes/acp/acp_groups.php
2013-02-24 18:07:29 +01:00
erangamapa
ab530a999e [ticket/11355] Referred proper variable when validating selection.
Earlier PR was referring wrong variable $name_ary. Changed it to
$mark_ary which actually contains selected user ids.

PHPBB3-11355
2013-02-24 18:04:54 +01:00
erangamapa
f8e184c54e [ticket/11355] Wrong error message when no user is selected.
In ACP group membership management, if you select 'remove member
from group' without selecting any users and submit,it will display
a wrong error after confirmbox. Since no users are selected, this
should not go even until confirmbox. Added a new condition to check
weather any users are selected when the action is 'deleteusers'
in acp_groups.php and disply a correct error.

PHPBB3-11355
2013-02-24 18:04:46 +01:00
Marc Alexander
a9e0aea4b1 [feature/avatars] Remove trailing whitespace from avatar code
PHPBB3-10018
2013-02-19 12:30:14 +01:00
Marc Alexander
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
Marc Alexander
c56db535b4 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/config/services.yml
2013-02-07 00:07:59 +01:00
Joas Schilling
bd87b06858 [ticket/9492] Ensure to update all avatar values when the avatar is changed
PHPBB3-9492
2013-01-17 14:43:00 +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
41710c745d [feature/avatars] Add function for localizing errors
PHPBB3-10018
2013-01-06 21:09:07 +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
c865f98dcf [feature/avatars] Some more miscellaneous changes
PHPBB3-10018
2012-12-27 20:42:05 +01:00
Marc Alexander
2f47c99432 [feature/avatars] Add more consistency to codebase
PHPBB3-10018
2012-12-11 21:02:37 +01:00
Joas Schilling
780a8c98ac [ticket/10411] Rename template variable CUR_ to CURRENT_
PHPBB3-10411
2012-12-06 14:28:52 +01:00
Marc Alexander
fb139a8820 [feature/avatars] Fix behavior of avatar manager and variables
The $force_all variable was only partially removed and the behavior was
not consistent in all files.

PHPBB3-10018
2012-12-04 15:12:04 +01:00
Marc Alexander
b42ca792fd [feature/avatars] Minor variable naming fixes
PHPBB3-10018
2012-12-04 00:49:37 +01:00
Marc Alexander
33b98dc5ba [feature/avatars] Fix variable names
PHPBB3-10018
2012-11-30 16:46:11 +01:00
Marc Alexander
d5cbedaaa2 [feature/avatars] Let avatar manager handle $ignore_config
The avatar manager already handles if avatars are enabled. It should also
handle ignoring the config settings.

PHPBB3-10018
2012-11-30 15:12:34 +01:00
Marc Alexander
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
Marc Alexander
a77fcdb5f9 [feature/avatars] Implement better treatment of avatar errors
PHPBB3-10018
2012-11-25 17:01:21 +01:00
Marc Alexander
f8256ed00f [feature/avatars] Small cosmetic changes
PHPBB3-10018
2012-11-25 16:18:51 +01:00
Marc Alexander
06639729ea [feature/avatars] Add static methods for handling driver names
PHPBB3-10018
2012-11-25 16:05:57 +01:00
Marc Alexander
6d061304af [feature/avatars] Small fixes
PHPBB3-10018
2012-11-25 15:03:35 +01:00
Marc Alexander
67c2e48d15 [feature/avatars] Only create avatar objects if necessary
PHPBB3-10018
2012-11-25 14:33:13 +01:00
Marc Alexander
ce5e2f1677 [feature/avatars] Miscellaneous fixes
PHPBB3-10018
2012-11-25 01:18:27 +01:00
Marc Alexander
ce44e3908e [feature/avatars] Remove unnecessary abbreviations
PHPBB3-10018
2012-11-25 00:54:34 +01:00
Marc Alexander
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
Marc Alexander
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
Joas Schilling
98092add9e [ticket/10411] Move globals to the top and use array for cache destroy
PHPBB3-10411
2012-11-16 11:48:41 +01:00
Joas Schilling
e417882af1 [ticket/10411] Use the objects instead of the deprecated wrappers
PHPBB3-10411
2012-11-14 19:01:52 +01:00