diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-02 14:53:44 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-02 14:53:44 +0000 |
| commit | f69c60ece8c65db2828fc28107e3c1caf8985e89 (patch) | |
| tree | 32b485322f7b45059772b6b8bfbe54bd3dd10b14 | |
| parent | 51d9bdeca72e22dfa2f7cecc3e7867b125ee899b (diff) | |
| download | forums-f69c60ece8c65db2828fc28107e3c1caf8985e89.tar forums-f69c60ece8c65db2828fc28107e3c1caf8985e89.tar.gz forums-f69c60ece8c65db2828fc28107e3c1caf8985e89.tar.bz2 forums-f69c60ece8c65db2828fc28107e3c1caf8985e89.tar.xz forums-f69c60ece8c65db2828fc28107e3c1caf8985e89.zip | |
more changes
git-svn-id: file:///svn/phpbb/trunk@2463 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/admin/admin_forum_prune.php | 55 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/prune.php | 8 |
3 files changed, 34 insertions, 33 deletions
diff --git a/phpBB/admin/admin_forum_prune.php b/phpBB/admin/admin_forum_prune.php index f3e528e35a..6315d9b2da 100644 --- a/phpBB/admin/admin_forum_prune.php +++ b/phpBB/admin/admin_forum_prune.php @@ -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); diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 456742fd38..353e36b4b9 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -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; diff --git a/phpBB/includes/prune.php b/phpBB/includes/prune.php index 84f552ec91..ed94ef1232 100644 --- a/phpBB/includes/prune.php +++ b/phpBB/includes/prune.php @@ -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 |