aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-241-2/+2
| | | | | | | | | | | | | | | | 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
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-051-46/+104
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-191-2/+2
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-191-2/+2
| | | | | | | | | | | | | | The phpbb_user object might be used for language variables and other things. PHPBB3-10018
| * [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-071-2/+2
| | | | | | | | | | | | | | | | 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
| * [feature/avatars] Use empty() instead of sizeof()Marc Alexander2013-01-071-1/+1
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Add function for localizing errorsMarc Alexander2013-01-061-12/+1
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-041-1/+1
| | | | | | | | | | | | | | | | 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
| * [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-271-1/+1
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-111-2/+2
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Use seperate function for retrieving the config nameMarc Alexander2012-12-041-1/+1
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-041-2/+2
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Fix variable namesMarc Alexander2012-11-301-18/+16
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Get list of enabled drivers from avatar managerMarc Alexander2012-11-301-19/+16
| | | | | | | | | | | | | | | | 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
| * [feature/avatars] Implement better treatment of avatar errorsMarc Alexander2012-11-251-8/+6
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Small cosmetic changesMarc Alexander2012-11-251-2/+2
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Add static methods for handling driver namesMarc Alexander2012-11-251-3/+3
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Only create avatar objects if necessaryMarc Alexander2012-11-251-1/+4
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Miscellaneous fixesMarc Alexander2012-11-251-5/+7
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Remove unnecessary abbreviationsMarc Alexander2012-11-251-8/+8
| | | | | | | | PHPBB3-10018
| * [feature/avatars] Handle deletion of avatarsMarc Alexander2012-11-181-1/+7
| | | | | | | | | | | | Previously this wasn't handled correctly if at all. PHPBB3-10018
| * [feature/avatars] Fix acp front-end of user and group avatarsMarc Alexander2012-11-171-11/+15
| | | | | | | | | | | | Due to the changes to the avatar manager etc. these had to be updated. PHPBB3-10018
| * Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into ↵Marc Alexander2012-11-121-47/+108
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-211-12/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (201 commits) [feature/new-tz-handling] Don't use global user but make it a parameter [feature/new-tz-handling] Fix size of suggestion button in chrome [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid [feature/new-tz-handling] Add previous selected value to validation if valid [feature/new-tz-handling] Display suggestion when a different value is selected [ticket/10998] Add border-radius to forum rules block - prosilver [feature/new-tz-handling] Remove additional marking of selected items [feature/new-tz-handling] Move update helper function to new class [feature/new-tz-handling] Fix unit test [feature/new-tz-handling] Delete old variable which is not used anymore [feature/new-tz-handling] Rename $user->tz back to $user->timezone [feature/pagination-as-list] New parameter for name of start var [feature/pagination-as-list] Updates for nils comments [feature/pagination-as-list] Rename and deprecate functions [feature/pagination-as-list] Various fixes and improvements [ticket/10968] Render pagination within the template [feature/new-tz-handling] Remove "timezone might be numeric" [feature/new-tz-handling] Add function to update the timezone [feature/new-tz-handling] Correctly update user and board timezones on update [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL ...
| | * \ Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-271-0/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | [feature/avatars] Do not assign in an if statementIgor Wiedler2012-04-081-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | [feature/avatars] Simplify clean_row, move it to avatar managerIgor Wiedler2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | [feature/avatars] Introduce an avatar driver interfaceIgor Wiedler2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | [feature/avatars] Introduce global phpbb_avatar_managerIgor Wiedler2012-04-081-7/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | [feature/avatars] Use request object in avatar driversIgor Wiedler2012-04-071-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-071-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (335 commits) [ticket/10575] Adding public visibility to the methods. [ticket/10575] Fixing non-static access to static functions get_instance [ticket/10547] User is not logged in as admin after installation [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop [ticket/10650] Added checking for empty subjects [ticket/10650] Corrected intendation [ticket/10650]Added permission checking and utf8 functions [ticket/10650] Cropped subject and inserted newline [ticket/10650] Corrected space before true [ticket/10650] Changed language files and forumlist [ticket/10650] Added static sql files [ticket/10650] Displaying last topic on forum list [ticket/10760] Fix numbering in php fun facts. [ticket/10760] Value must be quoted as it might be two words. [ticket/10760] PHP is great. This commit is the proof. [ticket/10760] Catch both versions of parse error output in php. [ticket/10607] Added 'Powered by' translation string. [ticket/10760] Account for display_errors=stderr in pre-commit hook. [ticket/10760] Quote PHP_BIN when using it. [ticket/10760] Use echo -e only if echo understands -e. ...
| | * | | | [feature/avatars] Support editing of group avatars in ACPCullen Walsh2012-03-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited templates for group avatars so they can be properly modified in ACP PHPBB3-10018
| | * | | | [feature/avatars] Made ACP avatar gallery in Manage Users prettierCullen Walsh2012-03-181-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added row/column information so avatars can be displayed nicely in the ACP PHPBB3-10018
| | * | | | [feature/avatars] Update ACP manage users, fix gallery focus issueCullen Walsh2012-03-181-41/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | [feature/avatars] Dynamically list the avatar types in UCP and ACPCullen Walsh2012-03-181-42/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List the avatar types more nicely, adding UCP modify user support PHPBB3-10018
| | * | | | [feature/avatars] Support proper avatar deletion, stub ACPCullen Walsh2012-03-181-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing avatar deletion in the UCP and ACP, and stubbing the ACP configuration page. I'll admit I kind of got caught carried away, so this really should be a couple separate commits. PHPBB3-10018
| | * | | | [feature/avatars] Modularized AvatarsCullen Walsh2012-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A modularized avatar system that easily allows plugins to be created for various avatar services, such as Gravatar. This inital commit includes module support and is backwards compatible with 3.0 avatars, but does notcontain ACP or UCP modules for manipulating new avatars. PHPBB3-10018
* | | | | | Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-101-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-merge-develop # By Oleg Pudeyev (45) and others # Via Oleg Pudeyev (42) and others * remotes/phpbb/develop: (289 commits) [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. [ticket/11050] make all properties protected in all search backends [ticket/11050] get_common_words() returns empty array for sphinx [ticket/11050] fix tidied search query docblock language [ticket/11050] fix min/max length docblock language [ticket/11050] multi sentences separated by period in docblocks [ticket/11050] fix separated spelling in docblock [ticket/11050] fix split words doc block language [ticket/11050] remove class word from docblocks ... Conflicts: phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/language/en/acp/permissions_phpbb.php phpBB/styles/prosilver/template/posting_editor.html
| * | | | | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11023
| * | | | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | [feature/soft-delete] Fix the rest of *_approved and the delete_post unit testJoas Schilling2012-11-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Fix sync() and some more functions to use the new fieldsJoas Schilling2012-10-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Lay the groundwork for a soft-delete featureJosh Woody2012-08-291-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | So far, I've added no new functionality. The biggest change here is adjusting the DB column names to "visibility" rather than "approved". Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :) PHPBB3-9657
* | | | | Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into developDavid King2012-08-201-6/+43
|\ \ \ \ \
| * | | | | [feature/php-events] Add core.acp_users_overview_run_quicktoolJoas Schilling2012-08-051-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This event was split from core.acp_users_display_overview to make it work as expected. PHPBB3-9550
| * | | | | [feature/php-events] Add core.acp_users_overview_modify_dataJoas Schilling2012-08-051-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This event was split from core.acp_users_display_overview to make it work as expected. PHPBB3-9550
| * | | | | [feature/php-events] Move and fix event core.acp_users_display_overviewJoas Schilling2012-08-051-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event had some invalid variables, so the event was moved to give it some more power. PHPBB3-9550
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-11 20:39:49 +0000