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

413 Commits

Author SHA1 Message Date
Igor Wiedler
eea2ec5052 [feature/avatars] Introduce global phpbb_avatar_manager
PHPBB3-10018
2012-04-08 16:27:09 +02:00
Igor Wiedler
e861bb0e04 [feature/avatars] Use request object in avatar drivers
PHPBB3-10018
2012-04-07 19:20:11 +02:00
Igor Wiedler
24daef1aaf Merge branch 'develop' into feature/avatars
* develop: (335 commits)
  [ticket/10575] Adding public visibility to the methods.
  [ticket/10575] Fixing non-static access to static functions get_instance
  [ticket/10547] User is not logged in as admin after installation
  [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list
  [ticket/10760] Fix numbering in php fun facts.
  [ticket/10760] Value must be quoted as it might be two words.
  [ticket/10760] PHP is great. This commit is the proof.
  [ticket/10760] Catch both versions of parse error output in php.
  [ticket/10607] Added 'Powered by' translation string.
  [ticket/10760] Account for display_errors=stderr in pre-commit hook.
  [ticket/10760] Quote PHP_BIN when using it.
  [ticket/10760] Use echo -e only if echo understands -e.
  ...
2012-04-07 18:27:30 +02:00
Igor Wiedler
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth
PHPBB3-10609
2012-03-31 18:14:11 +02:00
Cullen Walsh
48e61b1b45 [feature/avatars] Support editing of group avatars in ACP
Edited templates for group avatars so they can be properly modified in ACP

PHPBB3-10018
2012-03-18 22:22:41 +00:00
Cullen Walsh
8416bf3dc9 [feature/avatars] Made ACP avatar gallery in Manage Users prettier
Added row/column information so avatars can be displayed nicely in
the ACP

PHPBB3-10018
2012-03-18 22:21:36 +00:00
Cullen Walsh
d0bb14ded1 [feature/avatars] Update ACP manage users, fix gallery focus issue
Updated ACP to match UCP with dropdown. Correctly determe which
avatar to focus on by checking if the form was submitted and
avatar_driver is set.

PHPBB3-10018
2012-03-18 22:21:36 +00:00
Cullen Walsh
22c864cb3a [feature/avatars] Dynamically list the avatar types in UCP and ACP
List the avatar types more nicely, adding UCP modify user support

PHPBB3-10018
2012-03-18 22:21:36 +00:00
Cullen Walsh
84099e5bc1 [feature/avatars] Support proper avatar deletion, stub ACP
Fixing avatar deletion in the UCP and ACP, and stubbing the ACP
configuration page. I'll admit I kind of got caught carried away, so
this really should be a couple separate commits.

PHPBB3-10018
2012-03-18 22:20:45 +00:00
Cullen Walsh
4c699e0d0a [feature/avatars] Modularized Avatars
A modularized avatar system that easily allows plugins to be created
for various avatar services, such as Gravatar.

This inital commit includes module support and is backwards
compatible with 3.0 avatars, but does notcontain ACP or UCP modules
for manipulating new avatars.

PHPBB3-10018
2012-03-18 22:19:16 +00: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
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
2012-02-03 16:21:51 -05:00
Andreas Fischer
69a725198b Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop
* unknownbliss/ticket/9916:
  [ticket/9916] Updating header license and removing Version $Id$
2012-01-02 17:54:54 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Andreas Fischer
71698996ca Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10428] Documentation for optionget/optionset functions.
  [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
  [ticket/10428] Dispose of $this->keyvalues cache for optionget.
  [ticket/10428] Compare $data to false strictly.
2011-12-25 15:13:02 +01:00
Oleg Pudeyev
10453b6752 [ticket/10428] Documentation for optionget/optionset functions.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
Oleg Pudeyev
99c102344e [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
Oleg Pudeyev
38c2d4da35 [ticket/10428] Compare $data to false strictly.
Users may pass 0 or '' for $data, this should cause the
user-specified $data code path to be taken.

PHPBB3-10428
2011-12-25 01:51:20 -05:00
David King
4baa2bb52c [ticket/10535] Removed email confirm field from acp_users module
PHPBB3-10535
2011-12-23 21:55:49 +00:00
David King
53617dfce5 [ticket/10541] Fixed empty drop-down menu bug
PHPBB3-10541
2011-12-21 03:28:00 +00:00
Joas Schilling
b790d2e283 [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions
PHPBB3-10345
2011-11-30 21:03:29 +01:00
Joas Schilling
c4aa8d8401 [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
PHPBB3-10345
2011-11-25 15:10:50 -05:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places.
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.

PHPBB3-10345
2011-11-25 15:10:49 -05:00
Igor Wiedler
d766ee3fe6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
  [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
  [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
  [ticket/10446] DRY X-AntiAbuse header addition.

Conflicts:
	phpBB/includes/ucp/ucp_register.php
2011-11-20 18:45:56 +01:00
Andreas Fischer
37c7668193 [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
PHPBB3-10446
2011-11-20 16:35:31 +01:00
Oleg Pudeyev
64d62038cd [ticket/10446] DRY X-AntiAbuse header addition.
PHPBB3-10446
2011-11-20 04:15:44 -05:00
Igor Wiedler
189bd6dc9b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
2011-10-29 12:32:39 +02:00
Andreas Fischer
ba1464b6e0 [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
PHPBB3-10421
2011-10-18 21:25:27 +02:00
Nils Adermann
6f851d89aa Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/5506] Do not display an empty last page after deleting logs.
2011-07-16 21:00:14 -04:00
Joas Schilling
8ebc8ec182 [ticket/5506] Do not display an empty last page after deleting logs.
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
2011-07-14 04:05:20 +02:00
Andreas Fischer
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
Josh Woody
46d2d97a37 Merge branch 'ticket/bantu/9611' into develop-olympus
* ticket/bantu/9611:
  [ticket/9611] Make length of activation keys variable between 6 and 10.
2010-08-19 09:03:45 -05:00
Joas Schilling
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
Andreas Fischer
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
Josh Woody
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
Thatbitextra
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
Andreas Fischer
af21e38c1d [ticket/9611] Make length of activation keys variable between 6 and 10.
PHPBB3-9611
2010-05-17 08:54:51 +02:00
Nils Adermann
8ade14a036 Merge branch 'ticket/nickvergessen/9548' into develop-olympus
* ticket/nickvergessen/9548:
  [ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
2010-05-16 18:42:46 +02:00
Nils Adermann
39770de921 Merge branch 'ticket/bantu/9536' into develop-olympus
* ticket/bantu/9536:
  [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
2010-05-14 02:33:52 +02:00
Andreas Fischer
823f2571f5 [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
There can be multiple entries in the session table for one user_id. We only need and also only fetch one. Using LIMIT 1 should therefore increase performance slightly. This is especially true when editing the anonymous user account because the session table can have many entries for the user_id ANONYMOUS.

PHPBB3-9536
2010-05-14 02:31:44 +02:00
Andreas Fischer
cb642cff11 [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists.
In the UCP this is not necessary, because there is code in $user->setup() that updates the session table on the next page reload.

Since we cannot tell if the user generally wants to be hidden or the user only wants to be hidden for one session, we only update the session table when setting the flag to 'hide me', but not 'show me' - equivalent to how it works in the UCP.

If the user is a bot we however also update the session when setting the flag to 'show me' because bots cannot login at all.

PHPBB3-9526
2010-05-14 02:27:37 +02:00
Joas Schilling
5f4c6e9c91 [ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
PHPBB3-9548
2010-04-18 15:13:53 +02:00
Chris Smith
44b9dfaff5 permit current year in ACP - UCP changed in r8807 #55115
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10323 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-11 22:39:13 +00:00
Henry Sudhof
3850de87fc #52245
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10199 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-30 15:00:44 +00:00
Henry Sudhof
c1b898890b #51805
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10182 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-23 17:41:11 +00:00
Joas Schilling
b4c7dbcd66 Fix #51305 - User need a_clearlog to delete warnings
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10145 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 09:45:05 +00:00
Meik Sievertsen
f17e49d11b only whitespace changes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10097 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 10:20:47 +00:00
Jim Wigginton
73baf42558 Fixed bugs #43145, #44375, #44415 and #43045
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10088 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-02 05:12:23 +00:00
Joas Schilling
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
Joas Schilling
818b252f20 fix r9758
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9828 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-22 11:47:37 +00:00