1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 08:53:05 +02:00
Commit Graph

331 Commits

Author SHA1 Message Date
ac11806bf4 [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
Introduced by 6b4d0a2542.

PHPBB3-10329
2011-08-21 14:34:34 +02:00
00a69b4372 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
  [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
2011-04-10 19:52:58 -04:00
259929ad4e [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
The user_ban() function is shared by the MCP and the ACP.

Mark trigger_error() calls as errors by passing E_USER_WARNING to make the
error message appear on red background (instead of green background) in the
ACP.

PHPBB3-10128
2011-04-11 00:29:48 +02:00
ebc338b9f3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
  [ticket/9751] Compare $password with empty string instead of casting it to bool
  [ticket/9751] Use a switch/case block without break for password complexity.
  [ticket/9751] Password requirement "Must contain letters and numbers" fails
2011-04-01 15:11:55 +02:00
4dce53628c [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
Add shortcut logic for pass_complex because this is the default value phpBB
ships with and there is nothing to do in that function in that case.

PHPBB3-9751
2011-04-01 15:10:29 +02:00
7cc32d3843 [ticket/9751] Compare $password with empty string instead of casting it to bool
PHPBB3-9751
2011-04-01 15:10:29 +02:00
dba8cf12fd [ticket/9751] Use a switch/case block without break for password complexity.
PHPBB3-9751
2011-04-01 15:10:29 +02:00
rxu
a835189823 [ticket/9751] Password requirement "Must contain letters and numbers" fails
PHPBB3-9751
2011-04-01 15:10:29 +02:00
df096b6b52 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9970] Rename validate_language() to validate_language_iso_name().
  [ticket/9970] Do not allow switching to languages not installed on reg. page.
  [ticket/9970] Check whether language pack is installed.
  [ticket/9970] User language input is checked for existance
2011-03-11 21:55:46 -05:00
ac90190682 [ticket/9970] Rename validate_language() to validate_language_iso_name().
PHPBB3-9970
2011-03-07 00:41:24 +01:00
405ef39828 [ticket/9970] Check whether language pack is installed.
PHPBB3-9970
2011-03-07 00:41:24 +01:00
f7723b3e95 [ticket/9970] User language input is checked for existance
Users could select a language which did not exist in the database by altering
form fields because there was no back-end verification.

PHPBB3-9970
2011-03-07 00:41:14 +01:00
448df1cdf5 Merge branch 'ticket/9549' into develop
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
2011-03-01 16:57:00 -05:00
ee0db1a1d5 Merge branch 'develop-olympus' into develop
* 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
2011-02-24 20:59:19 -05:00
e6219c83c7 [ticket/9872] Removed some useless code that broke delete_posts
When in the ACP, there is the option to delete a user and all their
posts. This would then call the user_delete function and define $mode as
'remove'.

On lines 485-521 was some code that would delete their topics, then
after that there would be a call to delete_posts - which would also
delete their topics. It would not update the board statistics, and the
thread count would remain the same, even though several had been
deleted. It stopped delete_topics functioning correctly, so
delete_topics would not update the board statistics either.

My solution to this is to delete lines 485-521 and allow delete_posts
to call delete_topics, thus updating the thread count in the statistics.

PHPBB3-9872
2011-02-24 14:53:44 +00:00
d9f092a18b [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
The checkbox for the teampage was also missing from the template file.

PHPBB3-9549
2011-02-17 23:59:41 +01:00
8d12838aed [ticket/9549] Make the class non static and extend delete_group function.
delete_group() can now be used, so it does not update the actual group.
This can save a query, when you update the group anyway.

PHPBB3-9549
2011-02-16 18:22:29 +01:00
4f2b0d9d42 [ticket/9549] Add the module and files for the ACP.
PHPBB3-9549
2011-02-16 18:21:48 +01:00
eff1d378cc Merge branch 'develop-olympus' into develop 2011-01-10 23:43:04 +01:00
6b4d0a2542 [ticket/9574] Add pcre_utf8_support() function
Refactor the check for PCRE UTF-8 support into a new pcre_utf8_support()
function.

PHPBB3-9574
2010-12-28 22:37:33 +01:00
eda9fbbb63 [ticket/9574] Remove conditional PHP<5.2 code
There is a large amount of conditional code for PHP < 5.2 that can be
removed with phpBB 3.1.

PHPBB3-9574
2010-12-28 22:36:25 +01:00
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
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
2010-11-11 19:10:55 +01:00
ac26bb458f [ticket/9764] Allow $config['mime_triggers'] to be an empty string.
explode('|', '') and explode('|', NULL) both return array(0 => '') which can
cause filespec::check_content() to reject everything starting with a '<'
character in case $config['mime_triggers'] is an empty string or not set.

fileupload::set_disallowed_content() now filters out empty strings by calling
array_diff() on the passed array, so setting $config['mime_triggers'] to an
empty string will turn off mime checking completely.

On the other side we want to fail safe if $config['mime_triggers'] is not set
at all. To do this, the array fileupload::$disallowed_content now contains some
default strings to be filtered out.

PHPBB3-9764
2010-10-28 22:00:04 +02:00
e4ff780c13 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9117] Wrong redirection after login.
  [ticket/9772] Unify permissions for sending email when board_email_form is off
  [ticket/7369] CPF date should always render the users selection.
  [ticket/7296] Exporting styles to tar creates corrupted archives.
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:34:18 +02:00
dfd3c4a5df Merge branch 'ticket/nickvergessen/9519' into develop-olympus
* ticket/nickvergessen/9519:
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:25:05 +02:00
dfa53bfe9a Merge branch 'ticket/p/6855' into develop
* ticket/p/6855:
  [ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]
2010-08-22 17:48:44 +02:00
3eb01d50cb Merge branch 'ticket/bantu/9702' into develop-olympus
* ticket/bantu/9702:
  [ticket/9702] Take user's timezone settings into account when banning Until ->
2010-08-19 10:56:34 -05:00
6343e67fab Merge branch 'ticket/bantu/9534' into develop-olympus
* ticket/bantu/9534:
  [ticket/9534] Update function documentation for user_ipwhois().
  [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
2010-08-19 10:48:41 -05:00
4c95ed0eeb [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.

PHPBB3-9519
2010-08-10 16:11:39 +02:00
aca0e024fa [ticket/9702] Take user's timezone settings into account when banning Until ->
PHPBB3-9702
2010-07-23 18:41:49 +02:00
0dc05a2d84 Merge branch 'ticket/kellanved/9504' into develop-olympus
* ticket/kellanved/9504:
  [ticket/9504] Allow whitespaces in gallery avatars
2010-07-15 23:15:41 +02:00
8690d25b4f [ticket/9504] Allow whitespaces in gallery avatars
Gallery avatars are discovered on the server filesystem; to allow linking to
the images, the filenames are urlencoded before being written to the database.
However, getimagesize needs the decoded filename as input.

PHPBB3-9504
2010-07-15 13:05:56 +02:00
c0183cabd0 [ticket/9534] Update function documentation for user_ipwhois().
PHPBB3-9534
2010-07-11 01:19:42 +02:00
ed44235d26 [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
whois.arin.net does currently not refer to other servers (using ReferralServer)
when queried for an IPv6 address. whois.sixxs.net however works in this case.

This also adds '.' to the hostname to make sure we're querying the dns root.

PHPBB3-9534
2010-07-11 01:19:27 +02:00
0c2512bea2 Merge branch 'ticket/jellydoughnut/9650' into develop-olympus
* ticket/jellydoughnut/9650:
  [ticket/9650] Do not allow banning the anonymous user by username
2010-07-10 21:22:16 +02:00
ae967d16f1 [ticket/9650] Do not allow banning the anonymous user by username
Banning anonymous can result in bad things, like not being able to log in.  However, it was possible until now.

PHPBB3-9650
2010-07-08 13:24:45 -05:00
c3db21bfa2 Merge branch 'ticket/bantu/9451' into develop-olympus
* ticket/bantu/9451:
  [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
2010-07-08 19:52:29 +02:00
e130a6bad9 [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
Avoid unnecessary overhead in avatar_process_user() by optionally passing in
the value of $can_upload.

PHPBB3-9451
2010-07-07 16:45:00 +02:00
22232213f9 [ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]
PHPBB3-6855
2010-07-06 13:35:44 +02:00
24cc3fd0f9 [ticket/9703] Correct database leak where deleting user did not rm some PM data
Users' PM rules and PM folders were being left intact when deleting them.

PHPBB3-9703
2010-07-03 21:21:22 -05:00
b4df815547 [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"
Due to an oversight, the default group was not properly checked in the user_add function.  This fix corrects the check.  No other changes are needed because they go direct to the database, this one used an array in memory.

PHPBB3-9633
2010-06-01 00:19:43 -05:00
aef6352a35 Bug #52525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10214 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-05 17:54:55 +00:00
c35cdff241 Also update newest user data if someone is creating a founder with user_add().
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10099 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 12:04:30 +00:00
c52f05b332 Fix Bug #49195 - Queries on un-indexed column user_email
Added function to generate email-hash.

Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10060 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-28 09:26:43 +00:00
17f40511bf Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10053 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-25 09:07:26 +00:00
300f6868af i am very very sorry for this hackish approach...
(ability to skip add_log calls)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10003 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-17 13:21:44 +00:00
530f4963cb Fix Bug #37585 - Correctly log action when users request to join a group
Authorised by: AcydBurn



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9903 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-01 11:43:39 +00:00
6510aef869 Fix bug #48345 - Adding users to group - default rank does not changing correctly
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9879 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-28 11:47:32 +00:00
224aa404f6 Fix bug #47825 - Banning an already banned user states to be successful, but has no effect - Patch by Pyramide
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9840 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-24 08:49:51 +00:00
33033ad125 Fix Bug #45675 - Do not allow setting group as default group for pending user
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9759 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-14 20:40:45 +00:00