aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/report.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11763] Add missing variable when reporting a PM to avoid SQL ErrorOliver Schramm2013-08-031-3/+4
| | | | PHPBB3-11763
* [ticket/11722] Remove reference assignment for $captcha in report.phpAndreas Fischer2013-07-221-1/+1
| | | | PHPBB3-11722
* Merge branch 'develop-olympus' into developAndreas Fischer2013-07-221-3/+6
|\ | | | | | | | | | | * develop-olympus: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| * [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
| | | | | | | | | | | | | | | | PHPBB3-11566 changed big parts of code. Unfortunately, a call to $captcha->validate was added that is being called even if $captcha hasn't been initialized. This change will fix this issue. PHPBB3-11720
* | Merge branch 'ticket/11566' into ticket/11566-developDhruv2013-07-011-74/+112
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11566: [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha Conflicts: phpBB/report.php
| * [ticket/11566] Remove extra pair of brackets from conditional statementDhruv2013-07-011-1/+1
| | | | | | | | PHPBB3-11566
| * [ticket/11566] Use the new constant CONFIRM_REPORT for captcha initDhruv2013-07-011-1/+1
| | | | | | | | PHPBB3-11566
| * [ticket/11566] Rename var to $visual_confirmation_responseDhruv2013-07-011-3/+3
| | | | | | | | PHPBB3-11566
| * [ticket/11566] add captcha reset and hidden fieldsDhruv2013-07-011-0/+11
| | | | | | | | | | | | | | | | If captcha is solved and some other error pops up, store the captcha in a hidden field. Reset captcha if reporting the post is successful PHPBB3-11566
| * [ticket/11566] display error instead of trigger_errorDhruv2013-07-011-12/+12
| | | | | | | | | | | | | | When the error report is empty display error in the template instead of trigger_error PHPBB3-11566
| * [ticket/11566] add error functionalityDhruv2013-07-011-67/+80
| | | | | | | | | | | | add $error which stores the captcha error when captcha validation fails PHPBB3-11566
| * [ticket/11566] add interface for captchaDhruv2013-07-011-0/+14
| | | | | | | | | | | | | | Add basic captcha template while reporting post when the user is not a registered user. PHPBB3-11566
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-19/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (37) and others # Via Oleg Pudeyev (24) and others * 'develop' of github.com:phpbb/phpbb3: (179 commits) [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/10805] Compare phpbbAlertTimer against null [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql phpBB/styles/subsilver2/template/overall_footer.html
| * | [ticket/11171] Adapted the code in report.phpBruno Ais2012-12-071-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | Added the variable aliases needed (to look and feel the same as it was before) Added the variables into the table insert. PHPBB3-11171
* | | [ticket/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-131-0/+2
| | | | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976 PHPBB3-11103
* | | [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a very basic user loader class to handle querying/storing user data in a centralized location. Use DIC collection service for notification types/methods. Cleanup unused dependencies. Fix some other issues. PHPBB3-11103
* | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-101-13/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | [ticket/10845] Removed one empty line that wasn't supposed to be thereBruno Ais2012-06-141-1/+0
| | | | | | | | | | | | | | | | | | I onder when it got there... Maybe a wrong rebase... Don't really know. PHPBB3-10845
| * | [ticket/10845] Changed the report system. Now it saves posts with the bbcodeBruno Ais2012-05-011-12/+19
| | | | | | | | | | | | | | | | | | | | | Now the bitfield and uid of the bbcode is saved in the reports table. This will allow parsing the BBCode while loading the post to show PHPBB3-10845
* | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-201-2/+2
| | | | | | | | | | | | | | | | | | This is going to require you recreate the db tables. PHPBB3-11103
* | | [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-181-2/+0
| | | | | | | | | | | | | | | | | | | | | Comments that are not needed because the actions are completely self-explanatory PHPBB3-11103
* | | [ticket/11103] Use report text for report notification, never notify reporterNathan Guse2012-10-161-1/+4
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Finishing up PM Report notificationsNathan Guse2012-10-091-1/+4
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-1/+7
|/ / | | | | | | PHPBB3-11103
* | [feature/save-post-on-report] Changed the name of the columnBruno Ais2012-03-191-5/+5
| | | | | | | | | | | | | | | | The name of the column was changed from reported_post AND reported_text to reported_post_text. This change was made by request PHPBB3-10600
* | [feature/save-post-on-report] The complete changes for this featureBruno Ais2012-03-191-3/+7
| | | | | | | | | | | | | | This covers all the changes so that when a report is made, the post itself is copied and displayed in the MCP instead of the current post. Unfortunatly, I made all commits in the wrong way and they were lost. Now I have only the final files.
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-0/+7
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10266] Add "Return to forum" link after reporting a post
| * [ticket/10266] Add "Return to forum" link after reporting a postJoas Schilling2011-07-141-0/+7
| | | | | | | | PHPBB3-10266
| * Fix Bug #54375 - Show correct HTML title when reporting private messages.Andreas Fischer2009-11-241-1/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10284 89ea8834-ac86-4346-8a33-228a782c2dd0
| * use existing language key for "private message not found"Meik Sievertsen2009-09-191-1/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10164 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Users can report PMs to moderators which are then visible in a new MCP moduleNils Adermann2009-07-211-47/+116
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
* | [ticket/9684] Remove code for global announcement in root-filesJoas Schilling2011-04-071-1/+1
| | | | | | | | PHPBB3-9684
* | [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
* | merge changes from 3.0.x branchMeik Sievertsen2009-12-161-1/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Copy 3.0.x branch to trunkMeik Sievertsen2009-10-041-0/+238
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Move trunk/phpBB to old_trunk/phpBB Meik Sievertsen2009-10-041-168/+0
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
* | $template to phpbb::$templateMeik Sievertsen2009-02-221-6/+6
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@9337 89ea8834-ac86-4346-8a33-228a782c2dd0
* | $db-> to phpbb::$db->Meik Sievertsen2009-02-221-12/+12
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@9336 89ea8834-ac86-4346-8a33-228a782c2dd0
* | $auth-> to phpbb::$acl->Meik Sievertsen2009-02-221-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@9335 89ea8834-ac86-4346-8a33-228a782c2dd0
* | remove global and change $user-> to phpbb::$user->Meik Sievertsen2009-02-221-12/+12
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
* | add nils' request and super globals classMeik Sievertsen2008-12-251-2/+2
| | | | | | | | | | | | rename request:: to phpbb_request:: git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
* | - updated all code to use the request class instead of any direct access toNils Adermann2008-11-241-2/+2
| | | | | | | | | | | | | | | | | | super globals - disabled super globals in common.php. See commit r9101 for more information - cleaned up/simplified a few lines along the way. git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0
* | ok... i hope i haven't messed too much with the code and everything is still ↵Meik Sievertsen2008-05-291-6/+6
|/ | | | | | | | | | working. Changes: - Ascraeus now uses constants for the phpbb root path and the php extension. This ensures more security for external applications and modifications (no more overwriting of root path and extension possible through insecure mods and register globals enabled) as well as no more globalizing needed. - A second change implemented here is an additional short-hand-notation for append_sid(). It is allowed to omit the root path and extension now (for example calling append_sid('memberlist')) - in this case the root path and extension get added automatically. The hook is called after these are added. git-svn-id: file:///svn/phpbb/trunk@8572 89ea8834-ac86-4346-8a33-228a782c2dd0
* dumdidum... sorry. ;)Meik Sievertsen2007-10-051-3/+3
| | | | git-svn-id: file:///svn/phpbb/trunk@8146 89ea8834-ac86-4346-8a33-228a782c2dd0
* do not get too excitedMeik Sievertsen2007-07-261-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0
* - #10159 (as well as the exact same issue with reports)Vic D'Elfant2007-04-301-1/+2
| | | | | | | - #10263 git-svn-id: file:///svn/phpbb/trunk@7432 89ea8834-ac86-4346-8a33-228a782c2dd0
* checking in some fixes. ;) Most of them are really minor, including:Meik Sievertsen2007-04-261-1/+1
| | | | | | | | - correctly enter report notification into db - fix double-quote pm issue git-svn-id: file:///svn/phpbb/trunk@7409 89ea8834-ac86-4346-8a33-228a782c2dd0
* - fixes for the following bugs:Meik Sievertsen2006-11-151-3/+1
| | | | | | | | | | | | | | | | | | #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) git-svn-id: file:///svn/phpbb/trunk@6584 89ea8834-ac86-4346-8a33-228a782c2dd0
* messageNils Adermann2006-11-121-4/+7
| | | | git-svn-id: file:///svn/phpbb/trunk@6569 89ea8834-ac86-4346-8a33-228a782c2dd0