aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_compose.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-3/+7
| | | | PHPBB3-12594
* [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
| | | | PHPBB3-12526
* [ticket/12493] Fix sql query for selection of users that have disabled PMn-aleha2014-05-071-8/+7
| | | | | | | | This fixes a bug where a user A could not send a PM to user B when both users allowed other users to send them a PM. More precisely, it fixes the selection of users that either are inactive or have disabled private messages. PHPBB3-12493
* Merge remote-tracking branch 'github-exreaction/ticket/8323' into ↵Nils Adermann2014-05-021-16/+68
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-exreaction/ticket/8323: [ticket/8323] Cache auth request [ticket/8323] Combine into a single query [ticket/8323] Comments on phpbb_get_banned_user_ids input for test [ticket/8323] More readability in test case [ticket/8323] Comments [ticket/8323] dataProvider for the test; better test data [ticket/8323] Comments [ticket/8323] Unit test for phpbb_get_banned_user_ids [ticket/8323] Comments for inactive reasons in constants.php [ticket/8323] Only disable administrative deactivated accounts from receiving PMs [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification [ticket/8323] Correct PM notification settings (only notify those who can receive them) [ticket/8323] Cleanup viewtopic code (not sure how this mess happened) [ticket/8323] Allow sending PMs to temporarily banned users [ticket/8323] Do not allow sending PMs to Inactive users [ticket/8323] Hide the Send PM link if users cannot receive the PM [ticket/8323] Correcting the comment [ticket/8323] Do not allow sending of Private Messages to users who are banned [ticket/8323] Remove code used for testing [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages Conflicts: phpBB/language/en/ucp.php
| * [ticket/8323] Cache auth requestNathan Guse2013-09-051-2/+3
| | | | | | | | PHPBB3-8323
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-051-8/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/includes/functions_privmsgs.php
| * | [ticket/8323] Combine into a single queryNathaniel Guse2013-05-011-30/+28
| | | | | | | | | | | | PHPBB3-8323
| * | [ticket/8323] CommentsNathan Guse2012-12-071-1/+1
| | | | | | | | | | | | PHPBB3-8323
| * | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-071-4/+5
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/viewtopic.php
| * | | [ticket/8323] Only disable administrative deactivated accounts from ↵Nathan2012-07-101-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving PMs Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation) PHPBB3-8323
| * | | [ticket/8323] Correct PM notification settings (only notify those who can ↵Nathan2012-07-101-25/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receive them) Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense) PHPBB3-8323
| * | | [ticket/8323] Allow sending PMs to temporarily banned usersNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added an argument to the phpbb_get_banned_user_ids() function to allow specifying a banned end time (default true for current functionality, false for only permanent bans, timestamp to find banned until a specified time) PHPBB3-8323
| * | | [ticket/8323] Do not allow sending PMs to Inactive usersNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-8323
| * | | [ticket/8323] Correcting the commentNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-8323
| * | | [ticket/8323] Do not allow sending of Private Messages to users who are bannedNathan2012-07-101-0/+17
| | | | | | | | | | | | | | | | PHPBB3-8323
| * | | [ticket/8323] Remove code used for testingNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-8323
| * | | [ticket/8323] Do not allow sending of Private Messages to users who do not ↵Nathan2012-07-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | have permission to read private messages PHPBB3-8323
* | | | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * There MUST NOT be trailing whitespace at the end of lines. * There MUST NOT be whitespace before the first content of a file. * There MUST NOT be whitespace after the last content of a file. * Functions MUST NOT contain multiple empty lines in a row. PHPBB3-12458
* | | | [ticket/12356] Assign vars preventing Plupload from loading in PM editor.Cesar G2014-04-091-1/+3
| | | | | | | | | | | | | | | | PHPBB3-12356
* | | | [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-111-1/+9
| |_|/ |/| | | | | | | | | | | | | | | | | | | | This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-061-7/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable Conflicts: phpBB/download/file.php phpBB/styles/prosilver/template/login_forum.html
| * | | [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-061-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-311-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * develop-olympus: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| * | [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | While composing pm, it should not be allowed to add anonymous user as a PM recipient PHPBB3-11233
* | | [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.Andreas Fischer2012-11-101-2/+2
| | | | | | | | | | | | PHPBB3-10780
* | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-171-1/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| * | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-1/+2
| | | | | | | | | | | | PHPBB3-10568
* | | [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-221-1/+1
| |/ |/| | | | | PHPBB3-10990
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-251-1/+1
| | | | | | | | | | | | | | 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
* | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-5/+26
|\ \ | |/ | | | | | | | | | | | | | | * 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-091-5/+15
| | | | | | | | PHPBB3-10158
| * [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.Joas Schilling2011-05-051-2/+5
| | | | | | | | PHPBB3-10158
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+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
* | [feature/request-class] Convert any direct access to $_* to use $requestIgor Wiedler2010-09-251-13/+9
|/ | | | PHPBB3-9716
* [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
* [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
* 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
* 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
* 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
* Separate PM Reply and PM Reply to all in prosilver.Meik Sievertsen2009-08-041-4/+8
| | | | | | Style changes by dhn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9919 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
* 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
* Fix bug #38395 - Loading draft removes recipients when replying to PMJoas Schilling2009-06-261-1/+1
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9685 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #44525 - do not try to fetch existing username var in cookie set by ↵Meik Sievertsen2009-04-281-1/+3
| | | | | | external applications on pm'ing git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9494 89ea8834-ac86-4346-8a33-228a782c2dd0
* force non-relative date for pm forwards (thanks chris. :))Meik Sievertsen2009-04-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9456 89ea8834-ac86-4346-8a33-228a782c2dd0
* Hide font size options which are bigger than the allowed size in the editor. ↵Chris Smith2009-03-111-0/+1
| | | | | | #42615 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9365 89ea8834-ac86-4346-8a33-228a782c2dd0