makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

more changes

Browse source 
git-svn-id: file:///svn/phpbb/trunk@2463 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-04-02 14:53:44 +00:00
parent 51d9bdeca7
commit f69c60ece8
3 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
phpBB/admin/admin_forum_prune.php
View file

@ -70,7 +70,7 @@ $sql = "SELECT f.*
ORDER BY c.cat_order ASC, f.forum_order ASC";
if( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, "Couldn't obtain list of forums for pruning", "", __LINE__, __FILE__, $sql);
message_die(GENERAL_ERROR, 'Could not obtain list of forums for pruning', '', __LINE__, __FILE__, $sql);
}
$forum_rows = array();
@ -96,25 +96,26 @@ if( isset($HTTP_POST_VARS['doprune']) )
for($i = 0; $i < count($forum_rows); $i++)
{
$p_result = prune($forum_rows[$i]['forum_id'], $prunedate);
sync('forum', $forum_rows[$i]['forum_id']);
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("prune_results", array(
"ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"FORUM_NAME" => $forum_rows[$i]['forum_name'],
"FORUM_TOPICS" => $p_result['topics'],
"FORUM_POSTS" => $p_result['posts'])
$template->assign_block_vars('prune_results', array(
'ROW_COLOR' => '#' . $row_color,
'ROW_CLASS' => $row_class,
'FORUM_NAME' => $forum_rows[$i]['forum_name'],
'FORUM_TOPICS' => $p_result['topics'],
'FORUM_POSTS' => $p_result['posts'])
);
}
$template->assign_vars(array(
"L_FORUM_PRUNE" => $lang['Forum_Prune'],
"L_FORUM" => $lang['Forum'],
"L_TOPICS_PRUNED" => $lang['Topics_pruned'],
"L_POSTS_PRUNED" => $lang['Posts_pruned'],
"L_PRUNE_RESULT" => $lang['Prune_success'])
'L_FORUM_PRUNE' => $lang['Forum_Prune'],
'L_FORUM' => $lang['Forum'],
'L_TOPICS_PRUNED' => $lang['Topics_pruned'],
'L_POSTS_PRUNED' => $lang['Posts_pruned'],
'L_PRUNE_RESULT' => $lang['Prune_success'])
);
}
else
@ -129,7 +130,7 @@ else
// Output a selection table if no forum id has been specified.
//
$template->set_filenames(array(
"body" => "admin/forum_prune_select_body.tpl")
'body' => 'admin/forum_prune_select_body.tpl')
);
$select_list = '<select name="' . POST_FORUM_URL . '">';
@ -145,12 +146,12 @@ else
// Assign the template variables.
//
$template->assign_vars(array(
"L_FORUM_PRUNE" => $lang['Forum_Prune'],
"L_SELECT_FORUM" => $lang['Select_a_Forum'],
"L_LOOK_UP" => $lang['Look_up_Forum'],
'L_FORUM_PRUNE' => $lang['Forum_Prune'],
'L_SELECT_FORUM' => $lang['Select_a_Forum'],
'L_LOOK_UP' => $lang['Look_up_Forum'],
"S_FORUMPRUNE_ACTION" => append_sid("admin_forum_prune.$phpEx"),
"S_FORUMS_SELECT" => $select_list)
'S_FORUMPRUNE_ACTION' => append_sid("admin_forum_prune.$phpEx"),
'S_FORUMS_SELECT' => $select_list)
);
}
else
@ -161,7 +162,7 @@ else
// Output the form to retrieve Prune information.
//
$template->set_filenames(array(
"body" => "admin/forum_prune_body.tpl")
'body' => 'admin/forum_prune_body.tpl')
);
$forum_name = ( $forum_id == -1 ) ? $lang['All_Forums'] : $forum_rows[0]['forum_name'];
@ -175,22 +176,22 @@ else
// Assign the template variables.
//
$template->assign_vars(array(
"FORUM_NAME" => $forum_name,
'FORUM_NAME' => $forum_name,
"L_FORUM_PRUNE" => $lang['Forum_Prune'],
"L_FORUM_PRUNE_EXPLAIN" => $lang['Forum_Prune_explain'],
"L_DO_PRUNE" => $lang['Do_Prune'],
'L_FORUM_PRUNE' => $lang['Forum_Prune'],
'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'],
'L_DO_PRUNE' => $lang['Do_Prune'],
"S_FORUMPRUNE_ACTION" => append_sid("admin_forum_prune.$phpEx"),
"S_PRUNE_DATA" => $prune_data,
"S_HIDDEN_VARS" => $hidden_input)
'S_FORUMPRUNE_ACTION' => append_sid("admin_forum_prune.$phpEx"),
'S_PRUNE_DATA' => $prune_data,
'S_HIDDEN_VARS' => $hidden_input)
);
}
}
//
// Actually output the page here.
//
$template->pparse("body");
$template->pparse('body');
include('page_footer_admin.'.$phpEx);

4
phpBB/includes/functions_admin.php
View file

@ -71,7 +71,7 @@ function sync($type, $id)
while( $row = $db->sql_fetchrow($result) )
{
sync("forum", $row['forum_id']);
sync('forum', $row['forum_id']);
}
break;
@ -85,7 +85,7 @@ function sync($type, $id)
while( $row = $db->sql_fetchrow($result) )
{
sync("topic", $row['topic_id']);
sync('topic', $row['topic_id']);
}
break;

8
phpBB/includes/prune.php
View file

@ -26,7 +26,6 @@ if ( !defined('IN_PHPBB') )
}
require($phpbb_root_path . 'includes/functions_search.'.$phpEx);
require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
function prune($forum_id, $prune_date)
{
@ -110,8 +109,6 @@ function prune($forum_id, $prune_date)
remove_search_post($sql_post);
sync('forum', $forum_id);
return array ('topics' => $pruned_topics, 'posts' => $pruned_posts);
}
}
@ -125,6 +122,8 @@ function prune($forum_id, $prune_date)
//
function auto_prune($forum_id = 0)
{
require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
global $db, $lang;
$sql = "SELECT *
@ -142,7 +141,8 @@ function auto_prune($forum_id = 0)
$prune_date = time() - ( $row['prune_days'] * 86400 );
$next_prune = time() + ( $row['prune_freq'] * 86400 );
$pruned = prune($forum_id, $prune_date);
prune($forum_id, $prune_date);
sync('forum', $forum_id);
$sql = "UPDATE " . FORUMS_TABLE . "
SET prune_next = $next_prune