Commit graph

1117 commits

Author SHA1 Message Date
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
Joas Schilling
3637cd395e [feature/new-tz-handling] Properly name new timezone selection function
Marked the old one as deprecated and made it using the new function.

PHPBB3-9558
2012-07-17 16:09:05 +02:00
Nathan
b25efd744d [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation)

PHPBB3-8323
2012-07-10 17:41:27 -05:00
Nathan
33852e6251 [ticket/8323] Correct PM notification settings (only notify those who can receive them)
Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense)

PHPBB3-8323
2012-07-10 16:07:12 -05:00
Nathan
362ba43f18 [ticket/8323] Allow sending PMs to temporarily banned users
Added an argument to the phpbb_get_banned_user_ids() function to allow specifying a banned end time (default true for current functionality, false for only permanent bans, timestamp to find banned until a specified time)

PHPBB3-8323
2012-07-10 12:34:40 -05:00
Nathan
0f4956b280 [ticket/8323] Do not allow sending PMs to Inactive users
PHPBB3-8323
2012-07-10 12:34:39 -05:00
Nathan
e6d4e9bbb9 [ticket/8323] Correcting the comment
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
c38bb4254a [ticket/8323] Do not allow sending of Private Messages to users who are banned
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
c53d7f0b62 [ticket/8323] Remove code used for testing
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
05452b9ec0 [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages
PHPBB3-8323
2012-07-10 12:34:37 -05:00
Igor Wiedler
df16bd1c49 [feature/avatars] Rewrite drivers to use full class name
* Use full driver class name as avatar_type value
* Move avatar drivers to core namespace
* Make avatars installable through extensions

PHPBB3-10018
2012-06-27 21:02:07 +02:00
Igor Wiedler
1b3cb68c2f Merge remote-tracking branch 'upstream/develop' into feature/avatars
* upstream/develop: (255 commits)
  [ticket/10935] Limit number of PM rules per user to 5000
  [ticket/10801] Fixed quickmod tools.
  [ticket/9551] uncomment line and change length to 255
  [ticket/10925] Clarify installation requirements for SQLite
  [ticket/10938] Serve subforum listing on forumlist from template loop
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
  [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
  [ticket/10829] $style_name -> $style_path in style class.
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
  [ticket/10882] Fix test name - oops.
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10932] Use included composer.phar in build process
  ...

Conflicts:
	phpBB/includes/mcp/mcp_warn.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-06-27 14:47:13 +02:00
Andreas Fischer
85ea062a05 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10935] Limit number of PM rules per user to 5000
2012-06-21 10:31:08 +02:00
Joas Schilling
80fafdeb1a [ticket/10935] Limit number of PM rules per user to 5000
PHPBB3-10935
2012-06-20 14:29:48 +02:00
Joas Schilling
435573a9cb [feature/new-tz-handling] Fix Timezone selection on registration page
PHPBB3-9558
2012-06-18 15:09:36 +02:00
Joas Schilling
66f7d45603 [feature/new-tz-handling] Introduce 2 step timezone selection using javascript
PHPBB3-9558
2012-06-18 15:08:57 +02:00
Joas Schilling
3c6272ff04 [feature/new-tz-handling] Remove appearances of board_dst and user_dst
PHPBB3-9558
2012-06-18 15:08:46 +02:00
Joas Schilling
963d4afc2c [feature/new-tz-handling] Replace gmmktime() and mktime() with phpbb_datetime
PHPBB3-9558
2012-06-18 15:08:36 +02:00
Joas Schilling
66ae9ee2ea [feature/new-tz-handling] Fix timezone selection on registration page
PHPBB3-9558
2012-06-18 15:08:14 +02:00
Joas Schilling
50936cb2ef [feature/new-tz-handling] Fix selecting and validating of timezone in UCP
PHPBB3-9558
2012-06-18 15:07:12 +02:00
Dhruv Goel
71f8416480 [feature/delete-auto-logins] improved styling and fixes language
Table ahs been styled. Date is now formatted properly instead of
the unix timestamp being displayed earlier. fixes small mistake in language
entry

PHPBB3-9647
2012-05-17 14:02:28 +05:30
Dhruv Goel
bdf66b27ab [feature/delete-auto-logins] using loop for errors
instead of hardcoding html code into ERROR variable, we use errors array
and use loop in template file.

PHPBB3-9647
2012-05-17 14:02:25 +05:30
Dhruv Goel
4129711e9f [feature/delete-auto-logins] checks form key
The form key is checked after submission if not correct error is returned.

PHPBB3-9647
2012-05-17 14:02:17 +05:30
Dhruv Goel
79ef960435 [feature/delete-auto-logins] Fixes language entries and redirection.
The user is redirected after deleting auto login session keys.

PHPBB3-9647
2012-05-17 14:02:14 +05:30
Dhruv Goel
5ce46cc960 [feature/delete-auto-logins] User can view/delete auto logins.
User has an extra option in UCP->Profile to view the auto logins and
clear them.

PHPBB3-9647
2012-05-17 14:02:12 +05:30
Andreas Fischer
26e7dd98b7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).

Conflicts:
	phpBB/install/database_update.php
2012-04-08 22:04:33 +02:00
Igor Wiedler
3b71e81cfb [feature/avatars] Simplify clean_row, move it to avatar manager
PHPBB3-10018
2012-04-08 21:29:52 +02:00
Hari Sankar R
4e630ef160 [ticket/10561] Casted $config['default_style'] to int
PHPBB3-10561
2012-04-09 00:33:55 +05:30
Igor Wiedler
81fb4268cd [feature/avatars] Introduce an avatar driver interface
PHPBB3-10018
2012-04-08 16:40:19 +02:00
Igor Wiedler
eea2ec5052 [feature/avatars] Introduce global phpbb_avatar_manager
PHPBB3-10018
2012-04-08 16:27:09 +02:00
Hari Sankar R
03a35581c4 [ticket/10561] Reverted to phpbb_style_is_active()
Changes made to function name, reverted to old.

PHPBB3-10561
2012-04-07 23:15:12 +05:30
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
Hari Sankar R
018419b36c [ticket/10561] Moved and renamed the funtion validate_style().
Fixed minor changes as suggested by @bantu.

PHPBB3-10561
2012-04-05 19:31:18 +05:30
Hari Sankar R
b81a5afc25 [ticket/10561] Changes made to function phpbb_style_is_active().
Fixed return type, documented function and, removed
style_id from fetch.

PHPBB3-10561
2012-04-03 22:56:06 +05:30
Hari Sankar R
084e1ae560 [ticket/10561] All users can choose deactivated styles (fixed).
A form exploit enabled the users to select a deactivated
style. Fixed with extra check on submit, with a new function
styles_verify to check if the selected style is activated or not.

PHPBB3-10561
2012-04-03 22:15:59 +05:30
Igor Wiedler
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth
PHPBB3-10609
2012-03-31 18:14:11 +02:00
Callum Macrae
7a933bdb5a [ticket/10328] Renamed the JSON class, also now using autoloading.
It is no longer static, and uses autoloading. It has also been renamed
from JSON to phpbb_json_response.

PHPBB3-10328
2012-03-31 02:09:14 +02:00
Callum Macrae
082c5c5b32 [ticket/10272] Zebra operations using AJAX are now less hacky.
Before, they were splitting stuff by the <br />, and now JSON::add() is
being used.

PHPBB3-10272
2012-03-31 02:09:14 +02:00
Cullen Walsh
a06380c69a [feature/avatars] Make avatars generic
Adding a cleaning function for data coming from the users/groups
tables so drivers only deal with clean data (ideally). Refactored
get_user_avatar() and get_group_avatar() to use an underlying
get_avatar() function.

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
6deadc3acf [feature/avatars] Rework UCP to be simpler/more consistent
Redesigning the UCP avatar page to use javascript to make use less
confusing. This design is also more easily transfered to the ACP for
group avatars, which will give better consistency in the long run.

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
611a1d647a [feature/avatars] Refactor avatar's handle_form
Since it was performing two distinct operations, refactor handle_form
to separate functions that prepare and process forms.

PHPBB3-10018
2012-03-18 22:20:45 +00:00
Cullen Walsh
019b9bc073 [feature/avatars] Implement avatar uploads for ucp
As above, implement avatar uploads from local and remote sources in
the UCP.

PHPBB3-10018
2012-03-18 22:20:45 +00:00
Cullen Walsh
00d4b9d431 [feature/avatars] Implement UCP remote/local avatars
Implementing selection logic for gallery and remote avatars. Modified
some of the driver interfaces to make things work nicer also. Upload
functionality will be in the next commit.

PHPBB3-10018
2012-03-18 22:20:45 +00:00
Cullen Walsh
f102d9a631 [feature/avatars] Various cosmetic changes
Various small changes based on feedback from nn-
* Renaming $php_ext to $phpEx
* Fixing copyright years
* Explain $ignore_config
* Explain Regex
* Copypasta package error
* rename get_singleton

PHPBB3-10018
2012-03-18 22:19:17 +00:00
Cullen Walsh
7abded081d [feature/avatars] UCP Avatar Interface
This stubs out the avatar form fields and how form processing will
occur. Form processing is not yet implemented, but shouldn't be too
hard. After this I will refactor/duplicate some of the logic for the
ACP.

PHPBB3-10018
2012-03-18 22:19:16 +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