1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

327 Commits

Author SHA1 Message Date
Marc Alexander
9d4d212e0f [ticket/11525] Only remove group or user prefix from given avatar data
Until now, the user data had both user_id and group_id keys in the avatar
data. As both group_ and user_ prefixes were removed the group_id was
collapsed onto the user_id and therefore all users in the same group had
the same prefix for their uploaded avatars. This patch will make sure
that the correct id is used depending on whether it's a group's or user's
avatar data.

PHPBB3-11525
2013-10-24 13:55:23 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Nils Adermann
da2752e400 [ticket/11700] Modify all code to use the new interface names
PHPBB3-11700
2013-07-14 13:30:52 -04:00
Joas Schilling
081350678d [ticket/9649] Display information on index for moderators on unapproved posts
PHPBB3-9649
2013-07-13 14:57:31 -04:00
Joas Schilling
9aed758c13 [ticket/9657] Use the service instead of the static class
PHPBB3-9657
2013-07-11 14:24:07 +02:00
Joas Schilling
923c0709db Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (234 commits)
  [ticket/11398] Correctly call permission_set method in permission tool
  [ticket/11394] Relax Migration Tools
  [ticket/11386] Fix missing ;
  [ticket/10714] Get log from container in install, update and download/file
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [ticket/11396] Rename insert_migration to set_migration_state
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
  [ticket/11393] Give more information on database updater
  [ticket/11386] Send list of migrations instead of using load_migrations
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  ...
2013-03-05 18:26:01 +01:00
Marc Alexander
8778c9c945 [feature/avatars] Pass phpbb_user object to get_custom_html()
Pass the phpbb_user object to function get_custom_html(). This object is
used in that method. Also fixed incorrect arguments to get_custom_html()
in phpbb_get_avatar().

PHPBB3-10018
2013-01-08 15:34:20 +01:00
Marc Alexander
7256a2d944 [feature/avatars] Add phpbb prefix to new functions
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.

PHPBB3-10018
2013-01-04 15:10:43 +01:00
Marc Alexander
c9338b38b3 Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars 2012-12-24 14:34:10 +01:00
Joas Schilling
e34b8ed094 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [ticket/11285] Use more granularity in dependency checks in compress test
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
  [ticket/10803] Show failure message until user dismisses it
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [ticket/10954] Miscellaneous coding fixes
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [ticket/10763] Use self when calling get_extension() in filespec class
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/posting.php
2012-12-20 22:51:38 +01:00
Marc Alexander
16c021e986 [ticket/10954] Change behavior of marking topics/forums
It will now display a popup message for 3 seconds which will confirm the
taken action. The amount of DOM traversals have been significantly reduced
and jQuery.each is now used instead of for loops. Additionally, it is now
possible to click on the mark topics/forums read links without triggering
an AJAX error.

PHPBB3-10954
2012-12-14 15:46:45 +01:00
Marc Alexander
7efc37d1f9 [ticket/10954] Modify is_ajax check for consistency
PHPBB3-10954
2012-12-12 19:09:18 +01:00
Marc Alexander
7ce009f2e2 [ticket/10954] Mark forums read without popup or page refresh
PHPBB3-10954
2012-12-12 12:46:20 +01:00
Marc Alexander
33b98dc5ba [feature/avatars] Fix variable names
PHPBB3-10018
2012-11-30 16:46:11 +01:00
Marc Alexander
d5cbedaaa2 [feature/avatars] Let avatar manager handle $ignore_config
The avatar manager already handles if avatars are enabled. It should also
handle ignoring the config settings.

PHPBB3-10018
2012-11-30 15:12:34 +01:00
Marc Alexander
81a1a21185 [feature/avatars] Properly implement custom HTML in the interface
Previously the driver class added a variable that defined wether an avatar
driver would return custom HTML. The existence of this variable was
implied in the interface. It's also not needed which is why it has been
removed.

PHPBB3-10018
2012-11-29 23:08:29 +01:00
Marc Alexander
67c2e48d15 [feature/avatars] Only create avatar objects if necessary
PHPBB3-10018
2012-11-25 14:33:13 +01:00
Marc Alexander
076785d76a [feature/avatars] Add support for custom avatar HTML code
PHPBB3-10018
2012-11-14 20:04:02 +01:00
Marc Alexander
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +01:00
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +01:00
Joas Schilling
334265fc83 [feature/soft-delete] Fix displaying the button/permission
When the post is already softdeleted the options should only be available if
*_delete is granted.

PHPBB3-9567
2012-11-03 22:57:49 +01:00
Joas Schilling
6c39563e9f [feature/soft-delete] Add a function to calculate the actual post/topic count
PHPBB3-9567
2012-10-21 23:38:55 +02:00
Andreas Fischer
b3fdf8a046 Merge remote-tracking branch 'EXreaction/ticket/8796' into develop
* EXreaction/ticket/8796:
  [ticket/8796] Prevent setting post_time greater than time() in markread
  [ticket/8796] Fix a few issues with the previous commits
  [ticket/8796] Mark read links updated to include time() in url
  [ticket/8796] Revert changes to $user->data['lastmark']
  [ticket/8796] Make function markread obey the $post_time argument
2012-10-18 16:43:46 +02:00
Joas Schilling
2841ecc44f [feature/soft-delete] Fix display_user_activity()
The Logic of $forum_ary was inverted, so if the array is empty, we can skip
the queries. We also should not merge passworded forums into the $forum_ary
as we removed them from that array right before that.

PHPBB3-9567
2012-10-09 12:08:17 +02:00
Joas Schilling
4a65940e62 [feature/soft-delete] Add unit tests for get_forums_visibility_sql()
PHPBB3-9657
2012-10-01 22:14:04 +02:00
Nathan Guse
c93b3827dc [ticket/11092] phpbb_gen_download_links strict standards errors
Two strict standards errors in phpbb_gen_download_links

PHPBB3-11092
2012-09-07 11:29:47 -05:00
Nathaniel Guse
fccbf09e4a [ticket/8796] Fix a few issues with the previous commits
Fix an SQL error and the redirect url generated

PHPBB3-8796
2012-09-03 18:58:38 -05:00
Nathaniel Guse
9cba0b5263 [ticket/8796] Mark read links updated to include time() in url
Submitting the current time() allows us to mark only the topics
and forums read up until a certain time (when the user loaded
the page). This means that any new posts or topics posted between
when the user opened the page and clicked the link are still
shown as unread.

PHPBB3-8796
2012-09-03 18:51:29 -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
Andreas Fischer
d0ce637251 Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop
* Fyorl/feature/attach-dl: (75 commits)
  [feature/attach-dl] Removed the use of some abbreviations
  [feature/attach-dl] Changed $files_added checks
  [feature/attach-dl] Renamed $post_id to $post_msg_id
  [feature/attach-dl] Fixed a comment
  [feature/attach-dl] Optimised an sql query
  [feature/attach-dl] Fixed the logic in an sql statement
  [feature/attch-dl] $forum_id cast to int
  [feature/attach-dl] Fixed $file_added to $files_added
  [feature/attach-dl] Moved definition of $archive_name
  [feature/attach-dl] Swapped the order of an if statement
  [feature/attach-dl] Cast variables to int
  [feature/attach-dl] Added $archive_path
  [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
  [feature/attach-dl] Renamed $count to $files_added
  [feature/attach-dl] Removed sprintf() use
  [feature/attach-dl] Removed need for array_keys()
  [feature/attach-dl] Added multiple attachment downloads to PMs
  [feature/attach-dl] Removed reliance on current($row)
  [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
  [feature/attach-dl] Moved PM authentication handling into own function
  ...
2012-08-26 18:56:09 +02:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
Fyorl
773c513ac0 [feature/attach-dl] Moved include of compress class inside function
PHPBB3-11042
2012-08-07 16:59:57 +01:00
Fyorl
18d7210a11 [feature/attach-dl] Prefixed gen_download_links with phpbb_
PHPBB3-11042
2012-08-04 13:58:50 +01:00
Fyorl
ee7d9614c0 [feature/attach-dl] Downloading all attachments fully implemented
Added a function to list all available archiving methods and integrated
it with the prosilver style.

Heavy modifications to download/file.php to support archiving and
downloading of multiple files at once.

PHPBB3-11042
2012-08-04 13:18:20 +01:00
Joas Schilling
39869d46b1 [feature/php-events] Allow core.user_get_avatar to overwrite all avatars
PHPBB3-9550
2012-08-01 10:18:57 +02:00
Joas Schilling
4f13b049f8 [feature/php-events] Fix docs of core.display_custom_bbcodes
PHPBB3-9550
2012-08-01 10:18:56 +02:00
Joas Schilling
96f20160bc [feature/php-events] Fix docs and naming of display_custom_bbcodes_modify_row
PHPBB3-9550
2012-08-01 10:18:56 +02:00
Joas Schilling
8b7e3739a0 [feature/php-events] Fix docs and naming of display_forums_modify_template_vars
PHPBB3-9550
2012-08-01 10:18:56 +02:00
Joas Schilling
d4f9442e87 [feature/php-events] Move core.display_forums_modify_forum_rows to better point
PHPBB3-9550
2012-08-01 10:18:56 +02:00
Joas Schilling
14edfd2856 [feature/php-events] Fix docs of core.display_forums_modify_row
PHPBB3-9550
2012-08-01 10:18:55 +02:00
Joas Schilling
099aaab720 [feature/php-events] Fix docs and naming of core.display_forums_modify_sql
PHPBB3-9550
2012-08-01 10:18:55 +02:00
Joas Schilling
bdfedba521 [feature/php-events] Make handling of forumrow consistent with others
PHPBB3-9550
2012-08-01 10:18:52 +02:00
Joas Schilling
3af0ae69ee [feature/php-events] Properly name user_default_avatar and add additional vars
PHPBB3-9550
2012-08-01 10:18:50 +02:00
Joas Schilling
730bd6eb08 [feature/php-events] Rename display_forums_sql_inject to be less misleading
PHPBB3-9550
2012-08-01 10:18:50 +02:00
David King
611d965b04 [feature/events] Renamed $empty_avatar to $default_avatar
PHPBB3-9550
2012-08-01 10:18:48 +02:00
David King
6059bc7b45 [feature/events] Added core.user_default_avatar event
This way, extension authors can overwrite the empty value returned
when a user does not have an avatar with a default value to display
instead of nothing in the avatar space.

PHPBB3-9550
2012-08-01 10:18:48 +02:00
Michael Cullum
3f1b4e83ae [feature/events] Removing the third trigger_event parameter
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Michael Cullum
8af7d225ef [feature/events] Change to use the new method of adding events
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Joas Schilling
1a7f83948e [feature/events] Adding ledge display_custom_bbcodes
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:42 +02:00
Joas Schilling
69407cae7b [feature/events] Adding ledge display_custom_bbcodes_row
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:41 +02:00