Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1279) +++ branches/2.8.x/CHANGELOG (revision 1280) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.1 ------------------------------------- +29-Jan-2010 Dietmar Woellbrink (Luisehahne) +! continue update headertext 28-Jan-2010 Dietmar Woellbrink (Luisehahne) + Ticket #927 news module language file in swedish ! update headertext Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1279) +++ branches/2.8.x/wb/upgrade-script.php (revision 1280) @@ -1,32 +1,4 @@ \ No newline at end of file Index: branches/2.8.x/wb/modules/news/info.php =================================================================== --- branches/2.8.x/wb/modules/news/info.php (revision 1279) +++ branches/2.8.x/wb/modules/news/info.php (revision 1280) @@ -1,32 +1,4 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -require('../../config.php'); - -// Include WB admin wrapper script -require(WB_PATH.'/modules/admin.php'); - -// Include the ordering class -require(WB_PATH.'/framework/class.order.php'); -// Get new order -$order = new order(TABLE_PREFIX.'mod_news_posts', 'position', 'post_id', 'section_id'); -$position = $order->get_new($section_id); - -// Get default commenting -$query_settings = $database->query("SELECT commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); -$fetch_settings = $query_settings->fetchRow(); -$commenting = $fetch_settings['commenting']; - -// Insert new row into database -$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id,position,commenting,active) VALUES ('$section_id','$page_id','$position','$commenting','1')"); - -// Get the id -$post_id = $database->get_one("SELECT LAST_INSERT_ID()"); - -// Say that a new record has been added, then redirect to modify page -if($database->is_error()) { - $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); -} else { - $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); -} - -// Print admin footer -$admin->print_footer(); - +get_new($section_id); + +// Get default commenting +$query_settings = $database->query("SELECT commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); +$fetch_settings = $query_settings->fetchRow(); +$commenting = $fetch_settings['commenting']; + +// Insert new row into database +$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id,position,commenting,active) VALUES ('$section_id','$page_id','$position','$commenting','1')"); + +// Get the id +$post_id = $database->get_one("SELECT LAST_INSERT_ID()"); + +// Say that a new record has been added, then redirect to modify page +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); +} else { + $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); +} + +// Print admin footer +$admin->print_footer(); + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/add_post.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/search.php =================================================================== --- branches/2.8.x/wb/modules/news/search.php (revision 1279) +++ branches/2.8.x/wb/modules/news/search.php (revision 1280) @@ -1,111 +1,104 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -function news_search($func_vars) { - extract($func_vars, EXTR_PREFIX_ALL, 'func'); - - // how many lines of excerpt we want to have at most - $max_excerpt_num = $func_default_max_excerpt; - // do we want excerpt from comments? - $excerpt_from_comments = true; // TODO: make this configurable - $divider = "."; - $result = false; - - // fetch all active news-posts (from active groups) in this section. - $t = time(); - $table_posts = TABLE_PREFIX."mod_news_posts"; - $table_groups = TABLE_PREFIX."mod_news_groups"; - $query = $func_database->query(" - SELECT p.post_id, p.title, p.content_short, p.content_long, p.link, p.posted_when, p.posted_by - FROM $table_posts AS p LEFT OUTER JOIN $table_groups AS g ON p.group_id = g.group_id - WHERE p.section_id='$func_section_id' AND p.active = '1' AND ( g.active IS NULL OR g.active = '1' ) - AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t) - ORDER BY p.post_id DESC - "); - // now call print_excerpt() for every single post - if($query->numRows() > 0) { - while($res = $query->fetchRow()) { - $text = $res['title'].$divider.$res['content_short'].$divider.$res['content_long'].$divider; - // fetch comments and add to $text - if($excerpt_from_comments) { - $table = TABLE_PREFIX."mod_news_comments"; - $commentquery = $func_database->query(" - SELECT title, comment - FROM $table - WHERE post_id='{$res['post_id']}' - ORDER BY commented_when ASC - "); - if($commentquery->numRows() > 0) { - while($c_res = $commentquery->fetchRow()) { - $text .= $c_res['title'].$divider.$c_res['comment'].$divider; - } - } - } - $mod_vars = array( - 'page_link' => $res['link'], // use direct link to news-item - 'page_link_target' => "", - 'page_title' => $func_page_title, - 'page_description' => $res['title'], // use news-title as description - 'page_modified_when' => $res['posted_when'], - 'page_modified_by' => $res['posted_by'], - 'text' => $text, - 'max_excerpt_num' => $max_excerpt_num - ); - if(print_excerpt2($mod_vars, $func_vars)) { - $result = true; - } - } - } - - // now fetch group-titles - ignore those without (active) postings - $table_groups = TABLE_PREFIX."mod_news_groups"; - $table_posts = TABLE_PREFIX."mod_news_posts"; - $query = $func_database->query(" - SELECT DISTINCT g.title, g.group_id - FROM $table_groups AS g INNER JOIN $table_posts AS p ON g.group_id = p.group_id - WHERE g.section_id='$func_section_id' AND g.active = '1' AND p.active = '1' - "); - // now call print_excerpt() for every single group, too - if($query->numRows() > 0) { - while($res = $query->fetchRow()) { - $mod_vars = array( - 'page_link' => $func_page_link, - 'page_link_target' => "&g=".$res['group_id'], - 'page_title' => $func_page_title, - 'page_description' => $func_page_description, - 'page_modified_when' => $func_page_modified_when, - 'page_modified_by' => $func_page_modified_by, - 'text' => $res['title'].$divider, - 'max_excerpt_num' => $max_excerpt_num - ); - if(print_excerpt2($mod_vars, $func_vars)) { - $result = true; - } - } - } - return $result; -} - -?> +query(" + SELECT p.post_id, p.title, p.content_short, p.content_long, p.link, p.posted_when, p.posted_by + FROM $table_posts AS p LEFT OUTER JOIN $table_groups AS g ON p.group_id = g.group_id + WHERE p.section_id='$func_section_id' AND p.active = '1' AND ( g.active IS NULL OR g.active = '1' ) + AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t) + ORDER BY p.post_id DESC + "); + // now call print_excerpt() for every single post + if($query->numRows() > 0) { + while($res = $query->fetchRow()) { + $text = $res['title'].$divider.$res['content_short'].$divider.$res['content_long'].$divider; + // fetch comments and add to $text + if($excerpt_from_comments) { + $table = TABLE_PREFIX."mod_news_comments"; + $commentquery = $func_database->query(" + SELECT title, comment + FROM $table + WHERE post_id='{$res['post_id']}' + ORDER BY commented_when ASC + "); + if($commentquery->numRows() > 0) { + while($c_res = $commentquery->fetchRow()) { + $text .= $c_res['title'].$divider.$c_res['comment'].$divider; + } + } + } + $mod_vars = array( + 'page_link' => $res['link'], // use direct link to news-item + 'page_link_target' => "", + 'page_title' => $func_page_title, + 'page_description' => $res['title'], // use news-title as description + 'page_modified_when' => $res['posted_when'], + 'page_modified_by' => $res['posted_by'], + 'text' => $text, + 'max_excerpt_num' => $max_excerpt_num + ); + if(print_excerpt2($mod_vars, $func_vars)) { + $result = true; + } + } + } + + // now fetch group-titles - ignore those without (active) postings + $table_groups = TABLE_PREFIX."mod_news_groups"; + $table_posts = TABLE_PREFIX."mod_news_posts"; + $query = $func_database->query(" + SELECT DISTINCT g.title, g.group_id + FROM $table_groups AS g INNER JOIN $table_posts AS p ON g.group_id = p.group_id + WHERE g.section_id='$func_section_id' AND g.active = '1' AND p.active = '1' + "); + // now call print_excerpt() for every single group, too + if($query->numRows() > 0) { + while($res = $query->fetchRow()) { + $mod_vars = array( + 'page_link' => $func_page_link, + 'page_link_target' => "&g=".$res['group_id'], + 'page_title' => $func_page_title, + 'page_description' => $func_page_description, + 'page_modified_when' => $func_page_modified_when, + 'page_modified_by' => $func_page_modified_by, + 'text' => $res['title'].$divider, + 'max_excerpt_num' => $max_excerpt_num + ); + if(print_excerpt2($mod_vars, $func_vars)) { + $result = true; + } + } + } + return $result; +} + +?> Property changes on: branches/2.8.x/wb/modules/news/search.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/modify_settings.php =================================================================== --- branches/2.8.x/wb/modules/news/modify_settings.php (revision 1279) +++ branches/2.8.x/wb/modules/news/modify_settings.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); // Include WB admin wrapper script Index: branches/2.8.x/wb/modules/news/delete_post.php =================================================================== --- branches/2.8.x/wb/modules/news/delete_post.php (revision 1279) +++ branches/2.8.x/wb/modules/news/delete_post.php (revision 1280) @@ -1,72 +1,65 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -require('../../config.php'); - -// Get id -if(!isset($_GET['post_id']) OR !is_numeric($_GET['post_id'])) { - header("Location: ".ADMIN_URL."/pages/index.php"); - exit(0); -} else { - $post_id = $_GET['post_id']; -} - -// Include WB admin wrapper script -$update_when_modified = true; // Tells script to update when this page was last updated -require(WB_PATH.'/modules/admin.php'); - -// Get post details -$query_details = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'"); -if($query_details->numRows() > 0) { - $get_details = $query_details->fetchRow(); -} else { - $admin->print_error($TEXT['NOT_FOUND'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); -} - -// Unlink post access file -if(is_writable(WB_PATH.PAGES_DIRECTORY.$get_details['link'].PAGE_EXTENSION)) { - unlink(WB_PATH.PAGES_DIRECTORY.$get_details['link'].PAGE_EXTENSION); -} - -// Delete post -$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id' LIMIT 1"); -$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '$post_id'"); - -// Clean up ordering -require(WB_PATH.'/framework/class.order.php'); -$order = new order(TABLE_PREFIX.'mod_news_posts', 'position', 'post_id', 'section_id'); -$order->clean($section_id); - -// Check if there is a db error, otherwise say successful -if($database->is_error()) { - $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&post_id='.$post_id); -} else { - $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); -} - -// Print admin footer -$admin->print_footer(); - +query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'"); +if($query_details->numRows() > 0) { + $get_details = $query_details->fetchRow(); +} else { + $admin->print_error($TEXT['NOT_FOUND'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Unlink post access file +if(is_writable(WB_PATH.PAGES_DIRECTORY.$get_details['link'].PAGE_EXTENSION)) { + unlink(WB_PATH.PAGES_DIRECTORY.$get_details['link'].PAGE_EXTENSION); +} + +// Delete post +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id' LIMIT 1"); +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '$post_id'"); + +// Clean up ordering +require(WB_PATH.'/framework/class.order.php'); +$order = new order(TABLE_PREFIX.'mod_news_posts', 'position', 'post_id', 'section_id'); +$order->clean($section_id); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&post_id='.$post_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/delete_post.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/uninstall.php =================================================================== --- branches/2.8.x/wb/modules/news/uninstall.php (revision 1279) +++ branches/2.8.x/wb/modules/news/uninstall.php (revision 1280) @@ -1,40 +1,33 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -// Must include code to stop this file being access directly -if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } - -$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE name = 'module' AND value = 'news'"); -$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE extra = 'news'"); -$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_posts"); -$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_groups"); -$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_comments"); -$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_settings"); - -require_once(WB_PATH.'/framework/functions.php'); -rm_full_dir(WB_PATH.PAGES_DIRECTORY.'/posts'); -rm_full_dir(WB_PATH.MEDIA_DIRECTORY.'/.news'); - +query("DELETE FROM ".TABLE_PREFIX."search WHERE name = 'module' AND value = 'news'"); +$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE extra = 'news'"); +$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_posts"); +$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_groups"); +$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_comments"); +$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_settings"); + +require_once(WB_PATH.'/framework/functions.php'); +rm_full_dir(WB_PATH.PAGES_DIRECTORY.'/posts'); +rm_full_dir(WB_PATH.MEDIA_DIRECTORY.'/.news'); + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/uninstall.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/modify_comment.php =================================================================== --- branches/2.8.x/wb/modules/news/modify_comment.php (revision 1279) +++ branches/2.8.x/wb/modules/news/modify_comment.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); // Get id Property changes on: branches/2.8.x/wb/modules/news/modify_comment.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/save_group.php =================================================================== --- branches/2.8.x/wb/modules/news/save_group.php (revision 1279) +++ branches/2.8.x/wb/modules/news/save_group.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); // Get id Property changes on: branches/2.8.x/wb/modules/news/save_group.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/move_up.php =================================================================== --- branches/2.8.x/wb/modules/news/move_up.php (revision 1279) +++ branches/2.8.x/wb/modules/news/move_up.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); // Get id Property changes on: branches/2.8.x/wb/modules/news/move_up.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/save_settings.php =================================================================== --- branches/2.8.x/wb/modules/news/save_settings.php (revision 1279) +++ branches/2.8.x/wb/modules/news/save_settings.php (revision 1280) @@ -1,66 +1,59 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -require('../../config.php'); - -// Include WB admin wrapper script -$update_when_modified = true; // Tells script to update when this page was last updated -require(WB_PATH.'/modules/admin.php'); - -// This code removes any ', ''); -$header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['header'])); -$post_loop = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_loop'])); -$footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['footer'])); -$post_header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_header'])); -$post_footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_footer'])); -$comments_header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_header'])); -$comments_loop = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_loop'])); -$comments_footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_footer'])); -$comments_page = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_page'])); -$commenting = $admin->add_slashes($_POST['commenting']); -$posts_per_page = $admin->add_slashes($_POST['posts_per_page']); -$use_captcha = $admin->add_slashes($_POST['use_captcha']); -if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { - $resize = $_POST['resize']; -} else { - $resize = ''; -} - -// Update settings -$database->query("UPDATE ".TABLE_PREFIX."mod_news_settings SET header = '$header', post_loop = '$post_loop', footer = '$footer', posts_per_page = '$posts_per_page', post_header = '$post_header', post_footer = '$post_footer', comments_header = '$comments_header', comments_loop = '$comments_loop', comments_footer = '$comments_footer', comments_page = '$comments_page', commenting = '$commenting', resize = '$resize', use_captcha = '$use_captcha' WHERE section_id = '$section_id'"); - -// Check if there is a db error, otherwise say successful -if($database->is_error()) { - $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); -} else { - $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); -} - -// Print admin footer -$admin->print_footer(); - +', ''); +$header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['header'])); +$post_loop = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_loop'])); +$footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['footer'])); +$post_header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_header'])); +$post_footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['post_footer'])); +$comments_header = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_header'])); +$comments_loop = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_loop'])); +$comments_footer = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_footer'])); +$comments_page = $admin->add_slashes(str_replace($friendly, $raw, $_POST['comments_page'])); +$commenting = $admin->add_slashes($_POST['commenting']); +$posts_per_page = $admin->add_slashes($_POST['posts_per_page']); +$use_captcha = $admin->add_slashes($_POST['use_captcha']); +if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { + $resize = $_POST['resize']; +} else { + $resize = ''; +} + +// Update settings +$database->query("UPDATE ".TABLE_PREFIX."mod_news_settings SET header = '$header', post_loop = '$post_loop', footer = '$footer', posts_per_page = '$posts_per_page', post_header = '$post_header', post_footer = '$post_footer', comments_header = '$comments_header', comments_loop = '$comments_loop', comments_footer = '$comments_footer', comments_page = '$comments_page', commenting = '$commenting', resize = '$resize', use_captcha = '$use_captcha' WHERE section_id = '$section_id'"); + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/save_settings.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/delete_comment.php =================================================================== --- branches/2.8.x/wb/modules/news/delete_comment.php (revision 1279) +++ branches/2.8.x/wb/modules/news/delete_comment.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); // Get id Property changes on: branches/2.8.x/wb/modules/news/delete_comment.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/modify.php =================================================================== --- branches/2.8.x/wb/modules/news/modify.php (revision 1279) +++ branches/2.8.x/wb/modules/news/modify.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // Must include code to stop this file being access directly if(!defined('WB_PATH')) { exit("Cannot access this file directly"); } $database->query("DELETE FROM ".TABLE_PREFIX."mod_news_posts WHERE page_id = '$page_id' and section_id = '$section_id' and title=''"); Property changes on: branches/2.8.x/wb/modules/news/modify.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/add.php =================================================================== --- branches/2.8.x/wb/modules/news/add.php (revision 1279) +++ branches/2.8.x/wb/modules/news/add.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } Property changes on: branches/2.8.x/wb/modules/news/add.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/move_down.php =================================================================== --- branches/2.8.x/wb/modules/news/move_down.php (revision 1279) +++ branches/2.8.x/wb/modules/news/move_down.php (revision 1280) @@ -1,61 +1,54 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -require('../../config.php'); - -// Get id -if(!isset($_GET['post_id']) OR !is_numeric($_GET['post_id'])) { - if(!isset($_GET['group_id']) OR !is_numeric($_GET['group_id'])) { - header("Location: index.php"); - exit(0); - } else { - $id = $_GET['group_id']; - $id_field = 'group_id'; - $table = TABLE_PREFIX.'mod_news_groups'; - } -} else { - $id = $_GET['post_id']; - $id_field = 'post_id'; - $table = TABLE_PREFIX.'mod_news_posts'; -} - -// Include WB admin wrapper script -require(WB_PATH.'/modules/admin.php'); - -// Include the ordering class -require(WB_PATH.'/framework/class.order.php'); - -// Create new order object an reorder -$order = new order($table, 'position', $id_field, 'section_id'); -if($order->move_down($id)) { - $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); -} else { - $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); -} - -// Print admin footer -$admin->print_footer(); - +move_down($id)) { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/move_down.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/comment_page.php =================================================================== --- branches/2.8.x/wb/modules/news/comment_page.php (revision 1279) +++ branches/2.8.x/wb/modules/news/comment_page.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // Make sure page cannot be accessed directly if(!defined('WB_URL')) { header('Location: ../index.php'); Property changes on: branches/2.8.x/wb/modules/news/comment_page.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/delete.php =================================================================== --- branches/2.8.x/wb/modules/news/delete.php (revision 1279) +++ branches/2.8.x/wb/modules/news/delete.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { Property changes on: branches/2.8.x/wb/modules/news/delete.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/comment.php =================================================================== --- branches/2.8.x/wb/modules/news/comment.php (revision 1279) +++ branches/2.8.x/wb/modules/news/comment.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // Include config file require('../../config.php'); Property changes on: branches/2.8.x/wb/modules/news/comment.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/modify_group.php =================================================================== --- branches/2.8.x/wb/modules/news/modify_group.php (revision 1279) +++ branches/2.8.x/wb/modules/news/modify_group.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); // Get id Property changes on: branches/2.8.x/wb/modules/news/modify_group.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/add_group.php =================================================================== --- branches/2.8.x/wb/modules/news/add_group.php (revision 1279) +++ branches/2.8.x/wb/modules/news/add_group.php (revision 1280) @@ -1,53 +1,46 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -require('../../config.php'); - -// Include WB admin wrapper script -require(WB_PATH.'/modules/admin.php'); - -// Include the ordering class -require(WB_PATH.'/framework/class.order.php'); -// Get new order -$order = new order(TABLE_PREFIX.'mod_news_groups', 'position', 'group_id', 'section_id'); -$position = $order->get_new($section_id); - -// Insert new row into database -$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_groups (section_id,page_id,position,active) VALUES ('$section_id','$page_id','$position','1')"); - -// Get the id -$group_id = $database->get_one("SELECT LAST_INSERT_ID()"); - -// Say that a new record has been added, then redirect to modify page -if($database->is_error()) { - $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'§ion_id='.$section_id.'&group_id='.$group_id); -} else { - $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'§ion_id='.$section_id.'&group_id='.$group_id); -} - -// Print admin footer -$admin->print_footer(); - +get_new($section_id); + +// Insert new row into database +$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_groups (section_id,page_id,position,active) VALUES ('$section_id','$page_id','$position','1')"); + +// Get the id +$group_id = $database->get_one("SELECT LAST_INSERT_ID()"); + +// Say that a new record has been added, then redirect to modify page +if($database->is_error()) { + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'§ion_id='.$section_id.'&group_id='.$group_id); +} else { + $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'§ion_id='.$section_id.'&group_id='.$group_id); +} + +// Print admin footer +$admin->print_footer(); + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/add_group.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/index.php =================================================================== --- branches/2.8.x/wb/modules/news/index.php (revision 1279) +++ branches/2.8.x/wb/modules/news/index.php (revision 1280) @@ -1,27 +1,20 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -header("Location: ../../index.php"); + \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/index.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/rss.php =================================================================== --- branches/2.8.x/wb/modules/news/rss.php (revision 1279) +++ branches/2.8.x/wb/modules/news/rss.php (revision 1280) @@ -1,97 +1,90 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -// Check that GET values have been supplied -if(isset($_GET['page_id']) AND is_numeric($_GET['page_id'])) { - $page_id = $_GET['page_id']; -} else { - header('Location: /'); - exit(0); -} -if(isset($_GET['group_id']) AND is_numeric($_GET['group_id'])) { - $group_id = $_GET['group_id']; - define('GROUP_ID', $group_id); -} - -// Include WB files -require_once('../../config.php'); -require_once(WB_PATH.'/framework/class.frontend.php'); -$database = new database(); -$wb = new frontend(); -$wb->page_id = $page_id; -$wb->get_page_details(); -$wb->get_website_settings(); - -//checkout if a charset is defined otherwise use UTF-8 -if(defined('DEFAULT_CHARSET')) { - $charset=DEFAULT_CHARSET; -} else { - $charset='utf-8'; -} - -// Sending XML header -header("Content-type: text/xml; charset=$charset" ); - -// Header info -// Required by CSS 2.0 -echo ''; -?> - - - <?php echo PAGE_TITLE; ?> - http:// - - - - - - - - WebsiteBaker Content Management System -= ".$t.")"; -//Query -if(isset($group_id)) { - $query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE group_id=".$group_id." AND page_id = ".$page_id." AND active=1 AND ".$time_check_str." ORDER BY posted_when DESC"; -} else { - $query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE page_id=".$page_id." AND active=1 AND ".$time_check_str." ORDER BY posted_when DESC"; -} -$result = $database->query($query); - -//Generating the news items -while($item = $result->fetchRow()){ ?> - - <![CDATA[<?php echo stripslashes($item["title"]); ?>]]> - ]]> - - - - - +page_id = $page_id; +$wb->get_page_details(); +$wb->get_website_settings(); + +//checkout if a charset is defined otherwise use UTF-8 +if(defined('DEFAULT_CHARSET')) { + $charset=DEFAULT_CHARSET; +} else { + $charset='utf-8'; +} + +// Sending XML header +header("Content-type: text/xml; charset=$charset" ); + +// Header info +// Required by CSS 2.0 +echo ''; +?> + + + <?php echo PAGE_TITLE; ?> + http:// + + + + + + + + WebsiteBaker Content Management System += ".$t.")"; +//Query +if(isset($group_id)) { + $query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE group_id=".$group_id." AND page_id = ".$page_id." AND active=1 AND ".$time_check_str." ORDER BY posted_when DESC"; +} else { + $query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE page_id=".$page_id." AND active=1 AND ".$time_check_str." ORDER BY posted_when DESC"; +} +$result = $database->query($query); + +//Generating the news items +while($item = $result->fetchRow()){ ?> + + <![CDATA[<?php echo stripslashes($item["title"]); ?>]]> + ]]> + + + + + \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/rss.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/delete_group.php =================================================================== --- branches/2.8.x/wb/modules/news/delete_group.php (revision 1279) +++ branches/2.8.x/wb/modules/news/delete_group.php (revision 1280) @@ -1,53 +1,46 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -require('../../config.php'); - -// Get id -if(!isset($_GET['group_id']) OR !is_numeric($_GET['group_id'])) { - header("Location: ".ADMIN_URL."/pages/index.php"); - exit(0); -} else { - $group_id = $_GET['group_id']; -} - -// Include WB admin wrapper script -$update_when_modified = true; // Tells script to update when this page was last updated -require(WB_PATH.'/modules/admin.php'); - -$database->query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '0' where group_id='$group_id'"); -// Update row -$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_groups WHERE group_id = '$group_id'"); -// Check if there is a db error, otherwise say successful -if($database->is_error()) { - $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); -} else { - $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); -} - -// Print admin footer -$admin->print_footer(); - +query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '0' where group_id='$group_id'"); +// Update row +$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_groups WHERE group_id = '$group_id'"); +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} + +// Print admin footer +$admin->print_footer(); + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/news/delete_group.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/save_comment.php =================================================================== --- branches/2.8.x/wb/modules/news/save_comment.php (revision 1279) +++ branches/2.8.x/wb/modules/news/save_comment.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); // Get id Property changes on: branches/2.8.x/wb/modules/news/save_comment.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/submit_comment.php =================================================================== --- branches/2.8.x/wb/modules/news/submit_comment.php (revision 1279) +++ branches/2.8.x/wb/modules/news/submit_comment.php (revision 1280) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // Include config file require('../../config.php'); Property changes on: branches/2.8.x/wb/modules/news/submit_comment.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property