History | View | Annotate | Download (6.3 kB)
commit adfa1656fb9d8b5bb601af1d7a6720884954d87aMerge: bd579c8 af5b9a9Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 16:35:55 2010 +0100
Merge branch 'ticket/igorw/9556' into develop
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
use existing language key for "private message not found"
Users can report PMs to moderators which are then visible in a new MCP module
Hiding everywhere little buggers, eh?
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
dumdidum... sorry. ;)
do not get too excited
- #10159 (as well as the exact same issue with reports)- #10263
checking in some fixes. ;) Most of them are really minor, including:- correctly enter report notification into db- fix double-quote pm issue
- fixes for the following bugs:#5326#5318#5304#5290#5288#5278#5276#5272#5266- also fixed the "Call-time pass-by-reference" bug #5252- within this step changed the normalize calls to require references.- added captcha size variables to the class scope (suggestion was posted at area51)
message
- #5120- #5104
- forum image being an additional image instead of replacing forum indicators- reasons fixes
- automatically sync topic_reported when deleting a post [Bug #2152]- retrieve forum information in report.php- don't update deleted topics- proper permission check for "admin or moderator" - allow changing poster while ip dropdown contains a different user [Bug #2190]...
Fix the ability to report/view reports and warn in global announcements
ok, sorry for this. :/- cleaned up table names/constants
ok, this one is rather large... the most important change:re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different
apart from this, code cleanage, bug fixing, etc.
- some adjustements for phpdocumentor
- allow reporting posts that have a closed report- show multiple reports for one post correctly- Bug #1389
To all people having their bug status set to fixed: SF pserver CVS access is currently down, therefore the snapshots are still out of date.
- fix a bunch of bugs- <!-- $Id$ --> is no longer allowed in template (.html) files- changed layout of private message screens (folders are menu items)...
- streamlined reports to consist of the feature set we decided upon (Nils, your turn now)- use getenv instead of $_ENV (with $_ENV the case could be wrong)- permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently)...
- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)- fixed forum editing and parent id selection- completely removed HTML support (it only creates security problems)- changed cache_moderators() to reflect permission changes
- some bugfixes
blabla
Fixed small i18n related error in report.php
- added updated coding guidelines- introduced is_registered and is_bot flags for correct determinition of guest/registered/bot users- changed bot code to act on useragent || ip
- Documentation related changes- added resend activation email dialog- fixed issue in session code- log failed/successful admin re-authentication/login- fixed simple forum dropdown box (used in mcp and posting)
my turn to break the forum (and at least pm's are no longer working - will not last long). HARRRR
- fork/copy topic- resync topics- possible to show only reported posts in topic_view- view reports in post details- mcp_queue (show unapproved items)
- remove output buffering options from download.php (not needed anymore)- optimized viewtopic.php a little bit- removed the create_function (was consuming too much memory) from viewtopic- check for manually added convert[.exe] program name to imagemagick path in admin_attachments...
fix some issues with oop, fixing small bugs and prepare the next steps...NOTE TO DEVS: have a look at adm/admin_board.php (new config layout)
splitted language files
Updates mainly for removal of extension + header comment ... moved some aspects of ucp around, further work to be done on these areas ... not commiting search for time being
Changed: Allow multiple reports. If one tries to report the same post twice, it will silently update the existing report.
Re-arrange auth and setup calls ... needs to be repeated for all major scripts
A single post can now only be reported once
Fixed: some stuff ;)Changed: users cannot report the same post twice. if an user tries to, s/he's invited to edit his/her report
page header/footer become functions, forum passwords (I know, I know but it appears a popular feature for some reason ... inclusion not yet set in concrete nor complete), various bug fixes (and no doubt new bugs).
Various changes, and tests ... marking/tracking is not complete ... tinkering, changing, etc. still to be done ... it's just I've made numerous and various changes to different files so a commit really is due
"Report" button only shows up if the user is authorised. Default forum_id for globals temporary (and arbitrary) set to 2.
I knew that I forgot something: f_report now in use
Added user notification for post reporting, moved lang strings to lang_main, added CSS style for mcp_jumpbox
Windows carriage returns
More "reporting" stuff, note the very lame warning in viewtopic when a post has been reported.
