aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-9/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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/10758] Add return to the other compat function.Oleg Pudeyev2012-12-241-1/+1
| | | | | | | | PHPBB3-10758
| * [ticket/10758] Add periods.Oleg Pudeyev2012-12-221-2/+2
| | | | | | | | PHPBB3-10758
| * [ticket/10758] Yes, only one empty line.Oleg Pudeyev2012-12-221-1/+0
| | | | | | | | PHPBB3-10758
| * [ticket/10758] Add deprecated tags.Oleg Pudeyev2012-12-201-0/+2
| | | | | | | | PHPBB3-10758
| * [ticket/10758] Add compat functions.Oleg Pudeyev2012-12-201-0/+27
| | | | | | | | PHPBB3-10758
| * [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-151-4/+8
| | | | | | | | | | | | Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
| * [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-151-5/+9
| | | | | | | | | | | | Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
* | [ticket/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-131-4/+6
| | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976 PHPBB3-11103
* | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * Merge branch 'develop-olympus' into developAndreas Fischer2012-11-291-1/+1
| |\ | | | | | | | | | | | | * develop-olympus: [ticket/11227] @return void -> @return null in develop-olympus.
| | * [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-291-1/+1
| | | | | | | | | | | | PHPBB3-11227
* | | [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-201-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-201-2/+12
| | | | | | | | | | | | | | | | | | 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] Make $phpbb_notifications a global and use it everywhereNathan Guse2012-10-041-4/+2
| | | | | | | | | | | | | | | | | | Do not use phpbb_container everywhere (makes testing difficult) PHPBB3-11103
* | | [ticket/11103] Bug fixNathan Guse2012-09-161-1/+1
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Delete some notifications when deleting posts/topicsNathan Guse2012-09-151-2/+2
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Normalization of $phpbb_notifications variable nameNathan Guse2012-09-141-4/+4
| | | | | | | | | | | | | | | | | | | | | Use $phpbb_notifications instead of $notifications everywhere for consistency and conflict prevention. PHPBB3-11103
* | | [ticket/11103] Remove notifications to posts/topics when they are deletedNathan Guse2012-09-091-0/+10
|/ / | | | | | | PHPBB3-11103
* | [ticket/11052] update search backend constructor everywhereDhruv2012-08-151-2/+2
| | | | | | | | PHPBB3-11052
* | [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).Andreas Fischer2012-07-081-15/+0
| | | | | | | | | | | | Merge their bodies into phpbb_remove_comments($input). PHPBB3-10969
* | Merge PR #856 branch 'develop-olympus' into developOleg Pudeyev2012-07-071-0/+15
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10937] Update documentation to say which comment styles are removed. [ticket/10937] Comment removal functions: Restore backward compatibility
| * [ticket/10937] Comment removal functions: Restore backward compatibilityAndreas Fischer2012-07-031-0/+15
| | | | | | | | PHPBB3-10937
* | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column. [ticket/10751] Add sql_lower_text() to database abstraction layer. Conflicts: phpBB/includes/db/dbal.php
| * [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.Andreas Fischer2012-05-311-1/+2
| | | | | | | | PHPBB3-10751
* | Merge remote-tracking branch 'bantu/ticket/10636' into developOleg Pudeyev2012-02-101-2/+2
|\ \ | | | | | | | | | | | | * bantu/ticket/10636: [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
| * | [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().Andreas Fischer2012-02-091-2/+2
| | | | | | | | | | | | | | | | | | Regression from 4c77903129749008cd08c346006d2a57cf6ff544. PHPBB3-10636
* | | [ticket/10637] Leftovers from implementation of extensionsVjacheslav Trushkin2012-02-091-4/+2
|/ / | | | | | | | | | | Replacing code in includes/functions_admin.php that was missed in ticket 10323 PHPBB3-10637
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-031-35/+0
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/10349] Removed duplicated functions from schema loading in tests [ticket/10349] Update function comment [ticket/10349] Use new schema comment function in installer [ticket/10349] Unit tests: Consolidate schema comment removal functions [ticket/10349] Unit tests: Remove comments while loading schema files
| * Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-031-35/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10349: [ticket/10349] Removed duplicated functions from schema loading in tests [ticket/10349] Update function comment [ticket/10349] Use new schema comment function in installer [ticket/10349] Unit tests: Consolidate schema comment removal functions [ticket/10349] Unit tests: Remove comments while loading schema files
| | * [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-281-35/+0
| | | | | | | | | | | | | | | | | | | | | This is what now runs in the unit tests. The COMMENTS field in the dbms data is no longer needed, so it has been removed. PHPBB3-10349
* | | Merge remote-tracking branch 'nickvergessen/ticket/10484' into developOleg Pudeyev2011-11-241-9/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10484: [ticket/10484] Use variables for sql_build_query() calls Conflicts: phpBB/includes/mcp/mcp_front.php
| * | | [ticket/10484] Use variables for sql_build_query() callsJoas Schilling2011-11-211-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | It's easier for mods/extensions to extend the arrays. PHPBB3-10484
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+5
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | * develop-olympus: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| * | [ticket/10461] Add a comment explaining the logic here.Oleg Pudeyev2011-11-231-0/+4
| | | | | | | | | | | | PHPBB3-10461
| * | [ticket/10461] Correct $log_count check in view_log() so we show logs again.Andreas Fischer2011-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We pass $log_count as false now when we do not need to know how many log entries there are. However when $log_count is false, $log_count == 0 will be true as well and thus we will return early with 0. PHPBB3-9874 PHPBB3-10461
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| * | [ticket/10278] Also timeout when receiving data over a slow connection.Andreas Fischer2011-10-131-1/+2
| | | | | | | | | | | | PHPBB3-10278
| * | [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.Andreas Fischer2011-08-251-1/+1
| | | | | | | | | | | | PHPBB3-10278
| * | [ticket/10278] Return with a timeout error when fread() or fgets() time out.Andreas Fischer2011-08-251-0/+8
| | | | | | | | | | | | PHPBB3-10278
| * | [ticket/10278] Also set timeout on stream in get_remote_file().Andreas Fischer2011-08-251-0/+2
| |/ | | | | | | | | | | | | | | | | | | From the PHP manual for fsockopen(): If you need to set a timeout for reading/writing data over the socket, use stream_set_timeout(), as the timeout parameter to fsockopen() only applies while connecting the socket. http://www.php.net/manual/en/function.fsockopen.php PHPBB3-10278
* | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-15/+32
|\ \ | |/ | | | | | | * develop-olympus: [ticket/5506] Do not display an empty last page after deleting logs.
| * [ticket/5506] Do not display an empty last page after deleting logs.Joas Schilling2011-07-141-15/+32
| | | | | | | | | | | | The fix is copied from view_inactive_users(). Also add keywords and sort parameters to url for deleting logs and inactive users. And finally save some queries if there are no logs/users to display anyway
* | [ticket/9684] Remove code in some more files especially includes/Joas Schilling2011-04-071-22/+3
| | | | | | | | | | | | Topic-Tracking is still missing. PHPBB3-9684
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-241-10/+14
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/9874] view_log() performs unneeded count query over all log entries. [ticket/7834] Topic time didn't update when first post was deleted [ticket/9997] Fixed an inconsistency in the Moderator Control Panel [ticket/9872] Removed some useless code that broke delete_posts
| * [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-251-10/+14
| | | | | | | | PHPBB3-9874
* | [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
* [ticket/9850] Display upgrade instructions for feature release in acpIgor Wiedler2010-11-021-1/+1
| | | | PHPBB3-9850