1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00

101 Commits

Author SHA1 Message Date
Nils Adermann
8231b881ad Merge pull request #1287 from erangamapa/ticket/11106
[ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
2013-03-31 14:54:23 -07:00
erangamapa
21a9462553 [ticket/11106] Added missing line breaks.
Added two missing line breaks into 'edited by' message.

PHPBB3-11106
2013-03-16 00:05:12 +05:30
erangamapa
df98de971c [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
When viewing a private message, when message edit count is 1
Undefined index EDITED_TIME_TOTAL php notice appears. Changed
the message formatting method to what is used in viewtopic.php.

PHPBB3-11106
2013-03-12 10:19:29 +05:30
Andreas Fischer
336187151a [ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

PHPBB3-11201
2013-02-04 01:31:43 +01:00
Joas Schilling
9affd6f7e7 [ticket/11201] Remove MSN/WLM fields
WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.

PHPBB3-11201
2013-01-11 14:32:44 +01:00
Marc Alexander
7256a2d944 [feature/avatars] Add phpbb prefix to new functions
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
2013-01-04 15:10:43 +01:00
Marc Alexander
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into 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
2012-11-12 14:57:28 +01:00
Andreas Fischer
d0ce637251 Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop
* Fyorl/feature/attach-dl: (75 commits)
  [feature/attach-dl] Removed the use of some abbreviations
  [feature/attach-dl] Changed $files_added checks
  [feature/attach-dl] Renamed $post_id to $post_msg_id
  [feature/attach-dl] Fixed a comment
  [feature/attach-dl] Optimised an sql query
  [feature/attach-dl] Fixed the logic in an sql statement
  [feature/attch-dl] $forum_id cast to int
  [feature/attach-dl] Fixed $file_added to $files_added
  [feature/attach-dl] Moved definition of $archive_name
  [feature/attach-dl] Swapped the order of an if statement
  [feature/attach-dl] Cast variables to int
  [feature/attach-dl] Added $archive_path
  [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
  [feature/attach-dl] Renamed $count to $files_added
  [feature/attach-dl] Removed sprintf() use
  [feature/attach-dl] Removed need for array_keys()
  [feature/attach-dl] Added multiple attachment downloads to PMs
  [feature/attach-dl] Removed reliance on current($row)
  [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
  [feature/attach-dl] Moved PM authentication handling into own function
  ...
2012-08-26 18:56:09 +02:00
Fyorl
53aadd60a6 [feature/attach-dl] Renamed $post_id to $post_msg_id
PHPBB3-11042
2012-08-17 16:16:02 +01:00
Fyorl
39676d513e [feature/attach-dl] Added multiple attachment downloads to PMs
PHPBB3-11042
2012-08-14 13:21:00 +01:00
Joas Schilling
63a00efdd4 [feature/php-events] Fix naming and doc of core.ucp_pm_view_messsage
PHPBB3-9550
2012-08-04 17:37:54 +02:00
Michael Cullum
3f1b4e83ae [feature/events] Removing the third trigger_event parameter
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Michael Cullum
8af7d225ef [feature/events] Change to use the new method of adding events
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Joas Schilling
8d4c7d2e80 [feature/events] Adding ledge ucp_pm_viewmesssage
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:42 +02:00
Cullen Walsh
4c699e0d0a [feature/avatars] Modularized Avatars
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
2012-03-18 22:19:16 +00:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Joas Schilling
160e89aa06 [ticket/10457] Undefined variable $request, when print-viewing PMs
PHPBB3-10457
2011-11-14 18:49:07 +01:00
Andreas Fischer
d5cd49f276 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10304] Fix URL for ICQ while view private messages
2011-10-13 17:07:39 +02:00
Joas Schilling
f94f872624 [ticket/10304] Fix URL for ICQ while view private messages
PHPBB3-10304
2011-10-13 13:59:39 +02:00
Joas Schilling
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
2011-05-20 16:45:29 +02:00
Andreas Fischer
7074d19c40 Merge branch 'develop-olympus' into develop
* 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.
2011-04-05 00:31:42 +02:00
Joas Schilling
59d75c1ae6 [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
PHPBB3-10121
2011-04-03 22:11:13 +02:00
Nils Adermann
18f74a7e10 Merge branch 'develop-olympus' into develop
* 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
2010-12-13 17:14:36 +01:00
Igor Wiedler
217e77d16b [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
PHPBB3-9910
2010-11-21 23:18:09 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
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
2010-11-11 19:10:55 +01:00
Igor Wiedler
fccd7f0ab5 [feature/request-class] Convert any direct access to $_* to use $request
PHPBB3-9716
2010-09-25 20:32:15 +02:00
Josh Woody
2a59e6d486 [ticket/9772] Unify permissions for sending email when board_email_form is off
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
2010-08-28 15:49:47 -05:00
Andreas Fischer
8c3d390c61 Related to r9830: Change REPORT_POST to REPORT_PM.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10126 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 21:41:51 +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
Nils Adermann
6e4a7c03d1 Users can report PMs to moderators which are then visible in a new MCP module
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 20:59:11 +00:00
Joas Schilling
ecfe24528c Fix bug #47265 - Smilies and images not viewed in topic-print view
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
2009-07-13 19:20:17 +00:00
Ruslan Uzdenov
1c6e99848f Fixed Bug #40155 - Postcount of 0 not showing up in PMs
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9733 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-08 12:50:45 +00:00
Chris Smith
f9e9274bc3 Display the online status of hidden users to users with the u_viewonline permission when viewing PMs.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9483 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-24 20:52:00 +00:00
Chris Smith
00d8706765 - Do not show 'Forward' button if the user cannot send PM's.
- Correct colspan on prosilver mcp_front.html. #37515


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9174 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-04 19:58:42 +00:00
Meik Sievertsen
7752023b44 force full date on "edited by" line. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9138 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-30 16:53:36 +00:00
Meik Sievertsen
7de5bb3498 dumdidum... sorry. ;)
git-svn-id: file:///svn/phpbb/trunk@8147 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 14:36:34 +00:00
Meik Sievertsen
951f793dae some fixes. :P
- language authors may review their email template files...


git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-18 14:49:19 +00:00
Meik Sievertsen
09f6cf11dd - correct jabber token handling
- undisclosed-recipients:; instead of undisclosed-recipient:;
- PM details button should not be there


git-svn-id: file:///svn/phpbb/trunk@8090 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-14 14:06:23 +00:00
Meik Sievertsen
cda8083ba7 fixing some bugs
git-svn-id: file:///svn/phpbb/trunk@8075 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-02 17:24:56 +00:00
Nils Adermann
d104d3d969 - BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), bbcode_nl2br(), smiley_text(), parse_attachments()
- using \r on custom bbcodes to allow line breaks [Bug #10758]


git-svn-id: file:///svn/phpbb/trunk@8050 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-19 13:40:53 +00:00
Meik Sievertsen
e9188d4e05 Some changes... non-invasive...
git-svn-id: file:///svn/phpbb/trunk@8025 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-13 12:14:07 +00:00
Henry Sudhof
92c25a3e6c #13791 - I hope this works :D
git-svn-id: file:///svn/phpbb/trunk@7960 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-27 17:01:37 +00:00
Henry Sudhof
8a26bac6e2 #13813
git-svn-id: file:///svn/phpbb/trunk@7951 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-26 11:07:43 +00:00
Henry Sudhof
6813967ae1 Changing the behaviour of the hideonline permission.
Test the current setting before altering the memory limit during install(Bug #12195)

And another language var.


git-svn-id: file:///svn/phpbb/trunk@7755 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-14 15:03:52 +00:00
Meik Sievertsen
456586475b oh my god - what did he do? Adding attachment display to post/topic review, queue, reports, post details, mcp topic view... fixing other tiny things along the line.
git-svn-id: file:///svn/phpbb/trunk@7642 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-19 12:04:22 +00:00
David M
731a1b4ea4 #9893
git-svn-id: file:///svn/phpbb/trunk@7367 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-16 21:37:57 +00:00
Meik Sievertsen
b63745fdb3 my take on getting the bugs down... thanks to those also providing (usable) solutions to the problem. ;) Of course also to those reporting generally...
git-svn-id: file:///svn/phpbb/trunk@7330 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-12 16:20:39 +00:00
Meik Sievertsen
e70cea16b9 checking in some fixes... also added "previous/next pm in history" links to prosilvers private message view; dhn, you may want to have a look at the placement. :)
git-svn-id: file:///svn/phpbb/trunk@7322 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-10 20:50:14 +00:00
Meik Sievertsen
5f0b61065f unknown
git-svn-id: file:///svn/phpbb/trunk@6926 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-24 12:33:36 +00:00
Meik Sievertsen
d6ef968a67 - made sure ranks are displayed correctly (used RANK instead of RANK_TITLE)
- #6630
- hide a few links from bots (forum/topic marking, memberlist, post/reply/quote/edit/etc. buttons) [#6354]
- #5698


git-svn-id: file:///svn/phpbb/trunk@6818 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-28 16:21:17 +00:00