aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-01-25 21:01:52 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-01-25 21:01:52 +0000
commit90385cd79a550b4ac08e10e3b8a01abc37965bd4 (patch)
tree87838a4580032f81b981a0867cd2b766d3d81ab6 /phpBB/includes/functions_user.php
parent964615eb0799b2d20d9578af9e328fb1a348d8da (diff)
downloadforums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.tar
forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.tar.gz
forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.tar.bz2
forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.tar.xz
forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.zip
- moved add_log out of functions_admin (this file should only be included in admin/admin-related pages)
- fixed cookie based topic tracking - added missing config variables - other minor things git-svn-id: file:///svn/phpbb/trunk@5494 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php48
1 files changed, 0 insertions, 48 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 76bea9a146..58ecd6d0a7 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -274,12 +274,6 @@ function user_active_flip($user_id, $user_type, $user_actkey = false, $username
$auth->acl_clear_prefetch($user_id);
- if (!function_exists('add_log'))
- {
- global $phpbb_root_path, $phpEx;
- include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
- }
-
if ($username === false)
{
$sql = 'SELECT username
@@ -631,12 +625,6 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
}
}
- if (!function_exists('add_log'))
- {
- global $phpbb_root_path, $phpEx;
- include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
- }
-
// Update log
$log_entry = ($ban_exclude) ? 'LOG_BAN_EXCLUDE_' : 'LOG_BAN_';
add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log);
@@ -704,12 +692,6 @@ function user_unban($mode, $ban)
WHERE ban_id IN ($unban_sql)";
$db->sql_query($sql);
- if (!function_exists('add_log'))
- {
- global $phpbb_root_path, $phpEx;
- include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
- }
-
add_log('admin', 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list);
}
@@ -1272,12 +1254,6 @@ function group_create($group_id, $type, $name, $desc, $group_attributes)
$db->sql_query($sql);
}
- if (!function_exists('add_log'))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
- }
-
$log = ($group_id) ? 'LOG_GROUP_UPDATED' : 'LOG_GROUP_CREATED';
add_log('admin', $log, $name);
}
@@ -1341,12 +1317,6 @@ function group_delete($group_id, $group_name = false)
WHERE group_id = $group_id";
$db->sql_query($sql);
- if (!function_exists('add_log'))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
- }
-
add_log('admin', 'LOG_GROUP_DELETE', $group_name);
return false;
@@ -1453,12 +1423,6 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
$db->sql_freeresult($result);
}
- if (!function_exists('add_log'))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
- }
-
$log = ($leader) ? 'LOG_MODS_ADDED' : 'LOG_USERS_ADDED';
add_log('admin', $log, $group_name, implode(', ', $username_ary));
@@ -1574,12 +1538,6 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false,
$db->sql_freeresult($result);
}
- if (!function_exists('add_log'))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
- }
-
$log = 'LOG_GROUP_REMOVE';
add_log('admin', $log, $group_name, implode(', ', $username_ary));
@@ -1628,12 +1586,6 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
break;
}
- if (!function_exists('add_log'))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
- }
-
// Clear permissions cache of relevant users
$auth->acl_clear_prefetch($user_id_ary);