1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

414 Commits

Author SHA1 Message Date
Oleg Pudeyev
e82833d4b8 [ticket/10758] Dependency inject parameters into update_foes.
Also add phpbb prefix since the signature is being changed anyway.

PHPBB3-10758
2012-12-15 16:50:28 -05:00
Oleg Pudeyev
5c496674f6 [ticket/10758] Dependency inject parameters into cache_moderators.
Also add phpbb prefix since the signature is being changed anyway.

PHPBB3-10758
2012-12-15 16:50:28 -05:00
Nathan Guse
249f3c8885 [ticket/11103] Instantiate $phpbb_notifications as needed
https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976

PHPBB3-11103
2012-12-13 19:19:40 -06:00
Nathan Guse
0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-12-07 21:14:39 -06:00
Joas Schilling
37530abd39 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (645 commits)
  [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
  [ticket/10679] Use module_auth to limit access to the module
  [ticket/10679] Add new permission for changing profile field information
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  ...
2012-12-07 15:50:24 +01:00
Joas Schilling
70d23380aa [ticket/10714] Rely on global instead of creating an instance
PHPBB3-10714
2012-12-07 15:11:56 +01:00
Andreas Fischer
5d78346453 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11227] @return void -> @return null in develop-olympus.
2012-11-29 23:17:58 +01:00
Oleg Pudeyev
65253a3023 [ticket/11227] @return void -> @return null in develop-olympus.
PHPBB3-11227
2012-11-29 15:37:12 -05:00
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
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
2012-11-20 22:54:16 -06:00
Joas Schilling
f77a6eaab5 [feature/soft-delete] Fix the rest of *_approved and the delete_post unit test
PHPBB3-9567
2012-11-10 11:24:52 +01:00
Joas Schilling
9c2a58eff4 [feature/soft-delete] Append _approved to *_posts and *_topics column names
PHPBB3-9567
2012-11-09 13:37:53 +01:00
Joas Schilling
63e3baf0eb [feature/soft-delete] Correctly manage softdeleting via posting.php
PHPBB3-9567
2012-11-02 14:14:20 +01:00
Joas Schilling
b3d5f2b4e4 [feature/soft-delete] Fix unit tests for delete_posts()
PHPBB3-9567
2012-10-23 23:37:25 +02:00
Joas Schilling
168dd29f24 [feature/soft-delete] Fix sync() and some more functions to use the new fields
PHPBB3-9567
2012-10-22 14:22:56 +02:00
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method
This is going to require you recreate the db tables.

PHPBB3-11103
2012-10-20 20:58:53 -05:00
Nathan Guse
ae670cc87d [ticket/11103] Remove unnecessary comments
Comments that are not needed because the actions are completely
self-explanatory

PHPBB3-11103
2012-10-18 18:32:13 -05:00
Joas Schilling
fbf85b76c1 [feature/soft-delete] Correctly synchronize the topic_visibility in sync()
This also makes sync('topic_visibility') obsolete, but we keep it for now.
Also fix a unit test, because ITEM_DELETED overpowers ITEM_UNAPPROVED

PHPBB3-9567
2012-10-09 15:38:50 +02:00
Joas Schilling
224be5bc4f [feature/soft-delete] Fix sync('topic_visibility')
The function can not rely on the first post anymore, as that one could be soft
deleted but the topic still has approved replies which are still visible.

PHPBB3-9567
2012-10-09 14:02:42 +02:00
Joas Schilling
63d11c976b [feature/soft-delete] Fix sync('topic') to match the new logic
This also fixes set_post_visibility()

PHPBB3-9567
2012-10-05 12:39:05 +02:00
Nathan Guse
b9bc65eed8 [ticket/11103] Make $phpbb_notifications a global and use it everywhere
Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
2012-10-04 14:47:13 -05:00
Joas Schilling
5b64ebc11d [feature/soft-delete] Fix a bug in sync() and set_post_visibility()
PHPBB3-9657
2012-10-02 15:34:18 +02:00
Nathan Guse
661dd09d6f [ticket/11103] Bug fix
PHPBB3-11103
2012-09-16 23:03:00 -05:00
Nathan Guse
a4ec7e2aea [ticket/11103] Delete some notifications when deleting posts/topics
PHPBB3-11103
2012-09-15 14:50:05 -05:00
Nathan Guse
8e977544fb [ticket/11103] Normalization of $phpbb_notifications variable name
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.

PHPBB3-11103
2012-09-14 17:01:08 -05:00
Nathan Guse
12e46e48c8 [ticket/11103] Remove notifications to posts/topics when they are deleted
PHPBB3-11103
2012-09-09 17:43:10 -05:00
Joas Schilling
c03d692a98 [feature/soft-delete] Fix some more usages of _approved column names
PHPBB3-9657
2012-08-30 22:57:00 +02:00
Josh Woody
b8c55291ed [feature/soft-delete] Lay the groundwork for a soft-delete feature
So far, I've added no new functionality.  The biggest change here is adjusting the DB column names to "visibility" rather than "approved".  Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)

PHPBB3-9657
2012-08-29 17:49:37 +02:00
Joas Schilling
d289bc13ac [ticket/10714] Remove dependency injection and use global instead
This avoids loading functions_admin.php globally and was suggested by naderman

PHPBB3-10714
2012-08-21 16:49:08 +02:00
Joas Schilling
97290647fa [ticket/10714] Use phpbb_log class in view_log()
PHPBB3-10714
2012-08-21 12:12:37 +02:00
Joas Schilling
9248b9b25f [ticket/10714] Add doc block for view_log function
PHPBB3-10714
2012-08-21 11:59:36 +02:00
Joas Schilling
f5063a6eda [ticket/10714] Add incorrect offset calculation in view_log function
PHPBB3-10714
2012-08-21 11:59:35 +02:00
Joas Schilling
91384d8395 [ticket/10714] Add casts to integer values.
PHPBB3-10714
2012-08-21 11:59:35 +02:00
Dhruv
7c406e1e81 [ticket/11052] update search backend constructor everywhere
PHPBB3-11052
2012-08-15 22:05:26 +05:30
Andreas Fischer
cb245b1faf [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
Merge their bodies into phpbb_remove_comments($input).

PHPBB3-10969
2012-07-08 21:38:53 +02:00
Oleg Pudeyev
b6a364b706 Merge PR #856 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:30 -04:00
Andreas Fischer
81d5327e44 [ticket/10937] Comment removal functions: Restore backward compatibility
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Nils Adermann
1b73f82430 Merge branch 'develop-olympus' into develop
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
2012-05-31 15:28:08 +02:00
Andreas Fischer
9ab5ad2986 [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
PHPBB3-10751
2012-05-31 12:15:46 +02:00
Oleg Pudeyev
95ac995be8 Merge remote-tracking branch 'bantu/ticket/10636' into develop
* bantu/ticket/10636:
  [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
2012-02-10 13:25:46 -05:00
Vjacheslav Trushkin
11606c8607 [ticket/10637] Leftovers from implementation of extensions
Replacing code in includes/functions_admin.php that was missed in ticket 10323

PHPBB3-10637
2012-02-09 21:58:39 +02:00
Andreas Fischer
6858485964 [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
Regression from 4c77903129749008cd08c346006d2a57cf6ff544.

PHPBB3-10636
2012-02-09 14:18:17 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Oleg Pudeyev
0c0befe2f8 Merge branch 'develop-olympus' into develop
* 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
2011-12-03 22:25:32 -05:00
Oleg Pudeyev
bf6d501ab1 Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus
* 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
2011-12-03 22:07:34 -05:00
Oleg Pudeyev
90a7f55831 Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop
* nickvergessen/ticket/10484:
  [ticket/10484] Use variables for sql_build_query() calls

Conflicts:
	phpBB/includes/mcp/mcp_front.php
2011-11-24 21:51:10 -05:00
Oleg Pudeyev
817ef638d1 Merge branch 'develop-olympus' into develop
* 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.
2011-11-23 20:39:29 -05:00
Oleg Pudeyev
a72ea2bc98 [ticket/10461] Add a comment explaining the logic here.
PHPBB3-10461
2011-11-23 18:15:45 -05:00
Andreas Fischer
6f40960071 [ticket/10461] Correct $log_count check in view_log() so we show logs again.
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
2011-11-23 23:03:41 +01:00
Joas Schilling
4c77903129 [ticket/10484] Use variables for sql_build_query() calls
It's easier for mods/extensions to extend the arrays.

PHPBB3-10484
2011-11-21 16:22:07 +01:00
Nils Adermann
c5ee92c3f2 Merge branch 'develop-olympus' into develop
* 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().
2011-10-14 02:49:15 +02:00