makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/avatars] Some more miscellaneous changes

Browse source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-12-27 20:42:05 +01:00
parent ea6bf00977
commit c865f98dcf
7 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_groups.php
View file

@ -290,7 +290,7 @@ class acp_groups
if ($config['allow_avatar']) if ($config['allow_avatar'])
{ {
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the group_ prefix // This is normalised data, without the group_ prefix
$avatar_data = phpbb_avatar_manager::clean_row($group_row); $avatar_data = phpbb_avatar_manager::clean_row($group_row);

2
phpBB/includes/acp/acp_users.php
View file

@ -1737,7 +1737,7 @@ class acp_users
if ($config['allow_avatar']) if ($config['allow_avatar'])
{ {
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the user_ prefix // This is normalised data, without the user_ prefix
$avatar_data = phpbb_avatar_manager::clean_row($user_row); $avatar_data = phpbb_avatar_manager::clean_row($user_row);

2
phpBB/includes/avatar/driver/remote.php
View file

@ -117,7 +117,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
if (!class_exists('fileupload')) if (!class_exists('fileupload'))
{ {
include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext); include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
} }
$types = fileupload::image_types(); $types = fileupload::image_types();

2
phpBB/includes/avatar/driver/upload.php
View file

@ -63,7 +63,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
if (!class_exists('fileupload')) if (!class_exists('fileupload'))
{ {
include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext); include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
} }
$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));

44
phpBB/includes/avatar/manager.php
View file

@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
class phpbb_avatar_manager class phpbb_avatar_manager
{ {
protected $config; protected $config;
protected static $valid_drivers = false; static protected $enabled_drivers = false;
protected $avatar_drivers; protected $avatar_drivers;
protected $container; protected $container;
@ -47,18 +47,18 @@ class phpbb_avatar_manager
* Get the driver object specified by the avatar type * Get the driver object specified by the avatar type
* *
* @param string $avatar_type Avatar type; by default an avatar's service container name * @param string $avatar_type Avatar type; by default an avatar's service container name
* @param bool $load_valid Load only valid avatars * @param bool $load_enabled Load only enabled avatars
* *
* @return object Avatar driver object * @return object Avatar driver object
*/ */
public function get_driver($avatar_type, $load_valid = true) public function get_driver($avatar_type, $load_enabled = true)
{ {
if (self::$valid_drivers === false) if (self::$enabled_drivers === false)
{ {
$this->load_valid_drivers(); $this->load_enabled_drivers();
} }
$avatar_drivers = ($load_valid) ? self::$valid_drivers : $this->get_all_drivers(); $avatar_drivers = ($load_enabled) ? self::$enabled_drivers : $this->get_all_drivers();
// Legacy stuff... // Legacy stuff...
switch ($avatar_type) switch ($avatar_type)
@ -89,22 +89,22 @@ class phpbb_avatar_manager
} }
/** /**
* Load the list of valid drivers * Load the list of enabled drivers
* This is executed once and fills self::$valid_drivers * This is executed once and fills self::$enabled_drivers
*/ */
protected function load_valid_drivers() protected function load_enabled_drivers()
{ {
if (!empty($this->avatar_drivers)) if (!empty($this->avatar_drivers))
{ {
self::$valid_drivers = array(); self::$enabled_drivers = array();
foreach ($this->avatar_drivers as $driver) foreach ($this->avatar_drivers as $driver)
{ {
if ($this->is_enabled($driver)) if ($this->is_enabled($driver))
{ {
self::$valid_drivers[$driver->get_name()] = $driver->get_name(); self::$enabled_drivers[$driver->get_name()] = $driver->get_name();
} }
} }
asort(self::$valid_drivers); asort(self::$enabled_drivers);
} }
} }
@ -130,18 +130,18 @@ class phpbb_avatar_manager
} }
/** /**
* Get a list of valid avatar drivers * Get a list of enabled avatar drivers
* *
* @return array Array containing a list of the valid avatar drivers * @return array Array containing a list of the enabled avatar drivers
*/ */
public function get_valid_drivers() public function get_enabled_drivers()
{ {
if (self::$valid_drivers === false) if (self::$enabled_drivers === false)
{ {
$this->load_valid_drivers(); $this->load_enabled_drivers();
} }
return self::$valid_drivers; return self::$enabled_drivers;
} }
/** /**
@ -152,7 +152,7 @@ class phpbb_avatar_manager
* @return array User data or group data with keys that have been * @return array User data or group data with keys that have been
* stripped from the preceding "user_" or "group_" * stripped from the preceding "user_" or "group_"
*/ */
public static function clean_row($row) static public function clean_row($row)
{ {
$keys = array_keys($row); $keys = array_keys($row);
$values = array_values($row); $values = array_values($row);
@ -168,7 +168,7 @@ class phpbb_avatar_manager
* @param string Array key * @param string Array key
* @return string Key that has been stripped from its prefix * @return string Key that has been stripped from its prefix
*/ */
protected static function strip_prefix($key) static protected function strip_prefix($key)
{ {
return preg_replace('#^(?:user_|group_)#', '', $key); return preg_replace('#^(?:user_|group_)#', '', $key);
} }
@ -181,7 +181,7 @@ class phpbb_avatar_manager
* *
* @return string Cleaned driver name * @return string Cleaned driver name
*/ */
public static function clean_driver_name($name) static public function clean_driver_name($name)
{ {
return str_replace('_', '.', $name); return str_replace('_', '.', $name);
} }
@ -194,7 +194,7 @@ class phpbb_avatar_manager
* *
* @return string Prepared driver name * @return string Prepared driver name
*/ */
public static function prepare_driver_name($name) static public function prepare_driver_name($name)
{ {
return str_replace('.', '_', $name); return str_replace('.', '_', $name);
} }

2
phpBB/includes/ucp/ucp_groups.php
View file

@ -492,7 +492,7 @@ class ucp_groups
if ($config['allow_avatar']) if ($config['allow_avatar'])
{ {
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the group_ prefix // This is normalised data, without the group_ prefix
$avatar_data = phpbb_avatar_manager::clean_row($group_row); $avatar_data = phpbb_avatar_manager::clean_row($group_row);

2
phpBB/includes/ucp/ucp_profile.php
View file

@ -562,7 +562,7 @@ class ucp_profile
if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar')) if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
{ {
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the user_ prefix // This is normalised data, without the user_ prefix
$avatar_data = phpbb_avatar_manager::clean_row($user->data); $avatar_data = phpbb_avatar_manager::clean_row($user->data);