1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 18:23:00 +02:00

5529 Commits

Author SHA1 Message Date
Andreas Fischer
57eb50812f Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympus
* rxu/ticket/10684:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans
2012-03-22 18:14:13 +01:00
rxu
5a9dd1994f [ticket/10684] Adjust function and parameter name, minor changes.
PHPBB3-10684
2012-03-22 21:19:01 +08:00
Andreas Fischer
099f8de621 Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop
* dhruvgoel92/ticket/10704:
  [ticket/10704] minor typo in a comment
2012-03-22 10:59:41 +01:00
Andreas Fischer
89f988ecdd Merge remote-tracking branch 'p/task/php54-ascraeus' into develop
* p/task/php54-ascraeus:
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
2012-03-22 10:56:07 +01:00
Andreas Fischer
21bd0ca31a Merge branch 'develop-olympus' into develop
With 5efdbfa5e4e3c00c08167cdfff912ee4937f4fd2 reverted.

* develop-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:51:03 +01:00
Andreas Fischer
e5205ba2f8 Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympus
* p/task/php54-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:49:37 +01:00
Dhruv Goel
92f771eb82 [ticket/10704] minor typo in a comment
Make sure $id separation is working fine

PHPBB3-10704
2012-03-22 03:10:14 +05:30
Igor Wiedler
baefbdb882 [feature/event-dispatcher] Add phpbb_event_dispatcher_wrapper
PHPBB3-9550
2012-03-21 13:15:45 +01:00
Igor Wiedler
b4b586ae10 [feature/event-dispatcher] Switch subscriber loader to EventDispatcherInterface
Do not hardcode the implementation of EventDispatcher.

PHPBB3-9550
2012-03-21 13:09:39 +01:00
Richard Foote
70d88965c7 [ticket/10708] Check converted passwords for multi-byte characters
Check for multi-byte characters in converted passwords.

PHPBB3-10708
2012-03-19 23:19:21 -04:00
Richard Foote
97d4f168f5 [ticket/10675] Add disk full language string when posting attachments
Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.

PHPBB3-10675
2012-03-19 15:08:28 -04:00
David King
e45452d1b3 [ticket/10586] Sanitize periods from class names, use manager to get path.
PHPBB3-10586
2012-03-19 09:12:32 -04:00
David King
a0131b45f5 [ticket/10586] Extension front controller
Handle extension front pages

PHPBB3-10586
2012-03-19 09:12:31 -04:00
Bruno Ais
28c6b95100 [feature/save-post-on-report] bbcode_nl2br missing.
New lines were missing in the reported_post_text.
By adding the bbcode_nl2br() became as it is supposed to.

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
18373035c3 [feature/save-post-on-report] Changed the name of the column
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
2012-03-19 08:27:32 -04:00
Bruno Ais
95b5109c62 [feature/save-post-on-report] The complete changes for this feature
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.
2012-03-19 08:27:31 -04:00
Igor Wiedler
847d47a533 [feature/event-dispatcher] Change subscriber naming {subscriber => listener}.php
This is more consistent with what Symfony2 uses (EventListener/FooListener.php).

PHPBB3-9550
2012-03-18 23:12:17 +01:00
Oleg Pudeyev
43899ffdf3 [feature/event-dispatcher] Implement mutation for page_header ledge.
PHPBB3-9550
2012-03-18 02:48:55 -04:00
Oleg Pudeyev
be23445b8c [feature/event-dispatcher] Add get_data_filtered function to event data.
Its purpose is to discard any keys added by hooks to data stored
in the event, such that only keys that the ledge knows how to handle
are processed.

PHPBB3-9550
2012-03-18 02:48:55 -04:00
Oleg Pudeyev
fbf34f16ab [feature/event-dispatcher] Implement configurable autoloader selection.
The code is in startup.php which should be used by all scripts.

PHPBB3-9550
2012-03-18 02:48:55 -04:00
Callum Macrae
79a987ffcb [ticket/10510] Moved a $user->lang call into the function.
PHPBB3-10510
2012-03-17 18:06:46 +00:00
Callum Macrae
784c9725f3 [ticket/10510] Made a couple improvements to phpbb_add_quickmod_option.
PHPBB3-10510
2012-03-17 18:06:45 +00:00
Callum Macrae
4f59990d90 [ticket/10510] Added phpbb_add_quickmod_option and moved existing to it.
PHPBB3-10510
2012-03-17 18:06:45 +00:00
Oleg Pudeyev
1fa39ea722 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:35 -04:00
Oleg Pudeyev
81eeafbb8d Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus
* nickvergessen/ticket/8636:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:29 -04:00
Oleg Pudeyev
ccdd176b72 [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
Split module_auth into a static and a non-static version.

Call the static version statically and the non-static version non-statically.

PHPBB3-10615
2012-03-16 04:56:41 -04:00
Oleg Pudeyev
5efdbfa5e4 [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
We cannot use static in Olympus because it must be PHP 4 compatible.

Therefore disable E_STRICT for Olympus.

This commit should be reverted for Ascraeus.

PHPBB3-10615
2012-03-15 22:47:42 -04:00
Oleg Pudeyev
71afba0ded [task/php54] Refactor error_reporting call slightly.
Separate error level assignment into a variable in this commit
so that the only difference between Olympus and Ascraeus
is the addition of logic altering $level.

PHPBB3-10615
2012-03-15 22:46:06 -04:00
Vjacheslav Trushkin
fd96f97dc3 [feature/merging-style-components] Updating style initialization
Changing template initialization to style initialization.

PHPBB3-10632
2012-03-15 21:11:34 +02:00
Vjacheslav Trushkin
1ce4d4c4fc [feature/merging-style-components] Changing style class
Moving functions that deal with styles from template to style class, updating docblocks

PHPBB3-10632
2012-03-15 21:09:49 +02:00
Vjacheslav Trushkin
5b149e93b9 [feature/merging-style-components] Changing template class
Removing functions that are now handled by phpbb_style class, allowing to write $context, updating docblocks

PHPBB3-10632
2012-03-15 21:08:41 +02:00
Vjacheslav Trushkin
0b2abe5250 [feature/merging-style-components] Changing resource locator
Changing "template" to "style" in all functions that deal with styles, changing error messages, updating docblocks

PHPBB3-10632
2012-03-15 21:06:24 +02:00
Vjacheslav Trushkin
c692e0d92d [feature/merging-style-components] Changing path provider
Changing set_templates() to set_style() and removing second parameter, changing get_main_template_path() to get_main_style_path(), removing template_root_for_style(), updating docblocks

PHPBB3-10632
2012-03-15 21:04:27 +02:00
Vjacheslav Trushkin
8b7c2c3c65 [feature/merging-style-components] Renaming style locator
Renaming style locator to style resource locator

PHPBB3-10632
2012-03-15 16:33:13 +02:00
Vjacheslav Trushkin
c83f386c92 [feature/merging-style-components] Changing $style to $style_id
Changing $style to $style_id in user::setup to avoid conflict with new global style variable

PHPBB3-10632
2012-03-15 13:41:23 +02:00
Vjacheslav Trushkin
3997ffac2a [feature/merging-style-components] Creating style class
Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
2012-03-15 13:13:21 +02:00
Vjacheslav Trushkin
e35a20f957 [feature/merging-style-components] New acp_styles
New acp_styles, completely rewritten

PHPBB3-10632
2012-03-14 23:47:57 +02:00
Vjacheslav Trushkin
ae7d290a22 [feature/merging-style-components] Updating PHP files
Removing theme and template entries in all files, except for acp styles section

PHPBB3-10632
2012-03-14 23:24:16 +02:00
Vjacheslav Trushkin
234e5d6402 [feature/merging-style-components] Implementing unlimited parent templates
Implementing possibility of unlimited levels of parent templates. Paths are stored in style_parent_tree, entries are separated by /

PHPBB3-10632
2012-03-14 23:22:02 +02:00
Vjacheslav Trushkin
b7d84a586c [feature/merging-style-components] Renaming template classes
Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)

PHPBB3-10632
2012-03-14 23:12:11 +02:00
Vjacheslav Trushkin
7d414d04ca [feature/merging-style-components] Moving template classes to style
Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates

PHPBB3-10632
2012-03-14 22:57:58 +02:00
rxu
ff8d523768 [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
PHPBB3-10684
2012-03-12 01:57:51 +08:00
rxu
da395edbca [ticket/10684] Remove intval mapping for array keys
PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
2012-03-12 01:47:28 +08:00
rxu
321d0d9b56 [ticket/10684] Adjust pm_notifications() to handle stale bans
- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
2012-03-12 01:44:00 +08:00
Igor Wiedler
ae984025f0 Merge branch 'develop' into feature/event-dispatcher
* develop: (95 commits)
  [ticket/9084] Explain the logic.
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [feature/append_var] Adding test case
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
  [feature/append_var] Adding append_var template class function
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
  [ticket/10680] Add /phpBB/ext/* to .gitignore
  [ticket/10672] Fix total post count language string in statistics and feed
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
  [ticket/10453] Fixing spacing
  ...

Conflicts:
	tests/bootstrap.php
2012-03-11 15:18:33 +01:00
Igor Wiedler
e02d92ac62 [feature/event-dispatcher] Use real EventDispatcher through composer
* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading

PHPBB3-9550
2012-03-11 15:15:33 +01:00
Igor Wiedler
5dd5df46a4 [feature/event-dispatcher] Remove copied EventDispatcher code
PHPBB3-9550
2012-03-11 14:55:30 +01:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer
PHPBB3-10684
2012-03-11 00:56:07 +08:00
Michael Cullum
668c61686b [ticket/10694] Adjusting details link to 5.3 announcement
PHPBB3-10694
2012-03-10 16:47:07 +00:00
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update
PHPBB3-10684
2012-03-10 00:17:39 +08:00