1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

168 Commits

Author SHA1 Message Date
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Cesar G
a7d1fd44ee [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
PHPBB3-12526
2014-05-11 02:36:48 -07:00
n-aleha
0166493a89 [ticket/12493] Fix sql query for selection of users that have disabled PM
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
2014-05-07 23:00:42 +03:00
Nils Adermann
97e651a491 Merge remote-tracking branch 'github-exreaction/ticket/8323' into 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
2014-05-02 15:54:10 +02:00
Andreas Fischer
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
* 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
2014-04-29 17:51:21 +02:00
Cesar G
a8ec1905e1 [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
PHPBB3-12356
2014-04-09 11:38:14 -07:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload
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
2013-10-11 17:40:16 +02:00
Nathan Guse
d14aed0819 [ticket/8323] Cache auth request
PHPBB3-8323
2013-09-05 13:59:24 -05:00
Nathan Guse
e8ab8fe0bc Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323
# 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
2013-09-05 13:56:57 -05:00
Andreas Fischer
a97d9d4b89 Merge branch 'develop-olympus' into develop
* 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
2013-05-06 22:11:33 +02:00
Gaëtan Muller
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
2013-05-06 21:31:16 +02:00
Nathaniel Guse
abaa53b0b2 [ticket/8323] Combine into a single query
PHPBB3-8323
2013-05-01 12:28:31 -05:00
Andreas Fischer
01045a6bb0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:39 +01:00
Dhruv
36b7d7560e [ticket/11233] prohibit selecting anonymous user as a PM recipient
While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
2013-01-30 21:46:15 +05:30
Nathan Guse
4ab07aa45e [ticket/8323] Comments
PHPBB3-8323
2012-12-07 18:51:06 -06:00
Nathan Guse
92ec214537 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323
Conflicts:
	phpBB/viewtopic.php
2012-12-07 18:11:38 -06:00
Andreas Fischer
83179e07ff [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
PHPBB3-10780
2012-11-10 00:23:03 +01:00
Oleg Pudeyev
0a260f80af Merge PR #918 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:31:35 -04:00
Senky
d0a1c7bf0a [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
PHPBB3-10568
2012-08-02 20:08:49 +02:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
PHPBB3-10990
2012-07-22 14:32:03 -05:00
Nathan
b25efd744d [ticket/8323] Only disable administrative deactivated accounts from 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
2012-07-10 17:41:27 -05:00
Nathan
33852e6251 [ticket/8323] Correct PM notification settings (only notify those who can 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
2012-07-10 16:07:12 -05:00
Nathan
362ba43f18 [ticket/8323] Allow sending PMs to temporarily banned users
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
2012-07-10 12:34:40 -05:00
Nathan
0f4956b280 [ticket/8323] Do not allow sending PMs to Inactive users
PHPBB3-8323
2012-07-10 12:34:39 -05:00
Nathan
e6d4e9bbb9 [ticket/8323] Correcting the comment
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
c38bb4254a [ticket/8323] Do not allow sending of Private Messages to users who are banned
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
c53d7f0b62 [ticket/8323] Remove code used for testing
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
05452b9ec0 [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages
PHPBB3-8323
2012-07-10 12:34:37 -05:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places.
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
2011-11-25 15:10:49 -05:00
Nils Adermann
a30ec6e052 Merge branch 'develop-olympus' into develop
* 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.
2011-06-05 01:58:52 +02:00
Nils Adermann
6b6705b852 [ticket/10158] Remove some code duplication from generating the message.
PHPBB3-10158
2011-06-05 01:58:03 +02:00
Joas Schilling
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful.
PHPBB3-10158
2011-05-23 12:03:04 +02:00
Joas Schilling
437013194a [ticket/10158] Add return-link to folder, when the user replied from a folder.
PHPBB3-10158
2011-05-09 12:46:34 +02:00
Joas Schilling
65d956bd81 [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
PHPBB3-10158
2011-05-05 10:49:54 +02:00
Joas Schilling
e3ba934cd7 [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
PHPBB3-8894
2010-05-16 16:49:00 +02:00
Joas Schilling
f593ae1f35 [Fix] Use correct BBCode parseoptions in signatures when previewing PMs.
Authorised by: bantu



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10325 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-12 00:06:01 +00:00
Meik Sievertsen
7d4a25e73f Fix Bug #53505 (related to Bug #52515 and r10208) - i fixed this the "do not 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
2009-11-03 14:40:25 +00:00
Meik Sievertsen
e9c1c03ca6 Fix bug #52515 (wrong bbcode uid assigned if error triggered and 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
2009-10-04 18:03:19 +00:00
Joas Schilling
de25ce8724 Fix Bug #51835 - editing posts with attachments - regression from r9843 introduced in #48265
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10186 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-25 08:41:47 +00:00
Meik Sievertsen
bf1621c05d Style authors are now able to define the default submit button used for form 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
2009-08-30 17:50:11 +00:00
Meik Sievertsen
6cd6a907c7 Separate PM Reply and PM Reply to all in prosilver.
Style changes by dhn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9919 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-04 14:15:13 +00:00
Joas Schilling
780854818b Fix bug #48265 - Correctly set attachment flag for topics, posts and pms 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
2009-07-24 09:01:29 +00:00
Ruslan Uzdenov
4991cae3a1 Fixed Bug #39625 - QUOTE-string not included when replying to pm's
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9725 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-07 12:55:34 +00:00
Joas Schilling
89ddc4543f Fix bug #38395 - Loading draft removes recipients when replying to PM
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9685 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-26 11:38:29 +00:00
Meik Sievertsen
2547ca9635 Bug #44525 - do not try to fetch existing username var in cookie set by external applications on pm'ing
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9494 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-28 16:16:24 +00:00
Meik Sievertsen
cee46c7941 force non-relative date for pm forwards (thanks chris. :))
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9456 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-17 13:19:29 +00:00
Chris Smith
0d4a76a875 Hide font size options which are bigger than the allowed size in the editor. #42615
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9365 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-11 17:11:10 +00:00
Meik Sievertsen
866e4196f4 every second commit an pre/post-commit error... :/
Ask for forum password if post within passworded forum quoted in private message (Reported by nickvergessen)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9168 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-03 16:48:06 +00:00
Meik Sievertsen
7d1e8ed70e Fix header list build for replying oldest PM in PM history (Bug #37275)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9072 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-22 17:53:27 +00:00