aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/avatar
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-05-28 18:19:20 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-05-28 18:19:20 +0200
commit3ab06314f1250d737a4abdb1271ac062d4463b99 (patch)
treeaeed6a4aa404a4829a9dbd0ef31f526e4b6f9dae /phpBB/phpbb/avatar
parentcf12e179441f0ae247be3fd448a4d7fb16e089ec (diff)
parentc8e7b2c5d4a8bbc33cc9cf394fa2a4f978cca63c (diff)
downloadforums-3ab06314f1250d737a4abdb1271ac062d4463b99.tar
forums-3ab06314f1250d737a4abdb1271ac062d4463b99.tar.gz
forums-3ab06314f1250d737a4abdb1271ac062d4463b99.tar.bz2
forums-3ab06314f1250d737a4abdb1271ac062d4463b99.tar.xz
forums-3ab06314f1250d737a4abdb1271ac062d4463b99.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12594] Replace phpBB Group with phpBB Limited [ticket/12594] Update footer credit lines [ticket/12594] Remove @package tags and update file headers
Diffstat (limited to 'phpBB/phpbb/avatar')
-rw-r--r--phpBB/phpbb/avatar/driver/driver.php11
-rw-r--r--phpBB/phpbb/avatar/driver/driver_interface.php11
-rw-r--r--phpBB/phpbb/avatar/driver/gravatar.php11
-rw-r--r--phpBB/phpbb/avatar/driver/local.php11
-rw-r--r--phpBB/phpbb/avatar/driver/remote.php11
-rw-r--r--phpBB/phpbb/avatar/driver/upload.php11
-rw-r--r--phpBB/phpbb/avatar/manager.php13
7 files changed, 49 insertions, 30 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index dd55f09119..9c769071d4 100644
--- a/phpBB/phpbb/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
@@ -1,9 +1,13 @@
<?php
/**
*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
*
*/
@@ -11,7 +15,6 @@ namespace phpbb\avatar\driver;
/**
* Base class for avatar drivers
-* @package phpBB3
*/
abstract class driver implements \phpbb\avatar\driver\driver_interface
{
diff --git a/phpBB/phpbb/avatar/driver/driver_interface.php b/phpBB/phpbb/avatar/driver/driver_interface.php
index 7f049469a2..835609745a 100644
--- a/phpBB/phpbb/avatar/driver/driver_interface.php
+++ b/phpBB/phpbb/avatar/driver/driver_interface.php
@@ -1,9 +1,13 @@
<?php
/**
*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
*
*/
@@ -11,7 +15,6 @@ namespace phpbb\avatar\driver;
/**
* Interface for avatar drivers
-* @package phpBB3
*/
interface driver_interface
{
diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php
index 9f14b7f468..34b894c2a7 100644
--- a/phpBB/phpbb/avatar/driver/gravatar.php
+++ b/phpBB/phpbb/avatar/driver/gravatar.php
@@ -1,9 +1,13 @@
<?php
/**
*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
*
*/
@@ -11,7 +15,6 @@ namespace phpbb\avatar\driver;
/**
* Handles avatars hosted at gravatar.com
-* @package phpBB3
*/
class gravatar extends \phpbb\avatar\driver\driver
{
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
index 611a44cb3d..00e519e3f2 100644
--- a/phpBB/phpbb/avatar/driver/local.php
+++ b/phpBB/phpbb/avatar/driver/local.php
@@ -1,9 +1,13 @@
<?php
/**
*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
*
*/
@@ -11,7 +15,6 @@ namespace phpbb\avatar\driver;
/**
* Handles avatars selected from the board gallery
-* @package phpBB3
*/
class local extends \phpbb\avatar\driver\driver
{
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php
index 36623942df..d97093ae24 100644
--- a/phpBB/phpbb/avatar/driver/remote.php
+++ b/phpBB/phpbb/avatar/driver/remote.php
@@ -1,9 +1,13 @@
<?php
/**
*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
*
*/
@@ -11,7 +15,6 @@ namespace phpbb\avatar\driver;
/**
* Handles avatars hosted remotely
-* @package phpBB3
*/
class remote extends \phpbb\avatar\driver\driver
{
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index f77ef1332b..bef75d61c1 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -1,9 +1,13 @@
<?php
/**
*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
*
*/
@@ -11,7 +15,6 @@ namespace phpbb\avatar\driver;
/**
* Handles avatars uploaded to the board
-* @package phpBB3
*/
class upload extends \phpbb\avatar\driver\driver
{
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index 6ce924d2eb..7cf136be2c 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -1,17 +1,18 @@
<?php
/**
*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
*
*/
namespace phpbb\avatar;
-/**
-* @package avatar
-*/
class manager
{
/**