diff options
Diffstat (limited to 'phpBB/phpbb')
199 files changed, 388 insertions, 1902 deletions
| diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index b5cc675838..81676e75fc 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -10,14 +10,6 @@  namespace phpbb\auth;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Permission/Auth class  * @package phpBB3  */ diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php index 5cbb63c4fc..77bc976938 100644 --- a/phpBB/phpbb/auth/provider/apache.php +++ b/phpBB/phpbb/auth/provider/apache.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**   * Apache authentication provider for phpBB3   *   * @package auth diff --git a/phpBB/phpbb/auth/provider/base.php b/phpBB/phpbb/auth/provider/base.php index 2222d8c1b6..78a3289356 100644 --- a/phpBB/phpbb/auth/provider/base.php +++ b/phpBB/phpbb/auth/provider/base.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base authentication provider class that all other providers should implement  *  * @package auth diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 4654e49fb5..6ea04eab36 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**   * Database authentication provider for phpBB3   *   * This is for authentication via the integrated user table diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php index 9d29789567..4ce43853bd 100644 --- a/phpBB/phpbb/auth/provider/ldap.php +++ b/phpBB/phpbb/auth/provider/ldap.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**   * Database authentication provider for phpBB3   *   * This is for authentication via the integrated user table @@ -97,7 +89,6 @@ class ldap extends \phpbb\auth\provider\base  		@ldap_close($ldap); -  		if (!is_array($result) || sizeof($result) < 2)  		{  			return sprintf($this->user->lang['LDAP_NO_IDENTITY'], $this->user->data['username']); diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index de81ac0d04..2749661269 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -9,14 +9,6 @@  namespace phpbb\auth\provider\oauth; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use OAuth\Common\Consumer\Credentials;  use OAuth\Common\Http\Uri\Uri; @@ -179,7 +171,7 @@ class oauth extends \phpbb\auth\provider\base  		$storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table);  		$query = 'mode=login&login=external&oauth_service=' . $service_name_original; -		$service = $this->get_service($service_name_original, $storage, $service_credentials, $this->service_providers[$service_name]->get_auth_scope(), $query); +		$service = $this->get_service($service_name_original, $storage, $service_credentials, $query, $this->service_providers[$service_name]->get_auth_scope());  		if ($this->request->is_set('code', \phpbb\request\request_interface::GET))  		{ @@ -273,13 +265,13 @@ class oauth extends \phpbb\auth\provider\base  	* @param	string	$service_name			The name of the service  	* @param	\phpbb\auth\provider\oauth\token_storage $storage  	* @param	array	$service_credentials	{@see \phpbb\auth\provider\oauth\oauth::get_service_credentials} -	* @param	array	$scope					The scope of the request against -	*											the api.  	* @param	string	$query					The query string of the  	*											current_uri used in redirection +	* @param	array	$scope					The scope of the request against +	*											the api.  	* @return	\OAuth\Common\Service\ServiceInterface  	*/ -	protected function get_service($service_name, \phpbb\auth\provider\oauth\token_storage $storage, array $service_credentials, array $scopes = array(), $query) +	protected function get_service($service_name, \phpbb\auth\provider\oauth\token_storage $storage, array $service_credentials, $query, array $scopes = array())  	{  		$current_uri = $this->get_current_uri($service_name, $query); @@ -458,7 +450,7 @@ class oauth extends \phpbb\auth\provider\base  		// Prepare for an authentication request  		$service_credentials = $this->service_providers[$service_name]->get_service_credentials();  		$scopes = $this->service_providers[$service_name]->get_auth_scope(); -		$service = $this->get_service(strtolower($link_data['oauth_service']), $storage, $service_credentials, $scopes, $query); +		$service = $this->get_service(strtolower($link_data['oauth_service']), $storage, $service_credentials, $query, $scopes);  		$this->service_providers[$service_name]->set_external_service_provider($service);  		// The user has already authenticated successfully, request to authenticate again @@ -491,7 +483,7 @@ class oauth extends \phpbb\auth\provider\base  		$query = 'i=ucp_auth_link&mode=auth_link&link=1&oauth_service=' . strtolower($link_data['oauth_service']);  		$service_credentials = $this->service_providers[$service_name]->get_service_credentials();  		$scopes = $this->service_providers[$service_name]->get_auth_scope(); -		$service = $this->get_service(strtolower($link_data['oauth_service']), $storage, $service_credentials, $scopes, $query); +		$service = $this->get_service(strtolower($link_data['oauth_service']), $storage, $service_credentials, $query, $scopes);  		if ($this->request->is_set('code', \phpbb\request\request_interface::GET))  		{ diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php index 61deb48695..7a144d2f51 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/base.php +++ b/phpBB/phpbb/auth/provider/oauth/service/base.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider\oauth\service;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base OAuth abstract class that all OAuth services should implement  *  * @package auth diff --git a/phpBB/phpbb/auth/provider/oauth/service/bitly.php b/phpBB/phpbb/auth/provider/oauth/service/bitly.php index 47cf7ee380..b4050033a6 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/bitly.php +++ b/phpBB/phpbb/auth/provider/oauth/service/bitly.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider\oauth\service;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Bitly OAuth service  *  * @package auth diff --git a/phpBB/phpbb/auth/provider/oauth/service/exception.php b/phpBB/phpbb/auth/provider/oauth/service/exception.php index 0c6cba9fb8..3bc93be01e 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/exception.php +++ b/phpBB/phpbb/auth/provider/oauth/service/exception.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider\oauth\service;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * OAuth service exception class  *  * @package auth diff --git a/phpBB/phpbb/auth/provider/oauth/service/facebook.php b/phpBB/phpbb/auth/provider/oauth/service/facebook.php index 4a4eeba6d5..2698be8b18 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/facebook.php +++ b/phpBB/phpbb/auth/provider/oauth/service/facebook.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider\oauth\service;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Facebook OAuth service  *  * @package auth diff --git a/phpBB/phpbb/auth/provider/oauth/service/google.php b/phpBB/phpbb/auth/provider/oauth/service/google.php index 2449bbf523..08cb025c2d 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/google.php +++ b/phpBB/phpbb/auth/provider/oauth/service/google.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider\oauth\service;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Google OAuth service  *  * @package auth diff --git a/phpBB/phpbb/auth/provider/oauth/service/service_interface.php b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php index ab69fe6ef3..eee3a51cac 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/service_interface.php +++ b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider\oauth\service;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * OAuth service interface  *  * @package auth diff --git a/phpBB/phpbb/auth/provider/oauth/token_storage.php b/phpBB/phpbb/auth/provider/oauth/token_storage.php index 2ce0e32da3..43574288dc 100644 --- a/phpBB/phpbb/auth/provider/oauth/token_storage.php +++ b/phpBB/phpbb/auth/provider/oauth/token_storage.php @@ -9,14 +9,6 @@  namespace phpbb\auth\provider\oauth; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use OAuth\OAuth1\Token\StdOAuth1Token;  use OAuth\Common\Token\TokenInterface; @@ -78,7 +70,7 @@ class token_storage implements TokenStorageInterface  	{  		$service = $this->get_service_name_for_db($service); -		if ($this->cachedToken instanceOf TokenInterface) +		if ($this->cachedToken instanceof TokenInterface)  		{  			return $this->cachedToken;  		} @@ -238,7 +230,7 @@ class token_storage implements TokenStorageInterface  	{  		$service = $this->get_service_name_for_db($service); -		if ($this->cachedToken instanceOf TokenInterface) { +		if ($this->cachedToken instanceof TokenInterface) {  			return $this->cachedToken;  		} diff --git a/phpBB/phpbb/auth/provider/provider_interface.php b/phpBB/phpbb/auth/provider/provider_interface.php index 1bb209c821..946731f52d 100644 --- a/phpBB/phpbb/auth/provider/provider_interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -10,14 +10,6 @@  namespace phpbb\auth\provider;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**   * The interface authentication provider classes have to implement.   *   * @package auth diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index 0c54951cbd..d360614122 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -10,14 +10,6 @@  namespace phpbb\avatar\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base class for avatar drivers  * @package phpBB3  */ @@ -48,6 +40,12 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface  	protected $php_ext;  	/** +	* Path Helper +	* @var \phpbb\path_helper +	*/ +	protected $path_helper; + +	/**  	* Cache driver  	* @var \phpbb\cache\driver\driver_interface  	*/ @@ -75,13 +73,15 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface  	* @param \phpbb\request\request $request Request object  	* @param string $phpbb_root_path Path to the phpBB root  	* @param string $php_ext PHP file extension +	* @param \phpbb_path_helper $path_helper phpBB path helper  	* @param \phpbb\cache\driver\driver_interface $cache Cache driver  	*/ -	public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\cache\driver\driver_interface $cache = null) +	public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null)  	{  		$this->config = $config;  		$this->phpbb_root_path = $phpbb_root_path;  		$this->php_ext = $php_ext; +		$this->path_helper = $path_helper;  		$this->cache = $cache;  	} diff --git a/phpBB/phpbb/avatar/driver/driver_interface.php b/phpBB/phpbb/avatar/driver/driver_interface.php index d9540c19db..7f049469a2 100644 --- a/phpBB/phpbb/avatar/driver/driver_interface.php +++ b/phpBB/phpbb/avatar/driver/driver_interface.php @@ -10,14 +10,6 @@  namespace phpbb\avatar\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Interface for avatar drivers  * @package phpBB3  */ diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php index 3ad783932e..d64f4da734 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -10,14 +10,6 @@  namespace phpbb\avatar\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Handles avatars hosted at gravatar.com  * @package phpBB3  */ diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php index d779099c46..f6acc6e636 100644 --- a/phpBB/phpbb/avatar/driver/local.php +++ b/phpBB/phpbb/avatar/driver/local.php @@ -10,14 +10,6 @@  namespace phpbb\avatar\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Handles avatars selected from the board gallery  * @package phpBB3  */ @@ -29,7 +21,7 @@ class local extends \phpbb\avatar\driver\driver  	public function get_data($row)  	{  		return array( -			'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'], +			'src' => $this->path_helper->get_web_root_path() . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],  			'width' => $row['avatar_width'],  			'height' => $row['avatar_height'],  		); diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 1aa638dfe5..12cbd883f4 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -10,14 +10,6 @@  namespace phpbb\avatar\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Handles avatars hosted remotely  * @package phpBB3  */ diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 377c9a0b04..822c40af98 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -10,14 +10,6 @@  namespace phpbb\avatar\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Handles avatars uploaded to the board  * @package phpBB3  */ @@ -29,7 +21,7 @@ class upload extends \phpbb\avatar\driver\driver  	public function get_data($row, $ignore_config = false)  	{  		return array( -			'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'], +			'src' => $this->path_helper->get_web_root_path() . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'],  			'width' => $row['avatar_width'],  			'height' => $row['avatar_height'],  		); diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index c28380a401..5fe5e2b0a1 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -10,14 +10,6 @@  namespace phpbb\avatar;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * @package avatar  */  class manager @@ -42,12 +34,6 @@ class manager  	protected $avatar_drivers;  	/** -	* Service container object -	* @var object -	*/ -	protected $container; - -	/**  	* Default avatar data row  	* @var array  	*/ @@ -63,13 +49,27 @@ class manager  	*  	* @param \phpbb\config\config $config phpBB configuration  	* @param array $avatar_drivers Avatar drivers passed via the service container -	* @param object $container Container object  	*/ -	public function __construct(\phpbb\config\config $config, $avatar_drivers, $container) +	public function __construct(\phpbb\config\config $config, $avatar_drivers)  	{  		$this->config = $config; -		$this->avatar_drivers = $avatar_drivers; -		$this->container = $container; +		$this->register_avatar_drivers($avatar_drivers); +	} + +	/** +	* Register avatar drivers +	* +	* @param array $avatar_drivers Service collection of avatar drivers +	*/ +	protected function register_avatar_drivers($avatar_drivers) +	{ +		if (!empty($avatar_drivers)) +		{ +			foreach ($avatar_drivers as $driver) +			{ +				$this->avatar_drivers[$driver->get_name()] = $driver; +			} +		}  	}  	/** @@ -112,7 +112,7 @@ class manager  		* There is no need to handle invalid avatar types as the following code  		* will cause a ServiceNotFoundException if the type does not exist  		*/ -		$driver = $this->container->get($avatar_type); +		$driver = $this->avatar_drivers[$avatar_type];  		return $driver;  	} diff --git a/phpBB/phpbb/cache/driver/apc.php b/phpBB/phpbb/cache/driver/apc.php index ce72ec6134..a28d91c00a 100644 --- a/phpBB/phpbb/cache/driver/apc.php +++ b/phpBB/phpbb/cache/driver/apc.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * ACM for APC  * @package acm  */ diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php index 90185a00d2..feaca25a5b 100644 --- a/phpBB/phpbb/cache/driver/base.php +++ b/phpBB/phpbb/cache/driver/base.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * @package acm  */  abstract class base implements \phpbb\cache\driver\driver_interface diff --git a/phpBB/phpbb/cache/driver/driver_interface.php b/phpBB/phpbb/cache/driver/driver_interface.php index 34c60b5935..0715a4b934 100644 --- a/phpBB/phpbb/cache/driver/driver_interface.php +++ b/phpBB/phpbb/cache/driver/driver_interface.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * An interface that all cache drivers must implement  *  * @package acm diff --git a/phpBB/phpbb/cache/driver/eaccelerator.php b/phpBB/phpbb/cache/driver/eaccelerator.php index 72c0d77d02..2629cb53e5 100644 --- a/phpBB/phpbb/cache/driver/eaccelerator.php +++ b/phpBB/phpbb/cache/driver/eaccelerator.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * ACM for eAccelerator  * @package acm  * @todo Missing locks from destroy() talk with David diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index a64232400b..6686da6953 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * ACM File Based Caching  * @package acm  */ diff --git a/phpBB/phpbb/cache/driver/memcache.php b/phpBB/phpbb/cache/driver/memcache.php index 84fe68ae49..c725ec0fb0 100644 --- a/phpBB/phpbb/cache/driver/memcache.php +++ b/phpBB/phpbb/cache/driver/memcache.php @@ -9,14 +9,6 @@  namespace phpbb\cache\driver; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  if (!defined('PHPBB_ACM_MEMCACHE_PORT'))  {  	define('PHPBB_ACM_MEMCACHE_PORT', 11211); diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php index 5a9861913f..292024212b 100644 --- a/phpBB/phpbb/cache/driver/memory.php +++ b/phpBB/phpbb/cache/driver/memory.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * ACM Abstract Memory Class  * @package acm  */ diff --git a/phpBB/phpbb/cache/driver/null.php b/phpBB/phpbb/cache/driver/null.php index c03319ad61..ea535ca1e1 100644 --- a/phpBB/phpbb/cache/driver/null.php +++ b/phpBB/phpbb/cache/driver/null.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * ACM Null Caching  * @package acm  */ diff --git a/phpBB/phpbb/cache/driver/redis.php b/phpBB/phpbb/cache/driver/redis.php index 317d07428a..3c6cb0e138 100644 --- a/phpBB/phpbb/cache/driver/redis.php +++ b/phpBB/phpbb/cache/driver/redis.php @@ -9,14 +9,6 @@  namespace phpbb\cache\driver; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  if (!defined('PHPBB_ACM_REDIS_PORT'))  {  	define('PHPBB_ACM_REDIS_PORT', 6379); diff --git a/phpBB/phpbb/cache/driver/wincache.php b/phpBB/phpbb/cache/driver/wincache.php index a0b24e4a1f..1f040e9ab2 100644 --- a/phpBB/phpbb/cache/driver/wincache.php +++ b/phpBB/phpbb/cache/driver/wincache.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * ACM for WinCache  * @package acm  */ diff --git a/phpBB/phpbb/cache/driver/xcache.php b/phpBB/phpbb/cache/driver/xcache.php index fdcbf7e4b5..4d0d683b3d 100644 --- a/phpBB/phpbb/cache/driver/xcache.php +++ b/phpBB/phpbb/cache/driver/xcache.php @@ -10,14 +10,6 @@  namespace phpbb\cache\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * ACM for XCache  * @package acm  * diff --git a/phpBB/phpbb/cache/service.php b/phpBB/phpbb/cache/service.php index da8f4eb8d8..ebbcfb8cdb 100644 --- a/phpBB/phpbb/cache/service.php +++ b/phpBB/phpbb/cache/service.php @@ -10,14 +10,6 @@  namespace phpbb\cache;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Class for grabbing/handling cached entries  * @package acm  */ diff --git a/phpBB/phpbb/class_loader.php b/phpBB/phpbb/class_loader.php index 769f28b4f1..37b62fff24 100644 --- a/phpBB/phpbb/class_loader.php +++ b/phpBB/phpbb/class_loader.php @@ -10,14 +10,6 @@  namespace phpbb;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * The class loader resolves class names to file system paths and loads them if  * necessary.  * @@ -55,7 +47,7 @@ class class_loader  	* @param \phpbb\cache\driver\driver_interface $cache An implementation of the phpBB cache interface.  	*/  	public function __construct($namespace, $path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null) -    { +	{  		if ($namespace[0] !== '\\')  		{  			$namespace = '\\' . $namespace; diff --git a/phpBB/phpbb/config/config.php b/phpBB/phpbb/config/config.php index dc865df707..d37922acf1 100644 --- a/phpBB/phpbb/config/config.php +++ b/phpBB/phpbb/config/config.php @@ -10,14 +10,6 @@  namespace phpbb\config;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Configuration container class  * @package phpBB3  */ diff --git a/phpBB/phpbb/config/db.php b/phpBB/phpbb/config/db.php index 0a490af14f..c1a3630a14 100644 --- a/phpBB/phpbb/config/db.php +++ b/phpBB/phpbb/config/db.php @@ -10,14 +10,6 @@  namespace phpbb\config;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Configuration container class  * @package phpBB3  */ diff --git a/phpBB/phpbb/config/db_text.php b/phpBB/phpbb/config/db_text.php index 3ee3351e19..b1ea112b53 100644 --- a/phpBB/phpbb/config/db_text.php +++ b/phpBB/phpbb/config/db_text.php @@ -10,14 +10,6 @@  namespace phpbb\config;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Manages configuration options with an arbitrary length value stored in a TEXT  * column. In constrast to class \phpbb\config\db, values are never cached and  * prefetched, but every get operation sends a query to the database. diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php index 0b351bc9ec..874889015a 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -10,14 +10,6 @@  namespace phpbb;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * phpbb_visibility  * Handle fetching and setting the visibility for topics and posts  * @package phpbb diff --git a/phpBB/phpbb/controller/exception.php b/phpBB/phpbb/controller/exception.php index e8694b8bcf..06ece8d1d5 100644 --- a/phpBB/phpbb/controller/exception.php +++ b/phpBB/phpbb/controller/exception.php @@ -10,14 +10,6 @@  namespace phpbb\controller;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Controller exception class  * @package phpBB3  */ diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 07483a91eb..05a05d1e57 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -9,14 +9,6 @@  namespace phpbb\controller; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\HttpFoundation\Response;  /** diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index 3aad08e3aa..fde51696e8 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -9,14 +9,6 @@  namespace phpbb\controller; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\Routing\RouteCollection;  use Symfony\Component\Routing\Loader\YamlFileLoader;  use Symfony\Component\Config\FileLocator; @@ -31,17 +23,17 @@ class provider  	* YAML file(s) containing route information  	* @var array  	*/ -	protected $routing_paths; +	protected $routing_files;  	/**  	* Construct method  	* -	* @param array() $routing_paths Array of strings containing paths +	* @param array() $routing_files Array of strings containing paths  	*							to YAML files holding route information  	*/ -	public function __construct($routing_paths = array()) +	public function __construct($routing_files = array())  	{ -		$this->routing_paths = $routing_paths; +		$this->routing_files = $routing_files;  	}  	/** @@ -54,12 +46,11 @@ class provider  	{  		// We hardcode the path to the core config directory  		// because the finder cannot find it -		$this->routing_paths = array_merge(array('config'), array_map('dirname', array_keys($finder +		$this->routing_files = array_merge(array('config/routing.yml'), array_keys($finder  			->directory('config') -			->prefix('routing') -			->suffix('yml') +			->suffix('routing.yml')  			->find() -		))); +		));  		return $this;  	} @@ -73,10 +64,10 @@ class provider  	public function find($base_path = '')  	{  		$routes = new RouteCollection; -		foreach ($this->routing_paths as $path) +		foreach ($this->routing_files as $file_path)  		{ -			$loader = new YamlFileLoader(new FileLocator($base_path . $path)); -			$routes->addCollection($loader->load('routing.yml')); +			$loader = new YamlFileLoader(new FileLocator($base_path)); +			$routes->addCollection($loader->load($file_path));  		}  		return $routes; diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php index 1cc8981105..233179e343 100644 --- a/phpBB/phpbb/controller/resolver.php +++ b/phpBB/phpbb/controller/resolver.php @@ -9,14 +9,6 @@  namespace phpbb\controller; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;  use Symfony\Component\DependencyInjection\ContainerInterface;  use Symfony\Component\HttpFoundation\Request; diff --git a/phpBB/phpbb/cron/manager.php b/phpBB/phpbb/cron/manager.php index f58ba64a3d..b6af07aff7 100644 --- a/phpBB/phpbb/cron/manager.php +++ b/phpBB/phpbb/cron/manager.php @@ -10,14 +10,6 @@  namespace phpbb\cron;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Cron manager class.  *  * Finds installed cron tasks, stores task objects, provides task selection. diff --git a/phpBB/phpbb/cron/task/base.php b/phpBB/phpbb/cron/task/base.php index f30c9daf1b..63f0407bcd 100644 --- a/phpBB/phpbb/cron/task/base.php +++ b/phpBB/phpbb/cron/task/base.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Cron task base class. Provides sensible defaults for cron tasks  * and partially implements cron task interface, making writing cron tasks easier.  * diff --git a/phpBB/phpbb/cron/task/core/prune_all_forums.php b/phpBB/phpbb/cron/task/core/prune_all_forums.php index 8e3ef25ce6..90b9a5914b 100644 --- a/phpBB/phpbb/cron/task/core/prune_all_forums.php +++ b/phpBB/phpbb/cron/task/core/prune_all_forums.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Prune all forums cron task.  *  * It is intended to be invoked from system cron. diff --git a/phpBB/phpbb/cron/task/core/prune_forum.php b/phpBB/phpbb/cron/task/core/prune_forum.php index f14ab7b702..e0d8b067c5 100644 --- a/phpBB/phpbb/cron/task/core/prune_forum.php +++ b/phpBB/phpbb/cron/task/core/prune_forum.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Prune one forum cron task.  *  * It is intended to be used when cron is invoked via web. diff --git a/phpBB/phpbb/cron/task/core/prune_notifications.php b/phpBB/phpbb/cron/task/core/prune_notifications.php index 1f75709322..9f67c54e1c 100644 --- a/phpBB/phpbb/cron/task/core/prune_notifications.php +++ b/phpBB/phpbb/cron/task/core/prune_notifications.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Prune notifications cron task.  *  * @package phpBB3 diff --git a/phpBB/phpbb/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php index cb13df86df..cd799b8024 100644 --- a/phpBB/phpbb/cron/task/core/queue.php +++ b/phpBB/phpbb/cron/task/core/queue.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Queue cron task. Sends email and jabber messages queued by other scripts.  *  * @package phpBB3 diff --git a/phpBB/phpbb/cron/task/core/tidy_cache.php b/phpBB/phpbb/cron/task/core/tidy_cache.php index 021d5fd8a3..a94a85db53 100644 --- a/phpBB/phpbb/cron/task/core/tidy_cache.php +++ b/phpBB/phpbb/cron/task/core/tidy_cache.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Tidy cache cron task.  *  * @package phpBB3 diff --git a/phpBB/phpbb/cron/task/core/tidy_database.php b/phpBB/phpbb/cron/task/core/tidy_database.php index d03cba1d86..f712a5047c 100644 --- a/phpBB/phpbb/cron/task/core/tidy_database.php +++ b/phpBB/phpbb/cron/task/core/tidy_database.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Tidy database cron task.  *  * @package phpBB3 diff --git a/phpBB/phpbb/cron/task/core/tidy_plupload.php b/phpBB/phpbb/cron/task/core/tidy_plupload.php index 09e9dfa6b4..5a98e0bd7b 100644 --- a/phpBB/phpbb/cron/task/core/tidy_plupload.php +++ b/phpBB/phpbb/cron/task/core/tidy_plupload.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Cron task for cleaning plupload's temporary upload directory.  *  * @package phpBB3 diff --git a/phpBB/phpbb/cron/task/core/tidy_search.php b/phpBB/phpbb/cron/task/core/tidy_search.php index ebd0d86cbc..42f7df308f 100644 --- a/phpBB/phpbb/cron/task/core/tidy_search.php +++ b/phpBB/phpbb/cron/task/core/tidy_search.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Tidy search cron task.  *  * Will only run when the currently selected search backend supports tidying. diff --git a/phpBB/phpbb/cron/task/core/tidy_sessions.php b/phpBB/phpbb/cron/task/core/tidy_sessions.php index 5df019ae46..68094af1f7 100644 --- a/phpBB/phpbb/cron/task/core/tidy_sessions.php +++ b/phpBB/phpbb/cron/task/core/tidy_sessions.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Tidy sessions cron task.  *  * @package phpBB3 diff --git a/phpBB/phpbb/cron/task/core/tidy_warnings.php b/phpBB/phpbb/cron/task/core/tidy_warnings.php index 1cc0abbe88..a0ff23fc57 100644 --- a/phpBB/phpbb/cron/task/core/tidy_warnings.php +++ b/phpBB/phpbb/cron/task/core/tidy_warnings.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task\core;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Tidy warnings cron task.  *  * Will only run when warnings are configured to expire. diff --git a/phpBB/phpbb/cron/task/parametrized.php b/phpBB/phpbb/cron/task/parametrized.php index 1d2f449c58..1aeead0399 100644 --- a/phpBB/phpbb/cron/task/parametrized.php +++ b/phpBB/phpbb/cron/task/parametrized.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Parametrized cron task interface.  *  * Parametrized cron tasks are somewhat of a cross between regular cron tasks and diff --git a/phpBB/phpbb/cron/task/task.php b/phpBB/phpbb/cron/task/task.php index 84218c4fc9..3ce3de9598 100644 --- a/phpBB/phpbb/cron/task/task.php +++ b/phpBB/phpbb/cron/task/task.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Cron task interface  * @package phpBB3  */ diff --git a/phpBB/phpbb/cron/task/wrapper.php b/phpBB/phpbb/cron/task/wrapper.php index aa015966c6..fc3f897206 100644 --- a/phpBB/phpbb/cron/task/wrapper.php +++ b/phpBB/phpbb/cron/task/wrapper.php @@ -10,14 +10,6 @@  namespace phpbb\cron\task;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Cron task wrapper class.  * Enhances cron tasks with convenience methods that work identically for all tasks.  * diff --git a/phpBB/phpbb/datetime.php b/phpBB/phpbb/datetime.php index 84b13202af..dfa21976e0 100644 --- a/phpBB/phpbb/datetime.php +++ b/phpBB/phpbb/datetime.php @@ -74,8 +74,8 @@ class datetime extends \DateTime  			* finally check that relative dates are supported by the language pack  			*/  			if ($delta <= 3600 && $delta > -60 && -			  ($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60)) -			  && isset($this->user->lang['datetime']['AGO'])) +				($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60)) +				&& isset($this->user->lang['datetime']['AGO']))  			{  				return $this->user->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60)));  			} diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 53d39e9127..58d0b61519 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Database Abstraction Layer  * @package dbal  */ diff --git a/phpBB/phpbb/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php index aef75eab15..ed56a5d154 100644 --- a/phpBB/phpbb/db/driver/firebird.php +++ b/phpBB/phpbb/db/driver/firebird.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Firebird/Interbase Database Abstraction Layer  * Minimum Requirement is Firebird 2.1  * @package dbal diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php index 50096deded..6ebc891673 100644 --- a/phpBB/phpbb/db/driver/mssql.php +++ b/phpBB/phpbb/db/driver/mssql.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * MSSQL Database Abstraction Layer  * Minimum Requirement is MSSQL 2000+  * @package dbal @@ -259,7 +251,7 @@ class mssql extends \phpbb\db\driver\driver  		{  			foreach ($row as $key => $value)  			{ -				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value; +				$row[$key] = ($value === ' ' || $value === null) ? '' : $value;  			}  		} diff --git a/phpBB/phpbb/db/driver/mssql_base.php b/phpBB/phpbb/db/driver/mssql_base.php index 57c4e0f1fd..113f1c6902 100644 --- a/phpBB/phpbb/db/driver/mssql_base.php +++ b/phpBB/phpbb/db/driver/mssql_base.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * MSSQL Database Base Abstraction Layer  * @package dbal   */ diff --git a/phpBB/phpbb/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php index b9881035c0..f8c70f1cd7 100644 --- a/phpBB/phpbb/db/driver/mssql_odbc.php +++ b/phpBB/phpbb/db/driver/mssql_odbc.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Unified ODBC functions  * Unified ODBC functions support any database having ODBC driver, for example Adabas D, IBM DB2, iODBC, Solid, Sybase SQL Anywhere...  * Here we only support MSSQL Server 2000+ because of the provided schema diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php index aade311bcb..125db9c8d4 100644 --- a/phpBB/phpbb/db/driver/mssqlnative.php +++ b/phpBB/phpbb/db/driver/mssqlnative.php @@ -14,188 +14,11 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/** - * Prior to version 1.1 the SQL Server Native PHP driver didn't support sqlsrv_num_rows, or cursor based seeking so we recall all rows into an array - * and maintain our own cursor index into that array. - */ -class result_mssqlnative -{ -	public function result_mssqlnative($queryresult = false) -	{ -		$this->m_cursor = 0; -		$this->m_rows = array(); -		$this->m_num_fields = sqlsrv_num_fields($queryresult); -		$this->m_field_meta = sqlsrv_field_metadata($queryresult); - -		while ($row = sqlsrv_fetch_array($queryresult, SQLSRV_FETCH_ASSOC)) -		{ -			if ($row !== null) -			{ -				foreach($row as $k => $v) -				{ -					if (is_object($v) && method_exists($v, 'format')) -					{ -						$row[$k] = $v->format("Y-m-d\TH:i:s\Z"); -					} -				} -				$this->m_rows[] = $row;//read results into memory, cursors are not supported -			} -		} - -		$this->m_row_count = sizeof($this->m_rows); -	} - -	private function array_to_obj($array, &$obj) -	{ -		foreach ($array as $key => $value) -		{ -			if (is_array($value)) -			{ -				$obj->$key = new \stdClass(); -				array_to_obj($value, $obj->$key); -			} -			else -			{ -				$obj->$key = $value; -			} -		} -		return $obj; -	} - -	public function fetch($mode = SQLSRV_FETCH_BOTH, $object_class = 'stdClass') -	{ -		if ($this->m_cursor >= $this->m_row_count || $this->m_row_count == 0) -		{ -			return false; -		} - -		$ret = false; -		$arr_num = array(); - -		if ($mode == SQLSRV_FETCH_NUMERIC || $mode == SQLSRV_FETCH_BOTH) -		{ -			foreach($this->m_rows[$this->m_cursor] as $key => $value) -			{ -				$arr_num[] = $value; -			} -		} - -		switch ($mode) -		{ -			case SQLSRV_FETCH_ASSOC: -				$ret = $this->m_rows[$this->m_cursor]; -			break; -			case SQLSRV_FETCH_NUMERIC: -				$ret = $arr_num; -			break; -			case 'OBJECT': -				$ret = $this->array_to_obj($this->m_rows[$this->m_cursor], $o = new $object_class); -			break; -			case SQLSRV_FETCH_BOTH: -			default: -				$ret = $this->m_rows[$this->m_cursor] + $arr_num; -			break; -		} -		$this->m_cursor++; -		return $ret; -	} - -	public function get($pos, $fld) -	{ -		return $this->m_rows[$pos][$fld]; -	} - -	public function num_rows() -	{ -		return $this->m_row_count; -	} - -	public function seek($iRow) -	{ -		$this->m_cursor = min($iRow, $this->m_row_count); -	} - -	public function num_fields() -	{ -		return $this->m_num_fields; -	} - -	public function field_name($nr) -	{ -		$arr_keys = array_keys($this->m_rows[0]); -		return $arr_keys[$nr]; -	} - -	public function field_type($nr) -	{ -		$i = 0; -		$int_type = -1; -		$str_type = ''; - -		foreach ($this->m_field_meta as $meta) -		{ -			if ($nr == $i) -			{ -				$int_type = $meta['Type']; -				break; -			} -			$i++; -		} - -		//http://msdn.microsoft.com/en-us/library/cc296183.aspx contains type table -		switch ($int_type) -		{ -			case SQLSRV_SQLTYPE_BIGINT: 		$str_type = 'bigint'; break; -			case SQLSRV_SQLTYPE_BINARY: 		$str_type = 'binary'; break; -			case SQLSRV_SQLTYPE_BIT: 			$str_type = 'bit'; break; -			case SQLSRV_SQLTYPE_CHAR: 			$str_type = 'char'; break; -			case SQLSRV_SQLTYPE_DATETIME: 		$str_type = 'datetime'; break; -			case SQLSRV_SQLTYPE_DECIMAL/*($precision, $scale)*/: $str_type = 'decimal'; break; -			case SQLSRV_SQLTYPE_FLOAT: 			$str_type = 'float'; break; -			case SQLSRV_SQLTYPE_IMAGE: 			$str_type = 'image'; break; -			case SQLSRV_SQLTYPE_INT: 			$str_type = 'int'; break; -			case SQLSRV_SQLTYPE_MONEY: 			$str_type = 'money'; break; -			case SQLSRV_SQLTYPE_NCHAR/*($charCount)*/: $str_type = 'nchar'; break; -			case SQLSRV_SQLTYPE_NUMERIC/*($precision, $scale)*/: $str_type = 'numeric'; break; -			case SQLSRV_SQLTYPE_NVARCHAR/*($charCount)*/: $str_type = 'nvarchar'; break; -			case SQLSRV_SQLTYPE_NTEXT: 			$str_type = 'ntext'; break; -			case SQLSRV_SQLTYPE_REAL: 			$str_type = 'real'; break; -			case SQLSRV_SQLTYPE_SMALLDATETIME: 	$str_type = 'smalldatetime'; break; -			case SQLSRV_SQLTYPE_SMALLINT: 		$str_type = 'smallint'; break; -			case SQLSRV_SQLTYPE_SMALLMONEY: 	$str_type = 'smallmoney'; break; -			case SQLSRV_SQLTYPE_TEXT: 			$str_type = 'text'; break; -			case SQLSRV_SQLTYPE_TIMESTAMP: 		$str_type = 'timestamp'; break; -			case SQLSRV_SQLTYPE_TINYINT: 		$str_type = 'tinyint'; break; -			case SQLSRV_SQLTYPE_UNIQUEIDENTIFIER: $str_type = 'uniqueidentifier'; break; -			case SQLSRV_SQLTYPE_UDT: 			$str_type = 'UDT'; break; -			case SQLSRV_SQLTYPE_VARBINARY/*($byteCount)*/: $str_type = 'varbinary'; break; -			case SQLSRV_SQLTYPE_VARCHAR/*($charCount)*/: $str_type = 'varchar'; break; -			case SQLSRV_SQLTYPE_XML: 			$str_type = 'xml'; break; -			default: $str_type = $int_type; -		} -		return $str_type; -	} - -	public function free() -	{ -		unset($this->m_rows); -		return; -	} -} - -/**  * @package dbal  */  class mssqlnative extends \phpbb\db\driver\mssql_base  { -	var $m_insert_id = NULL; +	var $m_insert_id = null;  	var $last_query_text = '';  	var $query_options = array();  	var $connect_error = ''; @@ -427,7 +250,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base  		{  			foreach ($row as $key => $value)  			{ -				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value; +				$row[$key] = ($value === ' ' || $value === null) ? '' : $value;  			}  			// remove helper values from LIMIT queries diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php index d215453ccb..e311f0dd74 100644 --- a/phpBB/phpbb/db/driver/mysql.php +++ b/phpBB/phpbb/db/driver/mysql.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * MySQL4 Database Abstraction Layer  * Compatible with:  * MySQL 3.23+ diff --git a/phpBB/phpbb/db/driver/mysql_base.php b/phpBB/phpbb/db/driver/mysql_base.php index 8f2f66674b..87b6d153a9 100644 --- a/phpBB/phpbb/db/driver/mysql_base.php +++ b/phpBB/phpbb/db/driver/mysql_base.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Abstract MySQL Database Base Abstraction Layer  * @package dbal  */ diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index 4d0e43b464..adc8f96302 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * MySQLi Database Abstraction Layer  * mysqli-extension has to be compiled with:  * MySQL 4.1+ or MySQL 5.0+ @@ -31,7 +23,7 @@ class mysqli extends \phpbb\db\driver\mysql_base  	/**  	* Connect to server  	*/ -	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false) +	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)  	{  		if (!function_exists('mysqli_connect'))  		{ @@ -47,11 +39,11 @@ class mysqli extends \phpbb\db\driver\mysql_base  		$this->server = ($this->persistency) ? 'p:' . (($sqlserver) ? $sqlserver : 'localhost') : $sqlserver;  		$this->dbname = $database; -		$port = (!$port) ? NULL : $port; +		$port = (!$port) ? null : $port;  		// If port is set and it is not numeric, most likely mysqli socket is set.  		// Try to map it to the $socket parameter. -		$socket = NULL; +		$socket = null;  		if ($port)  		{  			if (is_numeric($port)) @@ -61,7 +53,7 @@ class mysqli extends \phpbb\db\driver\mysql_base  			else  			{  				$socket = $port; -				$port = NULL; +				$port = null;  			}  		} diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php index 4fba654d1e..36ed43d4a7 100644 --- a/phpBB/phpbb/db/driver/oracle.php +++ b/phpBB/phpbb/db/driver/oracle.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Oracle Database Abstraction Layer  * @package dbal  */ diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php index 9cbb1ecb07..5dbd1ca74f 100644 --- a/phpBB/phpbb/db/driver/postgres.php +++ b/phpBB/phpbb/db/driver/postgres.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * PostgreSQL Database Abstraction Layer  * Minimum Requirement is Version 7.3+  * @package dbal @@ -328,7 +320,7 @@ class postgres extends \phpbb\db\driver\driver  					return false;  				} -				$temp_result = @pg_fetch_assoc($temp_q_id, NULL); +				$temp_result = @pg_fetch_assoc($temp_q_id, null);  				@pg_free_result($query_id);  				return ($temp_result) ? $temp_result['last_value'] : false; @@ -456,7 +448,7 @@ class postgres extends \phpbb\db\driver\driver  					if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query"))  					{ -						while ($row = @pg_fetch_assoc($result, NULL)) +						while ($row = @pg_fetch_assoc($result, null))  						{  							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);  						} @@ -476,7 +468,7 @@ class postgres extends \phpbb\db\driver\driver  				$endtime = $endtime[0] + $endtime[1];  				$result = @pg_query($this->db_connect_id, $query); -				while ($void = @pg_fetch_assoc($result, NULL)) +				while ($void = @pg_fetch_assoc($result, null))  				{  					// Take the time spent on parsing rows into account  				} diff --git a/phpBB/phpbb/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php index 55a33284f2..59ec895c0f 100644 --- a/phpBB/phpbb/db/driver/sqlite.php +++ b/phpBB/phpbb/db/driver/sqlite.php @@ -10,14 +10,6 @@  namespace phpbb\db\driver;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Sqlite Database Abstraction Layer  * Minimum Requirement: 2.8.2+  * @package dbal diff --git a/phpBB/phpbb/db/migration/data/v310/notifications.php b/phpBB/phpbb/db/migration/data/v310/notifications.php index 10f1392094..61be25bb5f 100644 --- a/phpBB/phpbb/db/migration/data/v310/notifications.php +++ b/phpBB/phpbb/db/migration/data/v310/notifications.php @@ -34,7 +34,7 @@ class notifications extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'notifications'		=> array(  					'COLUMNS'			=> array( -						'notification_id'  				=> array('UINT', NULL, 'auto_increment'), +						'notification_id'  				=> array('UINT', null, 'auto_increment'),  						'item_type'			   			=> array('VCHAR:255', ''),  						'item_id'		  				=> array('UINT', 0),  						'item_parent_id'   				=> array('UINT', 0), diff --git a/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php b/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php index 8ed626d8a6..eb2eb361ee 100644 --- a/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php +++ b/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php @@ -26,7 +26,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration  			'add_tables'		=> array(  				$this->table_prefix . 'notification_types'	=> array(  					'COLUMNS'			=> array( -						'notification_type_id'		=> array('USINT', NULL, 'auto_increment'), +						'notification_type_id'		=> array('USINT', null, 'auto_increment'),  						'notification_type_name'	=> array('VCHAR:255', ''),  						'notification_type_enabled'	=> array('BOOL', 1),  					), @@ -37,7 +37,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'notifications'		=> array(  					'COLUMNS'			=> array( -						'notification_id'				=> array('UINT:10', NULL, 'auto_increment'), +						'notification_id'				=> array('UINT:10', null, 'auto_increment'),  						'notification_type_id'			=> array('USINT', 0),  						'item_id'						=> array('UINT', 0),  						'item_parent_id'				=> array('UINT', 0), @@ -73,7 +73,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'notifications'		=> array(  					'COLUMNS'			=> array( -						'notification_id'  				=> array('UINT', NULL, 'auto_increment'), +						'notification_id'  				=> array('UINT', null, 'auto_increment'),  						'item_type'			   			=> array('VCHAR:255', ''),  						'item_id'		  				=> array('UINT', 0),  						'item_parent_id'   				=> array('UINT', 0), diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php index 202a8409fb..c5b45d9dc9 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php @@ -56,7 +56,7 @@ class style_update_p2 extends \phpbb\db\migration\migration  			'add_tables'	=> array(  				$this->table_prefix . 'styles_imageset'		=> array(  					'COLUMNS'		=> array( -						'imageset_id'				=> array('UINT', NULL, 'auto_increment'), +						'imageset_id'				=> array('UINT', null, 'auto_increment'),  						'imageset_name'				=> array('VCHAR_UNI:255', ''),  						'imageset_copyright'		=> array('VCHAR_UNI', ''),  						'imageset_path'				=> array('VCHAR:100', ''), @@ -68,7 +68,7 @@ class style_update_p2 extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'styles_imageset_data'	=> array(  					'COLUMNS'		=> array( -						'image_id'				=> array('UINT', NULL, 'auto_increment'), +						'image_id'				=> array('UINT', null, 'auto_increment'),  						'image_name'			=> array('VCHAR:200', ''),  						'image_filename'		=> array('VCHAR:200', ''),  						'image_lang'			=> array('VCHAR:30', ''), @@ -83,7 +83,7 @@ class style_update_p2 extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'styles_template'		=> array(  					'COLUMNS'		=> array( -						'template_id'			=> array('UINT', NULL, 'auto_increment'), +						'template_id'			=> array('UINT', null, 'auto_increment'),  						'template_name'			=> array('VCHAR_UNI:255', ''),  						'template_copyright'	=> array('VCHAR_UNI', ''),  						'template_path'			=> array('VCHAR:100', ''), @@ -112,7 +112,7 @@ class style_update_p2 extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'styles_theme'			=> array(  					'COLUMNS'		=> array( -						'theme_id'				=> array('UINT', NULL, 'auto_increment'), +						'theme_id'				=> array('UINT', null, 'auto_increment'),  						'theme_name'			=> array('VCHAR_UNI:255', ''),  						'theme_copyright'		=> array('VCHAR_UNI', ''),  						'theme_path'			=> array('VCHAR:100', ''), diff --git a/phpBB/phpbb/db/migration/data/v310/teampage.php b/phpBB/phpbb/db/migration/data/v310/teampage.php index 80cc4be1c0..172435c672 100644 --- a/phpBB/phpbb/db/migration/data/v310/teampage.php +++ b/phpBB/phpbb/db/migration/data/v310/teampage.php @@ -27,7 +27,7 @@ class teampage extends \phpbb\db\migration\migration  			'add_tables'		=> array(  				$this->table_prefix . 'teampage'	=> array(  					'COLUMNS'		=> array( -						'teampage_id'		=> array('UINT', NULL, 'auto_increment'), +						'teampage_id'		=> array('UINT', null, 'auto_increment'),  						'group_id'			=> array('UINT', 0),  						'teampage_name'		=> array('VCHAR_UNI:255', ''),  						'teampage_position'	=> array('UINT', 0), diff --git a/phpBB/phpbb/db/migration/exception.php b/phpBB/phpbb/db/migration/exception.php index 58e29b5218..cfe546d1ab 100644 --- a/phpBB/phpbb/db/migration/exception.php +++ b/phpBB/phpbb/db/migration/exception.php @@ -10,14 +10,6 @@  namespace phpbb\db\migration;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * The migrator is responsible for applying new migrations in the correct order.  *  * @package db diff --git a/phpBB/phpbb/db/migration/migration.php b/phpBB/phpbb/db/migration/migration.php index aff3837279..b32de00871 100644 --- a/phpBB/phpbb/db/migration/migration.php +++ b/phpBB/phpbb/db/migration/migration.php @@ -10,14 +10,6 @@  namespace phpbb\db\migration;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Abstract base class for database migrations  *  * Each migration consists of a set of schema and data changes to be implemented diff --git a/phpBB/phpbb/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php index f2149dc59a..36a1931f4e 100644 --- a/phpBB/phpbb/db/migration/tool/config.php +++ b/phpBB/phpbb/db/migration/tool/config.php @@ -130,6 +130,10 @@ class config implements \phpbb\db\migration\tool\tool_interface  			case 'remove':  				$call = 'add'; +				if (sizeof($arguments) == 1) +				{ +					$arguments[] = ''; +				}  			break;  			case 'update_if_equals': diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 47e1406043..3b966b7fe3 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -10,14 +10,6 @@  namespace phpbb\db;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * The migrator is responsible for applying new migrations in the correct order.  *  * @package db diff --git a/phpBB/phpbb/db/sql_insert_buffer.php b/phpBB/phpbb/db/sql_insert_buffer.php index 7bbd213bdc..41026ad425 100644 --- a/phpBB/phpbb/db/sql_insert_buffer.php +++ b/phpBB/phpbb/db/sql_insert_buffer.php @@ -10,14 +10,6 @@  namespace phpbb\db;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Collects rows for insert into a database until the buffer size is reached.  * Then flushes the buffer to the database and starts over again.  * diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 1f156fbb04..4360c89ac3 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -10,14 +10,6 @@  namespace phpbb\db;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Database Tools for handling cross-db actions such as altering columns, etc.  * Currently not supported is returning SQL for creating tables.  * @@ -33,7 +25,7 @@ class tools  	/**  	* @var object DB object  	*/ -	var $db = NULL; +	var $db = null;  	/**  	* The Column types for every database we support diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index 85b374a3ca..5fcb2d6f10 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -9,14 +9,6 @@  namespace phpbb\di\extension; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\DependencyInjection\ContainerBuilder;  use Symfony\Component\HttpKernel\DependencyInjection\Extension;  use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index 1f6b700973..455dfa7ecd 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -9,14 +9,6 @@  namespace phpbb\di\extension; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\DependencyInjection\ContainerBuilder;  use Symfony\Component\HttpKernel\DependencyInjection\Extension;  use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; diff --git a/phpBB/phpbb/di/extension/ext.php b/phpBB/phpbb/di/extension/ext.php index cf623a7c87..4f2f24cb1a 100644 --- a/phpBB/phpbb/di/extension/ext.php +++ b/phpBB/phpbb/di/extension/ext.php @@ -9,14 +9,6 @@  namespace phpbb\di\extension; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\DependencyInjection\ContainerBuilder;  use Symfony\Component\HttpKernel\DependencyInjection\Extension;  use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; diff --git a/phpBB/phpbb/di/pass/collection_pass.php b/phpBB/phpbb/di/pass/collection_pass.php index ffc5a41f6d..507271de3e 100644 --- a/phpBB/phpbb/di/pass/collection_pass.php +++ b/phpBB/phpbb/di/pass/collection_pass.php @@ -9,14 +9,6 @@  namespace phpbb\di\pass; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\DependencyInjection\ContainerBuilder;  use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/phpBB/phpbb/di/pass/kernel_pass.php b/phpBB/phpbb/di/pass/kernel_pass.php index 6a9124ad78..9c2b193361 100644 --- a/phpBB/phpbb/di/pass/kernel_pass.php +++ b/phpBB/phpbb/di/pass/kernel_pass.php @@ -9,14 +9,6 @@  namespace phpbb\di\pass; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\DependencyInjection\ContainerBuilder;  use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php index fccdd77071..65df9ab1d1 100644 --- a/phpBB/phpbb/di/service_collection.php +++ b/phpBB/phpbb/di/service_collection.php @@ -9,14 +9,6 @@  namespace phpbb\di; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\DependencyInjection\ContainerInterface;  /** diff --git a/phpBB/phpbb/error_collector.php b/phpBB/phpbb/error_collector.php index 9b3216e32f..297972c6b8 100644 --- a/phpBB/phpbb/error_collector.php +++ b/phpBB/phpbb/error_collector.php @@ -9,14 +9,6 @@  namespace phpbb; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class error_collector  {  	var $errors; diff --git a/phpBB/phpbb/event/data.php b/phpBB/phpbb/event/data.php index 3481023b74..fbb16574ed 100644 --- a/phpBB/phpbb/event/data.php +++ b/phpBB/phpbb/event/data.php @@ -9,62 +9,54 @@  namespace phpbb\event; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -    exit; -} -  use Symfony\Component\EventDispatcher\Event;  class data extends Event implements \ArrayAccess  { -    private $data; - -    public function __construct(array $data = array()) -    { -        $this->set_data($data); -    } - -    public function set_data(array $data = array()) -    { -        $this->data = $data; -    } - -    public function get_data() -    { -        return $this->data; -    } - -    /** -     * Returns data filtered to only include specified keys. -     * -     * This effectively discards any keys added to data by hooks. -     */ -    public function get_data_filtered($keys) -    { -        return array_intersect_key($this->data, array_flip($keys)); -    } - -    public function offsetExists($offset) -    { -        return isset($this->data[$offset]); -    } - -    public function offsetGet($offset) -    { -        return isset($this->data[$offset]) ? $this->data[$offset] : null; -    } - -    public function offsetSet($offset, $value) -    { -        $this->data[$offset] = $value; -    } - -    public function offsetUnset($offset) -    { -        unset($this->data[$offset]); -    } +	private $data; + +	public function __construct(array $data = array()) +	{ +		$this->set_data($data); +	} + +	public function set_data(array $data = array()) +	{ +		$this->data = $data; +	} + +	public function get_data() +	{ +		return $this->data; +	} + +	/** +	 * Returns data filtered to only include specified keys. +	 * +	 * This effectively discards any keys added to data by hooks. +	 */ +	public function get_data_filtered($keys) +	{ +		return array_intersect_key($this->data, array_flip($keys)); +	} + +	public function offsetExists($offset) +	{ +		return isset($this->data[$offset]); +	} + +	public function offsetGet($offset) +	{ +		return isset($this->data[$offset]) ? $this->data[$offset] : null; +	} + +	public function offsetSet($offset, $value) +	{ +		$this->data[$offset] = $value; +	} + +	public function offsetUnset($offset) +	{ +		unset($this->data[$offset]); +	}  } diff --git a/phpBB/phpbb/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php index cc3733692e..74b35eb78d 100644 --- a/phpBB/phpbb/event/dispatcher.php +++ b/phpBB/phpbb/event/dispatcher.php @@ -9,14 +9,6 @@  namespace phpbb\event; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;  /** diff --git a/phpBB/phpbb/event/extension_subscriber_loader.php b/phpBB/phpbb/event/extension_subscriber_loader.php index ab50a589fe..df8e093f4a 100644 --- a/phpBB/phpbb/event/extension_subscriber_loader.php +++ b/phpBB/phpbb/event/extension_subscriber_loader.php @@ -9,14 +9,6 @@  namespace phpbb\event; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\EventDispatcher\EventDispatcherInterface;  class extension_subscriber_loader diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php index 09103680e8..8a4de1fbad 100644 --- a/phpBB/phpbb/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/event/kernel_exception_subscriber.php @@ -9,14 +9,6 @@  namespace phpbb\event; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\EventDispatcher\EventSubscriberInterface;  use Symfony\Component\HttpKernel\KernelEvents;  use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; @@ -72,7 +64,6 @@ class kernel_exception_subscriber implements EventSubscriberInterface  		page_footer(true, false, false); -  		$status_code = $exception instanceof HttpException ? $exception->getStatusCode() : 500;  		$response = new Response($this->template->assign_display('body'), $status_code);  		$event->setResponse($response); diff --git a/phpBB/phpbb/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php index a629dd8440..7d5418498b 100644 --- a/phpBB/phpbb/event/kernel_request_subscriber.php +++ b/phpBB/phpbb/event/kernel_request_subscriber.php @@ -9,14 +9,6 @@  namespace phpbb\event; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\EventDispatcher\EventSubscriberInterface;  use Symfony\Component\HttpKernel\KernelEvents;  use Symfony\Component\HttpKernel\Event\GetResponseEvent; diff --git a/phpBB/phpbb/event/kernel_terminate_subscriber.php b/phpBB/phpbb/event/kernel_terminate_subscriber.php index de441da102..32dba322d1 100644 --- a/phpBB/phpbb/event/kernel_terminate_subscriber.php +++ b/phpBB/phpbb/event/kernel_terminate_subscriber.php @@ -9,14 +9,6 @@  namespace phpbb\event; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\EventDispatcher\EventSubscriberInterface;  use Symfony\Component\HttpKernel\KernelEvents;  use Symfony\Component\HttpKernel\Event\PostResponseEvent; diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index a529cc7961..1f871750e0 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -9,14 +9,6 @@  namespace phpbb\extension; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\DependencyInjection\ContainerInterface;  /** diff --git a/phpBB/phpbb/extension/exception.php b/phpBB/phpbb/extension/exception.php index e2ba647878..b1f4997fdd 100644 --- a/phpBB/phpbb/extension/exception.php +++ b/phpBB/phpbb/extension/exception.php @@ -10,14 +10,6 @@  namespace phpbb\extension;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**   * Exception class for metadata   */  class exception extends \UnexpectedValueException diff --git a/phpBB/phpbb/extension/extension_interface.php b/phpBB/phpbb/extension/extension_interface.php index 1e5f546dc5..bddff51b5a 100644 --- a/phpBB/phpbb/extension/extension_interface.php +++ b/phpBB/phpbb/extension/extension_interface.php @@ -10,14 +10,6 @@  namespace phpbb\extension;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * The interface extension meta classes have to implement to run custom code  * on enable/disable/purge.  * diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index e787919588..c9c16ae6d5 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -10,14 +10,6 @@  namespace phpbb\extension;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * The extension finder provides a simple way to locate files in active extensions  *  * @package extension diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index ce6d7e05c8..7f009867c9 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -9,14 +9,6 @@  namespace phpbb\extension; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  use Symfony\Component\DependencyInjection\ContainerInterface;  /** @@ -234,7 +226,9 @@ class manager  	*/  	public function enable($name)  	{ +		// @codingStandardsIgnoreStart  		while ($this->enable_step($name)); +		// @codingStandardsIgnoreEnd  	}  	/** @@ -311,7 +305,9 @@ class manager  	*/  	public function disable($name)  	{ +		// @codingStandardsIgnoreStart  		while ($this->disable_step($name)); +		// @codingStandardsIgnoreEnd  	}  	/** @@ -388,7 +384,9 @@ class manager  	*/  	public function purge($name)  	{ +		// @codingStandardsIgnoreStart  		while ($this->purge_step($name)); +		// @codingStandardsIgnoreEnd  	}  	/** diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 19c6288e96..d0323120d8 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -10,14 +10,6 @@  namespace phpbb\extension;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * The extension metadata manager validates and gets meta-data for extensions  *  * @package extension @@ -147,7 +139,7 @@ class metadata_manager  		if (!file_exists($this->metadata_file))  		{ -    		throw new \phpbb\extension\exception('The required file does not exist: ' . $this->metadata_file); +			throw new \phpbb\extension\exception('The required file does not exist: ' . $this->metadata_file);  		}  	} @@ -166,12 +158,12 @@ class metadata_manager  		{  			if (!($file_contents = file_get_contents($this->metadata_file)))  			{ -    			throw new \phpbb\extension\exception('file_get_contents failed on ' . $this->metadata_file); +				throw new \phpbb\extension\exception('file_get_contents failed on ' . $this->metadata_file);  			} -			if (($metadata = json_decode($file_contents, true)) === NULL) +			if (($metadata = json_decode($file_contents, true)) === null)  			{ -    			throw new \phpbb\extension\exception('json_decode failed on ' . $this->metadata_file); +				throw new \phpbb\extension\exception('json_decode failed on ' . $this->metadata_file);  			}  			$this->metadata = $metadata; @@ -199,50 +191,50 @@ class metadata_manager  	* @return Bool True if valid, throws an exception if invalid  	*/  	public function validate($name = 'display') -    { -    	// Basic fields -    	$fields = array( -    		'name'		=> '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#', -    		'type'		=> '#^phpbb-extension$#', -    		'licence'	=> '#.+#', -    		'version'	=> '#.+#', -    	); - -    	switch ($name) -    	{ -    		case 'all': -    			$this->validate('display'); +	{ +		// Basic fields +		$fields = array( +			'name'		=> '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#', +			'type'		=> '#^phpbb-extension$#', +			'licence'	=> '#.+#', +			'version'	=> '#.+#', +		); + +		switch ($name) +		{ +			case 'all': +				$this->validate('display');  				$this->validate_enable(); -    		break; +			break; -    		case 'display': -    			foreach ($fields as $field => $data) +			case 'display': +				foreach ($fields as $field => $data)  				{  					$this->validate($field);  				}  				$this->validate_authors(); -    		break; - -    		default: -    			if (isset($fields[$name])) -    			{ -    				if (!isset($this->metadata[$name])) -    				{ -    					throw new \phpbb\extension\exception("Required meta field '$name' has not been set."); +			break; + +			default: +				if (isset($fields[$name])) +				{ +					if (!isset($this->metadata[$name])) +					{ +						throw new \phpbb\extension\exception("Required meta field '$name' has not been set.");  					}  					if (!preg_match($fields[$name], $this->metadata[$name]))  					{ -    					throw new \phpbb\extension\exception("Meta field '$name' is invalid."); +						throw new \phpbb\extension\exception("Meta field '$name' is invalid.");  					}  				}  			break;  		}  		return true; -    } +	}  	/**  	 * Validates the contents of the authors field @@ -253,14 +245,14 @@ class metadata_manager  	{  		if (empty($this->metadata['authors']))  		{ -    		throw new \phpbb\extension\exception("Required meta field 'authors' has not been set."); +			throw new \phpbb\extension\exception("Required meta field 'authors' has not been set.");  		}  		foreach ($this->metadata['authors'] as $author)  		{  			if (!isset($author['name']))  			{ -    			throw new \phpbb\extension\exception("Required meta field 'author name' has not been set."); +				throw new \phpbb\extension\exception("Required meta field 'author name' has not been set.");  			}  		} diff --git a/phpBB/phpbb/extension/provider.php b/phpBB/phpbb/extension/provider.php index c2a264d311..bfdc2b66b9 100644 --- a/phpBB/phpbb/extension/provider.php +++ b/phpBB/phpbb/extension/provider.php @@ -10,14 +10,6 @@  namespace phpbb\extension;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Provides a set of items found in extensions.  *  * This abstract class is essentially a wrapper around item-specific diff --git a/phpBB/phpbb/feed/base.php b/phpBB/phpbb/feed/base.php index de7dd41df4..e6c1e606fa 100644 --- a/phpBB/phpbb/feed/base.php +++ b/phpBB/phpbb/feed/base.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base class with some generic functions and settings.  *  * @package phpBB3 @@ -150,7 +142,7 @@ abstract class base  	*/  	function get($key)  	{ -		return (isset($this->keys[$key])) ? $this->keys[$key] : NULL; +		return (isset($this->keys[$key])) ? $this->keys[$key] : null;  	}  	function get_readable_forums() diff --git a/phpBB/phpbb/feed/factory.php b/phpBB/phpbb/feed/factory.php index e011b0e3a9..d370160563 100644 --- a/phpBB/phpbb/feed/factory.php +++ b/phpBB/phpbb/feed/factory.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Factory class to return correct object  * @package phpBB3  */ diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php index 83066d2d25..8026824ab7 100644 --- a/phpBB/phpbb/feed/forum.php +++ b/phpBB/phpbb/feed/forum.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Forum feed  *  * This will give you the last {$this->num_items} posts made diff --git a/phpBB/phpbb/feed/forums.php b/phpBB/phpbb/feed/forums.php index 6be1c68da8..ddbb0bf7b3 100644 --- a/phpBB/phpbb/feed/forums.php +++ b/phpBB/phpbb/feed/forums.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * 'All Forums' feed  *  * This will give you a list of all postable forums where feeds are enabled diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php index cf8328bd5e..3f2759b85e 100644 --- a/phpBB/phpbb/feed/helper.php +++ b/phpBB/phpbb/feed/helper.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Class with some helpful functions used in feeds  * @package phpBB3  */ diff --git a/phpBB/phpbb/feed/news.php b/phpBB/phpbb/feed/news.php index 20017a3248..7888e73239 100644 --- a/phpBB/phpbb/feed/news.php +++ b/phpBB/phpbb/feed/news.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * News feed  *  * This will give you {$this->num_items} first posts diff --git a/phpBB/phpbb/feed/overall.php b/phpBB/phpbb/feed/overall.php index 8ee1f092ab..4545ba5c64 100644 --- a/phpBB/phpbb/feed/overall.php +++ b/phpBB/phpbb/feed/overall.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Board wide feed (aka overall feed)  *  * This will give you the newest {$this->num_items} posts diff --git a/phpBB/phpbb/feed/post_base.php b/phpBB/phpbb/feed/post_base.php index 5588ecadb0..42c5eea9e3 100644 --- a/phpBB/phpbb/feed/post_base.php +++ b/phpBB/phpbb/feed/post_base.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Abstract class for post based feeds  *  * @package phpBB3 diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php index 1eeb4fbe94..09f377dd10 100644 --- a/phpBB/phpbb/feed/topic.php +++ b/phpBB/phpbb/feed/topic.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Topic feed for a specific topic  *  * This will give you the last {$this->num_items} posts made within this topic. diff --git a/phpBB/phpbb/feed/topic_base.php b/phpBB/phpbb/feed/topic_base.php index f05be9223e..7e28e67b82 100644 --- a/phpBB/phpbb/feed/topic_base.php +++ b/phpBB/phpbb/feed/topic_base.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Abstract class for topic based feeds  *  * @package phpBB3 diff --git a/phpBB/phpbb/feed/topics.php b/phpBB/phpbb/feed/topics.php index d70195c87b..bdc858e947 100644 --- a/phpBB/phpbb/feed/topics.php +++ b/phpBB/phpbb/feed/topics.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * New Topics feed  *  * This will give you the last {$this->num_items} created topics diff --git a/phpBB/phpbb/feed/topics_active.php b/phpBB/phpbb/feed/topics_active.php index c6f46d67e6..cc0adac2eb 100644 --- a/phpBB/phpbb/feed/topics_active.php +++ b/phpBB/phpbb/feed/topics_active.php @@ -10,14 +10,6 @@  namespace phpbb\feed;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Active Topics feed  *  * This will give you the last {$this->num_items} topics diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php index dbfaebe0fa..7878be0a5e 100644 --- a/phpBB/phpbb/filesystem.php +++ b/phpBB/phpbb/filesystem.php @@ -10,14 +10,6 @@  namespace phpbb;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * A class with various functions that are related to paths, files and the filesystem  * @package phpBB3  */ diff --git a/phpBB/phpbb/groupposition/exception.php b/phpBB/phpbb/groupposition/exception.php index 3a8d92dbc7..f43502235d 100644 --- a/phpBB/phpbb/groupposition/exception.php +++ b/phpBB/phpbb/groupposition/exception.php @@ -10,14 +10,6 @@  namespace phpbb\groupposition;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * @package groupposition  */  class exception extends \Exception diff --git a/phpBB/phpbb/groupposition/groupposition_interface.php b/phpBB/phpbb/groupposition/groupposition_interface.php index a568785185..9785172a00 100644 --- a/phpBB/phpbb/groupposition/groupposition_interface.php +++ b/phpBB/phpbb/groupposition/groupposition_interface.php @@ -10,14 +10,6 @@  namespace phpbb\groupposition;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Interface to manage group positions in various places of phpbb  *  * The interface provides simple methods to add, delete and move a group diff --git a/phpBB/phpbb/groupposition/legend.php b/phpBB/phpbb/groupposition/legend.php index 9a1ef3d1d0..47ba06c006 100644 --- a/phpBB/phpbb/groupposition/legend.php +++ b/phpBB/phpbb/groupposition/legend.php @@ -10,14 +10,6 @@  namespace phpbb\groupposition;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Legend group position class  *  * group_legend is an ascending list 1, 2, ..., n for groups which are displayed. 1 is the first group, n the last. diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php index 4e8228eb58..d934571ebc 100644 --- a/phpBB/phpbb/groupposition/teampage.php +++ b/phpBB/phpbb/groupposition/teampage.php @@ -10,14 +10,6 @@  namespace phpbb\groupposition;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Teampage group position class  *  * Teampage position is an ascending list 1, 2, ..., n for items which are displayed. 1 is the first item, n the last. diff --git a/phpBB/phpbb/hook/finder.php b/phpBB/phpbb/hook/finder.php index d5eb1f8186..c8f71861d9 100644 --- a/phpBB/phpbb/hook/finder.php +++ b/phpBB/phpbb/hook/finder.php @@ -10,14 +10,6 @@  namespace phpbb\hook;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * The hook finder locates installed hooks.  *  * @package phpBB3 diff --git a/phpBB/phpbb/json_response.php b/phpBB/phpbb/json_response.php index fe532fc9d4..45c2f6cac4 100644 --- a/phpBB/phpbb/json_response.php +++ b/phpBB/phpbb/json_response.php @@ -10,14 +10,6 @@  namespace phpbb;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * JSON class  * @package phpBB3  */ diff --git a/phpBB/phpbb/lock/db.php b/phpBB/phpbb/lock/db.php index 3e15727c12..461adda045 100644 --- a/phpBB/phpbb/lock/db.php +++ b/phpBB/phpbb/lock/db.php @@ -10,14 +10,6 @@  namespace phpbb\lock;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Database locking class  * @package phpBB3  */ diff --git a/phpBB/phpbb/lock/flock.php b/phpBB/phpbb/lock/flock.php index 2a36a853ee..94a5895440 100644 --- a/phpBB/phpbb/lock/flock.php +++ b/phpBB/phpbb/lock/flock.php @@ -10,14 +10,6 @@  namespace phpbb\lock;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * File locking class  * @package phpBB3  */ diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 7f4e52ed39..a6ee06ebf2 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -10,14 +10,6 @@  namespace phpbb\log;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * This class is used to add entries into the log table.  *  * @package \phpbb\log\log diff --git a/phpBB/phpbb/log/log_interface.php b/phpBB/phpbb/log/log_interface.php index 427d30015d..420ba79691 100644 --- a/phpBB/phpbb/log/log_interface.php +++ b/phpBB/phpbb/log/log_interface.php @@ -10,14 +10,6 @@  namespace phpbb\log;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * The interface for the log-system.  *  * @package \phpbb\log\log diff --git a/phpBB/phpbb/log/null.php b/phpBB/phpbb/log/null.php index 2ef69926ee..77d0fbe2d7 100644 --- a/phpBB/phpbb/log/null.php +++ b/phpBB/phpbb/log/null.php @@ -10,14 +10,6 @@  namespace phpbb\log;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Null logger  *  * @package phpbb_log diff --git a/phpBB/phpbb/notification/exception.php b/phpBB/phpbb/notification/exception.php index 275fb3b542..6bdded3fd8 100644 --- a/phpBB/phpbb/notification/exception.php +++ b/phpBB/phpbb/notification/exception.php @@ -10,14 +10,6 @@  namespace phpbb\notification;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Notifications exception  *  * @package notifications diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index b92b247c74..d77a936413 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -10,14 +10,6 @@  namespace phpbb\notification;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Notifications service class  * @package notifications  */ @@ -262,8 +254,7 @@ class manager  			SET notification_read = 1  			WHERE notification_time <= " . (int) $time .  				(($notification_type_name !== false) ? ' AND ' . -					(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) -					 : '') . +					(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) : '') .  				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .  				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');  		$this->db->sql_query($sql); @@ -285,8 +276,7 @@ class manager  			SET notification_read = 1  			WHERE notification_time <= " . (int) $time .  				(($notification_type_name !== false) ? ' AND ' . -					(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) -					 : '') . +					(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) : '') .  				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .  				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');  		$this->db->sql_query($sql); diff --git a/phpBB/phpbb/notification/method/base.php b/phpBB/phpbb/notification/method/base.php index 327f964424..4ce42de830 100644 --- a/phpBB/phpbb/notification/method/base.php +++ b/phpBB/phpbb/notification/method/base.php @@ -10,14 +10,6 @@  namespace phpbb\notification\method;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base notifications method class  * @package notifications  */ diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php index b761eb5a28..e039fae8de 100644 --- a/phpBB/phpbb/notification/method/email.php +++ b/phpBB/phpbb/notification/method/email.php @@ -10,14 +10,6 @@  namespace phpbb\notification\method;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Email notification method class  * This class handles sending emails for notifications  * diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php index 6ec21bb735..bdfaf5a6fc 100644 --- a/phpBB/phpbb/notification/method/jabber.php +++ b/phpBB/phpbb/notification/method/jabber.php @@ -10,14 +10,6 @@  namespace phpbb\notification\method;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Jabber notification method class  * This class handles sending Jabber messages for notifications  * diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index b1b30f29b7..7cb38eb59d 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -10,14 +10,6 @@  namespace phpbb\notification\method;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Abstract notification method handling email and jabber notifications  * using the phpBB messenger.  * diff --git a/phpBB/phpbb/notification/method/method_interface.php b/phpBB/phpbb/notification/method/method_interface.php index 0131a8bde0..4830d06b86 100644 --- a/phpBB/phpbb/notification/method/method_interface.php +++ b/phpBB/phpbb/notification/method/method_interface.php @@ -10,14 +10,6 @@  namespace phpbb\notification\method;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base notifications method interface  * @package notifications  */ diff --git a/phpBB/phpbb/notification/type/admin_activate_user.php b/phpBB/phpbb/notification/type/admin_activate_user.php new file mode 100644 index 0000000000..1231c0b75d --- /dev/null +++ b/phpBB/phpbb/notification/type/admin_activate_user.php @@ -0,0 +1,174 @@ +<?php +/** +* +* @package notifications +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\notification\type; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* Admin activation notifications class +* This class handles notifications for users requiring admin activation +* +* @package notifications +*/ +class admin_activate_user extends \phpbb\notification\type\base +{ +	/** +	* {@inheritdoc} +	*/ +	public function get_type() +	{ +		return 'admin_activate_user'; +	} + +	/** +	* {@inheritdoc} +	*/ +	protected $language_key = 'NOTIFICATION_ADMIN_ACTIVATE_USER'; + +	/** +	* {@inheritdoc} +	*/ +	public static $notification_option = array( +		'lang'	=> 'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER', +		'group'	=> 'NOTIFICATION_GROUP_ADMINISTRATION', +	); + +	/** +	* {@inheritdoc} +	*/ +	public function is_available() +	{ +		return ($this->auth->acl_get('a_user') && $this->config['require_activation'] == USER_ACTIVATION_ADMIN); +	} + +	/** +	* {@inheritdoc} +	*/ +	public static function get_item_id($user) +	{ +		return (int) $user['user_id']; +	} + +	/** +	* {@inheritdoc} +	*/ +	public static function get_item_parent_id($post) +	{ +		return 0; +	} + +	/** +	* {@inheritdoc} +	*/ +	public function find_users_for_notification($user, $options = array()) +	{ +		$options = array_merge(array( +			'ignore_users'	=> array(), +		), $options); + +		// Grab admins that have permission to administer users. +		$admin_ary = $this->auth->acl_get_list(false, 'a_user', false); +		$users = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array(); + +		// Grab founders +		$sql = 'SELECT user_id +			FROM ' . USERS_TABLE . ' +			WHERE user_type = ' . USER_FOUNDER; +		$result = $this->db->sql_query($sql); + +		while ($row = $this->db->sql_fetchrow($sql)) +		{ +			$users[] = (int) $row['user_id']; +		} +		$this->db->sql_freeresult($result); + +		if (empty($users)) +		{ +			return array(); +		} +		$users = array_unique($users); + +		return $this->check_user_notification_options($users, $options); +	} + +	/** +	* {@inheritdoc} +	*/ +	public function get_avatar() +	{ +		return $this->user_loader->get_avatar($this->item_id); +	} + +	/** +	* {@inheritdoc} +	*/ +	public function get_title() +	{ +		$username = $this->user_loader->get_username($this->item_id, 'no_profile'); + +		return $this->user->lang($this->language_key, $username); +	} + +	/** +	* {@inheritdoc} +	*/ +	public function get_email_template() +	{ +		return 'admin_activate'; +	} + +	/** +	* {@inheritdoc} +	*/ +	public function get_email_template_variables() +	{ +		$board_url = generate_board_url(); +		$username = $this->user_loader->get_username($this->item_id, 'no_profile'); + +		return array( +			'USERNAME'			=> htmlspecialchars_decode($username), +			'U_USER_DETAILS'	=> "{$board_url}/memberlist.{$this->php_ext}?mode=viewprofile&u={$this->item_id}", +			'U_ACTIVATE'		=> "{$board_url}/ucp.{$this->php_ext}?mode=activate&u={$this->item_id}&k={$this->get_data('user_actkey')}", +		); +	} + +	/** +	* {@inheritdoc} +	*/ +	public function get_url() +	{ +		return append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, "mode=viewprofile&u={$this->item_id}"); +	} + +	/** +	* {@inheritdoc} +	*/ +	public function users_to_query() +	{ +		return array($this->item_id); +	} + +	/** +	* {@inheritdoc} +	*/ +	public function create_insert_array($user, $pre_create_data) +	{ +		$this->set_data('user_actkey', $user['user_actkey']); +		$this->notification_time = $user['user_regdate']; + +		return parent::create_insert_array($user, $pre_create_data); +	} +} diff --git a/phpBB/phpbb/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php index cf4ec57989..51a9a704b0 100644 --- a/phpBB/phpbb/notification/type/approve_post.php +++ b/phpBB/phpbb/notification/type/approve_post.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Post approved notifications class  * This class handles notifications for posts when they are approved (to their authors)  * diff --git a/phpBB/phpbb/notification/type/approve_topic.php b/phpBB/phpbb/notification/type/approve_topic.php index ca5bb67754..6229800c68 100644 --- a/phpBB/phpbb/notification/type/approve_topic.php +++ b/phpBB/phpbb/notification/type/approve_topic.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Topic approved notifications class  * This class handles notifications for topics when they are approved (for authors)  * @@ -34,7 +26,7 @@ class approve_topic extends \phpbb\notification\type\topic  	{  		return 'approve_topic';  	} -	 +  	/**  	* Language key used to output the text  	* diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index 3c44468bb8..951585853f 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base notifications class  * @package notifications  */ diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php index 50ea7380af..5e6fdd2523 100644 --- a/phpBB/phpbb/notification/type/bookmark.php +++ b/phpBB/phpbb/notification/type/bookmark.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Bookmark updating notifications class  * This class handles notifications for replies to a bookmarked topic  * diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php index 0c9162ec5c..411d4195c7 100644 --- a/phpBB/phpbb/notification/type/disapprove_post.php +++ b/phpBB/phpbb/notification/type/disapprove_post.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Post disapproved notifications class  * This class handles notifications for posts when they are disapproved (for authors)  * diff --git a/phpBB/phpbb/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php index dde6f83ec4..19e9d468ce 100644 --- a/phpBB/phpbb/notification/type/disapprove_topic.php +++ b/phpBB/phpbb/notification/type/disapprove_topic.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Topic disapproved notifications class  * This class handles notifications for topics when they are disapproved (for authors)  * diff --git a/phpBB/phpbb/notification/type/group_request.php b/phpBB/phpbb/notification/type/group_request.php index 1768a8fffa..e0527fe220 100644 --- a/phpBB/phpbb/notification/type/group_request.php +++ b/phpBB/phpbb/notification/type/group_request.php @@ -9,14 +9,6 @@  namespace phpbb\notification\type; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class group_request extends \phpbb\notification\type\base  {  	/** diff --git a/phpBB/phpbb/notification/type/group_request_approved.php b/phpBB/phpbb/notification/type/group_request_approved.php index be4a902acd..448f049412 100644 --- a/phpBB/phpbb/notification/type/group_request_approved.php +++ b/phpBB/phpbb/notification/type/group_request_approved.php @@ -9,14 +9,6 @@  namespace phpbb\notification\type; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class group_request_approved extends \phpbb\notification\type\base  {  	/** diff --git a/phpBB/phpbb/notification/type/pm.php b/phpBB/phpbb/notification/type/pm.php index bed0807b0f..584a30efa6 100644 --- a/phpBB/phpbb/notification/type/pm.php +++ b/phpBB/phpbb/notification/type/pm.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Private message notifications class  * This class handles notifications for private messages  * diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index fe50e7f172..9d5c7b0a4c 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Post notifications class  * This class handles notifications for replies to a topic  * diff --git a/phpBB/phpbb/notification/type/post_in_queue.php b/phpBB/phpbb/notification/type/post_in_queue.php index f05ed1ce9a..db16763583 100644 --- a/phpBB/phpbb/notification/type/post_in_queue.php +++ b/phpBB/phpbb/notification/type/post_in_queue.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Post in queue notifications class  * This class handles notifications for posts that are put in the moderation queue (for moderators)  * diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php index 8fb433990e..e8527261d8 100644 --- a/phpBB/phpbb/notification/type/quote.php +++ b/phpBB/phpbb/notification/type/quote.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Post quoting notifications class  * This class handles notifying users when they have been quoted in a post  * diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php index 13330e2932..55f6bf946d 100644 --- a/phpBB/phpbb/notification/type/report_pm.php +++ b/phpBB/phpbb/notification/type/report_pm.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Private message reported notifications class  * This class handles notifications for private messages when they are reported  * diff --git a/phpBB/phpbb/notification/type/report_pm_closed.php b/phpBB/phpbb/notification/type/report_pm_closed.php index 2e4a1ceb30..9d2aac329e 100644 --- a/phpBB/phpbb/notification/type/report_pm_closed.php +++ b/phpBB/phpbb/notification/type/report_pm_closed.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * PM report closed notifications class  * This class handles notifications for when reports are closed on PMs (for the one who reported the PM)  * diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php index c2dad6f1bb..89b497efa6 100644 --- a/phpBB/phpbb/notification/type/report_post.php +++ b/phpBB/phpbb/notification/type/report_post.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Reported post notifications class  * This class handles notifications for reported posts  * diff --git a/phpBB/phpbb/notification/type/report_post_closed.php b/phpBB/phpbb/notification/type/report_post_closed.php index 270ccf0a1a..5874d48e31 100644 --- a/phpBB/phpbb/notification/type/report_post_closed.php +++ b/phpBB/phpbb/notification/type/report_post_closed.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Post report closed notifications class  * This class handles notifications for when reports are closed on posts (for the one who reported the post)  * diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php index 8db02f610b..6198881d8d 100644 --- a/phpBB/phpbb/notification/type/topic.php +++ b/phpBB/phpbb/notification/type/topic.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Topic notifications class  * This class handles notifications for new topics  * diff --git a/phpBB/phpbb/notification/type/topic_in_queue.php b/phpBB/phpbb/notification/type/topic_in_queue.php index 056651bc53..c8c1b5b7e2 100644 --- a/phpBB/phpbb/notification/type/topic_in_queue.php +++ b/phpBB/phpbb/notification/type/topic_in_queue.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Topic in queue notifications class  * This class handles notifications for topics when they are put in the moderation queue (for moderators)  * diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php index cfc6cd461e..e3e6898172 100644 --- a/phpBB/phpbb/notification/type/type_interface.php +++ b/phpBB/phpbb/notification/type/type_interface.php @@ -10,14 +10,6 @@  namespace phpbb\notification\type;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base notifications interface  * @package notifications  */ diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php index e9fd092b62..8cd8808261 100644 --- a/phpBB/phpbb/path_helper.php +++ b/phpBB/phpbb/path_helper.php @@ -10,14 +10,6 @@  namespace phpbb;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * A class with various functions that are related to paths, files and the filesystem  * @package phpBB3  */ diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index d0405471bc..8319e6d123 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -9,14 +9,6 @@  namespace phpbb; -/** -* DO NOT CHANGE -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class permissions  {  	/** diff --git a/phpBB/phpbb/php/ini.php b/phpBB/phpbb/php/ini.php index 8767091aba..f0f53807fe 100644 --- a/phpBB/phpbb/php/ini.php +++ b/phpBB/phpbb/php/ini.php @@ -10,14 +10,6 @@  namespace phpbb\php;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Wrapper class for ini_get function.  *  * Provides easier handling of the different interpretations of ini values. diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index 6eb5adf864..f21ec40450 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -10,14 +10,6 @@  namespace phpbb\plupload;  /** - * @ignore - */ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * This class handles all server-side plupload functions  *  * @package \phpbb\plupload\plupload diff --git a/phpBB/phpbb/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php index 8f39960477..b03624593e 100644 --- a/phpBB/phpbb/request/deactivated_super_global.php +++ b/phpBB/phpbb/request/deactivated_super_global.php @@ -10,14 +10,6 @@  namespace phpbb\request;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Replacement for a superglobal (like $_GET or $_POST) which calls  * trigger_error on all operations but isset, overloads the [] operator with SPL.  * diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php index 1c388b3c73..e158d33c01 100644 --- a/phpBB/phpbb/request/request.php +++ b/phpBB/phpbb/request/request.php @@ -10,14 +10,6 @@  namespace phpbb\request;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * All application input is accessed through this class.  *  * It provides a method to disable access to input data through super globals. diff --git a/phpBB/phpbb/request/request_interface.php b/phpBB/phpbb/request/request_interface.php index cd949147f7..1f9978b276 100644 --- a/phpBB/phpbb/request/request_interface.php +++ b/phpBB/phpbb/request/request_interface.php @@ -10,14 +10,6 @@  namespace phpbb\request;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * An interface through which all application input can be accessed.  *  * @package \phpbb\request\request diff --git a/phpBB/phpbb/request/type_cast_helper.php b/phpBB/phpbb/request/type_cast_helper.php index 262aff73c1..e9b55663af 100644 --- a/phpBB/phpbb/request/type_cast_helper.php +++ b/phpBB/phpbb/request/type_cast_helper.php @@ -10,14 +10,6 @@  namespace phpbb\request;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * A helper class that provides convenience methods for type casting.  *  * @package \phpbb\request\request diff --git a/phpBB/phpbb/request/type_cast_helper_interface.php b/phpBB/phpbb/request/type_cast_helper_interface.php index e8195c352e..f12795eef9 100644 --- a/phpBB/phpbb/request/type_cast_helper_interface.php +++ b/phpBB/phpbb/request/type_cast_helper_interface.php @@ -10,14 +10,6 @@  namespace phpbb\request;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * An interface for type cast operations.  *  * @package \phpbb\request\request diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php index f2f982c31b..9ecf3751d0 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -12,14 +12,6 @@ namespace phpbb\search;  /**  * @ignore  */ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/** -* @ignore -*/  define('SEARCH_RESULT_NOT_IN_CACHE', 0);  define('SEARCH_RESULT_IN_CACHE', 1);  define('SEARCH_RESULT_INCOMPLETE', 2); diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index ca2f42358f..cdd2da222f 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -10,14 +10,6 @@  namespace phpbb\search;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * fulltext_mysql  * Fulltext search for MySQL  * @package search diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 33326f2882..1b314a24d3 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -10,14 +10,6 @@  namespace phpbb\search;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * fulltext_native  * phpBB's own db driven fulltext search, version 2  * @package search @@ -850,7 +842,6 @@ class fulltext_native extends \phpbb\search\base  		}  		$this->db->sql_freeresult($result); -  		// if we use mysql and the total result count is not cached yet, retrieve it from the db  		if (!$total_results && $is_mysql)  		{ @@ -1189,8 +1180,8 @@ class fulltext_native extends \phpbb\search\base  				* we know that it will also be lower than CJK ranges  				*/  				if ((strncmp($word, UTF8_HANGUL_FIRST, 3) < 0 || strncmp($word, UTF8_HANGUL_LAST, 3) > 0) -				 && (strncmp($word, UTF8_CJK_FIRST, 3) < 0 || strncmp($word, UTF8_CJK_LAST, 3) > 0) -				 && (strncmp($word, UTF8_CJK_B_FIRST, 4) < 0 || strncmp($word, UTF8_CJK_B_LAST, 4) > 0)) +					&& (strncmp($word, UTF8_CJK_FIRST, 3) < 0 || strncmp($word, UTF8_CJK_LAST, 3) > 0) +					&& (strncmp($word, UTF8_CJK_B_FIRST, 4) < 0 || strncmp($word, UTF8_CJK_B_LAST, 4) > 0))  				{  					$word = strtok(' ');  					continue; @@ -1684,8 +1675,8 @@ class fulltext_native extends \phpbb\search\base  			$pos += $utf_len;  			if (($utf_char >= UTF8_HANGUL_FIRST && $utf_char <= UTF8_HANGUL_LAST) -			 || ($utf_char >= UTF8_CJK_FIRST && $utf_char <= UTF8_CJK_LAST) -			 || ($utf_char >= UTF8_CJK_B_FIRST && $utf_char <= UTF8_CJK_B_LAST)) +				|| ($utf_char >= UTF8_CJK_FIRST && $utf_char <= UTF8_CJK_LAST) +				|| ($utf_char >= UTF8_CJK_B_FIRST && $utf_char <= UTF8_CJK_B_LAST))  			{  				/**  				* All characters within these ranges are valid diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php index 756034103e..063bf52a19 100644 --- a/phpBB/phpbb/search/fulltext_postgres.php +++ b/phpBB/phpbb/search/fulltext_postgres.php @@ -10,14 +10,6 @@  namespace phpbb\search;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * fulltext_postgres  * Fulltext search for PostgreSQL  * @package search diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index cb76d58f49..acbfad9474 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -9,16 +9,6 @@  namespace phpbb\search; -/** -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/** -* @ignore -*/  define('SPHINX_MAX_MATCHES', 20000);  define('SPHINX_CONNECT_RETRIES', 3);  define('SPHINX_CONNECT_WAIT_TIME', 300); diff --git a/phpBB/phpbb/search/sphinx/config.php b/phpBB/phpbb/search/sphinx/config.php index 262d6008cc..cb8e4524df 100644 --- a/phpBB/phpbb/search/sphinx/config.php +++ b/phpBB/phpbb/search/sphinx/config.php @@ -10,14 +10,6 @@  namespace phpbb\search\sphinx;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * \phpbb\search\sphinx\config  * An object representing the sphinx configuration  * Can read it from file and write it back out after modification diff --git a/phpBB/phpbb/search/sphinx/config_comment.php b/phpBB/phpbb/search/sphinx/config_comment.php index 77a943377d..20b1c19af1 100644 --- a/phpBB/phpbb/search/sphinx/config_comment.php +++ b/phpBB/phpbb/search/sphinx/config_comment.php @@ -10,14 +10,6 @@  namespace phpbb\search\sphinx;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * \phpbb\search\sphinx\config_comment  * Represents a comment inside the sphinx configuration  */ diff --git a/phpBB/phpbb/search/sphinx/config_section.php b/phpBB/phpbb/search/sphinx/config_section.php index 730abf011e..8f9253ec56 100644 --- a/phpBB/phpbb/search/sphinx/config_section.php +++ b/phpBB/phpbb/search/sphinx/config_section.php @@ -10,14 +10,6 @@  namespace phpbb\search\sphinx;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * \phpbb\search\sphinx\config_section  * Represents a single section inside the sphinx configuration  */ diff --git a/phpBB/phpbb/search/sphinx/config_variable.php b/phpBB/phpbb/search/sphinx/config_variable.php index c8f40bfb5f..c0f6d28dcc 100644 --- a/phpBB/phpbb/search/sphinx/config_variable.php +++ b/phpBB/phpbb/search/sphinx/config_variable.php @@ -10,14 +10,6 @@  namespace phpbb\search\sphinx;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * \phpbb\search\sphinx\config_variable  * Represents a single variable inside the sphinx configuration  */ diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 5e4380bfc8..f530d30f1f 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -10,14 +10,6 @@  namespace phpbb;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Session class  * @package phpBB3  */ @@ -1235,7 +1227,6 @@ class session  				$this->session_create(ANONYMOUS);  			} -  			// Determine which message to output  			$till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : '';  			$message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM'; diff --git a/phpBB/phpbb/symfony_request.php b/phpBB/phpbb/symfony_request.php index 92784c213b..ebe862a565 100644 --- a/phpBB/phpbb/symfony_request.php +++ b/phpBB/phpbb/symfony_request.php @@ -11,14 +11,6 @@ namespace phpbb;  use Symfony\Component\HttpFoundation\Request; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class symfony_request extends Request  {  	/** diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index 27564bf347..24e0d6698d 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -9,14 +9,6 @@  namespace phpbb\template; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class asset  {  	protected $components = array(); diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php index 86868707f0..6044effa1f 100644 --- a/phpBB/phpbb/template/base.php +++ b/phpBB/phpbb/template/base.php @@ -9,14 +9,6 @@  namespace phpbb\template; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  abstract class base implements template  {  	/** diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php index 24234c1e4a..65c7d094a0 100644 --- a/phpBB/phpbb/template/context.php +++ b/phpBB/phpbb/template/context.php @@ -10,14 +10,6 @@  namespace phpbb\template;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Stores variables assigned to template.  *  * @package phpBB3 @@ -285,7 +277,7 @@ class context  			// Search array to get correct position  			list($search_key, $search_value) = @each($key); -			$key = NULL; +			$key = null;  			foreach ($block as $i => $val_ary)  			{  				if ($val_ary[$search_key] === $search_value) @@ -296,7 +288,7 @@ class context  			}  			// key/value pair not found -			if ($key === NULL) +			if ($key === null)  			{  				return false;  			} diff --git a/phpBB/phpbb/template/template.php b/phpBB/phpbb/template/template.php index cf38bba522..d95b0a822c 100644 --- a/phpBB/phpbb/template/template.php +++ b/phpBB/phpbb/template/template.php @@ -9,14 +9,6 @@  namespace phpbb\template; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  interface template  { diff --git a/phpBB/phpbb/template/twig/definition.php b/phpBB/phpbb/template/twig/definition.php index 2490a43f81..945c46675e 100644 --- a/phpBB/phpbb/template/twig/definition.php +++ b/phpBB/phpbb/template/twig/definition.php @@ -10,14 +10,6 @@  namespace phpbb\template\twig;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * This class holds all DEFINE variables from the current page load  */  class definition diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index a6c0e476f0..24bd55b3c5 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class environment extends \Twig_Environment  {  	/** @var array */ diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 1ddb97369e..6847dbd9f8 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class extension extends \Twig_Extension  {  	/** @var \phpbb\template\context */ @@ -48,11 +40,11 @@ class extension extends \Twig_Extension  		return 'phpbb';  	} -    /** -     * Returns the token parser instance to add to the existing list. -     * -     * @return array An array of Twig_TokenParser instances -     */ +	/** +	* Returns the token parser instance to add to the existing list. +	* +	* @return array An array of Twig_TokenParser instances +	*/  	public function getTokenParsers()  	{  		return array( @@ -66,36 +58,36 @@ class extension extends \Twig_Extension  		);  	} -    /** -     * Returns a list of filters to add to the existing list. -     * -     * @return array An array of filters -     */ -    public function getFilters() -    { +	/** +	* Returns a list of filters to add to the existing list. +	* +	* @return array An array of filters +	*/ +	public function getFilters() +	{  		return array(  			new \Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),  			new \Twig_SimpleFilter('addslashes', 'addslashes'),  		); -    } - -    /** -     * Returns a list of global functions to add to the existing list. -     * -     * @return array An array of global functions -     */ -    public function getFunctions() -    { +	} + +	/** +	* Returns a list of global functions to add to the existing list. +	* +	* @return array An array of global functions +	*/ +	public function getFunctions() +	{  		return array(  			new \Twig_SimpleFunction('lang', array($this, 'lang')),  		);  	} -    /** -     * Returns a list of operators to add to the existing list. -     * -     * @return array An array of operators -     */ +	/** +	* Returns a list of operators to add to the existing list. +	* +	* @return array An array of operators +	*/  	public function getOperators()  	{  		return array( @@ -126,19 +118,19 @@ class extension extends \Twig_Extension  				'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT),  			),  		); -    } +	}  	/** -	 * Grabs a subset of a loop -	 * -	 * @param Twig_Environment $env          A Twig_Environment instance -	 * @param mixed            $item         A variable -	 * @param integer          $start        Start of the subset -	 * @param integer          $end   	     End of the subset -	 * @param Boolean          $preserveKeys Whether to preserve key or not (when the input is an array) -	 * -	 * @return mixed The sliced variable -	 */ +	* Grabs a subset of a loop +	* +	* @param Twig_Environment $env          A Twig_Environment instance +	* @param mixed            $item         A variable +	* @param integer          $start        Start of the subset +	* @param integer          $end   	     End of the subset +	* @param Boolean          $preserveKeys Whether to preserve key or not (when the input is an array) +	* +	* @return mixed The sliced variable +	*/  	function loop_subset(\Twig_Environment $env, $item, $start, $end = null, $preserveKeys = false)  	{  		// We do almost the same thing as Twig's slice (array_slice), except when $end is positive diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php index d832fbf84e..be53b3eb5b 100644 --- a/phpBB/phpbb/template/twig/lexer.php +++ b/phpBB/phpbb/template/twig/lexer.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class lexer extends \Twig_Lexer  {  	public function tokenize($code, $filename = null) diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php index 910061dc0f..e01e9de467 100644 --- a/phpBB/phpbb/template/twig/loader.php +++ b/phpBB/phpbb/template/twig/loader.php @@ -10,14 +10,6 @@  namespace phpbb\template\twig;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Twig Template loader  * @package phpBB3  */ diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php index ec084d0f7d..6a9969f8c6 100644 --- a/phpBB/phpbb/template/twig/node/definenode.php +++ b/phpBB/phpbb/template/twig/node/definenode.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\node; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class definenode extends \Twig_Node  { diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php index 202db775ee..7a1181a866 100644 --- a/phpBB/phpbb/template/twig/node/event.php +++ b/phpBB/phpbb/template/twig/node/event.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\node; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class event extends \Twig_Node  { @@ -57,10 +49,10 @@ class event extends \Twig_Node  				//  templates on page load rather than at compile. This is  				//  slower, but makes developing extensions easier (no need to  				//  purge the cache when a new event template file is added) -		        $compiler -		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n") -		            ->indent() -		        ; +				$compiler +					->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n") +					->indent() +				;  			}  			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html')) @@ -79,7 +71,7 @@ class event extends \Twig_Node  			{  				$compiler  					->outdent() -		            ->write("}\n\n") +					->write("}\n\n")  				;  			}  		} diff --git a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php index 48d8b814b8..f3bbfa6691 100644 --- a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php +++ b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\node\expression\binary; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class equalequal extends \Twig_Node_Expression_Binary  { diff --git a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php index 87585dfb4c..c9c2687e08 100644 --- a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php +++ b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\node\expression\binary; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class notequalequal extends \Twig_Node_Expression_Binary  { diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php index 77fe7f3acb..d9b45d6407 100644 --- a/phpBB/phpbb/template/twig/node/includenode.php +++ b/phpBB/phpbb/template/twig/node/includenode.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\node; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class includenode extends \Twig_Node_Include  { diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php index 4024cf0cc8..3f4621c0a9 100644 --- a/phpBB/phpbb/template/twig/node/includephp.php +++ b/phpBB/phpbb/template/twig/node/includephp.php @@ -9,21 +9,13 @@  namespace phpbb\template\twig\node; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class includephp extends \Twig_Node  {  	/** @var Twig_Environment */  	protected $environment; -	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $ignoreMissing = false, $lineno, $tag = null) +	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $ignoreMissing = false, $tag = null)  	{  		$this->environment = $environment; diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php index b37759303d..2b18551266 100644 --- a/phpBB/phpbb/template/twig/node/php.php +++ b/phpBB/phpbb/template/twig/node/php.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\node; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class php extends \Twig_Node  { diff --git a/phpBB/phpbb/template/twig/tokenparser/defineparser.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php index 688afec191..21add0c17c 100644 --- a/phpBB/phpbb/template/twig/tokenparser/defineparser.php +++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\tokenparser; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class defineparser extends \Twig_TokenParser  { diff --git a/phpBB/phpbb/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php index 7cf4000909..8864e879f8 100644 --- a/phpBB/phpbb/template/twig/tokenparser/event.php +++ b/phpBB/phpbb/template/twig/tokenparser/event.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\tokenparser; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class event extends \Twig_TokenParser  { diff --git a/phpBB/phpbb/template/twig/tokenparser/includejs.php b/phpBB/phpbb/template/twig/tokenparser/includejs.php index 30a99f3279..0e46915b86 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includejs.php +++ b/phpBB/phpbb/template/twig/tokenparser/includejs.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\tokenparser; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class includejs extends \Twig_TokenParser  { diff --git a/phpBB/phpbb/template/twig/tokenparser/includeparser.php b/phpBB/phpbb/template/twig/tokenparser/includeparser.php index 715c0ec84d..d351f1b4cd 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includeparser.php +++ b/phpBB/phpbb/template/twig/tokenparser/includeparser.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\tokenparser; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class includeparser extends \Twig_TokenParser_Include  { diff --git a/phpBB/phpbb/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php index d906837590..1b3d1742e3 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includephp.php +++ b/phpBB/phpbb/template/twig/tokenparser/includephp.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\tokenparser; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class includephp extends \Twig_TokenParser  { @@ -43,7 +35,7 @@ class includephp extends \Twig_TokenParser  		$stream->expect(\Twig_Token::BLOCK_END_TYPE); -		return new \phpbb\template\twig\node\includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag()); +		return new \phpbb\template\twig\node\includephp($expr, $this->parser->getEnvironment(), $token->getLine(), $ignoreMissing, $this->getTag());  	}  	/** diff --git a/phpBB/phpbb/template/twig/tokenparser/php.php b/phpBB/phpbb/template/twig/tokenparser/php.php index e4f70fb9b1..b427969e2d 100644 --- a/phpBB/phpbb/template/twig/tokenparser/php.php +++ b/phpBB/phpbb/template/twig/tokenparser/php.php @@ -9,14 +9,6 @@  namespace phpbb\template\twig\tokenparser; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class php extends \Twig_TokenParser  { @@ -53,5 +45,5 @@ class php extends \Twig_TokenParser  	public function getTag()  	{  		return 'PHP'; -    } +	}  } diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index 9df9310427..ddadcfd89a 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -10,14 +10,6 @@  namespace phpbb\template\twig;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Twig Template class.  * @package phpBB3  */ diff --git a/phpBB/phpbb/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php index 171dae4d14..13184cf41c 100644 --- a/phpBB/phpbb/tree/nestedset.php +++ b/phpBB/phpbb/tree/nestedset.php @@ -9,14 +9,6 @@  namespace phpbb\tree; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  abstract class nestedset implements \phpbb\tree\tree_interface  {  	/** @var \phpbb\db\driver\driver */ diff --git a/phpBB/phpbb/tree/nestedset_forum.php b/phpBB/phpbb/tree/nestedset_forum.php index 2fee5b097e..ef6023546b 100644 --- a/phpBB/phpbb/tree/nestedset_forum.php +++ b/phpBB/phpbb/tree/nestedset_forum.php @@ -9,14 +9,6 @@  namespace phpbb\tree; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  class nestedset_forum extends \phpbb\tree\nestedset  {  	/** diff --git a/phpBB/phpbb/tree/tree_interface.php b/phpBB/phpbb/tree/tree_interface.php index 162c1e5e29..90ec27e024 100644 --- a/phpBB/phpbb/tree/tree_interface.php +++ b/phpBB/phpbb/tree/tree_interface.php @@ -9,14 +9,6 @@  namespace phpbb\tree; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} -  interface tree_interface  {  	/** diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index f97cc94d40..ce0dc3c1df 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -10,14 +10,6 @@  namespace phpbb;  /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * Base user class  *  * This is the overarching class which contains (through session extend) @@ -343,7 +335,6 @@ class user extends \phpbb\session  			}  		} -  		// Does the user need to change their password? If so, redirect to the  		// ucp profile reg_details page ... of course do not redirect if we're already in the ucp  		if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && !empty($this->data['is_registered']) && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400)) diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 78620ab1b9..c1d69802f8 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -10,13 +10,6 @@  namespace phpbb;  /** -*/ -if (!defined('IN_PHPBB')) -{ -	exit; -} - -/**  * User loader class  *  * This handles loading users from the database and | 
