mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00
Code Issues Releases Wiki Activity

- fixed a few bugs

Browse Source 
- added user_add() function
- check posted images ([img]) for same domain/scipt and php files
- auth_api.html updated to the coding guidelines look&feel
- introduced ability to force non page-updates (cron is using it)
- correctly resend coppa email


git-svn-id: file:///svn/phpbb/trunk@6048 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-06-11 18:13:52 +00:00
parent ce3b07eee7
commit 01b4145381
45 changed files with 1847 additions and 1411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acp/acp_forums.php
View File

@@ -222,12 +222,16 @@ class acp_forums
$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'] . '&select_all_groups=1';
// Redirect to permissions
$message = ($action == 'add') ? $user->lang['FORUM_CREATED'] : $user->lang['FORUM_UPDATED'];
$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
// redirect directly to permission settings screen
if ($action == 'add' && !$forum_perm_from)
// Redirect to permissions
if ($auth->acl_get('a_fauth'))
{
$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
}
// redirect directly to permission settings screen if authed
if ($action == 'add' && !$forum_perm_from && $auth->acl_get('a_fauth'))
{
meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url));
}

6
phpBB/includes/acp/acp_language.php
View File

@@ -123,7 +123,7 @@ class acp_language
'HIDDEN' => $hidden_data,
'S_CONNECTION_SUCCESS' => (request_var('test_connection', '') && $test_connection === true) ? true : false,
'S_CONNECTION_FAILED' => (request_var('test_connection', '') && $test_connection === false) ? true : false
'S_CONNECTION_FAILED' => (request_var('test_connection', '') && $test_connection !== true) ? true : false
));
break;
@@ -327,9 +327,9 @@ class acp_language
trigger_error($user->lang['INVALID_UPLOAD_METHOD']);
}
if (!$transfer->open_session())
if (($result = $transfer->open_session()) !== true)
{
trigger_error($user->lang['ERR_CONNECTING_SERVER'] . adm_back_link($this->u_action));
trigger_error($user->lang[$result] . adm_back_link($this->u_action));
}
$transfer->rename($lang_path . $file, $lang_path . $file . '.bak');

17
phpBB/includes/acp/acp_main.php
View File

@@ -59,19 +59,8 @@ class acp_main
set_config('num_users', $config['num_users'] + sizeof($mark_ary), true);
// Get latest username
$sql = 'SELECT user_id, username
FROM ' . USERS_TABLE . '
WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
ORDER BY user_id DESC';
$result = $db->sql_query_limit($sql, 1);
if ($row = $db->sql_fetchrow($result))
{
set_config('newest_user_id', $row['user_id'], true);
set_config('newest_username', $row['username'], true);
}
$db->sql_freeresult($result);
// Update latest username
update_last_username();
}
else if ($action == 'delete')
{
@@ -368,7 +357,7 @@ class acp_main
{
while (($file = readdir($avatar_dir)) !== false)
{
if ($file{0} != '.' && strpos($file, 'index.') === false)
if ($file{0} != '.' && $file != 'CVS' && strpos($file, 'index.') === false)
{
$avatar_dir_size += filesize($phpbb_root_path . $config['avatar_path'] . '/' . $file);
}

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

@@ -297,20 +297,8 @@ class acp_users
set_config('num_users', $config['num_users'] - 1, true);
}
// Get latest username
$sql = 'SELECT user_id, username
FROM ' . USERS_TABLE . '
WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
ORDER BY user_id DESC';
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if ($row)
{
set_config('newest_user_id', $row['user_id'], true);
set_config('newest_username', $row['username'], true);
}
// Update latest username
update_last_username();
trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&amp;u=' . $user_id));