Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG (revision 599)
+++ trunk/CHANGELOG (revision 600)
@@ -14,6 +14,7 @@
26-Jan-2008 Matthias Gallas
+ Added keywords to files where they are missing
26-Jan-2008 Thomas Hornik
++ module news: added publish_until field to control the visibility of a news-posting by date and time
! added strongly "condensed" fonts with many intersections for ttf-CAPTCHA as default fonts.
It should be very difficult for spam-bots to recognize intersected characters.
25-Jan-2008 Christian Sommer
Index: trunk/wb/upgrade-script.php
===================================================================
--- trunk/wb/upgrade-script.php (revision 599)
+++ trunk/wb/upgrade-script.php (revision 600)
@@ -473,11 +473,15 @@
//Start of upgrade script for the news modul
//******************************************************************************
-echo " Adding new field to database table mod_news_posts ";
+echo " Adding new fields to database table mod_news_posts ";
if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_news_posts` ADD `published_when` INT NOT NULL AFTER `commenting`")) {
echo 'Database Field published_when added successfully ';
}
echo mysql_error().' ';
+if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_news_posts` ADD `published_until` INT NOT NULL AFTER `published_when`")) {
+ echo 'Database Field published_until added successfully ';
+}
+echo mysql_error().' ';
// UPDATING DATA INTO FIELDS
echo " ";
Index: trunk/wb/modules/news/search.php
===================================================================
--- trunk/wb/modules/news/search.php (revision 599)
+++ trunk/wb/modules/news/search.php (revision 600)
@@ -34,6 +34,7 @@
$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("
@@ -40,6 +41,7 @@
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
Index: trunk/wb/modules/news/view.php
===================================================================
--- trunk/wb/modules/news/view.php (revision 599)
+++ trunk/wb/modules/news/view.php (revision 600)
@@ -109,7 +109,11 @@
}
// 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 ORDER BY position DESC".$limit_sql);
+ $t = time();
+ $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
@@ -256,7 +260,11 @@
}
// Get post info
- $query_post = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '".POST_ID."' AND active = '1'");
+ $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
@@ -282,7 +290,7 @@
$post_long = ($post['content_long']);
}
} else {
- header("Location: ".WB_URL.PAGES_DIRECTORY."");
+ $wb->print_error($MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'], "javascript: history.go(-1);", false);
exit(0);
}
@@ -298,7 +306,7 @@
echo str_replace($vars, $values, $setting_post_footer);
// Show comments section if we have to
- if($post['commenting'] == 'private' AND isset($admin) AND $admin->is_authenticated() == true OR $post['commenting'] == 'public') {
+ if(($post['commenting'] == 'private' AND isset($wb) AND $wb->is_authenticated() == true) OR $post['commenting'] == 'public') {
// Print comments header
echo str_replace('[ADD_COMMENT_URL]', WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $setting_comments_header);
Index: trunk/wb/modules/news/modify.php
===================================================================
--- trunk/wb/modules/news/modify.php (revision 599)
+++ trunk/wb/modules/news/modify.php (revision 600)
@@ -82,7 +82,7 @@
}
?>
-
+
query("SELECT title FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".$post['post_id']."'");
@@ -93,6 +93,22 @@
Index: trunk/wb/modules/news/modify_post.php
===================================================================
--- trunk/wb/modules/news/modify_post.php (revision 599)
+++ trunk/wb/modules/news/modify_post.php (revision 600)
@@ -50,7 +50,7 @@
}
// include jscalendar-setup
-$jscal_use_time = false; // whether to use a clock, too
+$jscal_use_time = true; // whether to use a clock, too
require_once(WB_PATH."/include/jscalendar/wb-setup.php");
// override some vars: (normally, there is no need to change this)
//$jscal_lang = "en"; //- calendar-language (default: wb-backend-language)
@@ -121,12 +121,21 @@
+
+ 
+ 