diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-05-21 19:06:16 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-05-21 19:06:16 +0000 |
| commit | 2af466141d97dfaef8f11b7fe8e72bcbcc8fb91e (patch) | |
| tree | d38876b50efa25eca5d67ee797343abeb5c8e8a9 /phpBB | |
| parent | 1967bef6a5cdfd06445e19060d715856432503df (diff) | |
| download | forums-2af466141d97dfaef8f11b7fe8e72bcbcc8fb91e.tar forums-2af466141d97dfaef8f11b7fe8e72bcbcc8fb91e.tar.gz forums-2af466141d97dfaef8f11b7fe8e72bcbcc8fb91e.tar.bz2 forums-2af466141d97dfaef8f11b7fe8e72bcbcc8fb91e.tar.xz forums-2af466141d97dfaef8f11b7fe8e72bcbcc8fb91e.zip | |
get_forum_branch() moved to function_admins.php
git-svn-id: file:///svn/phpbb/trunk@4039 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 49 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 41 |
2 files changed, 45 insertions, 45 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b45dea5059..0ec09dba8d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -61,47 +61,6 @@ function get_userdata($user) return ($row = $db->sql_fetchrow($result)) ? $row : false; } -function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $include_forum = TRUE) -{ - global $db; - - switch ($type) - { - case 'parents': - $condition = 'f1.left_id BETWEEN f2.left_id AND f2.right_id'; - break; - - case 'children': - $condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id'; - break; - - default: - $condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id OR f1.left_id BETWEEN f2.left_id AND f2.right_id'; - } - - $rows = array(); - - $sql = 'SELECT f2.* - FROM (' . FORUMS_TABLE . ' f1 - LEFT JOIN ' . FORUMS_TABLE . " f2 ON $condition) - WHERE f1.forum_id = $forum_id - ORDER BY f2.left_id " . (($order == 'descending') ? 'ASC' : 'DESC'); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!$include_forum && $row['forum_id'] == $forum_id) - { - continue; - } - - $rows[] = $row; - } - $db->sql_freeresult($result); - - return $rows; -} - // Create forum navigation links for given forum, create parent // list if currently null, assign basic forum info to template function generate_forum_nav(&$forum_data) @@ -1196,18 +1155,18 @@ function page_header($page_title = '') foreach ($vars_online as $l_prefix => $var_ary) { - switch ($$var_ary[0]) + switch (${$var_ary[0]}) { case 0: - $$var_ary[1] = $user->lang[$l_prefix . '_USERS_ZERO_TOTAL']; + ${$var_ary[1]} = $user->lang[$l_prefix . '_USERS_ZERO_TOTAL']; break; case 1: - $$var_ary[1] = $user->lang[$l_prefix . '_USER_TOTAL']; + ${$var_ary[1]} = $user->lang[$l_prefix . '_USER_TOTAL']; break; default: - $$var_ary[1] = $user->lang[$l_prefix . '_USERS_TOTAL']; + ${$var_ary[1]} = $user->lang[$l_prefix . '_USERS_TOTAL']; break; } } diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 727154f0cb..ee789a0ade 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -116,6 +116,47 @@ function get_forum_list($acl_list = 'f_list', $id_only = TRUE, $postable_only = return $rowset; } +function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $include_forum = TRUE) +{ + global $db; + + switch ($type) + { + case 'parents': + $condition = 'f1.left_id BETWEEN f2.left_id AND f2.right_id'; + break; + + case 'children': + $condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id'; + break; + + default: + $condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id OR f1.left_id BETWEEN f2.left_id AND f2.right_id'; + } + + $rows = array(); + + $sql = 'SELECT f2.* + FROM (' . FORUMS_TABLE . ' f1 + LEFT JOIN ' . FORUMS_TABLE . " f2 ON $condition) + WHERE f1.forum_id = $forum_id + ORDER BY f2.left_id " . (($order == 'descending') ? 'ASC' : 'DESC'); + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + if (!$include_forum && $row['forum_id'] == $forum_id) + { + continue; + } + + $rows[] = $row; + } + $db->sql_freeresult($result); + + return $rows; +} + // Posts and topics manipulation function move_topics($topic_ids, $forum_id, $auto_sync = TRUE) { |