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

[ticket/11201] Make profile field classes autoloadable

Browse Source 
PHPBB3-11201
This commit is contained in:
Joas Schilling
2013-09-17 15:17:54 +02:00
parent 3e84fb76a3
commit 2471b19d73
12 changed files with 305 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/acp/acp_profile.php
View File

@@ -29,11 +29,10 @@ class acp_profile
{
global $config, $db, $user, $auth, $template, $cache;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
global $request;
global $request, $phpbb_container;
include($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$user->add_lang(array('ucp', 'acp/profile'));
$this->tpl_name = 'acp_profile';
@@ -60,7 +59,7 @@ class acp_profile
FIELD_DROPDOWN => array('field_length' => 0, 'field_minlen' => 0, 'field_maxlen' => 5, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),
);
$cp = new custom_profile_admin();
$cp = $phpbb_container->get('profilefields.admin');
// Build Language array
// Based on this, we decide which elements need to be edited later and which language items are missing

3
phpBB/includes/acp/acp_users.php
View File

@@ -1343,9 +1343,8 @@ class acp_users
case 'profile':
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields');
$cp_data = $cp_error = array();

1187
phpBB/includes/functions_profile_fields.php
View File

File diff suppressed because it is too large Load Diff

9
phpBB/includes/functions_user.php
View File

@@ -162,7 +162,7 @@ function user_update_name($old_name, $new_name)
function user_add($user_row, $cp_data = false)
{
global $db, $user, $auth, $config, $phpbb_root_path, $phpEx;
global $phpbb_dispatcher;
global $phpbb_dispatcher, $phpbb_container;
if (empty($user_row['username']) || !isset($user_row['group_id']) || !isset($user_row['user_email']) || !isset($user_row['user_type']))
{
@@ -276,12 +276,7 @@ function user_add($user_row, $cp_data = false)
{
$cp_data['user_id'] = (int) $user_id;
if (!class_exists('custom_profile'))
{
include_once($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
}
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields');
$sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' .
$db->sql_build_array('INSERT', $cp->build_insert_sql_array($cp_data));
$db->sql_query($sql);

8
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
*/
function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
{
global $user, $template, $auth, $db, $cache;
global $user, $template, $auth, $db, $cache, $phpbb_container;
global $phpbb_root_path, $request, $phpEx, $config, $phpbb_dispatcher;
$user->add_lang(array('viewtopic', 'memberlist'));
@@ -61,11 +61,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
// Load the custom profile fields
if ($config['load_cpf_pm'])
{
if (!class_exists('custom_profile'))
{
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
}
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields');
$profile_fields = $cp->generate_profile_fields_template('grab', $author_id);
}

7
phpBB/includes/ucp/ucp_profile.php
View File

@@ -29,8 +29,7 @@ class ucp_profile
function main($id, $mode)
{
global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
global $request;
global $phpbb_container;
global $request, $phpbb_container;
$user->add_lang('posting');
@@ -257,9 +256,7 @@ class ucp_profile
trigger_error('NO_AUTH_PROFILEINFO');
}
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields');
$cp_data = $cp_error = array();

4
phpBB/includes/ucp/ucp_register.php
View File

@@ -35,8 +35,6 @@ class ucp_register
trigger_error('UCP_REGISTER_DISABLE');
}
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$coppa = $request->is_set('coppa') ? (int) $request->variable('coppa', false) : false;
$agreed = $request->variable('agreed', false);
$submit = $request->is_set_post('submit');
@@ -78,7 +76,7 @@ class ucp_register
}
}
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields');
$error = $cp_data = $cp_error = array();
$s_hidden_fields = array();