History | View | Annotate | Download (33.2 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
commit a885095897054c91ab68b753ce2a86ae74f2f666Merge: 9a39f55 c2ffa78Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Oct 10 18:39:44 2010 +0200
Merge branch 'feature/igorw/request-class' into develop
commit 3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582Merge: c0d645c 161be96Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Sep 12 15:01:17 2010 +0200
Merge branch 'develop-olympus' into develop
commit 2e787fa836dbfdcec7864b5f143520aec3752bd0Merge: 999f6db 9731f24Author: Nils Adermann <naderman@naderman.de>Date: Sat Aug 21 23:35:43 2010 +0200
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)
A little precaution
Function approve_post adjustment (migrating to sync())Authorised by: Kellanved
Fix bug #47705 - Out of range value for column 'topic_replies_real'Authorised by: Kellanved
Fixed bug #'ers 42585, 35505, 36675, and 42705Authorised by: acydburn
Fix race condition for updating post/topic/etc. counter. (reported by BartVB)please do not try such fixes at home - the correct solution would be to create a second config table with integer columns. ;)
Fixed bug #40325 - Friend/foe system displays posts madeAuthorised by: acydburn
Do not increment users post count after post approval if post had been posted in a forum with no post count increasing set (Bug #37865)
Moderators can only see reports/queue/logs from forums they can actually read. #31085
Send localised disapproval reasons in the recipients local language. #31645
Fix one design failure in phpBB3. Do not count non-approved posts to the user_posts. Before, a user was able to circumvent basically any protection based on post counts.At the same time implement the queue_trigger feature.
#28455
remove the f portion from redirect urls now they no longer exist
Hiding everywhere little buggers, eh?
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
dumdidum... sorry. ;)
- 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]
#13973
#13796
try to normalize everything...
Cleaning up (#13689)Also removed the useless login box from the ACP.
#11313
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
MCP? Who uses that... :P
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.
Fixing some tiny bugs...- correctly close span tags within code=php
#10976
add possibility to return to post after approval (if approving one post) - very helpful if using approval links from within topics.
- create log entries on (dis)approving and handling reports
Ok, try to fix the "re-approval on edit" bugs. Also added make_clickable to log entries as well as logging moderator edits.
#9828, #10545, #10541, #10533, #10529, #10527, #10521, #10503, #10481- more label fixes- simpler approach to get input cursor text
- * wildcard in a search query should cause \w+ in highlighting, not \w* [Bug #10031]- display a warning that the search index is not converted from phpBB2 to phpBB3 [Bug #9761]- forgot to add : to reg_name when deleting userinfo from the url regex constructor [Bug #9868]...
- m_warn is no longer a local moderation permission- magic urls should properly use html entities- speed up posting on big boards, MAX query can be simplified a lot in certain cases- user IP list should be labelled with "Other users" [Bug #9707]
other fixes...
fixing some bugsmore mcp links for easier moderating different aspects (all, forum, topic)i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected.
- Pruning doesn't lower user post counts anymore [Bug #7676]- Better resync explanations in ACP- relative link to board shouldn't result in an empty link [Bug #7762]- allow spaces to define multiple classes [Bug #7700]- forgot addslashes for password conversion [Bug #7530]...
- introducing read/unread images in the MCP, if you view something through the MCP it will not update the "read" status of a post/topic/forum [includes Bug #6796]
- telling the admin for what the board contact and board email addresses are used for and also making sure this explanation is correct ;)- fixes for bugs #6694, #6664 and #6662
- add return links to approve details [#6252]- lets decide on input field or textarea based on the entry length in language pack management [#6280]
some fixes today- most important change is the consolidation of the display attachment functions; merging them together to have one function we need to call.
- a bunch of fixes- added todos to the updater to make sure i do not forget. :)
- bug fixes for #5618, #5588 and #5584- remove messenger->reset() calls (they are already performed on sending)
- a handful of mcp fixed, the most important one is the change for check_ids() - it is now supporting ids from more than one forum too, making it possible to use some mcp features as designed initially. We really need to get our moderator team testing the mcp extensively....
ok, change from doing the same logic all over again we call a function to do it for us. Also allow template designers to choose which method to use by just adding a fully compiled username string (profile link + user colour). This commit may introduce problems.
ok, i am an idiot...
- make sure the sql layer for mysql always states mysql4 and get to mysql if using mysql < 4- assign some default vars to email templates (we always need some basic ones)
- implemented the suggested html_entity_decode function made by david- fixed string length checking by also decoding entities for the sake of checking- used the new html_entity_decode function
- forum image being an additional image instead of replacing forum indicators- reasons fixes
he braces style is deprecated as of PHP 6
These changes should let olympus scale a little bit better.i haven't adjusted the schemas but added the details to create_schema_files - david is able to build them then in line with his changes. :)
#4428
- birthdays/age in user's timezone and not server's local time- parse bbcode in posts with fewer characters than selected maximum on search results page- retrieve search word context in posts which are longer than maximum characters (no raw BBCode anymore)...
sql_in_set changes
- fixed some bugs- made imageset naming more consistent- updated every schema to be consistent and also fixed it (every db should install fine now)-
- display age in user profile and make it available on viewtopic- various tiny bugfixes including [Bug #2351] [Bug #2549] [Bug #2681] [Bug #3015]- strip first, then change newlines [Bug #2403]- added support for creating user profiles to the login function (makes use of user_add), triggered by LOGIN_SUCCESS_CREATE_PROFILE constant...
These needed to be #p for proper compliance
New template variables in the mcp (not used by subsilver)
- removed db cache (might re-appear, but for now we do not see the need for it)- all changes to styles/subsilver/template are purely cosmetic (no functional changes)- cosmetics- bugfixes- add index to modules table- use modules ordering code for forums too
make sure custom profile fields are created correctly on registration (#2225)
- added class="radio" to all radio- and checkboxes- make sure the database gets closed correctly in cron.php- bugfixes
- forgot to commit common.php- cleaning up a few more mcp permissions- adjust some links- make global topics work properly in MCP
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 extra template variables *_EXPLAIN which some might wish to use
Assign page titles within the mcp
- removed useless code from style.php- added a view template cache mode to acp_styles- syntax highlighting for the acp css- completed refresh actions for themes and templates- fixed theme and template installation- use a function for generating database theme data...
some adjustmentsnils: please have a look at the @todo comment in mcp_queue.php
- various corrections related to permissions in the mcp, including [Bug #1994] and [Bug #1924]- fixed some quickmod bugs [#1994] and [Bug #1898]- browse reports/unapproved posts by topic id- correctly hide approval details- added return message to mcp_ban [Bug #1851]...
- fixed a few smaller things
- fixing a few tiny bugs- added new function to (re)apply sids where needed (login and mcp quickmod) - #1829
- introduce new function build_url to easily build a valid url from the user->page object as well as optionally removing certain keys- changed attachment config to utilize the config build methods- cleaned up posting.php- the submit/delete_post functions are now usable (functions_posting.php)...
- introduce LA_, UA_ and A_ template variables (they allow styles to use template variables used for javascript in subSilver outside javascript in their own template while they won't break our javascript if they contain quotes) also fixes [Bug #1116]- corrected page title for search indexing progress bar [Bug #1695]...
- fixing some bugs, containing fixes for anonymous username displays, eaccelerator issue, permission trace and a few smaller bugs.
say hello to role descriptions, role ordering and tooltips on role selects
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)...
- don't show too old reports/queue entries
- redirection should properly work now- align jumpbox properly
- add missing pagination to queue/reports- hide the close button on closed reports page- fix a JS bug in mcp/acp ban view
ok, thought about this now for too long. I think the best solution circumventing memory consumption and not introducing "hacks" is to seperate module information (and probably more in 3.2 for installation/uninstallation) from the main code.
adjusting sql_freeresult a bit as well as our error handler (it now prints out if it is because of DEBUG_EXTRA being defined - which is not enabled within the betas/rc's and stable releases).
- a bunch of bugfixes. :P
- replaced mcp reports system with a simplified version- fixed links to mcp_reports
- adding ability to assign moderator specific ban options- fixing destroying of sql caches- fixing referencing of sql cached queries if more than one are active on one page- other fixes
- 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)...
- some bugfixes- committed coding guidelines as they are at area51- removed script_path (needs a close inspection later)- removed the need for server_name and server_port- able to define server port/name/protocol and force the user-defined server vars (very handy for proxy setups)
- allow local moderators to properly use the mcp for more than one forum (mcp)- automatically get a forum id for global topics if needed (mcp)- allow linking to unapproved topics via a post id (viewtopic)- use #p[post_id] anchor (mcp_post)- use actions where appropriate (mcp_queue)...
- blabla, additional bugfixing permissions...
implementing permission roles
- copy permissions (adding groups)- copy permissions (adding forums)- checking proper groupadd/del settings- added intro page to permissions (to give an overview and quick links)- able to select forums + subforums, single forum, all groups, all users (permission screens)...
- size select fix- introduced function for building group options (acp)- fixed acl_getf if negated option needs to be retrieved- only using one function for updating post informations- fixing module display if module is disabled- if user is having a non-existent style do not print out error message, instead fix the users value and load the default style
