mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 02:36:38 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Various cosmetic changes

Browse Source 
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
This commit is contained in:
Cullen Walsh
2011-04-18 10:44:29 -07:00
committed by Cullen Walsh
parent 7abded081d
commit f102d9a631
7 changed files with 80 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
phpBB/includes/avatar/driver/local.php
View File

@@ -2,7 +2,7 @@
/**
*
* @package avatar
* @copyright (c) 2005, 2009 phpBB Group
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
@@ -22,11 +22,7 @@ if (!defined('IN_PHPBB'))
class phpbb_avatar_driver_local extends phpbb_avatar_driver
{
/**
* Get the avatar url and dimensions
*
* @param $ignore_config Whether $user or global avatar visibility settings
* should be ignored
* @return array Avatar data
* @inheritdoc
*/
public function get_data($user_row, $ignore_config = false)
{
@@ -49,8 +45,8 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
}
/**
* @TODO
**/
* @inheritdoc
*/
public function handle_form($template, &$error = array(), $submitted = false)
{
if ($submitted) {
@@ -58,39 +54,50 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
return '';
}
$avatar_list = array();
$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
$dh = @opendir($path);
if (!$dh)
if (!$avatar_list)
{
return $avatar_list;
}
$avatar_list = array();
$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
while (($cat = readdir($dh)) !== false) {
if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
$dh = @opendir($path);
if (!$dh)
{
if ($ch = @opendir("$path/$cat"))
return $avatar_list;
}
while (($cat = readdir($dh)) !== false) {
if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
{
while (($image = readdir($ch)) !== false)
if ($ch = @opendir("$path/$cat"))
{
if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
while (($image = readdir($ch)) !== false)
{
$avatar_list[$cat][] = array(
'file' => rawurlencode($cat) . '/' . rawurlencode($image),
'filename' => rawurlencode($image),
'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
);
// Match all images in the gallery folder
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($ch);
}
}
}
@closedir($dh);
@closedir($dh);
@ksort($avatar_list);
@ksort($avatar_list);
if ($this->cache != null)
{
$this->cache->put('av_local_list', $avatar_list);
}
}
$category = request_var('av_local_cat', '');
$categories = array_keys($avatar_list);

12
phpBB/includes/avatar/driver/remote.php
View File

@@ -2,7 +2,7 @@
/**
*
* @package avatar
* @copyright (c) 2005, 2009 phpBB Group
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
@@ -22,11 +22,7 @@ if (!defined('IN_PHPBB'))
class phpbb_avatar_driver_remote extends phpbb_avatar_driver
{
/**
* Get the avatar url and dimensions
*
* @param $ignore_config Whether $user or global avatar visibility settings
* should be ignored
* @return array Avatar data
* @inheritdoc
*/
public function get_data($user_row, $ignore_config = false)
{
@@ -49,8 +45,8 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
}
/**
* @TODO
**/
* @inheritdoc
*/
public function handle_form($template, &$error = array(), $submitted = false)
{
if ($submitted) {

14
phpBB/includes/avatar/driver/upload.php
View File

@@ -2,7 +2,7 @@
/**
*
* @package avatar
* @copyright (c) 2005, 2009 phpBB Group
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
@@ -22,18 +22,14 @@ if (!defined('IN_PHPBB'))
class phpbb_avatar_driver_upload extends phpbb_avatar_driver
{
/**
* Get the avatar url and dimensions
*
* @param $ignore_config Whether $user or global avatar visibility settings
* should be ignored
* @return array Avatar data
* @inheritdoc
*/
public function get_data($user_row, $ignore_config = false)
{
if ($ignore_config || $this->config['allow_avatar_upload'])
{
return array(
'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $user_row['user_avatar'],
'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $user_row['user_avatar'],
'width' => $user_row['user_avatar_width'],
'height' => $user_row['user_avatar_height'],
);
@@ -49,8 +45,8 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
}
/**
* @TODO
**/
* @inheritdoc
*/
public function handle_form($template, &$error = array(), $submitted = false)
{
if ($submitted) {