mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 12:14:06 +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

21
phpBB/includes/avatar/manager.php
View File

@@ -2,7 +2,7 @@
/**
*
* @package avatar
* @copyright (c) 2010 phpBB Group
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
@@ -16,12 +16,12 @@ if (!defined('IN_PHPBB'))
}
/**
* @package acm
* @package avatar
*/
class phpbb_avatar_manager
{
private $phpbb_root_path;
private $php_ext;
private $phpEx;
private $config;
private $cache;
private static $valid_drivers = false;
@@ -29,10 +29,10 @@ class phpbb_avatar_manager
/**
* @TODO
**/
public function __construct($phpbb_root_path, $php_ext = '.php', phpbb_config $config, phpbb_cache_driver_interface $cache = null)
public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_cache_driver_interface $cache = null)
{
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
$this->phpEx = $phpEx;
$this->config = $config;
$this->cache = $cache;
}
@@ -40,7 +40,7 @@ class phpbb_avatar_manager
/**
* @TODO
**/
public function get_singleton($avatar_type)
public function get_driver($avatar_type, $new = false)
{
if (self::$valid_drivers === false)
{
@@ -49,10 +49,10 @@ class phpbb_avatar_manager
if (isset(self::$valid_drivers[$avatar_type]))
{
if (!is_object(self::$valid_drivers[$avatar_type]))
if ($new || !is_object(self::$valid_drivers[$avatar_type]))
{
$class_name = 'phpbb_avatar_driver_' . $avatar_type;
self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->phpbb_root_path, $this->php_ext);
self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->phpbb_root_path, $this->phpEx, $this->cache);
}
return self::$valid_drivers[$avatar_type];
@@ -68,7 +68,7 @@ class phpbb_avatar_manager
**/
private function load_valid_drivers()
{
require_once($this->phpbb_root_path . 'includes/avatar/driver.' . $this->php_ext);
require_once($this->phpbb_root_path . 'includes/avatar/driver.' . $this->phpEx);
if ($this->cache)
{
@@ -83,7 +83,8 @@ class phpbb_avatar_manager
foreach ($iterator as $file)
{
if (preg_match("/^(.*)\.{$this->php_ext}$/", $file, $match))
// Match all files that appear to be php files
if (preg_match("/^(.*)\.{$this->phpEx}$/", $file, $match))
{
self::$valid_drivers[] = $match[1];
}