Large commit, read it carefully, and make the required changes to
your theme:
- corrected some missing translations in story.module. Oops!
- grealty simplified the "moderation threshold mechanism"(tm) so
that module writers don't have to worry about this. As a result
story.module and book.module became a bit smaller and easier to
grasp.
- greatly simplified new "category" and "topic" code which is soon
going to replace the "section" code. Needs more work though so
hang on thight.
- includes/section.inc and modules/section.module are replaced by
includes/structure.module and modules/structure.module.
- beautified example.theme a bit without adding HTML complexity:
it is a good example but still useful as a theme
- made theme example use "categories" and "topics"
--> TAKE A LOOK AT IT AND UPDATE YOUR THEME
- made theme marvin use "categories" and "topics"
--> TAKE A LOOK AT IT AND UPDATE YOUR THEME
- added 2 new "story listings" to administrator interface of
story.module to verify story integrity.
- optimized comment table a bit (work in progress)
3-00
Dries Buytaert
parent
49a7dccb64
commit
b9952f537d
|
|
@ -282,7 +282,6 @@ function account_user($uname) {
|
|||
// Display account information:
|
||||
$theme->header();
|
||||
if ($block1) $theme->box(strtr(t("%a's user information"), array("%a" => $uname)), $block1);
|
||||
// if ($block2) $theme->box(strtr(t("%a has posted %b recently"), array("%a" => $uname, "%b" => format_plural($comments, "comment", "comments"))), $block2);
|
||||
module_iterate("module", $uname);
|
||||
$theme->footer();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ $rstatus = array(0 => dumped, 1 => expired, 2 => queued, 3 => posted);
|
|||
function _node_get($field, $value) {
|
||||
$result = db_query("SELECT lid, type FROM node WHERE $field = '$value'");
|
||||
if ($node = db_fetch_object($result)) {
|
||||
return db_query("SELECT n.*, l.*, u.userid FROM node n LEFT JOIN $node->type l ON n.lid = l.lid AND n.nid = l.nid LEFT JOIN users u ON n.author = u.id WHERE n.$field = '$value' ORDER BY n.timestamp DESC");
|
||||
return db_query("SELECT n.*, l.*, c.name AS category, t.name AS topic, u.userid FROM node n LEFT JOIN $node->type l ON n.lid = l.lid AND n.nid = l.nid LEFT JOIN users u ON n.author = u.id LEFT JOIN category c ON n.cid = c.cid LEFT JOIN topic t ON n.tid = t.tid WHERE n.$field = '$value' ORDER BY n.timestamp DESC");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -31,10 +31,15 @@ function node_del($field, $value) {
|
|||
}
|
||||
}
|
||||
|
||||
function node_get_comments($nid) {
|
||||
$comment = db_fetch_object(db_query("SELECT COUNT(c.lid) AS number FROM node n LEFT JOIN comments c ON n.nid = c.lid WHERE n.nid = '$nid' GROUP BY n.nid", 1));
|
||||
return $comment->number ? $comment->number : 0;
|
||||
}
|
||||
|
||||
function node_save($node) {
|
||||
global $user, $status;
|
||||
|
||||
$rows = array(nid, pid, lid, log, type, title, score, votes, author, status, timestamp);
|
||||
$rows = array(nid, pid, lid, cid, tid, log, type, title, score, votes, author, status, timestamp);
|
||||
|
||||
if ($node[nid] > 0) {
|
||||
$n = node_get_object("nid", $node[nid]);
|
||||
|
|
@ -69,7 +74,7 @@ function node_save($node) {
|
|||
throttle("post node", variable_get(max_node_rate, 900));
|
||||
|
||||
// setup default values:
|
||||
$node = array_merge(array(title => "?", author => $user->id, type => "?", pid => 0, log => "node created", status => $status[queued], score => 0, votes => 0, timestamp => time()), $node);
|
||||
$node = array_merge(array(title => "?", author => $user->id, type => "?", pid => 0, cid => 0, tid => 0, log => "node created", status => $status[queued], score => 0, votes => 0, timestamp => time()), $node);
|
||||
|
||||
// prepare queries:
|
||||
$f1 = array();
|
||||
|
|
@ -129,7 +134,7 @@ function node_invoke($node, $name, $arg = 0) {
|
|||
if ($function) return ($arg ? $function($node) : $function($node, $arg));
|
||||
}
|
||||
|
||||
function node_view($node, $page) {
|
||||
function node_view($node, $page = 0) {
|
||||
return node_invoke($node, "view", $page);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
<?php
|
||||
|
||||
function section_get() {
|
||||
$array = array();
|
||||
$result = db_query("SELECT name FROM sections");
|
||||
while ($section = db_fetch_object($result)) array_push($array, $section->name);
|
||||
return $array;
|
||||
}
|
||||
|
||||
function section_post_threshold($section, $default) {
|
||||
$section = db_fetch_object(db_query("SELECT post AS threshold FROM sections WHERE name = '". check_input($section) ."'"));
|
||||
return $section->threshold ? $section->threshold : $default;
|
||||
}
|
||||
|
||||
function section_dump_threshold($section, $default) {
|
||||
$section = db_fetch_object(db_query("SELECT dump AS threshold FROM sections WHERE name = '". check_input($section) ."'"));
|
||||
return $section->threshold ? $section->threshold : $default;
|
||||
}
|
||||
|
||||
function section_timout_threshold($section, $default) {
|
||||
$section = db_fetch_object(db_query("SELECT timout AS threshold FROM sections WHERE name = '". check_input($section) ."'"));
|
||||
return $section->threshold ? $section->threshold : $default;
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -25,19 +25,30 @@ function category_save($edit) {
|
|||
// delete category $cid:
|
||||
function category_del($cid) {
|
||||
db_query("DELETE FROM category WHERE cid = '". check_input($cid) ."'");
|
||||
db_query("DELETE FROM node_category WHERE cid = '". check_input($cid) ."'");
|
||||
db_query("UPDATE node SET cid = 0 WHERE cid = '". check_input($cid) ."'");
|
||||
}
|
||||
|
||||
function category_node($nid, $cid) {
|
||||
db_query("INSERT INTO node_category (nid, cid) VALUES ('". check_input($nid) ."', '". check_input($cid) ."')", 1);
|
||||
function category_post_threshold($cid, $default) {
|
||||
$category = db_fetch_object(db_query("SELECT post AS threshold FROM category WHERE cid = '". check_input($cid) ."'"));
|
||||
return $category->threshold ? $category->threshold : $default;
|
||||
}
|
||||
|
||||
function category_dump_threshold($cid, $default) {
|
||||
$category = db_fetch_object(db_query("SELECT dump AS threshold FROM category WHERE cid = '". check_input($cid) ."'"));
|
||||
return $category->threshold ? $category->threshold : $default;
|
||||
}
|
||||
|
||||
function category_expire_threshold($cid, $default) {
|
||||
$category = db_fetch_object(db_query("SELECT expire AS threshold FROM category WHERE cid = '". check_input($cid) ."'"));
|
||||
return $category->threshold ? $category->threshold : $default;
|
||||
}
|
||||
|
||||
function category_form_select($type, $edit = array(), $size = 1) {
|
||||
$result = db_query("SELECT * FROM category WHERE type = '$type'");
|
||||
while ($category = db_fetch_object($result)) {
|
||||
$options .= "<OPTION VALUE=\"$category->cid\"". ($edit[$category->cid] ? "SELECTED" : "") .">". check_select($category->name) ."</OPTION>";
|
||||
$options .= "<OPTION VALUE=\"$category->cid\"". ($edit[cid] == $category->cid ? "SELECTED" : "") .">". check_select($category->name) ."</OPTION>";
|
||||
}
|
||||
return "<SELECT NAME=\"category[]\" SIZE=\"$size\"". ($size > 1 ? "MULTIPLE" : "") .">$options</SELECT>\n";
|
||||
return "<SELECT NAME=\"edit[cid]\" SIZE=\"$size\"". ($size > 1 ? "MULTIPLE" : "") .">$options</SELECT>\n";
|
||||
}
|
||||
|
||||
// ----- topic -----
|
||||
|
|
@ -75,20 +86,15 @@ function topic_tree($parent = 0, $name = "", $tree = array()) {
|
|||
// delete topic $tid:
|
||||
function topic_del($tid) {
|
||||
db_query("DELETE FROM topic WHERE tid = '". check_input($tid) ."'");
|
||||
db_query("DELETE FROM node_topic WHERE tid = '". check_input($tid) ."'");
|
||||
}
|
||||
|
||||
// add node $nid to topic $tid:
|
||||
function topic_node($nid, $tid) {
|
||||
db_query("INSERT INTO node_topic (nid, tid) VALUES ('". check_input($nid) ."', '". check_input($tid) ."')", 1);
|
||||
db_query("UPDATE node SET tid = 0 WHERE tid = '". check_input($tid) ."'");
|
||||
}
|
||||
|
||||
// renders a HTML form to select one or more topics:
|
||||
function topic_form_select($edit = array(), $size = 1) {
|
||||
foreach (topic_tree() as $tid=>$name) {
|
||||
$options .= "<OPTION VALUE=\"$tid\"". ($edit[$tid] ? "SELECTED" : "") .">". check_select($name) ."</OPTION>";
|
||||
$options .= "<OPTION VALUE=\"$tid\"". ($edit[tid] == $tid ? "SELECTED" : "") .">". check_select($name) ."</OPTION>";
|
||||
}
|
||||
return "<SELECT NAME=\"topic[]\" SIZE=\"$size\"". ($size > 1 ? "MULTIPLE" : "") .">$options</SELECT>\n";
|
||||
return "<SELECT NAME=\"edit[tid]\" SIZE=\"$size\"". ($size > 1 ? "MULTIPLE" : "") .">$options</SELECT>\n";
|
||||
}
|
||||
|
||||
// ----- structure -----
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ function theme_blocks($region, $theme) {
|
|||
}
|
||||
|
||||
function theme_morelink($theme, $node) {
|
||||
return ($node->body) ? "[ <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\"><B>". t("read more") ."</B></FONT></A> | ". sizeof(explode(" ", $node->body)) ." ". t("words") ." | <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". format_plural($node->comments, "comment", "comments") ."</FONT></A> ]" : "[ <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". format_plural($node->comments, "comment", "comments") ."</FONT></A> ]";
|
||||
return ($node->body) ? "[ <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". t("read more") ."</FONT></A> | ". sizeof(explode(" ", $node->body)) ." ". t("words") ." | <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". format_plural(node_get_comments($node->nid), "comment", "comments") ."</FONT></A> ]" : "[ <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". format_plural(node_get_comments($node->nid), "comment", "comments") ."</FONT></A> ]";
|
||||
}
|
||||
|
||||
function theme_moderation_results($theme, $node) {
|
||||
|
|
|
|||
|
|
@ -7,33 +7,15 @@ function variable_init($conf = array()) {
|
|||
}
|
||||
|
||||
function handler_post_threshold($node, $default) {
|
||||
if ($node->type) {
|
||||
$function = $node->type ."_post_threshold";
|
||||
return $function($node, $default);
|
||||
}
|
||||
else {
|
||||
return $default;
|
||||
}
|
||||
return ($threshold = category_post_threshold($node->cid) ? $threshold : $default);
|
||||
}
|
||||
|
||||
function handler_dump_threshold($node, $default) {
|
||||
if ($node->type) {
|
||||
$function = $node->type ."_dump_threshold";
|
||||
return $function($node, $default);
|
||||
}
|
||||
else {
|
||||
return $default;
|
||||
}
|
||||
return ($threshold = category_dump_threshold($node->cid) ? $threshold : $default);
|
||||
}
|
||||
|
||||
function handler_timout_threshold($node, $default) {
|
||||
if ($node->type) {
|
||||
$function = $node->type ."_timout_threshold";
|
||||
return $function($node, $default);
|
||||
}
|
||||
else {
|
||||
return $default;
|
||||
}
|
||||
function handler_expire_threshold($node, $default) {
|
||||
return ($threshold = category_expire_threshold($node->cid) ? $threshold : $default);
|
||||
}
|
||||
|
||||
function variable_get($name, $default, $object = 0) {
|
||||
|
|
@ -44,8 +26,8 @@ function variable_get($name, $default, $object = 0) {
|
|||
return handler_post_threshold($object, $default);
|
||||
case "dump_threshold":
|
||||
return handler_dump_threshold($object, $default);
|
||||
case "timout_threshold":
|
||||
return handler_timout_threshold($object, $default);
|
||||
case "expire_threshold":
|
||||
return handler_expire_threshold($object, $default);
|
||||
default:
|
||||
return ($conf[$name] ? $conf[$name] : $default);
|
||||
}
|
||||
|
|
|
|||
12
index.php
12
index.php
|
|
@ -4,16 +4,12 @@ include_once "includes/common.inc";
|
|||
|
||||
if (variable_get(dev_timing, 0)) timer_start();
|
||||
|
||||
// Initialize/pre-process variables:
|
||||
$number = ($user->nodes) ? $user->nodes : 10;
|
||||
$date = ($date > 0) ? $date : time();
|
||||
$result = db_query("SELECT nid FROM node WHERE type = 'story' AND status = '$status[posted]' AND timestamp <= ". ($date > 0 ? $date : time()) ." ". ($category ? "AND cid = '$category'" : "") ." ". ($topic ? "AND tid = '$topic'" : "") ." ORDER BY timestamp DESC LIMIT ". ($user->nodes ? $user->nodes : 10));
|
||||
|
||||
// Perform query:
|
||||
$result = db_query("SELECT n.*, s.*, u.userid, COUNT(c.lid) AS comments FROM node n LEFT JOIN story s ON n.nid = s.nid LEFT JOIN comments c ON n.nid = c.lid LEFT JOIN users u ON n.author = u.id WHERE n.status = '$status[posted]' AND n.type = 'story' ". ($section ? "AND s.section = '$section' " : "") ."AND n.timestamp <= $date GROUP BY n.nid ORDER BY n.timestamp DESC LIMIT $number");
|
||||
|
||||
// Display nodes:
|
||||
$theme->header();
|
||||
while ($story = db_fetch_object($result)) $theme->story($story);
|
||||
while ($node = db_fetch_object($result)) {
|
||||
node_view(node_get_object("nid", $node->nid));
|
||||
}
|
||||
$theme->footer();
|
||||
|
||||
if (variable_get(dev_timing, 0)) timer_print();
|
||||
|
|
|
|||
|
|
@ -19,18 +19,6 @@ class Book {
|
|||
}
|
||||
}
|
||||
|
||||
function book_post_threshold($node, $default) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
function book_dump_threshold($node, $default) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
function book_timout_threshold($node, $default) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
function book_status() {
|
||||
return array(dumped, expired, queued, posted);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,18 +19,6 @@ class Book {
|
|||
}
|
||||
}
|
||||
|
||||
function book_post_threshold($node, $default) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
function book_dump_threshold($node, $default) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
function book_timout_threshold($node, $default) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
function book_status() {
|
||||
return array(dumped, expired, queued, posted);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ function moderation_vote($id, $vote) {
|
|||
node_save(array(nid => $id, status => $status[dumped]));
|
||||
watchdog("message", "node: dumped '$node->title' - moderation");
|
||||
}
|
||||
else if (variable_get("timout_threshold", 8, $node) <= $node->votes) {
|
||||
else if (variable_get("expire_threshold", 8, $node) <= $node->votes) {
|
||||
node_save(array(nid => $id, status => $status[expired]));
|
||||
watchdog("message", "node: expired '$node->title' - moderation");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,137 +0,0 @@
|
|||
<?php
|
||||
|
||||
$module = array("help" => "section_help",
|
||||
"block" => "section_block",
|
||||
"admin" => "section_admin");
|
||||
|
||||
// global variables:
|
||||
$_section = array("status" => array(2 => "enabled: always", 1 => "enabled: custom", 0 => "disabled"),
|
||||
"timout" => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 20, 25, 30, 35, 40, 45, 50, 60, 70, 80, 90, 100),
|
||||
"post" => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 20, 25, 30, 35, 40, 45, 50, 60, 70, 80, 90, 100),
|
||||
"dump" => array(-1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -20, -25, -30));
|
||||
|
||||
function section_help() {
|
||||
?>
|
||||
<P>When submitting new stories, every story is assigned a section or category. Sections can be maintained from the administration pages.</P>
|
||||
<P>For moderation purpose, you can specify a post, dump and expiration thresholds for each available section according to type and urgency level of a section. This is useful considering the fact that some sections do not really "expire" and stay interesting and active as time passes by, whereas news-related stories are only considered "hot" over a short period of time.</P>
|
||||
<?php
|
||||
}
|
||||
|
||||
function section_block() {
|
||||
$result = db_query("SELECT se.name, COUNT(st.nid) AS stories FROM sections se LEFT JOIN story st ON se.name = st.section GROUP BY se.name");
|
||||
while ($_section = db_fetch_object($result)) {
|
||||
$content .= "<LI><A HREF=\"?section=". urlencode($_section->name) ."\">$_section->name</A> (". check_output($_section->stories, 0) .")</LI>\n";
|
||||
}
|
||||
|
||||
$block[0][subject] = "Sections";
|
||||
$block[0][content] = $content;
|
||||
$block[0][info] = "Section list";
|
||||
|
||||
return $block;
|
||||
}
|
||||
|
||||
function section_add() {
|
||||
global $_section;
|
||||
|
||||
$output .= " <FORM ACTION=\"admin.php?mod=section\" METHOD=\"post\">\n";
|
||||
$output .= " <P>\n";
|
||||
$output .= " <B>Section name:</B><BR>\n";
|
||||
$output .= " <INPUT TYPE=\"text\" NAME=\"edit[name]\" SIZE=\"50\">\n";
|
||||
$output .= " </P>\n";
|
||||
$output .= " <P>\n";
|
||||
$output .= " <B>Post threshold:</B><BR>\n";
|
||||
$output .= " <SELECT NAME=\"edit[post]\">\n";
|
||||
foreach ($_section[post] as $value) $output .= "<OPTION VALUE=\"$value\">". format_plural($value, "point", "points") ."</OPTION>\n";
|
||||
$output .= " </SELECT>\n";
|
||||
$output .= " </P>\n";
|
||||
$output .= " <P>\n";
|
||||
$output .= " <B>Dump threshold:</B><BR>\n";
|
||||
$output .= " <SELECT NAME=\"edit[dump]\">\n";
|
||||
foreach ($_section[dump] as $value) $output .= "<OPTION VALUE=\"$value\">". format_plural($value, "point", "points") ."</OPTION>\n";
|
||||
$output .= " </SELECT>\n";
|
||||
$output .= " </P>\n";
|
||||
$output .= " <P>\n";
|
||||
$output .= " <B>Timout threshold:</B><BR>\n";
|
||||
$output .= " <SELECT NAME=\"edit[timout]\">\n";
|
||||
foreach ($_section[timout] as $value) $output .= "<OPTION VALUE=\"$value\">". format_plural($value, "vote", "votes") ."</OPTION>\n";
|
||||
$output .= " </SELECT>\n";
|
||||
$output .= " </P>\n";
|
||||
$output .= " <INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Add section\">\n";
|
||||
$output .= " </FORM>\n";
|
||||
|
||||
print $output;
|
||||
}
|
||||
|
||||
function section_add_save($edit) {
|
||||
db_query("INSERT INTO sections (name, post, dump, timout) VALUES ('". check_input($edit[name]) ."', '". check_input($edit[post]) ."', '". check_input($edit[dump]) ."', '". check_input($edit[timout]) ."')");
|
||||
}
|
||||
|
||||
function section_delete($name) {
|
||||
db_query("DELETE FROM sections WHERE name = '$name'");
|
||||
}
|
||||
|
||||
function section_display() {
|
||||
global $_section;
|
||||
|
||||
$status = $_section[status];
|
||||
$timout = $_section[timout];
|
||||
$post = $_section[post];
|
||||
$dump = $_section[dump];
|
||||
|
||||
// Perform query:
|
||||
$result = db_query("SELECT * FROM sections ORDER BY name");
|
||||
|
||||
// Generate output:
|
||||
$output .= "<FORM ACTION=\"admin.php?mod=section\" METHOD=\"post\">\n";
|
||||
$output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
|
||||
$output .= " <TR><TH>section name</TH><TH>status</TH><TH>post threshold</TH><TH>dump threshold</TH><TH>expiration threshold<TH>operations</TH></TR>\n";
|
||||
while ($_section = db_fetch_object($result)) {
|
||||
foreach ($status as $key=>$value) $options0 .= "<OPTION VALUE=\"$key\"". (($_section->status == $key) ? " SELECTED" : "") .">$value</OPTION>\n";
|
||||
foreach ($post as $value) $options1 .= "<OPTION VALUE=\"$value\"". (($_section->post == $value) ? " SELECTED" : "") .">". format_plural($value, "point", "points") ."</OPTION>\n";
|
||||
foreach ($dump as $value) $options2 .= "<OPTION VALUE=\"$value\"". (($_section->dump == $value) ? " SELECTED" : "") .">". format_plural($value, "point", "points") ."</OPTION>\n";
|
||||
foreach ($timout as $value) $options3 .= "<OPTION VALUE=\"$value\"". (($_section->timout == $value) ? " SELECTED" : "") .">". format_plural($value, "vote", "votes") ."</OPTION>\n";
|
||||
$output .= " <TR><TD>". check_output($_section->name) ."</TD><TD><SELECT NAME=\"edit[$_section->name][status]\">$options0</SELECT></TD><TD><SELECT NAME=\"edit[$_section->name][post]\">$options1</SELECT></TD><TD><SELECT NAME=\"edit[$_section->name][dump]\">$options2</SELECT></TD><TD><SELECT NAME=\"edit[$_section->name][timout]\">$options3</SELECT></TD><TD ALIGN=\"center\"><A HREF=\"admin.php?mod=section&op=delete&name=". urlencode($_section->name) ."\">delete</A></TD></TR>\n";
|
||||
unset($options0); unset($options1); unset($options2); unset($options3);
|
||||
}
|
||||
$output .= "</TABLE>\n";
|
||||
$output .= "<INPUT NAME=\"op\" TYPE=\"submit\" VALUE=\"Save sections\">\n";
|
||||
$output .= "</FORM>\n";
|
||||
|
||||
print $output;
|
||||
}
|
||||
|
||||
function section_display_save($edit) {
|
||||
foreach ($edit as $key=>$value) {
|
||||
db_query("UPDATE sections SET status = '". check_input($value[status]) ."', post = '". check_input($value[post]) ."', dump = '". check_input($value[dump]) ."', timout = '". check_input($value[timout]) ."' WHERE name = '". check_input($key) ."'");
|
||||
}
|
||||
}
|
||||
|
||||
function section_admin() {
|
||||
global $op, $edit, $name;
|
||||
|
||||
print "<SMALL><A HREF=\"admin.php?mod=section&op=add\">add new section</A> | <A HREF=\"admin.php?mod=section\">overview</A> | <A HREF=\"admin.php?mod=section&op=help\">help</A></SMALL><HR>\n";
|
||||
|
||||
switch($op) {
|
||||
case "add":
|
||||
section_add();
|
||||
break;
|
||||
case "help":
|
||||
section_help();
|
||||
break;
|
||||
case "delete":
|
||||
section_delete(check_input($name));
|
||||
section_display();
|
||||
break;
|
||||
case "Add section":
|
||||
section_add_save($edit);
|
||||
section_display();
|
||||
break;
|
||||
case "Save sections":
|
||||
section_display_save($edit);
|
||||
// fall through
|
||||
default:
|
||||
section_display();
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -8,32 +8,21 @@ $module = array("help" => "story_help",
|
|||
"admin" => "story_admin",
|
||||
"block" => "story_block");
|
||||
|
||||
include_once "includes/section.inc";
|
||||
include_once "includes/structure.inc";
|
||||
|
||||
class Story {
|
||||
function Story($story, $category = 0, $topic = 0) {
|
||||
function Story($story) {
|
||||
global $user;
|
||||
$this->userid = $story[userid] ? $story[userid] : $user->userid;
|
||||
$this->title = $story[title];
|
||||
$this->abstract = $story[abstract];
|
||||
$this->body = $story[body];
|
||||
$this->timestamp = $story[timestamp] ? $story[timestamp] : time();
|
||||
$this->category = ($category ? $category : node_get_category($story[nid]));
|
||||
$this->topic = ($topic ? $topic : node_get_topic($story[nid]));
|
||||
$this->cid = $story[cid];
|
||||
$this->tid = $story[tid];
|
||||
}
|
||||
}
|
||||
|
||||
function story_post_threshold($node, $default) {
|
||||
return section_post_threshold($node->section, $default);
|
||||
}
|
||||
|
||||
function story_dump_threshold($node, $default) {
|
||||
return section_dump_threshold($node->section, $default);
|
||||
}
|
||||
|
||||
function story_timout_threshold($node, $default) {
|
||||
return section_timout_threshold($node->section, $default);
|
||||
}
|
||||
|
||||
function story_status() {
|
||||
return array(dumped, queued, posted);
|
||||
}
|
||||
|
|
@ -61,7 +50,7 @@ function story_type() {
|
|||
}
|
||||
|
||||
function story_view($node, $page = 1) {
|
||||
global $id, $cid, $op, $moderate, $pid, $subject, $comment, $theme, $mode, $order, $threshold;
|
||||
global $id, $cid, $op, $moderate, $pid, $subject, $comment, $theme, $mode, $order, $threshold, $PHP_SELF;
|
||||
|
||||
if ($page == 1) {
|
||||
switch($op) {
|
||||
|
|
@ -109,55 +98,51 @@ function story_view($node, $page = 1) {
|
|||
}
|
||||
}
|
||||
else {
|
||||
$theme->story($node, "[ <A HREF=\"node.php?op=reply&id=$node->nid&pid=0\">". t("reply to this story") ."</A> ]");
|
||||
$theme->story($node, ($PHP_SELF == "/node.php" ? "[ <A HREF=\"node.php?op=reply&id=$node->nid&pid=0\">". t("reply to this story") ."</A> ]" : 0));
|
||||
}
|
||||
}
|
||||
|
||||
function story_form($story = array()) {
|
||||
function story_form($edit = array()) {
|
||||
global $allowed_html, $REQUEST_URI, $user;
|
||||
|
||||
$output .= "<FORM ACTION=\"$REQUEST_URI\" METHOD=\"post\">\n";
|
||||
|
||||
$output .= "<B>". t("Your name") .":</B><BR>\n";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"story[userid]\" VALUE=\"$story[userid]\">\n";
|
||||
$output .= format_username(($story[userid] ? $story[userid] : $user->userid)) ."<P>";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[userid]\" VALUE=\"$edit[userid]\">\n";
|
||||
$output .= format_username(($edit[userid] ? $edit[userid] : $user->userid)) ."<P>";
|
||||
|
||||
$output .= "<B>". t("Subject") .":</B><BR>\n";
|
||||
$output .= "<INPUT TYPE=\"text\" NAME=\"story[title]\" SIZE=\"50\" MAXLENGTH=\"60\" VALUE=\"". check_textfield($story[title]) ."\"><P>\n";
|
||||
$output .= "<INPUT TYPE=\"text\" NAME=\"edit[title]\" SIZE=\"50\" MAXLENGTH=\"60\" VALUE=\"". check_textfield($edit[title]) ."\"><P>\n";
|
||||
|
||||
$output .= structure_form("story");
|
||||
$output .= structure_form("story", $edit);
|
||||
|
||||
$output .= "<B>". t("Abstract") .":</B><BR>\n";
|
||||
$output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"story[abstract]\">". check_textarea($story[abstract]) ."</TEXTAREA><BR>\n";
|
||||
$output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"edit[abstract]\">". check_textarea($edit[abstract]) ."</TEXTAREA><BR>\n";
|
||||
$output .= "<SMALL><I>". t("Allowed HTML tags") .": ". htmlspecialchars($allowed_html) .".</I></SMALL><P>\n";
|
||||
|
||||
$output .= "<B>". t("Body") .":</B><BR>\n";
|
||||
$output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"15\" NAME=\"story[body]\">". check_textarea($story[body]) ."</TEXTAREA><BR>\n";
|
||||
$output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"15\" NAME=\"edit[body]\">". check_textarea($edit[body]) ."</TEXTAREA><BR>\n";
|
||||
$output .= "<SMALL><I>". t("Allowed HTML tags") .": ". htmlspecialchars($allowed_html) .".</I></SMALL><P>\n";
|
||||
|
||||
if (user_access($user, "story")) {
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"story[timestamp]\" VALUE=\"$story[timestamp]\">\n";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"story[nid]\" VALUE=\"$story[nid]\">\n";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[timestamp]\" VALUE=\"$edit[timestamp]\">\n";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[nid]\" VALUE=\"$edit[nid]\">\n";
|
||||
}
|
||||
|
||||
$duplicate = db_result(db_query("SELECT COUNT(nid) FROM node WHERE title = '$title'"));
|
||||
|
||||
if (!$story) {
|
||||
if (!$edit) {
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
else if (!$story[title]) {
|
||||
else if (!$edit[title]) {
|
||||
$output .= "<FONT COLOR=\"red\">". t("Warning: you did not supply a subject.") ."</FONT><P>\n";
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
else if (!$story[section]) {
|
||||
$output .= "<FONT COLOR=\"red\">". t("Warning: you did not supply a section.") ."</FONT><P>\n";
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
else if (!$story[abstract]) {
|
||||
else if (!$edit[abstract]) {
|
||||
$output .= "<FONT COLOR=\"red\">". t("Warning: you did not supply an abstract.") ."</FONT><P>\n";
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
else if (!$story[nid] && $duplicate) {
|
||||
else if (!$edit[nid] && $duplicate) {
|
||||
$output .= "<FONT COLOR=\"red\">". t("Warning: there is already a story with that subject.") ."</FONT><P>\n";
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
|
|
@ -170,9 +155,8 @@ function story_form($story = array()) {
|
|||
return $output;
|
||||
}
|
||||
|
||||
function story_save($story, $category, $topic) {
|
||||
node_save(array_diff(array_merge($story, array(nid => $story[nid], type => "story")), array(userid => $story[userid])));
|
||||
structure_save($category, $topic);
|
||||
function story_save($edit) {
|
||||
node_save(array_diff(array_merge($edit, array(nid => $edit[nid], type => "story")), array(userid => $edit[userid])));
|
||||
}
|
||||
|
||||
function story_block() {
|
||||
|
|
@ -207,7 +191,7 @@ function story_block() {
|
|||
|
||||
function story_query($type = "") {
|
||||
global $status;
|
||||
$queries = array(array("recent stories", "WHERE n.type = 'story' ORDER BY n.timestamp DESC"), array("posted stories", "WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued stories", "WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped stories", "WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY n.timestamp DESC"));
|
||||
$queries = array(array("recent stories", "WHERE n.type = 'story' ORDER BY n.timestamp DESC"), array("posted stories", "WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued stories", "WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped stories", "WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY n.timestamp DESC"), array("stories without category (integrity)", "WHERE n.cid = '0' ORDER BY n.timestamp DESC"), array("stories without topic (integrity)", "WHERE n.tid = '0' ORDER BY n.timestamp DESC"));
|
||||
return ($queries[$type] ? $queries[$type] : $queries);
|
||||
}
|
||||
|
||||
|
|
@ -216,7 +200,7 @@ function story_overview($query = array()) {
|
|||
}
|
||||
|
||||
function story_admin() {
|
||||
global $id, $story, $category, $topic, $mod, $keys, $op, $theme, $type, $user;
|
||||
global $id, $edit, $mod, $keys, $op, $theme, $type, $user;
|
||||
|
||||
print "<SMALL><A HREF=\"admin.php?mod=story&op=add\">add new story</A> | <A HREF=\"admin.php?mod=story&op=listing\">story listing</A> | <A HREF=\"admin.php?mod=story&op=search\">search story</A> | <A HREF=\"admin.php?mod=story\">overview</A> | <A HREF=\"admin.php?mod=story&op=help\">help</A></SMALL><HR>\n";
|
||||
|
||||
|
|
@ -244,11 +228,11 @@ function story_admin() {
|
|||
print search_data($keys, $mod);
|
||||
break;
|
||||
case t("Preview"):
|
||||
story_view(new Story($story, $category, $topic),0);
|
||||
print story_form($story);
|
||||
story_view(new Story($edit),0);
|
||||
print story_form($edit);
|
||||
break;
|
||||
case t("Submit"):
|
||||
story_save($story, $category, $topic);
|
||||
story_save($edit);
|
||||
// fall through:
|
||||
default:
|
||||
print story_overview(story_query($type));
|
||||
|
|
@ -257,19 +241,19 @@ function story_admin() {
|
|||
|
||||
|
||||
function story_user() {
|
||||
global $story, $category, $topic, $op, $theme, $user;
|
||||
global $edit, $op, $theme, $user;
|
||||
|
||||
switch($op) {
|
||||
case t("Preview"):
|
||||
story_view(new Story($story, $category, $topic), 0);
|
||||
$theme->box("Submit", story_form($story));
|
||||
story_view(new Story($edit), 0);
|
||||
$theme->box(t("Submit"), story_form($edit));
|
||||
break;
|
||||
case t("Submit"):
|
||||
story_save($story, $category, $topic);
|
||||
story_save($edit);
|
||||
$theme->box(t("Submit"), t("Thank you for your submission."));
|
||||
break;
|
||||
default:
|
||||
$theme->box("Submit", story_form());
|
||||
$theme->box(t("Submit"), story_form());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,32 +8,21 @@ $module = array("help" => "story_help",
|
|||
"admin" => "story_admin",
|
||||
"block" => "story_block");
|
||||
|
||||
include_once "includes/section.inc";
|
||||
include_once "includes/structure.inc";
|
||||
|
||||
class Story {
|
||||
function Story($story, $category = 0, $topic = 0) {
|
||||
function Story($story) {
|
||||
global $user;
|
||||
$this->userid = $story[userid] ? $story[userid] : $user->userid;
|
||||
$this->title = $story[title];
|
||||
$this->abstract = $story[abstract];
|
||||
$this->body = $story[body];
|
||||
$this->timestamp = $story[timestamp] ? $story[timestamp] : time();
|
||||
$this->category = ($category ? $category : node_get_category($story[nid]));
|
||||
$this->topic = ($topic ? $topic : node_get_topic($story[nid]));
|
||||
$this->cid = $story[cid];
|
||||
$this->tid = $story[tid];
|
||||
}
|
||||
}
|
||||
|
||||
function story_post_threshold($node, $default) {
|
||||
return section_post_threshold($node->section, $default);
|
||||
}
|
||||
|
||||
function story_dump_threshold($node, $default) {
|
||||
return section_dump_threshold($node->section, $default);
|
||||
}
|
||||
|
||||
function story_timout_threshold($node, $default) {
|
||||
return section_timout_threshold($node->section, $default);
|
||||
}
|
||||
|
||||
function story_status() {
|
||||
return array(dumped, queued, posted);
|
||||
}
|
||||
|
|
@ -61,7 +50,7 @@ function story_type() {
|
|||
}
|
||||
|
||||
function story_view($node, $page = 1) {
|
||||
global $id, $cid, $op, $moderate, $pid, $subject, $comment, $theme, $mode, $order, $threshold;
|
||||
global $id, $cid, $op, $moderate, $pid, $subject, $comment, $theme, $mode, $order, $threshold, $PHP_SELF;
|
||||
|
||||
if ($page == 1) {
|
||||
switch($op) {
|
||||
|
|
@ -109,55 +98,51 @@ function story_view($node, $page = 1) {
|
|||
}
|
||||
}
|
||||
else {
|
||||
$theme->story($node, "[ <A HREF=\"node.php?op=reply&id=$node->nid&pid=0\">". t("reply to this story") ."</A> ]");
|
||||
$theme->story($node, ($PHP_SELF == "/node.php" ? "[ <A HREF=\"node.php?op=reply&id=$node->nid&pid=0\">". t("reply to this story") ."</A> ]" : 0));
|
||||
}
|
||||
}
|
||||
|
||||
function story_form($story = array()) {
|
||||
function story_form($edit = array()) {
|
||||
global $allowed_html, $REQUEST_URI, $user;
|
||||
|
||||
$output .= "<FORM ACTION=\"$REQUEST_URI\" METHOD=\"post\">\n";
|
||||
|
||||
$output .= "<B>". t("Your name") .":</B><BR>\n";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"story[userid]\" VALUE=\"$story[userid]\">\n";
|
||||
$output .= format_username(($story[userid] ? $story[userid] : $user->userid)) ."<P>";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[userid]\" VALUE=\"$edit[userid]\">\n";
|
||||
$output .= format_username(($edit[userid] ? $edit[userid] : $user->userid)) ."<P>";
|
||||
|
||||
$output .= "<B>". t("Subject") .":</B><BR>\n";
|
||||
$output .= "<INPUT TYPE=\"text\" NAME=\"story[title]\" SIZE=\"50\" MAXLENGTH=\"60\" VALUE=\"". check_textfield($story[title]) ."\"><P>\n";
|
||||
$output .= "<INPUT TYPE=\"text\" NAME=\"edit[title]\" SIZE=\"50\" MAXLENGTH=\"60\" VALUE=\"". check_textfield($edit[title]) ."\"><P>\n";
|
||||
|
||||
$output .= structure_form("story");
|
||||
$output .= structure_form("story", $edit);
|
||||
|
||||
$output .= "<B>". t("Abstract") .":</B><BR>\n";
|
||||
$output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"story[abstract]\">". check_textarea($story[abstract]) ."</TEXTAREA><BR>\n";
|
||||
$output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"edit[abstract]\">". check_textarea($edit[abstract]) ."</TEXTAREA><BR>\n";
|
||||
$output .= "<SMALL><I>". t("Allowed HTML tags") .": ". htmlspecialchars($allowed_html) .".</I></SMALL><P>\n";
|
||||
|
||||
$output .= "<B>". t("Body") .":</B><BR>\n";
|
||||
$output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"15\" NAME=\"story[body]\">". check_textarea($story[body]) ."</TEXTAREA><BR>\n";
|
||||
$output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"15\" NAME=\"edit[body]\">". check_textarea($edit[body]) ."</TEXTAREA><BR>\n";
|
||||
$output .= "<SMALL><I>". t("Allowed HTML tags") .": ". htmlspecialchars($allowed_html) .".</I></SMALL><P>\n";
|
||||
|
||||
if (user_access($user, "story")) {
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"story[timestamp]\" VALUE=\"$story[timestamp]\">\n";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"story[nid]\" VALUE=\"$story[nid]\">\n";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[timestamp]\" VALUE=\"$edit[timestamp]\">\n";
|
||||
$output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[nid]\" VALUE=\"$edit[nid]\">\n";
|
||||
}
|
||||
|
||||
$duplicate = db_result(db_query("SELECT COUNT(nid) FROM node WHERE title = '$title'"));
|
||||
|
||||
if (!$story) {
|
||||
if (!$edit) {
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
else if (!$story[title]) {
|
||||
else if (!$edit[title]) {
|
||||
$output .= "<FONT COLOR=\"red\">". t("Warning: you did not supply a subject.") ."</FONT><P>\n";
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
else if (!$story[section]) {
|
||||
$output .= "<FONT COLOR=\"red\">". t("Warning: you did not supply a section.") ."</FONT><P>\n";
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
else if (!$story[abstract]) {
|
||||
else if (!$edit[abstract]) {
|
||||
$output .= "<FONT COLOR=\"red\">". t("Warning: you did not supply an abstract.") ."</FONT><P>\n";
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
else if (!$story[nid] && $duplicate) {
|
||||
else if (!$edit[nid] && $duplicate) {
|
||||
$output .= "<FONT COLOR=\"red\">". t("Warning: there is already a story with that subject.") ."</FONT><P>\n";
|
||||
$output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Preview") ."\">\n";
|
||||
}
|
||||
|
|
@ -170,9 +155,8 @@ function story_form($story = array()) {
|
|||
return $output;
|
||||
}
|
||||
|
||||
function story_save($story, $category, $topic) {
|
||||
node_save(array_diff(array_merge($story, array(nid => $story[nid], type => "story")), array(userid => $story[userid])));
|
||||
structure_save($category, $topic);
|
||||
function story_save($edit) {
|
||||
node_save(array_diff(array_merge($edit, array(nid => $edit[nid], type => "story")), array(userid => $edit[userid])));
|
||||
}
|
||||
|
||||
function story_block() {
|
||||
|
|
@ -207,7 +191,7 @@ function story_block() {
|
|||
|
||||
function story_query($type = "") {
|
||||
global $status;
|
||||
$queries = array(array("recent stories", "WHERE n.type = 'story' ORDER BY n.timestamp DESC"), array("posted stories", "WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued stories", "WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped stories", "WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY n.timestamp DESC"));
|
||||
$queries = array(array("recent stories", "WHERE n.type = 'story' ORDER BY n.timestamp DESC"), array("posted stories", "WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued stories", "WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped stories", "WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY n.timestamp DESC"), array("stories without category (integrity)", "WHERE n.cid = '0' ORDER BY n.timestamp DESC"), array("stories without topic (integrity)", "WHERE n.tid = '0' ORDER BY n.timestamp DESC"));
|
||||
return ($queries[$type] ? $queries[$type] : $queries);
|
||||
}
|
||||
|
||||
|
|
@ -216,7 +200,7 @@ function story_overview($query = array()) {
|
|||
}
|
||||
|
||||
function story_admin() {
|
||||
global $id, $story, $category, $topic, $mod, $keys, $op, $theme, $type, $user;
|
||||
global $id, $edit, $mod, $keys, $op, $theme, $type, $user;
|
||||
|
||||
print "<SMALL><A HREF=\"admin.php?mod=story&op=add\">add new story</A> | <A HREF=\"admin.php?mod=story&op=listing\">story listing</A> | <A HREF=\"admin.php?mod=story&op=search\">search story</A> | <A HREF=\"admin.php?mod=story\">overview</A> | <A HREF=\"admin.php?mod=story&op=help\">help</A></SMALL><HR>\n";
|
||||
|
||||
|
|
@ -244,11 +228,11 @@ function story_admin() {
|
|||
print search_data($keys, $mod);
|
||||
break;
|
||||
case t("Preview"):
|
||||
story_view(new Story($story, $category, $topic),0);
|
||||
print story_form($story);
|
||||
story_view(new Story($edit),0);
|
||||
print story_form($edit);
|
||||
break;
|
||||
case t("Submit"):
|
||||
story_save($story, $category, $topic);
|
||||
story_save($edit);
|
||||
// fall through:
|
||||
default:
|
||||
print story_overview(story_query($type));
|
||||
|
|
@ -257,19 +241,19 @@ function story_admin() {
|
|||
|
||||
|
||||
function story_user() {
|
||||
global $story, $category, $topic, $op, $theme, $user;
|
||||
global $edit, $op, $theme, $user;
|
||||
|
||||
switch($op) {
|
||||
case t("Preview"):
|
||||
story_view(new Story($story, $category, $topic), 0);
|
||||
$theme->box("Submit", story_form($story));
|
||||
story_view(new Story($edit), 0);
|
||||
$theme->box(t("Submit"), story_form($edit));
|
||||
break;
|
||||
case t("Submit"):
|
||||
story_save($story, $category, $topic);
|
||||
story_save($edit);
|
||||
$theme->box(t("Submit"), t("Thank you for your submission."));
|
||||
break;
|
||||
default:
|
||||
$theme->box("Submit", story_form());
|
||||
$theme->box(t("Submit"), story_form());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
$module = array("admin" => "structure_admin");
|
||||
|
||||
$cstatus = array("disabled", "enabled: incl. anonymous", "enabled: excl. anonymous");
|
||||
$mstatus = array("post new submissions", "queue new submissions");
|
||||
$mstatus = array("post new submissions", "moderate new submissions");
|
||||
|
||||
include "includes/structure.inc";
|
||||
|
||||
|
|
@ -73,9 +73,9 @@ function category_overview() {
|
|||
$result = db_query("SELECT * FROM category ORDER BY name");
|
||||
|
||||
$output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
|
||||
$output .= " <TR><TH>name</TH><TH>type</TH><TH>comments</TH><TH>submissions</TH><TH>thresholds</TH><TH>operations</TH></TR>\n";
|
||||
$output .= " <TR><TH>name</TH><TH>type</TH><TH>comments</TH><TH>submissions</TH><TH>operations</TH></TR>\n";
|
||||
while ($category = db_fetch_object($result)) {
|
||||
$output .= " <TR><TD>". check_output($category->name) ."</TD><TD>". check_output($category->type) ."</TD><TD>". check_output($cstatus[$category->comment]) ."</TD><TD>". check_output($mstatus[$category->submission]) ."</TD><TD>post: $category->post, dump: $category->dump, expire: $category->expire</TD><TD><A HREF=\"admin.php?mod=structure&type=category&op=edit&id=$category->cid\">edit category</A></TD></TR>\n";
|
||||
$output .= " <TR><TD>". check_output($category->name) ."</TD><TD>". check_output($category->type) ."</TD><TD>". check_output($cstatus[$category->comment]) ."</TD><TD>". check_output($mstatus[$category->submission]) ."". ($category->submission ? "<BR><SMALL>post: $category->post, dump: $category->dump, expire: $category->expire</SMALL>" : "") ."</TD><TD><A HREF=\"admin.php?mod=structure&type=category&op=edit&id=$category->cid\">edit category</A></TD></TR>\n";
|
||||
}
|
||||
$output .= "</TABLE>\n";
|
||||
return $output;
|
||||
|
|
@ -88,7 +88,7 @@ function topic_form($edit = array()) {
|
|||
$output .= "<FORM ACTION=\"admin.php?mod=structure&type=topic\" METHOD=\"post\">\n";
|
||||
|
||||
$output .= "<B>Name:</B><BR>\n";
|
||||
$output .= "<INPUT NAME=\"edit[name]\" SIZE=\"55\" VALUE=\"". check_textfield($edit[name]) ."\"><P>\n";
|
||||
$output .= "<INPUT NAME=\"edit[name]\" SIZE=\"55\" VALUE=\"". check_textfield($edit[name]) ."\"><BR>\n";
|
||||
$output .= "<SMALL><I>A unique name for this topic like 'science', 'internet', 'culture', etc.</I></SMALL><P>\n";
|
||||
|
||||
$output .= "<B>Parent:</B><BR>\n";
|
||||
|
|
@ -112,9 +112,9 @@ function topic_overview() {
|
|||
$tree = topic_tree();
|
||||
|
||||
$output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
|
||||
$output .= " <TR><TH>name</TH><TH>operations</TH></TR>\n";
|
||||
$output .= " <TR><TH>name</TH><TH>read access</TH><TH>write access</TH><TH>operations</TH></TR>\n";
|
||||
foreach ($tree as $id=>$name) {
|
||||
$output .= " <TR><TD>". check_output($name) ."</TD><TD><A HREF=\"admin.php?mod=structure&type=topic&op=edit&id=$id\">edit topic</A></TD></TR>\n";
|
||||
$output .= " <TR><TD>". check_output($name) ."</TD><TD ALIGN=\"center\">all</TD><TD ALIGN=\"center\">all</TD><TD><A HREF=\"admin.php?mod=structure&type=topic&op=edit&id=$id\">edit topic</A></TD></TR>\n";
|
||||
}
|
||||
$output .= "</TABLE>\n";
|
||||
return $output;
|
||||
|
|
@ -133,7 +133,7 @@ function structure_overview() {
|
|||
function structure_admin() {
|
||||
global $id, $op, $type, $edit;
|
||||
|
||||
print "<SMALL><A HREF=\"admin.php?mod=structure&type=category&op=add\">add new category</A> | <A HREF=\"admin.php?mod=structure&type=topic&op=add\">add new topic</A> | <A HREF=\"admin.php?mod=structure&type=category\">categories</A> | <A HREF=\"admin.php?mod=structure&type=topic\">topics</A> | <A HREF=\"admin.php?mod=structure\">overview</A></SMALL><HR>\n";
|
||||
print "<SMALL><A HREF=\"admin.php?mod=structure&type=category&op=add\">add new category</A> | <A HREF=\"admin.php?mod=structure&type=topic&op=add\">add new topic</A> | <A HREF=\"admin.php?mod=structure\">overview</A></SMALL><HR>\n";
|
||||
|
||||
switch ($type) {
|
||||
case "category":
|
||||
|
|
@ -149,14 +149,14 @@ function structure_admin() {
|
|||
break;
|
||||
case "Delete category":
|
||||
print status(category_del($edit[cid]));
|
||||
print category_overview();
|
||||
print structure_overview();
|
||||
break;
|
||||
case "Save category":
|
||||
print status(category_save($edit));
|
||||
print category_overview();
|
||||
print structure_overview();
|
||||
break;
|
||||
default:
|
||||
print category_overview();
|
||||
print structure_overview();
|
||||
}
|
||||
break;
|
||||
case "topic":
|
||||
|
|
@ -172,14 +172,14 @@ function structure_admin() {
|
|||
break;
|
||||
case "Delete topic":
|
||||
print status(topic_del($edit[tid]));
|
||||
print topic_overview();
|
||||
print structure_overview();
|
||||
break;
|
||||
case "Save topic":
|
||||
print status(topic_save($edit));
|
||||
print topic_overview();
|
||||
print structure_overview();
|
||||
break;
|
||||
default:
|
||||
print topic_overview();
|
||||
print structure_overview();
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<TITLE><? echo variable_get(site_name, "drupal"); ?></TITLE>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<TABLE BORDER="1">
|
||||
<TABLE BORDER="0">
|
||||
<TR>
|
||||
<TD>
|
||||
<BIG><A HREF="index.php"><?php print variable_get(site_name, "drupal"); ?></A></BIG>
|
||||
|
|
@ -50,10 +50,10 @@
|
|||
function story($story, $reply = 0) {
|
||||
?>
|
||||
|
||||
<TABLE BORDER="1" WIDTH="100%">
|
||||
<TABLE BORDER="1" CELLSPACING="0" CELLPADDING="3" WIDTH="100%">
|
||||
<TR>
|
||||
<TD COLSPAN="2">
|
||||
<?php echo check_output($story->title); ?>
|
||||
<BIG><?php echo check_output($story->title); ?></BIG>
|
||||
</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
|
|
@ -65,13 +65,11 @@
|
|||
?>
|
||||
|
||||
</TD>
|
||||
<TD>
|
||||
|
||||
<TD ALIGN="right">
|
||||
<?php
|
||||
echo "<A HREF=\"search.php?category=". urlencode($story->section) ."\">". check_output($story->section) ."</A>";
|
||||
echo "<A HREF=\"index.php?category=$story->cid\">". check_output($story->category) ."</A> / <A HREF=\"index.php?topic=$story->tid\">". check_output($story->topic) ."</A>";
|
||||
|
||||
?>
|
||||
|
||||
</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
|
|
@ -112,41 +110,41 @@
|
|||
echo "<A NAME=\"$comment->cid\"></A>\n";
|
||||
|
||||
// Create comment header:
|
||||
echo " <TABLE BORDER=\"1\" WIDTH=\"100%\">";
|
||||
echo " <TR>";
|
||||
echo " <TD>";
|
||||
echo t("Subject") .":";
|
||||
echo " </TD>";
|
||||
echo " <TD>";
|
||||
echo " ". check_output($comment->subject);
|
||||
echo " </TD>";
|
||||
echo "<TABLE BORDER=\"1\" CELLSPACING=\"0\" CELLPADDING=\"3\" WIDTH=\"100%\">";
|
||||
echo " <TR>";
|
||||
echo " <TD>";
|
||||
echo t("Subject") .":";
|
||||
echo " </TD>";
|
||||
echo " <TD>";
|
||||
echo " ". check_output($comment->subject);
|
||||
echo " </TD>";
|
||||
|
||||
// Moderation:
|
||||
echo " <TD>";
|
||||
echo comment_moderation($comment);
|
||||
echo " </TD>";
|
||||
echo " </TR>";
|
||||
echo " <TD>";
|
||||
echo comment_moderation($comment);
|
||||
echo " </TD>";
|
||||
echo " </TR>";
|
||||
|
||||
// Author and date:
|
||||
echo " <TR>";
|
||||
echo " <TD>";
|
||||
echo t("Author") .":";
|
||||
echo " </TD>";
|
||||
echo " <TD COLSPAN=\"2\">";
|
||||
echo format_username($comment->userid) ." on ". format_date($comment->timestamp);
|
||||
echo " </TD>";
|
||||
echo " </TR>";
|
||||
echo " <TR>";
|
||||
echo " <TD>";
|
||||
echo t("Author") .":";
|
||||
echo " </TD>";
|
||||
echo " <TD COLSPAN=\"2\">";
|
||||
echo format_username($comment->userid) ." on ". format_date($comment->timestamp);
|
||||
echo " </TD>";
|
||||
echo " </TR>";
|
||||
|
||||
// Body of comment:
|
||||
echo " <TR>";
|
||||
echo " <TD COLSPAN=\"3\">";
|
||||
echo check_output($comment->comment, 1);
|
||||
echo " <TR>";
|
||||
echo " <TD COLSPAN=\"3\">";
|
||||
echo check_output($comment->comment, 1);
|
||||
|
||||
// Print navigation / control links:
|
||||
echo " <P>$link</P>";
|
||||
echo " </TD>";
|
||||
echo " </TR>";
|
||||
echo " </TABLE>";
|
||||
echo " <P>$link</P>";
|
||||
echo " </TD>";
|
||||
echo " </TR>";
|
||||
echo "</TABLE>";
|
||||
} // close comment function
|
||||
|
||||
function box($subject, $content, $options = "") {
|
||||
|
|
@ -156,7 +154,7 @@
|
|||
<TABLE>
|
||||
<TR>
|
||||
<TD>
|
||||
<DIV ALIGN="center"><B><? echo $subject; ?></B></DIV><HR>
|
||||
<DIV ALIGN="center"><BIG><? echo $subject; ?></BIG></DIV><HR>
|
||||
</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
print " <TR VALIGN=\"bottom\"><TD COLSPAN=\"2\" BGCOLOR=\"#000000\" WIDTH=\"100%\"><IMG SRC=\"themes/marvin/images/pixel.gif\" WIDTH=\"1\" HEIGHT=\"0\" ALT=\"\"></TD></TR>\n";
|
||||
print " <TR>\n";
|
||||
print " <TD>\n";
|
||||
print " <FONT COLOR=\"#7C7C7C\"><SMALL>". strtr(t("Submitted by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large"))); ?><?php if ($story->department) print "<BR>from the $story->department dept."; ?><?php print "</SMALL></FONT></TD><TD ALIGN=\"right\" VALIGN=\"top\" NOWRAP><SMALL><A HREF=\"?section=". urlencode($story->section) ."\"><FONT COLOR=\"#83997A\">". check_output($story->section) ."</FONT></A></SMALL>\n";
|
||||
print " <FONT COLOR=\"#7C7C7C\"><SMALL>". strtr(t("Submitted by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large"))); ?><?php if ($story->department) print "<BR>from the $story->department dept."; ?><?php print "</SMALL></FONT></TD><TD ALIGN=\"right\" VALIGN=\"top\" NOWRAP><SMALL><A HREF=\"index.php?category=$story->cid\"><FONT COLOR=\"#83997A\">". check_output($story->category) ."</FONT></A> / <A HREF=\"index.php?topic=$story->tid\"><FONT COLOR=\"#83997A\">". check_output($story->topic) ."</FONT></A></SMALL>\n";
|
||||
print " </TD>\n";
|
||||
print " </TR>\n";
|
||||
print " <TR><TD COLSPAN=\"2\"> </TD></TR>\n";
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@
|
|||
<tr>
|
||||
<td class="box">
|
||||
<img src="themes/jeroen2/images/square.gif" /> <b><?php echo check_output($comment->subject); ?></b>
|
||||
<font size="-1"><?php echo strtr(t(" by %a on %b"), array("%a" => format_username($comment->userid), "%b" => format_date($comment->timestamp), "small")); ?></font>
|
||||
<font size="-1"><?php echo strtr(t(" by %a on %b"), array("%a" => format_username($comment->userid), "%b" => format_date($comment->timestamp), "small")); ?></font>
|
||||
</td>
|
||||
<td align="right"><?php echo comment_moderation($comment); ?></td>
|
||||
</tr>
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
|
||||
<table width="90%" border="0" cellpadding="0" cellspacing="1">
|
||||
<tr>
|
||||
<td class="box"><img src="themes/jeroen2/images/square.gif" /> <b><?php echo $subject; ?></b></td>
|
||||
<td class="box"><img src="themes/jeroen2/images/square.gif" /> <b><?php echo $subject; ?></b></td>
|
||||
</tr>
|
||||
<tr><td class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /><br></td></tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
# 14/04/2001:
|
||||
ALTER TABLE node ADD cid int(10) unsigned DEFAULT '0' NOT NULL;
|
||||
ALTER TABLE node ADD tid int(10) unsigned DEFAULT '0' NOT NULL;
|
||||
ALTER TABLE story DROP section;
|
||||
ALTER TABLE comments ADD KEY(lid);
|
||||
|
||||
CREATE TABLE category (
|
||||
cid int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
|
||||
|
|
|
|||
Loading…
Reference in New Issue