aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functionsJoas Schilling2011-11-302-4/+4
| | | | PHPBB3-10345
* [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-252-4/+4
| | | | PHPBB3-10345
* [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-255-10/+10
| | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
* [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-254-7/+7
| | | | PHPBB3-10345
* Merge branch 'develop-olympus' into developIgor Wiedler2011-11-204-20/+5
|\ | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. [ticket/10446] DRY X-AntiAbuse header addition. Conflicts: phpBB/includes/ucp/ucp_register.php
| * [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-204-5/+5
| | | | | | | | PHPBB3-10446
| * [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-204-22/+7
| | | | | | | | PHPBB3-10446
* | Merge remote-tracking branch 'nickvergessen/ticket/10457' into developAndreas Fischer2011-11-141-1/+1
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/10457: [ticket/10457] Undefined variable $request, when print-viewing PMs
| * | [ticket/10457] Undefined variable $request, when print-viewing PMsJoas Schilling2011-11-141-1/+1
| | | | | | | | | | | | PHPBB3-10457
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-6/+6
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/9361] View correct error messages when editing account information
| * | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-141-6/+6
| |\ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/9361: [ticket/9361] View correct error messages when editing account information
| | * | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the "current password" is only checked, when you change something. This means you get "Your profile has been updated." although you enter a wrong password. I also added proper error messages, when you leave the confirm fields empty, and sorted them in the order of the field appearances on the html page. PHPBB3-9361
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | * develop-olympus: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| * | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-131-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/8616: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| | * | [ticket/8616] Direct links in pm notification emailsAlan2011-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Import the "Direct links in pm notification emails" modification, version 1.0.1. PHPBB3-8616
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-28/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10259] Do not send notifications to user accounts joining free groups.
| * | | [ticket/10259] Do not send notifications to user accounts joining free groups.Andreas Fischer2011-10-171-28/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | It does not make sense to send notifications to users joining a freely open group. They already know that they were added to the group, because they triggered the actual join. PHPBB3-10259
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10304] Fix URL for ICQ while view private messages
| * | [ticket/10304] Fix URL for ICQ while view private messagesJoas Schilling2011-10-131-1/+1
| |/ | | | | | | PHPBB3-10304
* | [feature/remove-imagesets] Adjustments to php filesVjacheslav Trushkin2011-09-042-4/+0
| | | | | | | | | | | | Removing imagesets. Adjustments to php files PHPBB3-10336
* | [ticket/9608] Remove blank lineIgor Wiedler2011-07-171-1/+0
| | | | | | | | PHPBB3-9608
* | [ticket/9608] Remove use of references in captcha and other placesIgor Wiedler2011-07-131-4/+4
| | | | | | | | | | | | | | | | | | References are not really needed in PHP due to copy-on-write. Since PHP5, objects are always passed around as identifiers, which means they are mutable. So it is no longer required to pass these by reference either. PHPBB3-9608
* | Merge branch 'develop-olympus' into developNils Adermann2011-06-052-7/+28
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/10158] Remove some code duplication from generating the message. [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed. [ticket/10158] Only view "Return to" links if they are useful. [ticket/10158] Add return-link to folder, when the user replied from a folder. [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
| * [ticket/10158] Remove some code duplication from generating the message.Nils Adermann2011-06-051-28/+10
| | | | | | | | PHPBB3-10158
| * [ticket/10158] Only view "Return to" links if they are useful.Joas Schilling2011-05-231-8/+34
| | | | | | | | PHPBB3-10158
| * [ticket/10158] Add return-link to folder, when the user replied from a folder.Joas Schilling2011-05-092-7/+17
| | | | | | | | PHPBB3-10158
| * [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.Joas Schilling2011-05-051-2/+5
| | | | | | | | PHPBB3-10158
* | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-201-0/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php
| * | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-201-0/+43
| | | | | | | | | | | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-301-0/+7
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/9961] Create log entries when users are activated.
| * | [ticket/9961] Create log entries when users are activated.Erik Frèrejean2011-04-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create log entries when a user activates own account without also changing their password. * Additionally create admin log entries when an administrator activates user accounts. PHPBB3-9961
* | | [ticket/9684] Fix Forum/Topic-Tracking for global announcementsJoas Schilling2011-04-071-5/+28
| | | | | | | | | | | | | | | | | | Should be ready for intensive testing now. PHPBB3-9684
* | | [ticket/9684] Remove code in some more files especially includes/Joas Schilling2011-04-071-23/+9
| |/ |/| | | | | | | | | Topic-Tracking is still missing. PHPBB3-9684
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-051-1/+1
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
| * [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.Joas Schilling2011-04-031-1/+1
| | | | | | | | PHPBB3-10121
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-112-3/+3
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/9970] Rename validate_language() to validate_language_iso_name(). [ticket/9970] Do not allow switching to languages not installed on reg. page. [ticket/9970] Check whether language pack is installed. [ticket/9970] User language input is checked for existance
| * [ticket/9970] Rename validate_language() to validate_language_iso_name().Andreas Fischer2011-03-072-3/+3
| | | | | | | | PHPBB3-9970
| * [ticket/9970] Do not allow switching to languages not installed on reg. page.Andreas Fischer2011-03-071-1/+1
| | | | | | | | PHPBB3-9970
| * [ticket/9970] User language input is checked for existanceJosh Woody2011-03-072-2/+2
| | | | | | | | | | | | | | Users could select a language which did not exist in the database by altering form fields because there was no back-end verification. PHPBB3-9970
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-281-0/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10024] Populate unread information to template for styling issues.
| * [ticket/10024] Populate unread information to template for styling issues.Philippe Chevrier2011-02-281-0/+1
| | | | | | | | PHPBB3-10024
* | Merge branch 'ticket/hanakin/10001' into developIgor Wiedler2011-02-282-0/+4
|\ \ | | | | | | | | | | | | | | | * ticket/hanakin/10001: [ticket/10001] Created the new styles within colours.css to handle the displaying of the forum & topic images [ticket/10001] Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
| * | [ticket/10001] Created new Template variable to house class names based on ↵hanakin2011-01-182-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images * Created new Template variable to house class names based on $folder_img value in functions_display.php. * Created new Template variable to house class names based on $folder_img value in mcp_forums.php. * Created new Template variable to house class names based on $folder_img value in ucp_main.php. * Created new Template variable to house class names based on $folder_img value in search.php. * Created new Template variable to house class names based on $folder_img value in ucp_pm_viewfolder.php. * Created new Template variable to house class names based on $folder_img value in search.php. * Created new Template variable to house class names based on $folder_img value in viewforum.php. * Modified forumlist_body.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified mcp_forum.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified search_results.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_bookmarks.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_subscribed.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_front.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_pm_viewfolder.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified viewforum_body.html to utilize class for forum & topic images through out template via the newly created Template variable * Created the new styles within colours.css to handle the displaying of the forum & topic images - NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server PHPBB3-10001
* | [ticket/9574] Remove conditional PHP<5.2 codeIgor Wiedler2010-12-281-1/+1
| | | | | | | | | | | | | | There is a large amount of conditional code for PHP < 5.2 that can be removed with phpBB 3.1. PHPBB3-9574
* | Merge branch 'feature/igorw/request-class' into developAndreas Fischer2010-12-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | * feature/igorw/request-class: [feature/request-class] Convert some remaining cookies [feature/request-class] Adjust misleading comment [feature/request-class] Remove direct access to _REQUEST in acp_search [feature/request-class] Special case of direct access to _REQUEST
| * | [feature/request-class] Convert some remaining cookiesIgor Wiedler2010-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | Convert some remaining accesses to cookie to use the request class instead. Thanks to bantu for the note. PHPBB3-9716
* | | Merge branch 'develop-olympus' into developNils Adermann2010-12-131-0/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9851] "Search new posts" should require login. [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor. [feature/acm-wincache] Adding caching module for WinCache's User Cache. [ticket/9939] Fix JavaScript error in admin recaptcha template [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/8736] guest can have 255 chars long username [ticket/9928] Do not link "login to your board" to the "send statistics" page. [ticket/9575] Change 'administrate' to 'administer' [ticket/9921] Adding sample configuration file for the lighttpd webserver. [ticket/9932] Add the Bing bot when converting [ticket/9930] Redirect failes with open_basedir enabled. [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
| * | [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMsIgor Wiedler2010-11-211-0/+3
| | | | | | | | | | | | PHPBB3-9910
* | | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-1123-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | | [ticket/9867] Adjust the implementation of error messages localization.rxu2010-10-263-7/+7
| | | | | | | | | | | | | | | | | | Use array_map instead of preg_replace. PHPBB3-9867