Commit graph

1581 commits

Author SHA1 Message Date
Senky
721bc03b2b [ticket/11010] properly tabifying 'max_autologin_time'
PHPBB3-11010
2013-05-21 11:57:33 +02:00
Senky
930f4c70ed [ticket/11010] resolving latest comments
PHPBB3-11010
2013-05-21 11:55:45 +02:00
Nathan Guse
421452e6fb Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By David King
# Via David King (1) and Nathan Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/11551] Fix error in system tab if get_remote_file returns empty string
2013-05-20 11:55:33 -05:00
Vjacheslav Trushkin
3e64c1b5d7 [ticket/11010] Fixes for number input in acp
PHPBB3-11010
2013-05-20 18:42:11 +02:00
Senky
3547b9738a [ticket/11010] validation to match type
PHPBB3-11010
2013-05-20 18:42:02 +02:00
Senky
6c0f3513d9 [ticket/11010] replacing maxlenght with max
PHPBB3-11010
2013-05-20 18:41:32 +02:00
Senky
cf9d407493 [ticket/11010] applying some of EXreaction notes
PHPBB3-11010
2013-05-20 18:40:12 +02:00
Senky
f75aa97282 [ticket/11010] adding type="url" to 'site_home_url'
PHPBB3-11010
2013-05-20 18:40:05 +02:00
Senky
49c1e0e348 [ticket/11010] adding type="number" in ACP; adding type="email" in install
PHPBB3-11010
2013-05-20 18:39:44 +02:00
Senky
4fe7ba5daf [ticket/11010] changing email and url input types in php files
PHPBB3-11010
2013-05-20 18:34:28 +02:00
David King
901955e452 [ticket/11551] Fix error in system tab if get_remote_file returns empty string
Currently a debug error is thrown. With this patch, it fails without keeping
the admin from being able to access the rest of the System modules by showing
a nicer error "Failed to obtain latest version information."

PHPBB3-11551
2013-05-20 12:20:55 -04:00
Marc Alexander
cd1da92d85 [ticket/11538] Add optional switch as argument to hex colour validation
The value of $optional will decide whether an empty string will be
treated as incorrect input or if it is allowed. The optional argument
will default to false and therefore treat an empty string as incorrect
unless explicitly told to not do so.

PHPBB3-11538
2013-05-19 17:45:45 +02:00
Andreas Fischer
a0f76f73e9 Merge remote-tracking branch 'marc1706/ticket/11535' into develop
* marc1706/ticket/11535:
  [ticket/11535] Correctly merge avatar_errors array into primary error array
2013-05-19 16:20:40 +02:00
Marc Alexander
7898dd9459 [ticket/11538] Limit comment in acp_groups to 80 characters per line
PHPBB3-11538
2013-05-19 15:13:37 +02:00
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
David King
d8ed228ddf Merge remote-tracking branch 'EXreaction/ticket/11415' into develop
* EXreaction/ticket/11415:
  [ticket/11415] Add test for find_from_extension()
  [ticket/11415] Send the extension base the finder rather than the manager
  [ticket/11415] Create function in finder find_from_extension
  [ticket/11415] Fix ext.manager constructor in tests
  [ticket/11415] Make migrator/ext.manager dependencies of the base ext class
  [ticket/11415] Remove migrator dependency from extension manager
  [ticket/11415] Move migrator to base extension class from ext.manager
  [ticket/11415] Move while loop from ext manager to acp_extensions.php
2013-05-18 11:20:47 -04: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
Marc Alexander
7e70eec5a3 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465 2013-05-12 22:41:00 +02:00
Oleg Pudeyev
88d4964f0e Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
  [ticket/10325] move migration into a new file
  [ticket/10325] fix acp language
  [ticket/10325] use assert_response_success parts
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] add assert_response_success in test
  [ticket/10325] functional tests for forgot password functionality
  [ticket/10325] add logout function in functional_test_case
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] improve acp option language
  [ticket/10325] fix language key
  [ticket/10325] fix language variable
  [ticket/10325] change language var
  [ticket/10325] fix language
  [ticket/10325] add new config value to database
  [ticket/10325] trigger error if forgot password option disabled
  [ticket/10325] add allow forgot password option in acp
2013-05-08 08:23:11 -04:00
Joas Schilling
62f35121d9 [ticket/11450] Fix all instances of phpbb_extension_metadata_manager
PHPBB3-11450
2013-05-08 08:47:21 +02:00
Nathaniel Guse
9db4e856db [ticket/11415] Move while loop from ext manager to acp_extensions.php
Now enable_step works as it's supposed to (do one step at a time) and
less refreshes are required for the user.

PHPBB3-11415
2013-05-01 13:00:43 -05:00
Oleg Pudeyev
c182ab0e7b Merge PR #1371 branch 'EXreaction/ticket/11236' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11236:
  [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language
  [ticket/11236] Do not require group selection in prune users
  [ticket/11236] Correct HTML
2013-04-26 22:35:13 -04:00
Nathaniel Guse
1a16ee4cb2 [ticket/11236] Do not require group selection in prune users
PHPBB3-11236
2013-04-25 11:20:13 -05:00
Nathaniel Guse
ee457e584c [ticket/11236] Correct HTML
PHPBB3-11236
2013-04-25 11:16:00 -05:00
Nathaniel Guse
42cfb7264d [ticket/11237] Fix PHP error in acp_prune.php
Also making the code a bit more efficient (removing one SQL query)

PHPBB3-11237
2013-04-25 10:58:48 -05:00
Dhruv
1a51abcca2 [ticket/10325] change language var
PHPBB3-10325
2013-04-25 21:01:14 +05:30
Dhruv
5de14b940e [ticket/10325] add allow forgot password option in acp
PHPBB3-10325
2013-04-25 20:39:49 +05:30
Nils Adermann
7b144bbff2 Merge pull request #1369 from EXreaction/ticket/11335
Ticket/11335
2013-04-25 04:01:38 -07:00
Nathaniel Guse
9c4553c41f [ticket/11335] Replace "$phpEx" with $phpEx
PHPBB3-11335
2013-04-24 20:39:24 -05:00
Nathan Guse
f49993766e [ticket/11335] (more) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:46:00 -05:00
Nathan Guse
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
Marc Alexander
7240759e34 [ticket/11465] Check if class exists before including info file
PHPBB3-11465
2013-04-14 17:25:45 +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
rechosen
694eb3ccb5 [ticket/11116] Made ACP "extension not available" error message E_USER_WARNING
The error message generated when an administrator tries to enable an
incompatible extension used to be displayed in the green of the default
E_USER_NOTICE. Changed it to E_USER_WARNING to make it appear in red, as
requested in the ticket.

PHPBB3-11116
2013-04-11 13:13:50 +02:00
Joas Schilling
78bcc31a5d [ticket/11465] The info file does not have _info suffix
PHPBB3-11465
2013-04-10 13:08:31 +02:00
Tabitha Backoff
a8f5695666 Migration file and change board_home_text to board_index_text 2013-03-28 17:53:14 -04:00
Tabitha Backoff
9e5cde7f66 Ticket# 11477 - Allow customisation of "Board index" 2013-03-28 02:34:36 -04:00
Marc Alexander
aefca4b40f [ticket/11465] Use extension finder when adding extensions' acp modules
The method acp_modules::get_module_infos() needs to use the extension
finder whenever it is looking for a module's info file. While
transitioning to the new extension system, only the initial search for all
module info files was changed to the new system. Due to this it is not
possible to add an extension's acp/mcp/ucp module manually in the ACP.
This patch will always use the extension finder for the acp module's info
files and therefore properly find the needed file. Additionally, the code
has been cleaned up a little bit.

PHPBB3-11465
2013-03-21 14:59:53 +01:00
Joas Schilling
5eef287646 [ticket/11310] Add hashes to action links to prevent CSRF attacks
PHPBB3-11310
2013-03-12 17:19:30 +01:00
Joas Schilling
923c0709db Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (234 commits)
  [ticket/11398] Correctly call permission_set method in permission tool
  [ticket/11394] Relax Migration Tools
  [ticket/11386] Fix missing ;
  [ticket/10714] Get log from container in install, update and download/file
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [ticket/11396] Rename insert_migration to set_migration_state
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
  [ticket/11393] Give more information on database updater
  [ticket/11386] Send list of migrations instead of using load_migrations
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  ...
2013-03-05 18:26:01 +01:00
David King
eb5075c80f Merge remote-tracking branch 'EXreaction/ticket/11395' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11395:
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
2013-03-04 14:42:12 -05: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
Nathaniel Guse
029f096411 Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10411-2: (33 commits)
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  [ticket/10411] Add maxlength to category name input field
  [ticket/10411] Test for thrown exceptions when group does not exist
  [ticket/10411] Catch exceptions from grouppositions
  [ticket/10411] Throw exceptions instead of using trigger_error()
  [ticket/10411] Add return values to add/delete function
  [ticket/10411] Add return value to move functions
  [ticket/10411] Fix typehinting and change private to protected
  [ticket/10411] Use template loops instead of defining the html in php files
  [ticket/10411] Ensure we only get services that do exist
  [ticket/10411] Add a comment why we left join the group table
  [ticket/10411] Rename template variable CUR_ to CURRENT_
  [ticket/10411] Move globals to the top and use array for cache destroy
  [ticket/10411] Use new ajax callback name row_up/row_down
  [ticket/10411] Fix logic error when editing/creating a group
  ...
2013-03-04 13:25:53 -06:00
Nathaniel Guse
9dfc5fbf9a [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
PHPBB3-11395
2013-03-03 20:47:14 -06:00