aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/8558] htmlspecialchars_decode the contact name for emailsNils Adermann2014-05-021-1/+2
| | | | PHPBB3-8558
* Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into ↵Nils Adermann2014-05-022-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-elsensee/ticket/stenudd/8558-2: [ticket/8558] Fix operator [ticket/8558] Fix field length in ACP [ticket/8558] Use only one variable and improve explain string [ticket/8558] Add config in migrations and schema_data [ticket/8558] Add display name in emails from board Conflicts: phpBB/includes/functions_messenger.php
| * [ticket/8558] Fix operatorOliver Schramm2014-04-231-1/+1
| | | | | | | | PHPBB3-8558
| * [ticket/8558] Fix field length in ACPOliver Schramm2014-04-171-1/+1
| | | | | | | | PHPBB3-8558
| * [ticket/8558] Use only one variable and improve explain stringOliver Schramm2014-04-171-16/+4
| | | | | | | | PHPBB3-8558
| * [ticket/8558] Add display name in emails from boardMarkus Stenudd2014-04-172-2/+17
| | | | | | | | PHPBB3-8558
* | Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558' into ↵Nils Adermann2014-05-021-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-elsensee/ticket/stenudd/8558: [ticket/8558] Do string concatenation only once and do htmlspecialchars [ticket/8558] Add display name in emails from board
| * | [ticket/8558] Do string concatenation only once and do htmlspecialcharsOliver Schramm2014-04-161-2/+4
| | | | | | | | | | | | PHPBB3-8558
| * | [ticket/8558] Add display name in emails from boardMarkus Stenudd2014-04-161-2/+2
| | | | | | | | | | | | PHPBB3-8558
* | | Merge remote-tracking branch 'github-rxu/ticket/12409' into develop-ascraeusNils Adermann2014-05-021-25/+65
|\ \ \ | | | | | | | | | | | | | | | | * github-rxu/ticket/12409: [ticket/12409] Add acp_users.php core events to modify users preferences data
| * | | [ticket/12409] Add acp_users.php core events to modify users preferences datarxu2014-04-171-25/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There're events to modify UCP user preferences in ucp_prefs.php, so it makes sense to add related events to acp_users.php to control new user's prefs via ACP. PHPBB3-12409
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into ↵Nils Adermann2014-05-0216-62/+140
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12273: (55 commits) [ticket/12273] Move $extension to constructor so the path is always set [ticket/12273] Find events.md relative from the path not the phpbb root [ticket/12273] Do not look in extensions docs/ and tests/ directory [ticket/12273] Also check file for adm "Location:" events [ticket/12273] Do not allow template events in non-html files [ticket/12273] Fix return description [ticket/12273] Update exporter to allow specifying an extension [ticket/12273] Allow to filter events for extensions [ticket/12273] Remove old parameter from function call [ticket/12273] Fix table header for adm events [ticket/12273] Add root path to recursive_event_filter_iterator [ticket/12273] Fix missing classes in export_events_for_wiki.php [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter [ticket/12273] Use RecursiveDirectoryIterator in md_exporter [ticket/12273] Fix doc blocks [ticket/12273] Do not allow 3.1-A1 for template events [ticket/12273] Sort arguments alphabetically before exporting [ticket/12273] Do not allow 3.1-A1 version [ticket/12273] Update since version to 3.1.0-a* style [ticket/12273] Update existing events ...
| * | | | [ticket/12273] Update since version to 3.1.0-a* styleJoas Schilling2014-04-2512-50/+50
| | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | [ticket/12273] Update existing eventsJoas Schilling2014-04-256-17/+86
| | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | [ticket/12273] Fix long $vars lines for existing eventsJoas Schilling2014-04-245-7/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | [ticket/12273] Fix missing $vars lineJoas Schilling2014-04-181-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | [ticket/12273] Fix invalid @event and @since tagsJoas Schilling2014-04-183-3/+3
| | |_|/ | |/| | | | | | | | | | PHPBB3-12273
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into ↵Nils Adermann2014-05-0212-59/+94
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12371: [ticket/12371] Fix language string [ticket/12371] Fix typos in comment [ticket/12371] Fix redirect link for approve_post and post_in_queue [ticket/12371] Delete the approve_post notification when editing a post [ticket/12371] Fix language in comment [ticket/12371] Reapprove the post and topic again in tests [ticket/12371] Correctly set is_starter when editing first post of the topic [ticket/12371] Add functional tests for reapproving [ticket/12371] Fix query in mcp_sorting() [ticket/12371] Rename disapprove and softdelete tests [ticket/12371] We do not group quote notifications anymore [ticket/12371] Fix SQL query [ticket/11772] Do not send out new topic/post notifications when reapproving [ticket/12052] Use different visibility when post was edited [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method [ticket/12371] Do not add unlimited users as responders [ticket/12371] Do not update the notification entry unneccessarily [ticket/12371] Do not delete post related notifications when a post is deleted [ticket/12371] Allow notification types to redirect to a different url [ticket/12371] Do not group "quote" notifications
| * | | | [ticket/12371] Delete the approve_post notification when editing a postJoas Schilling2014-04-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to delete the initial approve notification, so we can notify the user again, when his post got reapproved. PHPBB3-12371
| * | | | [ticket/12371] Correctly set is_starter when editing first post of the topicJoas Schilling2014-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12371
| * | | | [ticket/12371] Fix SQL queryJoas Schilling2014-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12371
| * | | | [ticket/11772] Do not send out new topic/post notifications when reapprovingJoas Schilling2014-04-251-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add notifications, if we are not reapproving post When the topic was already approved, but was edited and now needs re-approval, we don't want to notify the users again. PHPBB3-11772
| * | | | [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-2512-25/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and needs to be reapproved. PHPBB3-12052
| * | | | [ticket/12371] Do not delete post related notifications when a post is deletedJoas Schilling2014-04-252-25/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a post is marked edited and therefor marked as softdeleted/unapproved, we should not delete the notifications, just like we can't delete the emails. Links are out there anyway and just keeping the notification is fail save. If we keep the notification we can just continue to update it when more posts are added. Also when we delete a post, we don't have to go though the table and find all related notifications to be able to delete them or even update them, when they have responders set. PHPBB3-12371
* | | | | Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into ↵Nathaniel Guse2014-05-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus # By Nicofuma # Via Nicofuma * remotes/Nicofuma/ticket/12445: [ticket/12445] Change the formulation [ticket/12445] Disapproved post: the name of the poster should be in logs
| * | | | | [ticket/12445] Disapproved post: the name of the poster should be in logsNicofuma2014-04-261-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12445 PHPBB3-12445
* | | | | Merge pull request #2362 from n-aleha/ticket/12186aJoas Schilling2014-04-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12186] Move PM reports below post reports while installing for ascraeus * n-aleha/ticket/12186a: [ticket/12186] Move PM reports below post reports while installing for ascraeus [ticket/12186] Move PM reports below post reports while installing
| * \ \ \ \ Merge branch 'ticket/12186' into ticket/12186an-aleha2014-04-271-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/12186] Move PM reports below post reports while installingn-aleha2014-04-231-1/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | In mcp, move PM reports below post reports while installing. PHPBB3-12186
| | * | | | Merge pull request #2310 from n-aleha/ticket/12397Andreas Fischer2014-04-151-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12397] Fix sql_unique_index_exists doc block * n-aleha/ticket/12397: [ticket/12397] Fix sql_unique_index_exists doc block
| | | * | | | [ticket/12397] Fix sql_unique_index_exists doc blockn-aleha2014-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db_tools::sql_unique_index_exists() searches for unique indexes but not primary key indexes. PHPBB3-12397
* | | | | | | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-2941-121/+79
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | [ticket/12097] Bug fix and adding unit testNicofuma2014-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12097
* | | | | | [ticket/12097] Validate_data() should work with class methodNicofuma2014-04-261-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12097 PHPBB3-12097
* | | | | | [ticket/12199] Move deprecated functions to functions_compatibility.phpNicofuma2014-04-263-46/+46
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently 13 functions are marked as deprecated: functions.php: function set_var() function request_var() function set_config() function set_config_count() function tz_select() function add_log() functions_admin: function cache_moderators() function update_foes() functions_compatibility: function get_user_avatar() function phpbb_hash() function phpbb_check_hash() function phpbb_clean_path() functions_install: function get_tables() 8 of them are still used in the core: add_log Used in many places (~198 calls) get_tables Used in install\install_convert::get_convert_settings and functions_install.php\connect_check_db get_user_avatar Used in phpbb\user_loader:get_avatar phpbb_hash Used in phpbb\db\migration\data\v30x\release_3_0_5_rc1 request_var Used quite everywhere (~997 calls) set_config Used in many places (~129 calls) set_config_count Used in a few places (~37 calls) set_var Used by phpbb_http_login and phpbb\auth\provider\apache::autologin PHPBB3-12199
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into ↵Nils Adermann2014-04-242-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11917: [ticket/11917] Move OAuth Module to the bottom while installing [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend Conflicts: phpBB/install/install_install.php
| * | | | | [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backendJoas Schilling2014-04-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11917
* | | | | | Merge pull request #2036 from prototech/ticket/12201Joas Schilling2014-04-221-6/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12201] Clean up ACP attachment management page * prototech/ticket/12201: [ticket/12201] Decreased pagination font size. [ticket/12201] Update select element to follow same design as prosilver. [ticket/12201] Increase sort font size just slightly. [ticket/12201] Add link to resync file stats after error. [ticket/12201] Fix typos in language pack. [ticket/12201] Display error and sorting options when there are no attachments [ticket/12201] Only the top pagination should be floated to the right. [ticket/12201] Rearrange pagination, sorting, and submit elements. [ticket/12201] Center the file size and mark columns. [ticket/12201] Separate pagination from table.
| * | | | | | [ticket/12201] Add link to resync file stats after error.Cesar G2014-04-151-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12201
* | | | | | | Merge pull request #2248 from Elsensee/ticket/12193Joas Schilling2014-04-221-0/+10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12193] Fix broken HTML if SQL error occurs during migration * Elsensee/ticket/12193: [ticket/12193] Fix broken HTML if SQL error occurs during migration
| * | | | | | [ticket/12193] Fix broken HTML if SQL error occurs during migrationOliver Schramm2014-04-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12193
* | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-151-0/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
| * | | | | Merge pull request #2195 from Elsensee/ticket/10423Joas Schilling2014-04-151-0/+18
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10423] Remove * from search or highlight string * Elsensee/ticket/10423: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
| | * | | | [ticket/10423] Match multiple wildcardsOliver Schramm2014-04-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple wildcards are removed from the string if there is no word before or after them. If there is a word before or after them, they are just replaced with a single one. PHPBB3-10423
| | * | | | [ticket/10423] Move code into a function and add tests for itOliver Schramm2014-04-131-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10423
| * | | | | Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympusJoas Schilling2014-04-051-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/10851: [ticket/10851] Set disallowed content to empty array if checking is disabled
* | | | | | | [ticket/12344] Add core.pm_submit_before to function submit_pmlucifer4o2014-04-151-1/+13
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | PHPBB3-12344
* | | | | | Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeusJoas Schilling2014-04-141-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12372: [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay() [ticket/12372] Move dE() function core.js [ticket/12372] Unify definition of function dE() across all files [ticket/12372] Use jQuery in javascript dE() function
| * | | | | [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()Marc Alexander2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
* | | | | | [ticket/12211] Do not run attachment file names twice through htmlspecialcharsMarc Alexander2014-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upload filenames are already processed via htmlspecialchars in the type_cast_helper of the new request class. There is no need to run it through htmlspecialchars() again in the filespec class. PHPBB3-12211