diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index 777b225e84..016f9e94a8 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -86,4 +86,12 @@ abstract class phpbb_avatar_driver
{
return '';
}
+
+ /**
+ * @TODO
+ **/
+ public function handle_form($template, &$error = array(), $submitted = false)
+ {
+ return false;
+ }
}
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 4014f29cbe..0a3ae51a48 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -47,4 +47,77 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
);
}
}
+
+ /**
+ * @TODO
+ **/
+ public function handle_form($template, &$error = array(), $submitted = false)
+ {
+ if ($submitted) {
+ $error[] = 'TODO';
+ return '';
+ }
+
+ $avatar_list = array();
+ $path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
+
+ $dh = @opendir($path);
+
+ if (!$dh)
+ {
+ return $avatar_list;
+ }
+
+ while (($cat = readdir($dh)) !== false) {
+ if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
+ {
+ if ($ch = @opendir("$path/$cat"))
+ {
+ while (($image = readdir($ch)) !== false)
+ {
+ if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
+ {
+ $avatar_list[$cat][] = array(
+ 'file' => rawurlencode($cat) . '/' . rawurlencode($image),
+ 'filename' => rawurlencode($image),
+ 'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
+ );
+ }
+ }
+ @closedir($ch);
+ }
+ }
+ }
+ @closedir($dh);
+
+ @ksort($avatar_list);
+
+ $category = request_var('av_local_cat', '');
+ $categories = array_keys($avatar_list);
+
+ foreach ($categories as $cat)
+ {
+ if (!empty($avatar_list[$cat]))
+ {
+ $template->assign_block_vars('av_local_cats', array(
+ 'NAME' => $cat,
+ 'SELECTED' => ($cat == $category),
+ ));
+ }
+ }
+
+ if (!empty($avatar_list[$category]))
+ {
+ foreach ($avatar_list[$category] as $img => $data)
+ {
+ $template->assign_block_vars('av_local_imgs', array(
+ 'AVATAR_IMAGE' => $path . '/' . $data['file'],
+ 'AVATAR_NAME' => $data['name'],
+ 'AVATAR_FILE' => $data['filename'],
+ ));
+ }
+ }
+
+ return true;
+ }
}
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index dbd567124d..c60102e787 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -47,4 +47,19 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
);
}
}
+
+ /**
+ * @TODO
+ **/
+ public function handle_form($template, &$error = array(), $submitted = false)
+ {
+ if ($submitted) {
+ $error[] = 'TODO';
+ return '';
+ }
+ else
+ {
+ return true;
+ }
+ }
}
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index da12d52d40..fbfd5dcc89 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -47,4 +47,31 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
);
}
}
+
+ /**
+ * @TODO
+ **/
+ public function handle_form($template, &$error = array(), $submitted = false)
+ {
+ if ($submitted) {
+ $error[] = 'TODO';
+ return '';
+ }
+ else
+ {
+ $can_upload = (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+ if ($can_upload)
+ {
+ $template->assign_vars(array(
+ 'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
+ ));
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 04a4d8f425..11b7e75017 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -26,6 +26,9 @@ class phpbb_avatar_manager
private $cache;
private static $valid_drivers = false;
+ /**
+ * @TODO
+ **/
public function __construct($phpbb_root_path, $php_ext = '.php', phpbb_config $config, phpbb_cache_driver_interface $cache = null)
{
$this->phpbb_root_path = $phpbb_root_path;
@@ -34,6 +37,9 @@ class phpbb_avatar_manager
$this->cache = $cache;
}
+ /**
+ * @TODO
+ **/
public function get_singleton($avatar_type)
{
if (self::$valid_drivers === false)
@@ -57,6 +63,9 @@ class phpbb_avatar_manager
}
}
+ /**
+ * @TODO
+ **/
private function load_valid_drivers()
{
require_once($this->phpbb_root_path . 'includes/avatar/driver.' . $this->php_ext);
@@ -88,4 +97,16 @@ class phpbb_avatar_manager
}
}
}
+
+ /**
+ * @TODO
+ **/
+ public function get_valid_drivers() {
+ if (self::$valid_drivers === false)
+ {
+ $this->load_valid_drivers();
+ }
+
+ return array_keys(self::$valid_drivers);
+ }
}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index f61e692f32..0a2440d77d 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -28,7 +28,7 @@ class ucp_profile
function main($id, $mode)
{
- global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
+ global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
global $request;
$user->add_lang('posting');
@@ -544,55 +544,89 @@ class ucp_profile
break;
case 'avatar':
-
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-
+
$display_gallery = request_var('display_gallery', '0');
$avatar_select = basename(request_var('avatar_select', ''));
$category = basename(request_var('category', ''));
-
- $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $auth->acl_get('u_chgavatar') && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
-
+
add_form_key('ucp_avatar');
- if ($submit)
+ $avatars_enabled = false;
+
+ if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
{
- if (check_form_key('ucp_avatar'))
- {
- if (avatar_process_user($error, false, $can_upload))
- {
- meta_refresh(3, $this->u_action);
- $message = $user->lang['PROFILE_UPDATED'] . '
' . sprintf($user->lang['RETURN_UCP'], '', '');
- trigger_error($message);
+ $avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
+ $avatar_drivers = $avatar_manager->get_valid_drivers();
+ sort($avatar_drivers);
+
+ foreach ($avatar_drivers as $driver) {
+ if ($config["allow_avatar_$driver"]) {
+ $avatars_enabled = true;
+ $template->set_filenames(array(
+ 'avatar' => "ucp_avatar_options_$driver.html",
+ ));
+
+ $avatar = $avatar_manager->get_singleton($driver);
+ if (isset($_POST["submit_av_$driver"]))
+ {
+ if (check_form_key('ucp_avatar'))
+ {
+ $result = $avatar->handle_form($template, $error, true);
+
+ if (empty($error))
+ {
+ // Success! Lets save the result in the database
+ $sql_ary = array(
+ 'user_avatar_type' => $driver,
+ 'user_avatar' => (string) $result,
+ );
+
+ $sql = 'UPDATE ' . USERS_TABLE . '
+ SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+ WHERE user_id = ' . $user->data['user_id'];
+
+ $db->sql_query($sql);
+
+ meta_refresh(3, $this->u_action);
+ $message = $user->lang['PROFILE_UPDATED'] . '
' . sprintf($user->lang['RETURN_UCP'], '', '');
+ trigger_error($message);
+ }
+ }
+ else
+ {
+ $error[] = 'FORM_INVALID';
+ }
+ }
+
+ if ($avatar->handle_form($template, $error)) {
+ $driver_u = strtoupper($driver);
+
+ $template->assign_block_vars('avatar_drivers', array(
+ 'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
+ 'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
+
+ 'DRIVER' => $driver,
+ 'OUTPUT' => $template->assign_display('avatar'),
+ ));
+ }
}
}
- else
- {
- $error[] = 'FORM_INVALID';
- }
- // Replace "error" strings with their real, localised form
- $error = array_map(array($user, 'lang'), $error);
}
+
+ // Replace "error" strings with their real, localised form
+ $error = array_map(array($user, 'lang'), $error);
- if (!$config['allow_avatar'] && $user->data['user_avatar_type'])
- {
- $error[] = $user->lang['AVATAR_NOT_ALLOWED'];
- }
- else if ((($user->data['user_avatar_type'] == AVATAR_UPLOAD) && !$config['allow_avatar_upload']) ||
- (($user->data['user_avatar_type'] == AVATAR_REMOTE) && !$config['allow_avatar_remote']) ||
- (($user->data['user_avatar_type'] == AVATAR_GALLERY) && !$config['allow_avatar_local']))
- {
- $error[] = $user->lang['AVATAR_TYPE_NOT_ALLOWED'];
- }
+ $avatar = get_user_avatar($user->data, 'USER_AVATAR', true);
$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('
', $error) : '',
- 'AVATAR' => get_user_avatar($user->data, 'USER_AVATAR', true),
+ 'AVATAR' => $avatar,
'AVATAR_SIZE' => $config['avatar_filesize'],
'U_GALLERY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&mode=avatar&display_gallery=1'),
- 'S_FORM_ENCTYPE' => ($can_upload && ($config['allow_avatar_upload'] || $config['allow_avatar_remote_upload'])) ? ' enctype="multipart/form-data"' : '',
+ 'S_FORM_ENCTYPE' => ' enctype="multipart/form-data"',
'L_AVATAR_EXPLAIN' => phpbb_avatar_explanation_string(),
));
@@ -603,16 +637,11 @@ class ucp_profile
}
else if ($config['allow_avatar'])
{
- $avatars_enabled = (($can_upload && ($config['allow_avatar_upload'] || $config['allow_avatar_remote_upload'])) || ($auth->acl_get('u_chgavatar') && ($config['allow_avatar_local'] || $config['allow_avatar_remote']))) ? true : false;
-
$template->assign_vars(array(
- 'AVATAR_WIDTH' => request_var('width', $user->data['user_avatar_width']),
- 'AVATAR_HEIGHT' => request_var('height', $user->data['user_avatar_height']),
+ 'AVATAR_WIDTH' => request_var('width', empty($avatar) ? 0 : $user->data['user_avatar_width']),
+ 'AVATAR_HEIGHT' => request_var('height', empty($avatar) ? 0 : $user->data['user_avatar_height']),
'S_AVATARS_ENABLED' => $avatars_enabled,
- 'S_UPLOAD_AVATAR_FILE' => ($can_upload && $config['allow_avatar_upload']) ? true : false,
- 'S_UPLOAD_AVATAR_URL' => ($can_upload && $config['allow_avatar_remote_upload']) ? true : false,
- 'S_LINK_AVATAR' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false,
'S_DISPLAY_GALLERY' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) ? true : false)
);
}
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 7012c42f3b..680267bb10 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -7,31 +7,12 @@
{avatar_drivers.L_EXPLAIN}
+ + + + + + - - - - -