Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 1107) +++ trunk/CHANGELOG (revision 1108) @@ -12,6 +12,7 @@ ------------------------------------- 2.8.0 ------------------------------------- 6-Aug-2009 Matthias Gallas +# Fixed again some bugs in news modul (ticket #756) (Thanks to Aldus and Luisehahne) # Fixed bug that frontend.js, frontend.css and frontend_body.js are not used from snippets (ticket #764) (Thanks to Luisehahne) + Added new function 'register_frontend_modfiles_body' to default templates Index: trunk/wb/modules/news/modify_post.php =================================================================== --- trunk/wb/modules/news/modify_post.php (revision 1107) +++ trunk/wb/modules/news/modify_post.php (revision 1108) @@ -42,7 +42,7 @@ if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) { function show_wysiwyg_editor($name,$id,$content,$width,$height) { - echo ''; + echo ''; } } else { $id_list=array("short","long"); Index: trunk/wb/modules/news/comment_page.php =================================================================== --- trunk/wb/modules/news/comment_page.php (revision 1107) +++ trunk/wb/modules/news/comment_page.php (revision 1108) @@ -1,128 +1,128 @@ - - 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'); - exit(0); -} - -//overwrite php.ini on Apache servers for valid SESSION ID Separator -if(function_exists('ini_set')) { - ini_set('arg_separator.output', '&'); -} - -// check if frontend.css file needs to be included into the of page -if ( (!function_exists('register_frontend_modfiles') || !defined('MOD_FRONTEND_CSS_REGISTERED')) && file_exists(WB_PATH .'/modules/news/frontend.css')) { - echo '\n"; -} - -// check if module language file exists for the language set by the user (e.g. DE, EN) -if(!file_exists(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php')) { - // no module language file exists for the language set by the user, include default module language file EN.php - require_once(WB_PATH .'/modules/news/languages/EN.php'); -} else { - // a module language file exists for the language defined by the user, load it - require_once(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php'); -} - -require_once(WB_PATH.'/include/captcha/captcha.php'); - -// Get comments page template details from db -$query_settings = $database->query("SELECT comments_page,use_captcha,commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '".SECTION_ID."'"); -if($query_settings->numRows() == 0) { - header("Location: ".WB_URL.PAGES_DIRECTORY.""); - exit(0); -} else { - $settings = $query_settings->fetchRow(); - - // Print comments page - $vars = array('[POST_TITLE]','[TEXT_COMMENT]'); - $values = array(POST_TITLE, $MOD_NEWS['TEXT_COMMENT']); - echo str_replace($vars, $values, ($settings['comments_page'])); - ?> -
- - -

- email address: - -
- Homepage: - -
- URL: - -
- Comment: - -
-

- - : -
- /> -

- : -
- - - - - -

- '.$_SESSION['captcha_error'].'
'; - $_SESSION['captcha_retry_news'] = true; - } - // Captcha - if($settings['use_captcha']) { - ?> - - - - -
:
-
- - - -
- + 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'); + exit(0); +} + +//overwrite php.ini on Apache servers for valid SESSION ID Separator +if(function_exists('ini_set')) { + ini_set('arg_separator.output', '&'); +} + +// check if frontend.css file needs to be included into the of page +if ( (!function_exists('register_frontend_modfiles') || !defined('MOD_FRONTEND_CSS_REGISTERED')) && file_exists(WB_PATH .'/modules/news/frontend.css')) { + echo '\n"; +} + +// check if module language file exists for the language set by the user (e.g. DE, EN) +if(!file_exists(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php')) { + // no module language file exists for the language set by the user, include default module language file EN.php + require_once(WB_PATH .'/modules/news/languages/EN.php'); +} else { + // a module language file exists for the language defined by the user, load it + require_once(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php'); +} + +require_once(WB_PATH.'/include/captcha/captcha.php'); + +// Get comments page template details from db +$query_settings = $database->query("SELECT comments_page,use_captcha,commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '".SECTION_ID."'"); +if($query_settings->numRows() == 0) { + header("Location: ".WB_URL.PAGES_DIRECTORY.""); + exit(0); +} else { + $settings = $query_settings->fetchRow(); + + // Print comments page + $vars = array('[POST_TITLE]','[TEXT_COMMENT]'); + $values = array(POST_TITLE, $MOD_NEWS['TEXT_COMMENT']); + echo str_replace($vars, $values, ($settings['comments_page'])); + ?> +
+ + +

+ email address: + +
+ Homepage: + +
+ URL: + +
+ Comment: + +
+

+ + : +
+ /> +

+ : +
+ + + + + +

+ '.$_SESSION['captcha_error'].'
'; + $_SESSION['captcha_retry_news'] = true; + } + // Captcha + if($settings['use_captcha']) { + ?> + + + + +
:
+
+ + + +
+ \ No newline at end of file Index: trunk/wb/modules/news/modify_settings.php =================================================================== --- trunk/wb/modules/news/modify_settings.php (revision 1107) +++ trunk/wb/modules/news/modify_settings.php (revision 1108) @@ -77,31 +77,31 @@ : - + : - + : - + : - + : - + @@ -166,25 +166,25 @@ : - + : - + : - + : - + @@ -191,7 +191,7 @@ '; - } else { - $content .= ''; - } - } - - // Print comments footer - $vars = array('[ADD_COMMENT_URL]','[TEXT_ADD_COMMENT]'); - $values = array(WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $MOD_NEWS['TEXT_ADD_COMMENT']); - echo str_replace($vars, $values, $setting_comments_footer); - } - if(ENABLED_ASP) { - $_SESSION['comes_from_view'] = POST_ID; - $_SESSION['comes_from_view_time'] = time(); - } -} - + + 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"); } + +// check if frontend.css file needs to be included into the of view.php +if((!function_exists('register_frontend_modfiles') || !defined('MOD_FRONTEND_CSS_REGISTERED')) && file_exists(WB_PATH .'/modules/news/frontend.css')) { + echo '\n"; +} + +// check if module language file exists for the language set by the user (e.g. DE, EN) +if(!file_exists(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php')) { + // no module language file exists for the language set by the user, include default module language file EN.php + require_once(WB_PATH .'/modules/news/languages/EN.php'); +} else { + // a module language file exists for the language defined by the user, load it + require_once(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php'); +} + +//overwrite php.ini on Apache servers for valid SESSION ID Separator +if(function_exists('ini_set')) { + ini_set('arg_separator.output', '&'); +} + +// Check if there is a start point defined +if(isset($_GET['p']) AND is_numeric($_GET['p']) AND $_GET['p'] >= 0) { + $position = $_GET['p']; +} else { + $position = 0; +} + +// Get user's username, display name, email, and id - needed for insertion into post info +$users = array(); +$query_users = $database->query("SELECT user_id,username,display_name,email FROM ".TABLE_PREFIX."users"); +if($query_users->numRows() > 0) { + while($user = $query_users->fetchRow()) { + // Insert user info into users array + $user_id = $user['user_id']; + $users[$user_id]['username'] = $user['username']; + $users[$user_id]['display_name'] = $user['display_name']; + $users[$user_id]['email'] = $user['email']; + } +} + +// Get groups (title, if they are active, and their image [if one has been uploaded]) +if (isset($groups)) { + unset($groups); +} +$groups[0]['title'] = ''; +$groups[0]['active'] = true; +$groups[0]['image'] = ''; +$query_users = $database->query("SELECT group_id,title,active FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id' ORDER BY position ASC"); +if($query_users->numRows() > 0) { + while($group = $query_users->fetchRow()) { + // Insert user info into users array + $group_id = $group['group_id']; + $groups[$group_id]['title'] = ($group['title']); + $groups[$group_id]['active'] = $group['active']; + if(file_exists(WB_PATH.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg')) { + $groups[$group_id]['image'] = WB_URL.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg'; + } else { + $groups[$group_id]['image'] = ''; + } + } +} + +// Check if we should show the main page or a post itself +if(!defined('POST_ID') OR !is_numeric(POST_ID)) { + + // Check if we should only list posts from a certain group + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + $query_extra = " AND group_id = '".$_GET['g']."'"; + } else { + $query_extra = ''; + } + + // Get settings + $query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); + if($query_settings->numRows() > 0) { + $fetch_settings = $query_settings->fetchRow(); + $setting_header = ($fetch_settings['header']); + $setting_post_loop = ($fetch_settings['post_loop']); + $setting_footer = ($fetch_settings['footer']); + $setting_posts_per_page = $fetch_settings['posts_per_page']; + } else { + $setting_header = ''; + $setting_post_loop = ''; + $setting_footer = ''; + $setting_posts_per_page = ''; + } + + $t = time(); + // Get total number of posts + $query_total_num = $database->query("SELECT post_id FROM ".TABLE_PREFIX."mod_news_posts + WHERE section_id = '$section_id' AND active = '1' AND title != '' $query_extra + AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t)"); + $total_num = $query_total_num->numRows(); + + // Work-out if we need to add limit code to sql + if($setting_posts_per_page != 0) { + $limit_sql = " LIMIT $position,$setting_posts_per_page"; + } else { + $limit_sql = ""; + } + + // Query posts (for this page) + $query_posts = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts + WHERE section_id = '$section_id' AND active = '1' AND title != ''$query_extra + AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t) + ORDER BY position DESC".$limit_sql); + $num_posts = $query_posts->numRows(); + + // Create previous and next links + if($setting_posts_per_page != 0) { + if($position > 0) { + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + $pl_prepend = '<< '; + } else { + $pl_prepend = '<< '; + } + $pl_append = ''; + $previous_link = $pl_prepend.$TEXT['PREVIOUS'].$pl_append; + $previous_page_link = $pl_prepend.$TEXT['PREVIOUS_PAGE'].$pl_append; + } else { + $previous_link = ''; + $previous_page_link = ''; + } + if($position+$setting_posts_per_page >= $total_num) { + $next_link = ''; + $next_page_link = ''; + } else { + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + $nl_prepend = ' '; + } else { + $nl_prepend = ' '; + } + $nl_append = ' >>'; + $next_link = $nl_prepend.$TEXT['NEXT'].$nl_append; + $next_page_link = $nl_prepend.$TEXT['NEXT_PAGE'].$nl_append; + } + if($position+$setting_posts_per_page > $total_num) { + $num_of = $position+$num_posts; + } else { + $num_of = $position+$setting_posts_per_page; + } + $out_of = ($position+1).'-'.$num_of.' '.strtolower($TEXT['OUT_OF']).' '.$total_num; + $of = ($position+1).'-'.$num_of.' '.strtolower($TEXT['OF']).' '.$total_num; + $display_previous_next_links = ''; + } else { + $display_previous_next_links = 'none'; + } + + if ($num_posts === 0) { + $setting_header = ''; + $setting_post_loop = ''; + $setting_footer = ''; + $setting_posts_per_page = ''; + + } + + // Print header + if($display_previous_next_links == 'none') { + echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array('','','','','','', $display_previous_next_links), $setting_header); + } else { + echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array($next_page_link, $next_link, $previous_page_link, $previous_link, $out_of, $of, $display_previous_next_links), $setting_header); + } + + if($num_posts > 0) { + if($query_extra != '') { + ?> +
+ '.PAGE_TITLE.' >> '.$groups[$_GET['g']]['title']; ?> +
+ fetchRow()) { + if(isset($groups[$post['group_id']]['active']) AND $groups[$post['group_id']]['active'] != false) { // Make sure parent group is active + $uid = $post['posted_by']; // User who last modified the post + // Workout date and time of last modified post + if ($post['published_when'] === '0') $post['published_when'] = time(); + if ($post['published_when'] > $post['posted_when']) { + $post_date = gmdate(DATE_FORMAT, $post['published_when']+TIMEZONE); + $post_time = gmdate(TIME_FORMAT, $post['published_when']+TIMEZONE); + } else { + $post_date = gmdate(DATE_FORMAT, $post['posted_when']+TIMEZONE); + $post_time = gmdate(TIME_FORMAT, $post['posted_when']+TIMEZONE); + } + $publ_date = date(DATE_FORMAT,$post['published_when']); + $publ_time = date(TIME_FORMAT,$post['published_when']); + // Work-out the post link + $post_link = page_link($post['link']); + if(isset($_GET['p']) AND $position > 0) { + $post_link .= '?p='.$position; + } + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + if(isset($_GET['p']) AND $position > 0) { $post_link .= '&'; } else { $post_link .= '?'; } + $post_link .= 'g='.$_GET['g']; + } + // Get group id, title, and image + $group_id = $post['group_id']; + $group_title = $groups[$group_id]['title']; + $group_image = $groups[$group_id]['image']; + $display_image = ($group_image == '') ? "none" : "inherit"; + $display_group = ($group_id == 0) ? 'none' : 'inherit'; + if ($group_image != "") $group_image= "".$group_title.""; + // Replace [wblink--PAGE_ID--] with real link + $short = ($post['content_short']); + $wb->preprocess($short); + // Replace vars with values + $post_long_len = strlen($post['content_long']); + $vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[LINK]', '[MODI_DATE]', '[MODI_TIME]', '[PUBLISHED_DATE]', '[PUBLISHED_TIME]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]', '[TEXT_READ_MORE]','[SHOW_READ_MORE]'); + if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { + if($post_long_len < 9) { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, '#" onclick="javascript:void(0);return false;" style="cursor:no-drop;', $post_date, $post_time, $publ_date, $publ_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], '', 'none'); + } else { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], $MOD_NEWS['TEXT_READ_MORE'], 'visible'); + } + } else { + if($post_long_len < 9) { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, '#" onclick="javascript:void(0);return false;" style="cursor:no-drop;', $post_date, $post_time, $publ_date, $publ_time, '', '', '', '', '','none'); + } else { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, '', '', '', '', $MOD_NEWS['TEXT_READ_MORE'],'visible'); + } + } + echo str_replace($vars, $values, $setting_post_loop); + } + } + } + + // Print footer + if($display_previous_next_links == 'none') { + echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array('','','','','','', $display_previous_next_links), $setting_footer); + } else { + echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array($next_page_link, $next_link, $previous_page_link, $previous_link, $out_of, $of, $display_previous_next_links), $setting_footer); + } + +} elseif(defined('POST_ID') AND is_numeric(POST_ID)) { + + // Get settings + $query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); + if($query_settings->numRows() > 0) { + $fetch_settings = $query_settings->fetchRow(); + $setting_post_header = ($fetch_settings['post_header']); + $setting_post_footer = ($fetch_settings['post_footer']); + $setting_comments_header = ($fetch_settings['comments_header']); + $setting_comments_loop = ($fetch_settings['comments_loop']); + $setting_comments_footer = ($fetch_settings['comments_footer']); + } else { + $setting_post_header = ''; + $setting_post_footer = ''; + $setting_comments_header = ''; + $setting_comments_loop = ''; + $setting_comments_footer = ''; + } + + // Get page info + $query_page = $database->query("SELECT link FROM ".TABLE_PREFIX."pages WHERE page_id = '".PAGE_ID."'"); + if($query_page->numRows() > 0) { + $page = $query_page->fetchRow(); + $page_link = page_link($page['link']); + if(isset($_GET['p']) AND $position > 0) { + $page_link .= '?p='.$_GET['p']; + } + if(isset($_GET['g']) AND is_numeric($_GET['g'])) { + if(isset($_GET['p']) AND $position > 0) { $page_link .= '&'; } else { $page_link .= '?'; } + $page_link .= 'g='.$_GET['g']; + } + } else { + exit('Page not found'); + } + + // Get post info + $t = time(); + $query_post = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts + WHERE post_id = '".POST_ID."' AND active = '1' + AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t) + "); + if($query_post->numRows() > 0) { + $post = $query_post->fetchRow(); + if(isset($groups[$post['group_id']]['active']) AND $groups[$post['group_id']]['active'] != false) { // Make sure parent group is active + $uid = $post['posted_by']; // User who last modified the post + // Workout date and time of last modified post + if ($post['published_when'] === '0') $post['published_when'] = time(); + if ($post['published_when'] > $post['posted_when']) { + $post_date = gmdate(DATE_FORMAT, $post['published_when']+TIMEZONE); + $post_time = gmdate(TIME_FORMAT, $post['published_when']+TIMEZONE); + } else { + $post_date = gmdate(DATE_FORMAT, $post['posted_when']+TIMEZONE); + $post_time = gmdate(TIME_FORMAT, $post['posted_when']+TIMEZONE); + } + $publ_date = date(DATE_FORMAT,$post['published_when']); + $publ_time = date(TIME_FORMAT,$post['published_when']); + // Get group id, title, and image + $group_id = $post['group_id']; + $group_title = $groups[$group_id]['title']; + $group_image = $groups[$group_id]['image']; + $display_image = ($group_image == '') ? "none" : "inherit"; + $display_group = ($group_id == 0) ? 'none' : 'inherit'; + if ($group_image != "") $group_image= "".$group_title.""; + $vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[BACK]', '[TEXT_BACK]', '[TEXT_LAST_CHANGED]', '[MODI_DATE]', '[TEXT_AT]', '[MODI_TIME]', '[PUBLISHED_DATE]', '[PUBLISHED_TIME]', '[TEXT_POSTED_BY]', '[TEXT_ON]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]'); + $post_short=$post['content_short']; + $wb->preprocess($post_short); + if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $MOD_NEWS['TEXT_BACK'], $MOD_NEWS['TEXT_LAST_CHANGED'], $post_date, $MOD_NEWS['TEXT_AT'], $post_time, $publ_date, $publ_time, $MOD_NEWS['TEXT_POSTED_BY'], $MOD_NEWS['TEXT_ON'], $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email']); + } else { + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $MOD_NEWS['TEXT_BACK'], $MOD_NEWS['TEXT_LAST_CHANGED'], $post_date, $MOD_NEWS['TEXT_AT'], $post_time, $publ_date, $publ_time, $MOD_NEWS['TEXT_POSTED_BY'], $MOD_NEWS['TEXT_ON'], '', '', '', ''); + } + $post_long = ($post['content_long']); + } + } else { + $wb->print_error($MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'], "javascript: history.go(-1);", false); + exit(0); + } + + // Print post header + echo str_replace($vars, $values, $setting_post_header); + + // Replace [wblink--PAGE_ID--] with real link + $wb->preprocess($post_long); + // Print long + echo $post_long; + + // Print post footer + echo str_replace($vars, $values, $setting_post_footer); + + // Show comments section if we have to + if(($post['commenting'] == 'private' AND isset($wb) AND $wb->is_authenticated() == true) OR $post['commenting'] == 'public') { + + // Print comments header + $vars = array('[ADD_COMMENT_URL]','[TEXT_COMMENTS]'); + $values = array(WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $MOD_NEWS['TEXT_COMMENTS']); + echo str_replace($vars, $values, $setting_comments_header); + + // Query for comments + $query_comments = $database->query("SELECT title,comment,commented_when,commented_by FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".POST_ID."' ORDER BY commented_when ASC"); + if($query_comments->numRows() > 0) { + while($comment = $query_comments->fetchRow()) { + // Display Comments without slashes, but with new-line characters + $comment['comment'] = nl2br($wb->strip_slashes($comment['comment'])); + $comment['title'] = $wb->strip_slashes($comment['title']); + // Print comments loop + $commented_date = gmdate(DATE_FORMAT, $comment['commented_when']+TIMEZONE); + $commented_time = gmdate(TIME_FORMAT, $comment['commented_when']+TIMEZONE); + $uid = $comment['commented_by']; + $vars = array('[TITLE]','[COMMENT]','[TEXT_ON]','[DATE]','[TEXT_AT]','[TIME]','[TEXT_BY]','[USER_ID]','[USERNAME]','[DISPLAY_NAME]', '[EMAIL]'); + if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { + $values = array(($comment['title']), ($comment['comment']), $MOD_NEWS['TEXT_ON'], $commented_date, $MOD_NEWS['TEXT_AT'], $commented_time, $MOD_NEWS['TEXT_BY'], $uid, ($users[$uid]['username']), ($users[$uid]['display_name']), ($users[$uid]['email'])); + } else { + $values = array(($comment['title']), ($comment['comment']), $MOD_NEWS['TEXT_ON'], $commented_date, $MOD_NEWS['TEXT_AT'], $commented_time, $MOD_NEWS['TEXT_BY'], '0', strtolower($TEXT['UNKNOWN']), $TEXT['UNKNOWN'], ''); + } + echo str_replace($vars, $values, $setting_comments_loop); + } + } else { + // Say no comments found + $content = ''; + if(isset($TEXT['NONE_FOUND'])) { + $content .= ''; + } else { + $content .= ''; + } + } + + // Print comments footer + $vars = array('[ADD_COMMENT_URL]','[TEXT_ADD_COMMENT]'); + $values = array(WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $MOD_NEWS['TEXT_ADD_COMMENT']); + echo str_replace($vars, $values, $setting_comments_footer); + } + if(ENABLED_ASP) { + $_SESSION['comes_from_view'] = POST_ID; + $_SESSION['comes_from_view_time'] = time(); + } +} + ?> \ No newline at end of file Index: trunk/wb/modules/news/frontend.css =================================================================== --- trunk/wb/modules/news/frontend.css (revision 1107) +++ trunk/wb/modules/news/frontend.css (revision 1108) @@ -29,7 +29,7 @@ padding-bottom: 15px; } -.comment_title, .comment_text { +.comment_title, .comment-text { border-left: 1px solid #DDDDDD; } @@ -50,4 +50,38 @@ /*** Don't remove the class nixhier, this is required for ASP ***/ .nixhier { display:none; +} + +.loop-header { + width: 100%; +} + +.page-header { + width: 100%; +} +.post-header { + width: 100%; +} + +.page-left { + text-align: left; +} +.page-center { + text-align: center; +} + +.page-right { + text-align: right; +} + +.comment-header { + width: 100%; +} + +.public-info { + text-align: right; +} + +.group-page { + text-align: center; } \ No newline at end of file Index: trunk/wb/modules/news/add.php =================================================================== --- trunk/wb/modules/news/add.php (revision 1107) +++ trunk/wb/modules/news/add.php (revision 1108) @@ -1,81 +1,81 @@ - - 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"); } - -$header = '
- + Index: trunk/wb/modules/news/modify_comment.php =================================================================== --- trunk/wb/modules/news/modify_comment.php (revision 1107) +++ trunk/wb/modules/news/modify_comment.php (revision 1108) @@ -1,86 +1,86 @@ - - 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['comment_id']) OR !is_numeric($_GET['comment_id'])) { - header("Location: ".ADMIN_URL."/pages/index.php"); - exit(0); -} else { - $comment_id = $_GET['comment_id']; -} - -// Include WB admin wrapper script -require(WB_PATH.'/modules/admin.php'); - -// Get header and footer -$query_content = $database->query("SELECT post_id,title,comment FROM ".TABLE_PREFIX."mod_news_comments WHERE comment_id = '$comment_id'"); -$fetch_content = $query_content->fetchRow(); - -?> - -

- -
- - - - - - - - - - - - - - - -
: - -
: - -
- - - - - - -
- - - -
- - -print_footer(); - + + 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['comment_id']) OR !is_numeric($_GET['comment_id'])) { + header("Location: ".ADMIN_URL."/pages/index.php"); + exit(0); +} else { + $comment_id = $_GET['comment_id']; +} + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// Get header and footer +$query_content = $database->query("SELECT post_id,title,comment FROM ".TABLE_PREFIX."mod_news_comments WHERE comment_id = '$comment_id'"); +$fetch_content = $query_content->fetchRow(); + +?> + +

+ +
+ + + + + + + + + + + + + + + +
: + +
: + +
+ + + + + + +
+ + + +
+ + +print_footer(); + ?> \ No newline at end of file Index: trunk/wb/modules/news/view.php =================================================================== --- trunk/wb/modules/news/view.php (revision 1107) +++ trunk/wb/modules/news/view.php (revision 1108) @@ -1,387 +1,399 @@ - - 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"); } - -// check if frontend.css file needs to be included into the of view.php -if((!function_exists('register_frontend_modfiles') || !defined('MOD_FRONTEND_CSS_REGISTERED')) && file_exists(WB_PATH .'/modules/news/frontend.css')) { - echo '\n"; -} - -// check if module language file exists for the language set by the user (e.g. DE, EN) -if(!file_exists(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php')) { - // no module language file exists for the language set by the user, include default module language file EN.php - require_once(WB_PATH .'/modules/news/languages/EN.php'); -} else { - // a module language file exists for the language defined by the user, load it - require_once(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php'); -} - -//overwrite php.ini on Apache servers for valid SESSION ID Separator -if(function_exists('ini_set')) { - ini_set('arg_separator.output', '&'); -} - -// Check if there is a start point defined -if(isset($_GET['p']) AND is_numeric($_GET['p']) AND $_GET['p'] >= 0) { - $position = $_GET['p']; -} else { - $position = 0; -} - -// Get user's username, display name, email, and id - needed for insertion into post info -$users = array(); -$query_users = $database->query("SELECT user_id,username,display_name,email FROM ".TABLE_PREFIX."users"); -if($query_users->numRows() > 0) { - while($user = $query_users->fetchRow()) { - // Insert user info into users array - $user_id = $user['user_id']; - $users[$user_id]['username'] = $user['username']; - $users[$user_id]['display_name'] = $user['display_name']; - $users[$user_id]['email'] = $user['email']; - } -} - -// Get groups (title, if they are active, and their image [if one has been uploaded]) -if (isset($groups)) { - unset($groups); -} -$groups[0]['title'] = ''; -$groups[0]['active'] = true; -$groups[0]['image'] = ''; -$query_users = $database->query("SELECT group_id,title,active FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id' ORDER BY position ASC"); -if($query_users->numRows() > 0) { - while($group = $query_users->fetchRow()) { - // Insert user info into users array - $group_id = $group['group_id']; - $groups[$group_id]['title'] = ($group['title']); - $groups[$group_id]['active'] = $group['active']; - if(file_exists(WB_PATH.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg')) { - $groups[$group_id]['image'] = WB_URL.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg'; - } else { - $groups[$group_id]['image'] = ''; - } - } -} - -// Check if we should show the main page or a post itself -if(!defined('POST_ID') OR !is_numeric(POST_ID)) { - - // Check if we should only list posts from a certain group - if(isset($_GET['g']) AND is_numeric($_GET['g'])) { - $query_extra = " AND group_id = '".$_GET['g']."'"; - } else { - $query_extra = ''; - } - - // Get settings - $query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); - if($query_settings->numRows() > 0) { - $fetch_settings = $query_settings->fetchRow(); - $setting_header = ($fetch_settings['header']); - $setting_post_loop = ($fetch_settings['post_loop']); - $setting_footer = ($fetch_settings['footer']); - $setting_posts_per_page = $fetch_settings['posts_per_page']; - } else { - $setting_header = ''; - $setting_post_loop = ''; - $setting_footer = ''; - $setting_posts_per_page = ''; - } - - $t = time(); - // Get total number of posts - $query_total_num = $database->query("SELECT post_id FROM ".TABLE_PREFIX."mod_news_posts - WHERE section_id = '$section_id' AND active = '1' AND title != '' $query_extra - AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t)"); - $total_num = $query_total_num->numRows(); - - // Work-out if we need to add limit code to sql - if($setting_posts_per_page != 0) { - $limit_sql = " LIMIT $position,$setting_posts_per_page"; - } else { - $limit_sql = ""; - } - - // Query posts (for this page) - $query_posts = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts - WHERE section_id = '$section_id' AND active = '1' AND title != ''$query_extra - AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t) - ORDER BY position DESC".$limit_sql); - $num_posts = $query_posts->numRows(); - - // Create previous and next links - if($setting_posts_per_page != 0) { - if($position > 0) { - if(isset($_GET['g']) AND is_numeric($_GET['g'])) { - $pl_prepend = '<< '; - } else { - $pl_prepend = '<< '; - } - $pl_append = ''; - $previous_link = $pl_prepend.$TEXT['PREVIOUS'].$pl_append; - $previous_page_link = $pl_prepend.$TEXT['PREVIOUS_PAGE'].$pl_append; - } else { - $previous_link = ''; - $previous_page_link = ''; - } - if($position+$setting_posts_per_page >= $total_num) { - $next_link = ''; - $next_page_link = ''; - } else { - if(isset($_GET['g']) AND is_numeric($_GET['g'])) { - $nl_prepend = ' '; - } else { - $nl_prepend = ' '; - } - $nl_append = ' >>'; - $next_link = $nl_prepend.$TEXT['NEXT'].$nl_append; - $next_page_link = $nl_prepend.$TEXT['NEXT_PAGE'].$nl_append; - } - if($position+$setting_posts_per_page > $total_num) { - $num_of = $position+$num_posts; - } else { - $num_of = $position+$setting_posts_per_page; - } - $out_of = ($position+1).'-'.$num_of.' '.strtolower($TEXT['OUT_OF']).' '.$total_num; - $of = ($position+1).'-'.$num_of.' '.strtolower($TEXT['OF']).' '.$total_num; - $display_previous_next_links = ''; - } else { - $display_previous_next_links = 'none'; - } - - // Print header - if($display_previous_next_links == 'none') { - echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array('','','','','','', $display_previous_next_links), $setting_header); - } else { - echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array($next_page_link, $next_link, $previous_page_link, $previous_link, $out_of, $of, $display_previous_next_links), $setting_header); - } - - if($num_posts > 0) { - if($query_extra != '') { - ?> -
- '.PAGE_TITLE.' >> '.$groups[$_GET['g']]['title']; ?> -
- fetchRow()) { - if(isset($groups[$post['group_id']]['active']) AND $groups[$post['group_id']]['active'] != false) { // Make sure parent group is active - $uid = $post['posted_by']; // User who last modified the post - // Workout date and time of last modified post - if ($post['published_when'] > $post['posted_when']) { - $post_date = gmdate(DATE_FORMAT, $post['published_when']+TIMEZONE); - $post_time = gmdate(TIME_FORMAT, $post['published_when']+TIMEZONE); - } else { - $post_date = gmdate(DATE_FORMAT, $post['posted_when']+TIMEZONE); - $post_time = gmdate(TIME_FORMAT, $post['posted_when']+TIMEZONE); - } - $publ_date = date(DATE_FORMAT,$post['published_when']); - $publ_time = date(TIME_FORMAT,$post['published_when']); - // Work-out the post link - $post_link = page_link($post['link']); - if(isset($_GET['p']) AND $position > 0) { - $post_link .= '?p='.$position; - } - if(isset($_GET['g']) AND is_numeric($_GET['g'])) { - if(isset($_GET['p']) AND $position > 0) { $post_link .= '&'; } else { $post_link .= '?'; } - $post_link .= 'g='.$_GET['g']; - } - // Get group id, title, and image - $group_id = $post['group_id']; - $group_title = $groups[$group_id]['title']; - $group_image = $groups[$group_id]['image']; - $display_image = ($group_image == '') ? "none" : "inherit"; - $display_group = ($group_id == 0) ? 'none' : 'inherit'; - // Replace [wblink--PAGE_ID--] with real link - $short = ($post['content_short']); - $wb->preprocess($short); - // Replace vars with values - $post_long_len = strlen($post['content_long']); - $vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[LINK]', '[MODI_DATE]', '[MODI_TIME]', '[PUBLISHED_DATE]', '[PUBLISHED_TIME]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]', '[TEXT_READ_MORE]','[SHOW_READ_MORE]'); - if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { - if($post_long_len < 9) { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, '#" onclick="javascript:void(0);return false;" style="cursor:no-drop;', $post_date, $post_time, $publ_date, $publ_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], '', 'none'); - } else { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], $MOD_NEWS['TEXT_READ_MORE'], 'visible'); - } - } else { - if($post_long_len < 9) { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, '#" onclick="javascript:void(0);return false;" style="cursor:no-drop;', $post_date, $post_time, $publ_date, $publ_time, '', '', '', '', '','none'); - } else { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, '', '', '', '', $MOD_NEWS['TEXT_READ_MORE'],'visible'); - } - } - echo str_replace($vars, $values, $setting_post_loop); - } - } - } - - // Print footer - if($display_previous_next_links == 'none') { - echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array('','','','','','', $display_previous_next_links), $setting_footer); - } else { - echo str_replace(array('[NEXT_PAGE_LINK]','[NEXT_LINK]','[PREVIOUS_PAGE_LINK]','[PREVIOUS_LINK]','[OUT_OF]','[OF]','[DISPLAY_PREVIOUS_NEXT_LINKS]'), array($next_page_link, $next_link, $previous_page_link, $previous_link, $out_of, $of, $display_previous_next_links), $setting_footer); - } - -} elseif(defined('POST_ID') AND is_numeric(POST_ID)) { - - // Get settings - $query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); - if($query_settings->numRows() > 0) { - $fetch_settings = $query_settings->fetchRow(); - $setting_post_header = ($fetch_settings['post_header']); - $setting_post_footer = ($fetch_settings['post_footer']); - $setting_comments_header = ($fetch_settings['comments_header']); - $setting_comments_loop = ($fetch_settings['comments_loop']); - $setting_comments_footer = ($fetch_settings['comments_footer']); - } else { - $setting_post_header = ''; - $setting_post_footer = ''; - $setting_comments_header = ''; - $setting_comments_loop = ''; - $setting_comments_footer = ''; - } - - // Get page info - $query_page = $database->query("SELECT link FROM ".TABLE_PREFIX."pages WHERE page_id = '".PAGE_ID."'"); - if($query_page->numRows() > 0) { - $page = $query_page->fetchRow(); - $page_link = page_link($page['link']); - if(isset($_GET['p']) AND $position > 0) { - $page_link .= '?p='.$_GET['p']; - } - if(isset($_GET['g']) AND is_numeric($_GET['g'])) { - if(isset($_GET['p']) AND $position > 0) { $page_link .= '&'; } else { $page_link .= '?'; } - $page_link .= 'g='.$_GET['g']; - } - } else { - exit('Page not found'); - } - - // Get post info - $t = time(); - $query_post = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts - WHERE post_id = '".POST_ID."' AND active = '1' - AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t) - "); - if($query_post->numRows() > 0) { - $post = $query_post->fetchRow(); - if(isset($groups[$post['group_id']]['active']) AND $groups[$post['group_id']]['active'] != false) { // Make sure parent group is active - $uid = $post['posted_by']; // User who last modified the post - // Workout date and time of last modified post - if ($post['published_when'] > $post['posted_when']) { - $post_date = gmdate(DATE_FORMAT, $post['published_when']+TIMEZONE); - $post_time = gmdate(TIME_FORMAT, $post['published_when']+TIMEZONE); - } else { - $post_date = gmdate(DATE_FORMAT, $post['posted_when']+TIMEZONE); - $post_time = gmdate(TIME_FORMAT, $post['posted_when']+TIMEZONE); - } - $publ_date = date(DATE_FORMAT,$post['published_when']); - $publ_time = date(TIME_FORMAT,$post['published_when']); - // Get group id, title, and image - $group_id = $post['group_id']; - $group_title = $groups[$group_id]['title']; - $group_image = $groups[$group_id]['image']; - $display_image = ($group_image == '') ? "none" : "inherit"; - $display_group = ($group_id == 0) ? 'none' : 'inherit'; - $vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[BACK]', '[TEXT_BACK]', '[TEXT_LAST_CHANGED]', '[MODI_DATE]', '[TEXT_AT]', '[MODI_TIME]', '[PUBLISHED_DATE]', '[PUBLISHED_TIME]', '[TEXT_POSTED_BY]', '[TEXT_ON]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]'); - $post_short=$post['content_short']; - $wb->preprocess($post_short); - if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $MOD_NEWS['TEXT_BACK'], $MOD_NEWS['TEXT_LAST_CHANGED'], $post_date, $MOD_NEWS['TEXT_AT'], $post_time, $publ_date, $publ_time, $MOD_NEWS['TEXT_POSTED_BY'], $MOD_NEWS['TEXT_ON'], $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email']); - } else { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $MOD_NEWS['TEXT_BACK'], $MOD_NEWS['TEXT_LAST_CHANGED'], $post_date, $MOD_NEWS['TEXT_AT'], $post_time, $publ_date, $publ_time, $MOD_NEWS['TEXT_POSTED_BY'], $MOD_NEWS['TEXT_ON'], '', '', '', ''); - } - $post_long = ($post['content_long']); - } - } else { - $wb->print_error($MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'], "javascript: history.go(-1);", false); - exit(0); - } - - // Print post header - echo str_replace($vars, $values, $setting_post_header); - - // Replace [wblink--PAGE_ID--] with real link - $wb->preprocess($post_long); - // Print long - echo $post_long; - - // Print post footer - echo str_replace($vars, $values, $setting_post_footer); - - // Show comments section if we have to - if(($post['commenting'] == 'private' AND isset($wb) AND $wb->is_authenticated() == true) OR $post['commenting'] == 'public') { - - // Print comments header - $vars = array('[ADD_COMMENT_URL]','[TEXT_COMMENTS]'); - $values = array(WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $MOD_NEWS['TEXT_COMMENTS']); - echo str_replace($vars, $values, $setting_comments_header); - - // Query for comments - $query_comments = $database->query("SELECT title,comment,commented_when,commented_by FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".POST_ID."' ORDER BY commented_when ASC"); - if($query_comments->numRows() > 0) { - while($comment = $query_comments->fetchRow()) { - // Display Comments without slashes, but with new-line characters - $comment['comment'] = nl2br($wb->strip_slashes($comment['comment'])); - $comment['title'] = $wb->strip_slashes($comment['title']); - // Print comments loop - $commented_date = gmdate(DATE_FORMAT, $comment['commented_when']+TIMEZONE); - $commented_time = gmdate(TIME_FORMAT, $comment['commented_when']+TIMEZONE); - $uid = $comment['commented_by']; - $vars = array('[TITLE]','[COMMENT]','[TEXT_ON]','[DATE]','[TEXT_AT]','[TIME]','[TEXT_BY]','[USER_ID]','[USERNAME]','[DISPLAY_NAME]', '[EMAIL]'); - if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { - $values = array(($comment['title']), ($comment['comment']), $MOD_NEWS['TEXT_ON'], $commented_date, $MOD_NEWS['TEXT_AT'], $commented_time, $MOD_NEWS['TEXT_BY'], $uid, ($users[$uid]['username']), ($users[$uid]['display_name']), ($users[$uid]['email'])); - } else { - $values = array(($comment['title']), ($comment['comment']), $MOD_NEWS['TEXT_ON'], $commented_date, $MOD_NEWS['TEXT_AT'], $commented_time, $MOD_NEWS['TEXT_BY'], '0', strtolower($TEXT['UNKNOWN']), $TEXT['UNKNOWN'], ''); - } - echo str_replace($vars, $values, $setting_comments_loop); - } - } else { - // Say no comments found - $content = ''; - if(isset($TEXT['NONE_FOUND'])) { - $content .= '
'.$TEXT['NONE_FOUND'].'
None Found
'.$TEXT['NONE_FOUND'].'
None Found
'; -$post_loop = ' - - - - - -'; -$footer = '
[TITLE][PUBLISHED_TIME], [PUBLISHED_DATE]
-[SHORT] -[TEXT_READ_MORE] -
- - - - - - -
[PREVIOUS_PAGE_LINK][OF][NEXT_PAGE_LINK]
'; -$post_header = addslashes(' - - - - - - - - - - -

[TITLE]

[GROUP_TITLE]
[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]
[PAGE_TITLE] >> [GROUP_TITLE]
'); -$post_footer = '

[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]

-[TEXT_BACK]'; -$comments_header = addslashes('

-

[TEXT_COMMENTS]

-'); -$comments_loop = addslashes(' - - - - - -'); -$comments_footer = '
[TITLE][TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]
[COMMENT]
-
[TEXT_ADD_COMMENT]'; -$comments_page = '

[TEXT_COMMENT]

-

[POST_TITLE]

-
'; -$commenting = 'none'; -$use_captcha = true; -$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id,header,post_loop,footer,post_header,post_footer,comments_header,comments_loop,comments_footer,comments_page,commenting,use_captcha) VALUES ('$section_id','$page_id','$header','$post_loop','$footer','$post_header','$post_footer','$comments_header','$comments_loop','$comments_footer','$comments_page','$commenting','$use_captcha')"); - + + 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"); } + +$header = ''."\n"; +$post_loop = ' + + + + + +'; +$footer = '
[TITLE][PUBLISHED_TIME], [PUBLISHED_DATE]
+[SHORT] +[TEXT_READ_MORE] +
+ + + + + + +
[PREVIOUS_PAGE_LINK][OF][NEXT_PAGE_LINK]
'; +$post_header = addslashes(' + + + + + + + + + + +

[TITLE]

[GROUP_IMAGE]
[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]
[PAGE_TITLE] >> [GROUP_TITLE]
'); +$post_footer = '

[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]

+[TEXT_BACK]'; +$comments_header = addslashes('

+

[TEXT_COMMENTS]

+'); +$comments_loop = addslashes(' + + + + + +'); +$comments_footer = '
[TITLE][TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]
[COMMENT]
+
[TEXT_ADD_COMMENT]'; +$comments_page = '

[TEXT_COMMENT]

+

[POST_TITLE]

+
'; +$commenting = 'none'; +$use_captcha = true; +$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id,header,post_loop,footer,post_header,post_footer,comments_header,comments_loop,comments_footer,comments_page,commenting,use_captcha) VALUES ('$section_id','$page_id','$header','$post_loop','$footer','$post_header','$post_footer','$comments_header','$comments_loop','$comments_footer','$comments_page','$commenting','$use_captcha')"); + ?> \ No newline at end of file