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

- removed custom code. ;)

Browse source 
- fixed display of global, unapproved topics in mcp front (still a lot of bugs regarding global announcements)


git-svn-id: file:///svn/phpbb/trunk@5033 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2004-12-15 18:30:50 +00:00
parent 20d18e1a9f
commit 40880e7705
3 changed files with 49 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
phpBB/includes/functions_admin.php
View file

@ -319,7 +319,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = TRUE)
$where_ids = array_unique($where_ids);
}
if (!count($where_ids))
if (!sizeof($where_ids))
{
return array('topics' => 0, 'posts' => 0);
}
@ -403,7 +403,7 @@ function delete_posts($where_type, $where_ids, $auto_sync = TRUE)
$forum_ids[] = $row['forum_id'];
}
if (!count($post_ids))
if (!sizeof($post_ids))
{
return false;
}
@ -657,7 +657,7 @@ function delete_topic_shadows($max_age, $forum_id = '', $auto_sync = TRUE)
$topic_ids[] = $row['topic_id'];
}
if (count($topic_ids))
if (sizeof($topic_ids))
{
$sql = 'DELETE FROM ' . TOPICS_TABLE . '
WHERE topic_id IN (' . implode(',', $topic_ids) . ')';
@ -722,43 +722,8 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
{
if (!$where_type)
{
// Sync all topics/forums.
if($mode == 'topic')
{
//This can bomb out on a large forum so we're going to split this up.
$batch_size = 500;
//TODO: Fit this into the layout.
print "Syncing topics, going to do this in batches (batch size = $batch_size):<br />";
$sql = "SELECT
MIN(topic_id) AS topic_min,
MAX(topic_id) AS topic_max
FROM " . TOPICS_TABLE;
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$topic_min = $row['topic_min'];
$topic_max = $row['topic_max'];
// Run the batches
$batch_start = $topic_min;
while($batch_start <= $topic_max)
{
if (defined('DEBUG_EXTRA'))
{
print "Syncing topic_id $batch_start to ". ($batch_start+$batch_size) . ". ";
print ceil(memory_get_usage()/1024) . " KB<br />\n";
flush();
}
sync('topic', 'range', "topic_id BETWEEN $batch_start AND " . ($batch_start+$batch_size-1));
$batch_start += $batch_size;
}
}
else
{
$where_sql = '';
$where_sql_and = 'WHERE';
}
$where_sql = '';
$where_sql_and = 'WHERE';
}
elseif ($where_type == 'range')
{
@ -774,7 +739,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
return;
}
// Limit the topics/forums we are syncing, use specific topic/forum IDs.
// $where_type contains the field for the where clause (forum_id, topic_id)
// $where_type contains the field for the where clause (forum_id, topic_id)
$where_sql = 'WHERE ' . $mode{0} . ".$where_type IN (" . implode(', ', $where_ids) . ')';
$where_sql_and = $where_sql . "\n\tAND";
}
@ -785,6 +750,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
{
return;
}
// $where_type contains the field for the where clause (forum_id, topic_id)
$where_sql = 'WHERE ' . $mode{0} . ".$where_type IN (" . implode(', ', $where_ids) . ')';
$where_sql_and = $where_sql . "\n\tAND";
@ -852,7 +818,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
}
$db->sql_freeresult();
if (!count($topic_ids))
if (!sizeof($topic_ids))
{
return;
}
@ -906,7 +872,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
$post_ids[] = $post_id;
}
if (count($post_ids))
if (sizeof($post_ids))
{
$sql = 'UPDATE ' . POSTS_TABLE . '
SET post_reported = 1 - post_reported
@ -944,7 +910,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
}
}
if (count($topic_ids))
if (sizeof($topic_ids))
{
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET topic_reported = 1 - topic_reported
@ -996,7 +962,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
$post_ids[] = $post_id;
}
if (count($post_ids))
if (sizeof($post_ids))
{
$sql = 'UPDATE ' . POSTS_TABLE . '
SET post_attachment = 1 - post_attachment
@ -1034,7 +1000,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
}
}
if (count($topic_ids))
if (sizeof($topic_ids))
{
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET topic_attachment = 1 - topic_attachment
@ -1106,7 +1072,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
}
// 4: Retrieve last_post infos
if (count($post_ids))
if (sizeof($post_ids))
{
$sql = 'SELECT p.post_id, p.poster_id, p.post_time, p.post_username, u.username
FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
@ -1164,7 +1130,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
}
}
if (count($sql))
if (sizeof($sql))
{
$sql = 'UPDATE ' . FORUMS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql) . '
@ -1203,11 +1169,11 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
$db->sql_freeresult($result);
// Use "t" as table alias because of the $where_sql clause
// NOTE: 't.post_approved' in the GROUP BY is causing a major slowdown.
// NOTE: 't.post_approved' in the GROUP BY is causing a major slowdown.
$sql = 'SELECT t.topic_id, t.post_approved, COUNT(t.post_id) AS total_posts, MIN(t.post_id) AS first_post_id, MAX(t.post_id) AS last_post_id
FROM ' . POSTS_TABLE . " t
$where_sql
GROUP BY t.topic_id, t.post_approved";
GROUP BY t.topic_id"; //, t.post_approved";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
@ -1250,18 +1216,19 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
}
// Now we delete empty topics and orphan posts
if (count($delete_posts))
if (sizeof($delete_posts))
{
delete_posts('topic_id', array_keys($delete_posts), FALSE);
unset($delete_posts);
}
if (!count($topic_data))
if (!sizeof($topic_data))
{
// If we get there, topic ids were invalid or topics did not contain any posts
delete_topics($where_type, $where_ids, TRUE);
return;
}
if (count($delete_topics))
if (sizeof($delete_topics))
{
$delete_topic_ids = array();
foreach ($delete_topics as $topic_id => $void)
@ -1305,7 +1272,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
$db->sql_freeresult($result);
// approved becomes unapproved, and vice-versa
if (count($approved_unapproved_ids))
if (sizeof($approved_unapproved_ids))
{
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET topic_approved = 1 - topic_approved
@ -1364,7 +1331,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
}
}
if (count($sql))
if (sizeof($sql))
{
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql) . '
@ -1377,7 +1344,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
unset($topic_data);
// if some topics have been resync'ed then resync parent forums
if ($resync_parents && count($resync_forums))
if ($resync_parents && sizeof($resync_forums))
{
sync('forum', 'forum_id', $resync_forums, TRUE);
}
@ -1484,7 +1451,7 @@ function remove_comments(&$output)
$output = '';
// try to keep mem. use down
$linecount = count($lines);
$linecount = sizeof($lines);
$in_comment = false;
for($i = 0; $i < $linecount; $i++)
@ -1530,7 +1497,7 @@ function split_sql_file($sql, $delimiter)
$matches = array();
// this is faster than calling count($oktens) every time thru the loop.
$token_count = count($tokens);
$token_count = sizeof($tokens);
for ($i = 0; $i < $token_count; $i++)
{
// Don't wanna add an empty string as the last thing in the array.
@ -1837,7 +1804,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
}
$db->sql_freeresult($result);
if (count($topic_id_list))
if (sizeof($topic_id_list))
{
$topic_id_list = array_unique($topic_id_list);
@ -1852,7 +1819,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
{
if ($auth->acl_get('f_read', $row['forum_id']))
{
// DEBUG!!
// DEBUG!! - global topic
$config['default_forum_id'] = 2;
$is_auth[$row['topic_id']] = ($row['forum_id']) ? $row['forum_id'] : $config['default_forum_id'];
}
@ -1870,8 +1837,8 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
}
}
$sql = "SELECT COUNT(*) AS total_entries
FROM " . LOG_TABLE . " l
$sql = 'SELECT COUNT(l.log_id) AS total_entries
FROM ' . LOG_TABLE . " l
WHERE l.log_type = $log_type
AND l.log_time >= $limit_days
$sql_forum";

23
phpBB/includes/mcp/mcp_front.php
View file

@ -26,6 +26,9 @@ function mcp_front_view($id, $mode, $action, $url)
// Latest 5 unapproved
$forum_list = get_forum_list('m_approve');
$post_list = array();
$forum_names = array();
$forum_id = request_var('f', 0);
$template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false);
if (!empty($forum_list))
@ -40,6 +43,17 @@ function mcp_front_view($id, $mode, $action, $url)
if ($total)
{
$sql = 'SELECT forum_id, forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id IN (' . implode(', ', $forum_list) . ')';
$result = $db->sql_query_limit($sql);
while ($row = $db->sql_fetchrow($result))
{
$forum_names[$row['forum_id']] = $row['forum_name'];
}
$db->sql_freeresult($result);
$sql = 'SELECT post_id
FROM ' . POSTS_TABLE . '
WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ')
@ -51,11 +65,10 @@ function mcp_front_view($id, $mode, $action, $url)
$post_list[] = $row['post_id'];
}
$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.username, t.topic_id, t.topic_title, t.topic_first_post_id, f.forum_id, f.forum_name
FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f, ' . USERS_TABLE . ' u
$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.username, t.topic_id, t.topic_title, t.topic_first_post_id, p.forum_id
FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u
WHERE p.post_id IN (' . implode(', ', $post_list) . ')
AND t.topic_id = p.topic_id
AND f.forum_id = p.forum_id
AND p.poster_id = u.user_id
ORDER BY p.post_id DESC';
$result = $db->sql_query($sql);
@ -67,10 +80,10 @@ function mcp_front_view($id, $mode, $action, $url)
'U_MCP_FORUM' => ($row['forum_id']) ? $url . '&amp;f=' . $row['forum_id'] . '&amp;mode=forum_view' : '',
'U_MCP_TOPIC' => $url . '&amp;t=' . $row['topic_id'] . '&amp;mode=topic_view',
'U_FORUM' => ($row['forum_id']) ? 'viewforum.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] : '',
'U_TOPIC' => 'viewtopic.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id'],
'U_TOPIC' => $phpbb_root_path . 'viewtopic.' . $phpEx . $SID . '&amp;f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&amp;t=' . $row['topic_id'],
'U_AUTHOR' => ($row['poster_id'] == ANONYMOUS) ? '' : 'memberlist.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $row['poster_id'],
'FORUM_NAME' => ($row['forum_id']) ? $row['forum_name'] : $user->lang['POST_GLOBAL'],
'FORUM_NAME' => ($row['forum_id']) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'],
'TOPIC_TITLE' => $row['topic_title'],
'AUTHOR' => ($row['poster_id'] == ANONYMOUS) ? (($row['post_username']) ? $row['post_username'] : $user->lang['GUEST']) : $row['username'],
'SUBJECT' => ($row['post_subject']) ? $row['post_subject'] : $user->lang['NO_SUBJECT'],

2
phpBB/language/en/mcp.php
View file

@ -69,6 +69,8 @@ $lang += array(
'FORUM_STATUS' => 'Forum Status',
'FORUM_STYLE' => 'Forum Style',
'GLOBAL_ANNOUNCEMENT' => 'Global Announcement',
'IP_INFO' => 'IP Information',
'LATEST_LOGS' => 'Latest 5 logged actions',