makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15905] Correct line endings

Browse source 
PHPBB3-15905
This commit is contained in:
mrgoldy 2018-12-09 18:35:16 +01:00 • committed by Marc Alexander
parent 91b89b6374
commit 012fe18879
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 320 additions and 320 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

182
phpBB/phpbb/template/twig/extension/auth.php
View file

@ -1,91 +1,91 @@
<?php <?php
/** /**
* *
* This file is part of the phpBB Forum Software package. * This file is part of the phpBB Forum Software package.
* *
* @copyright (c) phpBB Limited <https://www.phpbb.com> * @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0) * @license GNU General Public License, version 2 (GPL-2.0)
* *
* For full copyright and license information, please see * For full copyright and license information, please see
* the docs/CREDITS.txt file. * the docs/CREDITS.txt file.
* *
*/ */
namespace phpbb\template\twig\extension; namespace phpbb\template\twig\extension;
class auth extends \Twig_Extension class auth extends \Twig_Extension
{ {
/** @var \phpbb\auth\auth */ /** @var \phpbb\auth\auth */
protected $auth; protected $auth;
/** /**
* Constructor. * Constructor.
* *
* @param \phpbb\auth\auth $auth Authentication object * @param \phpbb\auth\auth $auth Authentication object
*/ */
public function __construct(\phpbb\auth\auth $auth) public function __construct(\phpbb\auth\auth $auth)
{ {
$this->auth = $auth; $this->auth = $auth;
} }
/** /**
* Get the name of this extension * Get the name of this extension
* *
* @return string * @return string
*/ */
public function getName() public function getName()
{ {
return 'auth'; return 'auth';
} }
/** /**
* Returns a list of global functions to add to the existing list. * Returns a list of global functions to add to the existing list.
* *
* @return array An array of global functions * @return array An array of global functions
*/ */
public function getFunctions() public function getFunctions()
{ {
return array( return array(
new \Twig_SimpleFunction('auth', array($this, 'get_auth')), new \Twig_SimpleFunction('auth', array($this, 'get_auth')),
new \Twig_SimpleFunction('auth_global', array($this, 'get_auth_global')), new \Twig_SimpleFunction('auth_global', array($this, 'get_auth_global')),
); );
} }
/** /**
* Look up permission option(s). * Look up permission option(s).
* *
* How to use in a template: * How to use in a template:
* - {{ auth(options, forum_id) }} * - {{ auth(options, forum_id) }}
* *
* The options are required, either as a single string 'a_' or as a twig array ['a_', 'm_']. * The options are required, either as a single string 'a_' or as a twig array ['a_', 'm_'].
* The forum identifier is optional. * The forum identifier is optional.
* *
* @return bool * @return bool
*/ */
public function get_auth() public function get_auth()
{ {
$args = func_get_args(); $args = func_get_args();
$options = $args[0]; $options = $args[0];
$forum_id = isset($args[1]) ? (int) $args[1] : 0; $forum_id = isset($args[1]) ? (int) $args[1] : 0;
return is_array($options) ? $this->auth->acl_gets($options, $forum_id) : $this->auth->acl_get($options, $forum_id); return is_array($options) ? $this->auth->acl_gets($options, $forum_id) : $this->auth->acl_get($options, $forum_id);
} }
/** /**
* Look up permission option(s) for any forum * Look up permission option(s) for any forum
* *
* How to use in a template: * How to use in a template:
* - {{ auth_global(options) }} * - {{ auth_global(options) }}
* *
* The options are required, either as a single string 'a_' or as a twig array ['a_', 'm_']. * The options are required, either as a single string 'a_' or as a twig array ['a_', 'm_'].
* *
* @return bool * @return bool
*/ */
public function get_auth_global() public function get_auth_global()
{ {
$args = func_get_args(); $args = func_get_args();
return $this->auth->acl_getf_global($args); return $this->auth->acl_getf_global($args);
} }
} }

160
phpBB/phpbb/template/twig/extension/avatar.php
View file

@ -1,80 +1,80 @@
<?php <?php
/** /**
* *
* This file is part of the phpBB Forum Software package. * This file is part of the phpBB Forum Software package.
* *
* @copyright (c) phpBB Limited <https://www.phpbb.com> * @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0) * @license GNU General Public License, version 2 (GPL-2.0)
* *
* For full copyright and license information, please see * For full copyright and license information, please see
* the docs/CREDITS.txt file. * the docs/CREDITS.txt file.
* *
*/ */
namespace phpbb\template\twig\extension; namespace phpbb\template\twig\extension;
class avatar extends \Twig_Extension class avatar extends \Twig_Extension
{ {
/** /**
* Get the name of this extension * Get the name of this extension
* *
* @return string * @return string
*/ */
public function getName() public function getName()
{ {
return 'avatar'; return 'avatar';
} }
/** /**
* Returns a list of global functions to add to the existing list. * Returns a list of global functions to add to the existing list.
* *
* @return array An array of global functions * @return array An array of global functions
*/ */
public function getFunctions() public function getFunctions()
{ {
return array( return array(
new \Twig_SimpleFunction('avatar', array($this, 'get_avatar')), new \Twig_SimpleFunction('avatar', array($this, 'get_avatar')),
); );
} }
/** /**
* Get avatar for placing into templates. * Get avatar for placing into templates.
* *
* How to use in a template: * How to use in a template:
* - {{ avatar('mode', row, alt, ignore_config, lazy) }} * - {{ avatar('mode', row, alt, ignore_config, lazy) }}
* *
* The mode and row (group_row or user_row) are required. * The mode and row (group_row or user_row) are required.
* The other fields (alt|ignore_config|lazy) are optional. * The other fields (alt|ignore_config|lazy) are optional.
* *
* @uses \phpbb_get_group_avatar() * @uses \phpbb_get_group_avatar()
* @uses \phpbb_get_user_avatar() * @uses \phpbb_get_user_avatar()
* *
* @return string The avatar HTML for the specified mode * @return string The avatar HTML for the specified mode
*/ */
public function get_avatar() public function get_avatar()
{ {
$args = func_get_args(); $args = func_get_args();
$mode = (string) $args[0]; $mode = (string) $args[0];
$row = (array) $args[1]; $row = (array) $args[1];
$alt = isset($args[2]) ? (string) $args[2] : false; $alt = isset($args[2]) ? (string) $args[2] : false;
$ignore_config = isset($args[3]) ? (bool) $args[3] : false; $ignore_config = isset($args[3]) ? (bool) $args[3] : false;
$lazy = isset($args[4]) ? (bool) $args[4] : false; $lazy = isset($args[4]) ? (bool) $args[4] : false;
// To prevent having to redefine alt attribute ('USER_AVATAR'|'GROUP_AVATAR'), we check if an alternative has been provided // To prevent having to redefine alt attribute ('USER_AVATAR'|'GROUP_AVATAR'), we check if an alternative has been provided
switch ($mode) switch ($mode)
{ {
case 'group': case 'group':
return $alt ? phpbb_get_group_avatar($row, $alt, $ignore_config, $lazy) : phpbb_get_group_avatar($row); return $alt ? phpbb_get_group_avatar($row, $alt, $ignore_config, $lazy) : phpbb_get_group_avatar($row);
break; break;
case 'user': case 'user':
return $alt ? phpbb_get_user_avatar($row, $alt, $ignore_config, $lazy) : phpbb_get_user_avatar($row); return $alt ? phpbb_get_user_avatar($row, $alt, $ignore_config, $lazy) : phpbb_get_user_avatar($row);
break; break;
default: default:
return ''; return '';
break; break;
} }
} }
} }

128
phpBB/phpbb/template/twig/extension/config.php
View file

@ -1,64 +1,64 @@
<?php <?php
/** /**
* *
* This file is part of the phpBB Forum Software package. * This file is part of the phpBB Forum Software package.
* *
* @copyright (c) phpBB Limited <https://www.phpbb.com> * @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0) * @license GNU General Public License, version 2 (GPL-2.0)
* *
* For full copyright and license information, please see * For full copyright and license information, please see
* the docs/CREDITS.txt file. * the docs/CREDITS.txt file.
* *
*/ */
namespace phpbb\template\twig\extension; namespace phpbb\template\twig\extension;
class config extends \Twig_Extension class config extends \Twig_Extension
{ {
/** @var \phpbb\config\config */ /** @var \phpbb\config\config */
protected $config; protected $config;
/** /**
* Constructor. * Constructor.
* *
* @param \phpbb\config\config $config Configuration object * @param \phpbb\config\config $config Configuration object
*/ */
public function __construct(\phpbb\config\config $config) public function __construct(\phpbb\config\config $config)
{ {
$this->config = $config; $this->config = $config;
} }
/** /**
* Get the name of this extension * Get the name of this extension
* *
* @return string * @return string
*/ */
public function getName() public function getName()
{ {
return 'config'; return 'config';
} }
/** /**
* Returns a list of global functions to add to the existing list. * Returns a list of global functions to add to the existing list.
* *
* @return array An array of global functions * @return array An array of global functions
*/ */
public function getFunctions() public function getFunctions()
{ {
return array( return array(
new \Twig_SimpleFunction('config', array($this, 'get_config')), new \Twig_SimpleFunction('config', array($this, 'get_config')),
); );
} }
/** /**
* Retrieves a configuration value for use in templates. * Retrieves a configuration value for use in templates.
* *
* @return string The configuration value * @return string The configuration value
*/ */
public function get_config() public function get_config()
{ {
$args = func_get_args(); $args = func_get_args();
return $this->config->offsetGet($args[0]); return $this->config->offsetGet($args[0]);
} }
} }

170
phpBB/phpbb/template/twig/extension/username.php
View file

@ -1,85 +1,85 @@
<?php <?php
/** /**
* *
* This file is part of the phpBB Forum Software package. * This file is part of the phpBB Forum Software package.
* *
* @copyright (c) phpBB Limited <https://www.phpbb.com> * @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0) * @license GNU General Public License, version 2 (GPL-2.0)
* *
* For full copyright and license information, please see * For full copyright and license information, please see
* the docs/CREDITS.txt file. * the docs/CREDITS.txt file.
* *
*/ */
namespace phpbb\template\twig\extension; namespace phpbb\template\twig\extension;
class username extends \Twig_Extension class username extends \Twig_Extension
{ {
/** /**
* Get the name of this extension * Get the name of this extension
* *
* @return string * @return string
*/ */
public function getName() public function getName()
{ {
return 'username'; return 'username';
} }
/** /**
* Returns a list of global functions to add to the existing list. * Returns a list of global functions to add to the existing list.
* *
* @return array An array of global functions * @return array An array of global functions
*/ */
public function getFunctions() public function getFunctions()
{ {
return array( return array(
new \Twig_SimpleFunction('username', array($this, 'get_username')), new \Twig_SimpleFunction('username', array($this, 'get_username')),
); );
} }
/** /**
* Get username details for placing into templates. * Get username details for placing into templates.
* *
* How to use in a template: * How to use in a template:
* - {{ username('mode', user_id, username, user_colour, guest_username, custom_profile_url) }} * - {{ username('mode', user_id, username, user_colour, guest_username, custom_profile_url) }}
* - {{ username('mode', user_row, guest_username, custom_profile_url) }} * - {{ username('mode', user_row, guest_username, custom_profile_url) }}
* It's possible to provide the user identifier, name and colour separately, * It's possible to provide the user identifier, name and colour separately,
* or provide the entire user row at once as an array. * or provide the entire user row at once as an array.
* *
* The mode, user_id and username are required (separately or through a user row). * The mode, user_id and username are required (separately or through a user row).
* The other fields (user_colour|guest_username|custom_profile_url) are optional. * The other fields (user_colour|guest_username|custom_profile_url) are optional.
* *
* @uses \get_username_string() * @uses \get_username_string()
* *
* @return string A string based on what is wanted depending on $mode * @return string A string based on what is wanted depending on $mode
*/ */
public function get_username() public function get_username()
{ {
$args = func_get_args(); $args = func_get_args();
$mode = $args[0]; $mode = $args[0];
$user = $args[1]; $user = $args[1];
// If the entire user row is provided // If the entire user row is provided
if (is_array($user)) if (is_array($user))
{ {
$user_id = isset($user['user_id']) ? $user['user_id'] : ''; $user_id = isset($user['user_id']) ? $user['user_id'] : '';
$username = isset($user['username']) ? $user['username'] : ''; $username = isset($user['username']) ? $user['username'] : '';
$user_colour = isset($user['user_colour']) ? $user['user_colour'] : ''; $user_colour = isset($user['user_colour']) ? $user['user_colour'] : '';
$guest_username = isset($args[2]) ? $args[2] : false; $guest_username = isset($args[2]) ? $args[2] : false;
$custom_profile_url = isset($args[3]) ? $args[3] : false; $custom_profile_url = isset($args[3]) ? $args[3] : false;
} }
else else
{ {
// Options are provided separately // Options are provided separately
$user_id = $user; $user_id = $user;
$username = $args[2]; $username = $args[2];
$user_colour = isset($args[3]) ? $args[3] : ''; $user_colour = isset($args[3]) ? $args[3] : '';
$guest_username = isset($args[4]) ? $args[4] : false; $guest_username = isset($args[4]) ? $args[4] : false;
$custom_profile_url = isset($args[5]) ? $args[5] : false; $custom_profile_url = isset($args[5]) ? $args[5] : false;
} }
return get_username_string($mode, $user_id, $username, $user_colour, $guest_username, $custom_profile_url); return get_username_string($mode, $user_id, $username, $user_colour, $guest_username, $custom_profile_url);
} }
} }