aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'ticket/nickvergessen/9519' into develop-olympusAndreas Fischer2010-08-282-2/+2
|\ | | | | | | | | | | | | | | * ticket/nickvergessen/9519: [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
| * [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-102-2/+2
| | | | | | | | | | | | | | acm_memory.php is untested. install/install_convert.php and includes/functions_convert.php are going to be tested and committed afterwards. PHPBB3-9519
* | Merge branch 'ticket/jellydoughnut/9772' into develop-olympusAndreas Fischer2010-08-281-1/+1
|\ \ | | | | | | | | | | | | * ticket/jellydoughnut/9772: [ticket/9772] Unify permissions for sending email when board_email_form is off
| * | [ticket/9772] Unify permissions for sending email when board_email_form is offJosh Woody2010-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sending email via memberlist.php was limited to users having u_sendemail. When board_email_form is disabled, no such requirement was enforced. This is now changed. PHPBB3-9772
* | | Merge branch 'ticket/bantu/9612' into develop-olympusJosh Woody2010-08-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9612: [ticket/9612] Introduce new function gen_rand_string_friendly().
| * | | [ticket/9612] Introduce new function gen_rand_string_friendly().Andreas Fischer2010-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new function gen_rand_string_friendly() for user friendly random strings like passwords and captcha codes. Strings generated by gen_rand_string_friendly() will not contain the characters 0 and O. By adding a new function we can increase the entropy of strings generated by gen_rand_string() by putting 0 and O back in. PHPBB3-9612
* | | | Merge branch 'ticket/bantu/9611' into develop-olympusJosh Woody2010-08-193-10/+3
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * ticket/bantu/9611: [ticket/9611] Make length of activation keys variable between 6 and 10.
| * | [ticket/9611] Make length of activation keys variable between 6 and 10.Andreas Fischer2010-05-173-10/+3
| | | | | | | | | | | | PHPBB3-9611
* | | Merge branch 'ticket/nickvergessen/7720' into develop-olympusAndreas Fischer2010-07-141-2/+2
|\ \ \ | |_|/ |/| | | | | | | | * ticket/nickvergessen/7720: [ticket/7720] Fix alternative image-description for unread posts.
| * | [ticket/7720] Fix alternative image-description for unread posts.Joas Schilling2010-07-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Changed the wrong word "new" to "unread" as that is, what we show with the red-icons, not whether the post is new or not. Language variables were kept for backwards compatibility. PHPBB3-7720
* | | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-071-1/+1
|/ / | | | | | | | | | | | | Avoid unnecessary overhead in avatar_process_user() by optionally passing in the value of $can_upload. PHPBB3-9451
* | [ticket/9135] Fix report-icon for moderators in PM folders.Joas Schilling2010-05-261-1/+25
|/ | | | | | There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users. PHPBB3-9135
* [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if ↵Joas Schilling2010-05-161-1/+1
| | | | | | BBCodes are not allowed. PHPBB3-8894
* Bug #13181 - Honor minimum and maximum password length in generated ↵Andreas Fischer2010-02-071-5/+6
| | | | | | passwords as much as we can. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10479 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Fix] Don't send activation email when user tries to change email without ↵Cullen Walsh2010-01-251-1/+1
| | | | | | | | | permission (fix by nrohler). (Bug #56335) Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10438 89ea8834-ac86-4346-8a33-228a782c2dd0
* Friends and foes will not show up as private message rule options if their ↵Chris Smith2010-01-181-0/+17
| | | | | | respective UCP modules are disabled. #51155 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10425 89ea8834-ac86-4346-8a33-228a782c2dd0
* Invalidate captcha after regHenry Sudhof2010-01-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10417 89ea8834-ac86-4346-8a33-228a782c2dd0
* Invalidate captcha after regHenry Sudhof2010-01-171-0/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10415 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50985 - fix XML export of private messages sent to deleted usersHenry Sudhof2009-12-131-7/+23
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10329 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Fix] Use correct BBCode parseoptions in signatures when previewing PMs.Joas Schilling2009-12-121-1/+1
| | | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10325 89ea8834-ac86-4346-8a33-228a782c2dd0
* Do not permit unauthorised users to delete private messages from folder ↵Chris Smith2009-12-111-0/+6
| | | | | | listing. #54355 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10322 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #53505 (related to Bug #52515 and r10208) - i fixed this the "do not ↵Meik Sievertsen2009-11-031-1/+1
| | | | | | break other things" way, usually the fix would be using !$submit here git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10251 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #52515 (wrong bbcode uid assigned if error triggered and ↵Meik Sievertsen2009-10-041-1/+1
| | | | | | quote/forward PM) - still not entirely sure if this will break things, but the correct uid should also be assigned if there is an error triggered somewhere, this does not change the content or the actions assigned. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10208 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #52175Meik Sievertsen2009-10-042-1/+1
| | | | | | atm the "fix" with the most changes involved. We will inform style authors about these changes. We will not release RC2 to RC3 code changes, but will annnounce the style changes within the RC3 release announcement. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10204 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #51835 - editing posts with attachments - regression from r9843 ↵Joas Schilling2009-09-251-16/+1
| | | | | | | | introduced in #48265 Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10186 89ea8834-ac86-4346-8a33-228a782c2dd0
* Remove duplicate S_DISPLAY_GALLERY key from ucp_groups. Regression from r9757Meik Sievertsen2009-09-171-1/+0
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10155 89ea8834-ac86-4346-8a33-228a782c2dd0
* rollback; will be in 3.0.7Henry Sudhof2009-09-111-23/+7
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10138 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50985Henry Sudhof2009-09-111-7/+23
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10136 89ea8834-ac86-4346-8a33-228a782c2dd0
* Related to r9830: Change REPORT_POST to REPORT_PM.Andreas Fischer2009-09-091-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10126 89ea8834-ac86-4346-8a33-228a782c2dd0
* define $data array at the correct location. ;)Meik Sievertsen2009-09-091-3/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10123 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50485Henry Sudhof2009-09-031-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10095 89ea8834-ac86-4346-8a33-228a782c2dd0
* Redirect to group list if confirm box canceled - Bug #50105Meik Sievertsen2009-08-311-0/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10073 89ea8834-ac86-4346-8a33-228a782c2dd0
* Style authors are now able to define the default submit button used for form ↵Meik Sievertsen2009-08-301-1/+7
| | | | | | | | submission on ENTER keypress on forms using more than one. Prosilver uses this for the posting page(s) and registration screen. (we further test this at phpbb.com) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10069 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #49195 - Queries on un-indexed column user_emailJoas Schilling2009-08-283-3/+3
| | | | | | | | Added function to generate email-hash. Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10060 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix r10035Meik Sievertsen2009-08-201-1/+1
| | | | | | [ Sort private messages by message time and not message id. (Bug #50015) ] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10037 89ea8834-ac86-4346-8a33-228a782c2dd0
* Sort private messages by message time and not message id. (Bug #50015)Meik Sievertsen2009-08-201-4/+14
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10035 89ea8834-ac86-4346-8a33-228a782c2dd0
* Separate PM Reply and PM Reply to all in prosilver.Meik Sievertsen2009-08-042-4/+15
| | | | | | Style changes by dhn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9919 89ea8834-ac86-4346-8a33-228a782c2dd0
* check changed to allow for undefined lang entries. Proposed by a_jelly_donutHenry Sudhof2009-07-311-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9898 89ea8834-ac86-4346-8a33-228a782c2dd0
* Minor captcha API change - disable display of plugin by returning false in ↵Henry Sudhof2009-07-271-2/+1
| | | | | | get_template. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9869 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #48265 - Correctly set attachment flag for topics, posts and pms ↵Joas Schilling2009-07-241-1/+16
| | | | | | | | | after deleting attachments - Patch by WorldWar and nickvergessen Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9843 89ea8834-ac86-4346-8a33-228a782c2dd0
* Users can report PMs to moderators which are then visible in a new MCP moduleNils Adermann2009-07-212-72/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
* Feature Bug #45375 - Add option to disable remote upload avatarsJoas Schilling2009-07-142-10/+14
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9757 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #47265 - Smilies and images not viewed in topic-print viewJoas Schilling2009-07-131-1/+2
| | | | | | | | Fix - Force full date for PMs print-view Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9753 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #47575 - Disable word-censor option in UCP lacks the config-setting ↵Joas Schilling2009-07-081-1/+1
| | | | | | | | | - Patch by 00mohgta7 Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9734 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fixed Bug #40155 - Postcount of 0 not showing up in PMsRuslan Uzdenov2009-07-081-1/+1
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9733 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fixed Bug #39625 - QUOTE-string not included when replying to pm'sRuslan Uzdenov2009-07-071-1/+4
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9725 89ea8834-ac86-4346-8a33-228a782c2dd0
* Add some data for akismet et alHenry Sudhof2009-06-291-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9702 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fixed Bug #45115 - Signature parsing flags are not stored in DBRuslan Uzdenov2009-06-271-3/+12
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9696 89ea8834-ac86-4346-8a33-228a782c2dd0
* Okay, okay, I see the issue. I'll revisit this tomorrow.Henry Sudhof2009-06-261-4/+0
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9695 89ea8834-ac86-4346-8a33-228a782c2dd0
* Okay it should work again. Thanks Raimon. In the future, please test if your ↵Henry Sudhof2009-06-261-14/+11
| | | | | | changes are really a good idea. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9694 89ea8834-ac86-4346-8a33-228a782c2dd0