Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Added Marco's long-awaited taxonmy module and patches - a replacement 

for the meta system.  The patches add some extra functionality to the
  comment system (for example, comments can be set read-only) and fix a
  couple of small problems.

  + I integrated the required SQL updates from the varius *.mysql files
    into the "update.php" script.  Upgrading should be easy ...

  + I did not apply/commit the "user.diff" as requested by Marco ...

  + I didn't know what to do with "forum.module" and "forum2.module":
    what do you want me to do with it Marco?  Which one should go in?

  + Can we remove "node_index()" now; both from "node.module" and the
    themes?

  + Thanks Marco!
4.0.x
Dries Buytaert 2002-04-14 20:46:41 +00:00
parent e5fd671307
commit d8cd54969c
21 changed files with 1512 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/database.mysql
View File

@ -2,7 +2,7 @@
# #
# Host: localhost Database: drupal # Host: localhost Database: drupal
#-------------------------------------------------------- #--------------------------------------------------------
# Server version 3.23.38 # Server version 3.23.38
# #
# Table structure for table 'access' # Table structure for table 'access'

52
includes/common.inc
View File

@ -78,9 +78,13 @@ function object2array($node) {
return $array; return $array;
} }
function path_uri() { function path_uri($brief = 0) {
global $HTTP_HOST, $REQUEST_URI; global $HTTP_HOST, $REQUEST_URI;
return "http://". $HTTP_HOST . substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")) ."/"; $path = $HTTP_HOST . substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")) ."/";
if (!$brief) {
$path = "http://". $path;
}
return $path;
} }
function path_img() { function path_img() {
@ -148,7 +152,7 @@ function variable_del($name) {
* Format a single result entry of a search query: * Format a single result entry of a search query:
* *
* @param $item a single search result as returned by <module>_search of type * @param $item a single search result as returned by <module>_search of type
* array("count" => ..., "link" => ..., "title" => ..., * array("count" => ..., "link" => ..., "title" => ...,
* "user" => ..., "date" => ..., "keywords" => ...) * "user" => ..., "date" => ..., "keywords" => ...)
* @param $type module type of this item * @param $type module type of this item
*/ */
@ -164,14 +168,14 @@ function search_item($item, $type) {
* Render a generic search form. * Render a generic search form.
* *
* "Generic" means "universal usable" - that is, usable not only from * "Generic" means "universal usable" - that is, usable not only from
* module.php?mod=search, but also as a simple seach box (without * module.php?mod=search, but also as a simple seach box (without
* "Restrict search to", help text, etc) from theme's header etc. * "Restrict search to", help text, etc) from theme's header etc.
* This means: provide options to only conditionally render certain * This means: provide options to only conditionally render certain
* parts of this form. * parts of this form.
* *
* @param $action Form action. Defaults to module.php?mod=search. * @param $action Form action. Defaults to module.php?mod=search.
* @param $query Query string. Defaults to global $keys. * @param $query Query string. Defaults to global $keys.
* @param $options != 0: Render additional form fields/text * @param $options != 0: Render additional form fields/text
* ("Restrict search to", help text, etc). * ("Restrict search to", help text, etc).
*/ */
function search_form($action = 0, $query = 0, $options = 0) { function search_form($action = 0, $query = 0, $options = 0) {
@ -239,11 +243,11 @@ function search_data() {
/** /**
* Display the search form and the resulting data. * Display the search form and the resulting data.
* *
* @param $type If set, search only nodes of this type. * @param $type If set, search only nodes of this type.
* Otherwise, search all types. * Otherwise, search all types.
* @param $action Form action. Defaults to module.php?mod=search. * @param $action Form action. Defaults to module.php?mod=search.
* @param $query Query string. Defaults to global $keys. * @param $query Query string. Defaults to global $keys.
* @param $options != 0: Render additional form fields/text * @param $options != 0: Render additional form fields/text
* ("Restrict search to", help text, etc). * ("Restrict search to", help text, etc).
*/ */
function search_type($type = 0, $action = 0, $query = 0, $options = 0) { function search_type($type = 0, $action = 0, $query = 0, $options = 0) {
@ -256,6 +260,22 @@ function search_type($type = 0, $action = 0, $query = 0, $options = 0) {
return search_form($action, $query, $options) . search_data(); return search_form($action, $query, $options) . search_data();
} }
function drupal_str_replace($from, $to, $subject) {
/*
** Multiple item replace which works for *all* PHP versions
** (PHP 4.05+ supports this natively using similar syntax).
** $from and $to should be same sized arrays, $subject is the
** source text.
*/
for ($i = 0; $i < count($from); $i++) {
$subject = str_replace($from[$i], $to[$i], $subject);
}
return $subject;
}
function drupal_goto($url) { function drupal_goto($url) {
/* /*
@ -551,12 +571,12 @@ function form_textarea($title, $name, $value, $cols, $rows, $description = 0) {
return form_item($title, "<textarea wrap=\"virtual\" cols=\"$cols\" rows=\"$rows\" name=\"edit[$name]\">". check_form($value) ."</textarea>", $description); return form_item($title, "<textarea wrap=\"virtual\" cols=\"$cols\" rows=\"$rows\" name=\"edit[$name]\">". check_form($value) ."</textarea>", $description);
} }
function form_select($title, $name, $value, $options, $description = 0, $extra = 0) { function form_select($title, $name, $value, $options, $description = 0, $extra = 0, $multiple = 0) {
if (count($options) > 0) { if (count($options) > 0) {
foreach ($options as $key => $choice) { foreach ($options as $key=>$choice) {
$select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected=\"selected\"" : "") : ($key == $value ? " selected=\"selected\"" : "")) .">". check_form($choice) ."</option>"; $select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected=\"selected\"" : "") : ($key == $value ? " selected=\"selected\"" : "")) .">". check_form($choice) ."</option>";
} }
return form_item($title, "<select name=\"edit[$name]\"". ($extra ? " $extra" : "") .">$select</select>", $description); return form_item($title, "<select name=\"edit[$name]".($multiple ? "[]" : "")."\"" .($multiple ? " multiple " : "").($extra ? " $extra" : "") .">$select</select>", $description);
} }
} }
@ -595,20 +615,20 @@ function field_merge($a, $b) {
function link_page() { function link_page() {
global $custom_links; global $custom_links;
if (is_array($custom_links)) { if (is_array($custom_links)) {
return $custom_links; return $custom_links;
} }
else { else {
$links[] = "<a href=\"index.php\">". t("home") ."</a>"; $links[] = "<a href=\"index.php\">". t("home") ."</a>";
foreach (module_list() as $name) { foreach (module_list() as $name) {
if (module_hook($name, "link")) { if (module_hook($name, "link")) {
$links = array_merge($links, module_invoke($name, "link", "page")); $links = array_merge($links, module_invoke($name, "link", "page"));
} }
} }
return $links; return $links;
} }
} }
function link_node($node, $main = 0) { function link_node($node, $main = 0) {
foreach (module_list() as $name) { foreach (module_list() as $name) {

2
modules/blog.module
View File

@ -243,6 +243,8 @@ function blog_form(&$node, &$help, &$error) {
$output .= form_textarea(t("Teaser"), "teaser", $node->teaser, 60, 5, $error["teaser"]); $output .= form_textarea(t("Teaser"), "teaser", $node->teaser, 60, 5, $error["teaser"]);
} }
$output .= implode("<p>", taxonomy_node_form("blog", $node));
$output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", ""))); $output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", "")));
return $output; return $output;

2
modules/blog/blog.module
View File

@ -243,6 +243,8 @@ function blog_form(&$node, &$help, &$error) {
$output .= form_textarea(t("Teaser"), "teaser", $node->teaser, 60, 5, $error["teaser"]); $output .= form_textarea(t("Teaser"), "teaser", $node->teaser, 60, 5, $error["teaser"]);
} }
$output .= implode("<p>", taxonomy_node_form("blog", $node));
$output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", ""))); $output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", "")));
return $output; return $output;

63
modules/comment.module
View File

@ -145,22 +145,30 @@ function comment_edit($cid) {
} }
function comment_reply($pid, $nid) { function comment_reply($pid, $nid) {
global $theme; global $theme, $node;
if ($pid) { // we must provide a taxonomy context for user_access()
$comment = db_fetch_object(db_query("SELECT c.*, u.uid, u.name FROM comments c LEFT JOIN users u ON c.uid = u.uid WHERE c.cid = '$pid'")); $context->nid = $nid;
comment_view($comment, t("reply to this comment")); if (user_access("access comments", $context)) {
} if ($pid) {
else { $comment = db_fetch_object(db_query("SELECT c.*, u.uid, u.name FROM comments c LEFT JOIN users u ON c.uid = u.uid WHERE c.cid = '$pid'"));
node_view(node_load(array("nid" => $nid))); comment_view($comment, t("reply to this comment"));
$pid = 0; }
} else {
node_view(node_load(array("nid" => $nid)));
$pid = 0;
}
if (user_access("post comments")) { if (node_comment_mode($nid) == 1) {
$theme->box(t("Reply"), comment_form(array("pid" => $pid, "nid" => $nid))); $theme->box(t("Reply"), t("This discussion is closed: you can't post new comments."));
} } else if (user_access("post comments", $context)) {
else { $theme->box(t("Reply"), comment_form(array("pid" => $pid, "nid" => $nid)));
$theme->box(t("Reply"), t("You are not authorized to post comments.")); }
else {
$theme->box(t("Reply"), t("You are not authorized to post comments."));
}
} else {
$theme->box(t("Reply"), t("You are not authorized to view comments."));
} }
} }
@ -205,7 +213,8 @@ function comment_preview($edit) {
function comment_post($edit) { function comment_post($edit) {
global $theme, $user; global $theme, $user;
if (user_access("post comments")) { $context->nid = $edit["nid"];
if (user_access("post comments", $context) && node_comment_mode($edit["nid"]) == 2) {
/* /*
** Validate the comment's subject. If not specified, extract ** Validate the comment's subject. If not specified, extract
@ -378,6 +387,11 @@ function comment_links($comment, $return = 1) {
$links[] = "<a href=\"admin.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Administer this comment.") ."\"><span style=\"color: $theme->type;\">". t("administer") ."</span></a>"; $links[] = "<a href=\"admin.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Administer this comment.") ."\"><span style=\"color: $theme->type;\">". t("administer") ."</span></a>";
} }
// here we should check if this node has read-only comments, but we already check on submit
// and this way we save a query. it's just a cosmetic issue. otherwise just uncomment next
// line and related bracket some lines below
//if (node_comment_mode($comment->nid)) {
if (user_access("post comments")) { if (user_access("post comments")) {
if (comment_access("edit", $comment)) { if (comment_access("edit", $comment)) {
$links[] = "<a href=\"module.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Make changes to your comment.") ."\"><span style=\"color: $theme->type\">". t("edit your comment") ."</span></a>"; $links[] = "<a href=\"module.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Make changes to your comment.") ."\"><span style=\"color: $theme->type\">". t("edit your comment") ."</span></a>";
@ -386,6 +400,7 @@ function comment_links($comment, $return = 1) {
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$comment->nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\"><span style=\"color: $theme->type;\">". t("reply to this comment") ."</span></a>"; $links[] = "<a href=\"module.php?mod=comment&op=reply&id=$comment->nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\"><span style=\"color: $theme->type;\">". t("reply to this comment") ."</span></a>";
} }
} }
//}
return $theme->links($links); return $theme->links($links);
@ -553,10 +568,10 @@ function comment_search($keys) {
// index. // index.
// //
// "select"'s value is used to relate the data from the specific nodes // "select"'s value is used to relate the data from the specific nodes
// table to the data that the search_index table has in it, and the the // table to the data that the search_index table has in it, and the the
// do_search functino will rank it. // do_search functino will rank it.
// //
// The select must always provide the following fields - lno, title, // The select must always provide the following fields - lno, title,
// created, uid, name, count // created, uid, name, count
// //
// The select statement may optionally provide "nid", which is a secondary // The select statement may optionally provide "nid", which is a secondary
@ -565,7 +580,7 @@ function comment_search($keys) {
$find = do_search(array("keys" => $keys, $find = do_search(array("keys" => $keys,
"type" => "comment", "type" => "comment",
"select" => "select s.lno as lno, c.nid as nid, c.subject as title, c.timestamp as created, u.uid as uid, u.name as name, s.count as count FROM search_index s, comments c LEFT JOIN users u ON c.uid = u.uid WHERE s.lno = c.cid AND s.type = 'comment' AND s.word like '%'")); "select" => "select s.lno as lno, c.nid as nid, c.subject as title, c.timestamp as created, u.uid as uid, u.name as name, s.count as count FROM search_index s, comments c LEFT JOIN users u ON c.uid = u.uid WHERE s.lno = c.cid AND s.type = 'comment' AND s.word like '%'"));
return $find; return $find;
} }
@ -597,11 +612,15 @@ function comment_link($type, $node = 0, $main = 0) {
else { else {
/* /*
** Node page: add a "post comment" link if the user is allowed to ** Node page: add a "post comment" link if the user is allowed to
** post comments. ** post comments and if this node is not read-only
*/ */
if (user_access("post comments")) { if (user_access("post comments")) {
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$node->nid#comment\" title=\"". t("Share your thoughts and opinions related to this posting.") ."\">". t("add new comment") ."</a>"; if ($node->comment == 2) {
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$node->nid#comment\" title=\"". t("Share your thoughts and opinions related to this posting.") ."\">". t("add new comment") ."</a>";
} else {
$links[] = t("This discussion is closed: you can't post new comments.");
}
} }
} }
} }
@ -751,14 +770,14 @@ function comment_update_index() {
// Return an array of values to dictate how to update the search index // Return an array of values to dictate how to update the search index
// for this particular type of node. // for this particular type of node.
// //
// "last_update"'s value is used with variable_set to set the // "last_update"'s value is used with variable_set to set the
// last time this node type (comment) had an index update run. // last time this node type (comment) had an index update run.
// //
// "node_type"'s value is used to identify the node type in the search // "node_type"'s value is used to identify the node type in the search
// index (commentt in this case). // index (commentt in this case).
// //
// "select"'s value is used to select the node id and text fields from // "select"'s value is used to select the node id and text fields from
// the table we are indexing. In this case, we also check against the // the table we are indexing. In this case, we also check against the
// last run date for the comments update. // last run date for the comments update.
return array("last_update" => "comment_cron_last", return array("last_update" => "comment_cron_last",
"node_type" => "comment", "node_type" => "comment",

63
modules/comment/comment.module
View File

@ -145,22 +145,30 @@ function comment_edit($cid) {
} }
function comment_reply($pid, $nid) { function comment_reply($pid, $nid) {
global $theme; global $theme, $node;
if ($pid) { // we must provide a taxonomy context for user_access()
$comment = db_fetch_object(db_query("SELECT c.*, u.uid, u.name FROM comments c LEFT JOIN users u ON c.uid = u.uid WHERE c.cid = '$pid'")); $context->nid = $nid;
comment_view($comment, t("reply to this comment")); if (user_access("access comments", $context)) {
} if ($pid) {
else { $comment = db_fetch_object(db_query("SELECT c.*, u.uid, u.name FROM comments c LEFT JOIN users u ON c.uid = u.uid WHERE c.cid = '$pid'"));
node_view(node_load(array("nid" => $nid))); comment_view($comment, t("reply to this comment"));
$pid = 0; }
} else {
node_view(node_load(array("nid" => $nid)));
$pid = 0;
}
if (user_access("post comments")) { if (node_comment_mode($nid) == 1) {
$theme->box(t("Reply"), comment_form(array("pid" => $pid, "nid" => $nid))); $theme->box(t("Reply"), t("This discussion is closed: you can't post new comments."));
} } else if (user_access("post comments", $context)) {
else { $theme->box(t("Reply"), comment_form(array("pid" => $pid, "nid" => $nid)));
$theme->box(t("Reply"), t("You are not authorized to post comments.")); }
else {
$theme->box(t("Reply"), t("You are not authorized to post comments."));
}
} else {
$theme->box(t("Reply"), t("You are not authorized to view comments."));
} }
} }
@ -205,7 +213,8 @@ function comment_preview($edit) {
function comment_post($edit) { function comment_post($edit) {
global $theme, $user; global $theme, $user;
if (user_access("post comments")) { $context->nid = $edit["nid"];
if (user_access("post comments", $context) && node_comment_mode($edit["nid"]) == 2) {
/* /*
** Validate the comment's subject. If not specified, extract ** Validate the comment's subject. If not specified, extract
@ -378,6 +387,11 @@ function comment_links($comment, $return = 1) {
$links[] = "<a href=\"admin.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Administer this comment.") ."\"><span style=\"color: $theme->type;\">". t("administer") ."</span></a>"; $links[] = "<a href=\"admin.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Administer this comment.") ."\"><span style=\"color: $theme->type;\">". t("administer") ."</span></a>";
} }
// here we should check if this node has read-only comments, but we already check on submit
// and this way we save a query. it's just a cosmetic issue. otherwise just uncomment next
// line and related bracket some lines below
//if (node_comment_mode($comment->nid)) {
if (user_access("post comments")) { if (user_access("post comments")) {
if (comment_access("edit", $comment)) { if (comment_access("edit", $comment)) {
$links[] = "<a href=\"module.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Make changes to your comment.") ."\"><span style=\"color: $theme->type\">". t("edit your comment") ."</span></a>"; $links[] = "<a href=\"module.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Make changes to your comment.") ."\"><span style=\"color: $theme->type\">". t("edit your comment") ."</span></a>";
@ -386,6 +400,7 @@ function comment_links($comment, $return = 1) {
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$comment->nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\"><span style=\"color: $theme->type;\">". t("reply to this comment") ."</span></a>"; $links[] = "<a href=\"module.php?mod=comment&op=reply&id=$comment->nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\"><span style=\"color: $theme->type;\">". t("reply to this comment") ."</span></a>";
} }
} }
//}
return $theme->links($links); return $theme->links($links);
@ -553,10 +568,10 @@ function comment_search($keys) {
// index. // index.
// //
// "select"'s value is used to relate the data from the specific nodes // "select"'s value is used to relate the data from the specific nodes
// table to the data that the search_index table has in it, and the the // table to the data that the search_index table has in it, and the the
// do_search functino will rank it. // do_search functino will rank it.
// //
// The select must always provide the following fields - lno, title, // The select must always provide the following fields - lno, title,
// created, uid, name, count // created, uid, name, count
// //
// The select statement may optionally provide "nid", which is a secondary // The select statement may optionally provide "nid", which is a secondary
@ -565,7 +580,7 @@ function comment_search($keys) {
$find = do_search(array("keys" => $keys, $find = do_search(array("keys" => $keys,
"type" => "comment", "type" => "comment",
"select" => "select s.lno as lno, c.nid as nid, c.subject as title, c.timestamp as created, u.uid as uid, u.name as name, s.count as count FROM search_index s, comments c LEFT JOIN users u ON c.uid = u.uid WHERE s.lno = c.cid AND s.type = 'comment' AND s.word like '%'")); "select" => "select s.lno as lno, c.nid as nid, c.subject as title, c.timestamp as created, u.uid as uid, u.name as name, s.count as count FROM search_index s, comments c LEFT JOIN users u ON c.uid = u.uid WHERE s.lno = c.cid AND s.type = 'comment' AND s.word like '%'"));
return $find; return $find;
} }
@ -597,11 +612,15 @@ function comment_link($type, $node = 0, $main = 0) {
else { else {
/* /*
** Node page: add a "post comment" link if the user is allowed to ** Node page: add a "post comment" link if the user is allowed to
** post comments. ** post comments and if this node is not read-only
*/ */
if (user_access("post comments")) { if (user_access("post comments")) {
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$node->nid#comment\" title=\"". t("Share your thoughts and opinions related to this posting.") ."\">". t("add new comment") ."</a>"; if ($node->comment == 2) {
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$node->nid#comment\" title=\"". t("Share your thoughts and opinions related to this posting.") ."\">". t("add new comment") ."</a>";
} else {
$links[] = t("This discussion is closed: you can't post new comments.");
}
} }
} }
} }
@ -751,14 +770,14 @@ function comment_update_index() {
// Return an array of values to dictate how to update the search index // Return an array of values to dictate how to update the search index
// for this particular type of node. // for this particular type of node.
// //
// "last_update"'s value is used with variable_set to set the // "last_update"'s value is used with variable_set to set the
// last time this node type (comment) had an index update run. // last time this node type (comment) had an index update run.
// //
// "node_type"'s value is used to identify the node type in the search // "node_type"'s value is used to identify the node type in the search
// index (commentt in this case). // index (commentt in this case).
// //
// "select"'s value is used to select the node id and text fields from // "select"'s value is used to select the node id and text fields from
// the table we are indexing. In this case, we also check against the // the table we are indexing. In this case, we also check against the
// last run date for the comments update. // last run date for the comments update.
return array("last_update" => "comment_cron_last", return array("last_update" => "comment_cron_last",
"node_type" => "comment", "node_type" => "comment",

61
modules/node.module
View File

@ -149,7 +149,7 @@ function node_save($node, $filter) {
$node->created = time(); $node->created = time();
$node->changed = time(); $node->changed = time();
$node->nid = db_result(db_query("SELECT MAX(nid) + 1 FROM node")); $node->nid = db_result(db_query("SELECT MAX(nid) + 1 FROM node"));
$node->nid = empty($node->nid) ? 1 : $node->nid; $node->nid = empty($node->nid) ? 1 : $node->nid;
// Prepare the query: // Prepare the query:
foreach ($node as $key => $value) { foreach ($node as $key => $value) {
@ -363,6 +363,10 @@ function node_filter_line($text) {
return trim($text); return trim($text);
} }
function node_comment_mode($nid) {
return db_result(db_query("SELECT comment FROM node WHERE nid = '".check_query($nid)."'"));
}
function node_filter($text) { function node_filter($text) {
if (variable_get("filter_html", 0)) $text = node_filter_html($text); if (variable_get("filter_html", 0)) $text = node_filter_html($text);
if (variable_get("filter_link", 0)) $text = node_filter_link($text); if (variable_get("filter_link", 0)) $text = node_filter_link($text);
@ -867,7 +871,7 @@ function node_form($edit) {
$output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled")); $output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
$output .= form_select(t("Promote to front page"), "promote", $edit->promote, array("Disabled", "Enabled")); $output .= form_select(t("Promote to front page"), "promote", $edit->promote, array("Disabled", "Enabled"));
$output .= form_select(t("Static on front page"), "static", $edit->static, array("Disabled", "Enabled")); $output .= form_select(t("Static on front page"), "static", $edit->static, array("Disabled", "Enabled"));
$output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Enabled")); $output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
$output .= form_select(t("Create new revision"), "revision", $edit->revision, array("Disabled", "Enabled")); $output .= form_select(t("Create new revision"), "revision", $edit->revision, array("Disabled", "Enabled"));
} }
@ -985,9 +989,10 @@ function node_preview($node) {
} }
function node_submit($node) { function node_submit($node) {
global $theme, $user; global $theme, $user, $tid;
if (user_access("post content")) { $context->tid = $tid;
if (user_access("post content", $context)) {
/* /*
** Fixup the node when required: ** Fixup the node when required:
@ -1024,6 +1029,12 @@ function node_submit($node) {
$nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "update", $node))); $nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "update", $node)));
/*
** Update terms of the node
*/
taxonomy_node_save($nid, $node->taxonomy);
watchdog("special", "$node->type: updated '$node->title'"); watchdog("special", "$node->type: updated '$node->title'");
$output = t("The node has been updated."); $output = t("The node has been updated.");
} }
@ -1055,14 +1066,20 @@ function node_submit($node) {
*/ */
if (user_access("administer nodes")) { if (user_access("administer nodes")) {
$fields = array("uid", "body", "comment" => 1, "promote", "moderate", "status" => 1, "teaser", "title", "type" => $node->type); $fields = array("uid", "body", "comment" => 2, "promote", "moderate", "status" => 1, "teaser", "title", "type" => $node->type);
} }
else { else {
$fields = array("uid" => ($user->uid ? $user->uid : 0), "body", "comment" => 1, "teaser", "title", "type" => $node->type); $fields = array("uid" => ($user->uid ? $user->uid : 0), "body", "comment" => 2, "teaser", "title", "type" => $node->type);
} }
$nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "create", $node))); $nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "create", $node)));
/*
** Insert terms of the node
*/
taxonomy_node_save($nid, $node->taxonomy);
watchdog("special", "$node->type: added '$node->title'"); watchdog("special", "$node->type: added '$node->title'");
$output = t("Thanks for your submission."); $output = t("Thanks for your submission.");
} }
@ -1119,6 +1136,12 @@ function node_delete($edit) {
db_query("DELETE FROM node WHERE nid = '$node->nid'"); db_query("DELETE FROM node WHERE nid = '$node->nid'");
db_query("DELETE FROM comments WHERE nid = '$node->nid'"); db_query("DELETE FROM comments WHERE nid = '$node->nid'");
/*
** Delete any taxonomy terms
*/
taxonomy_node_delete($node->nid);
/* /*
** Call the node specific callback (if any): ** Call the node specific callback (if any):
*/ */
@ -1145,7 +1168,7 @@ function node_delete($edit) {
} }
function node_page() { function node_page() {
global $op, $id, $user, $edit, $type, $theme, $meta; global $op, $id, $user, $edit, $type, $theme, $or, $and;
if ($op == "feed") { if ($op == "feed") {
node_feed(); node_feed();
@ -1185,11 +1208,31 @@ function node_page() {
$theme->box($title, node_delete($edit)); $theme->box($title, node_delete($edit));
break; break;
default: default:
$result = db_query("SELECT nid, type FROM node WHERE ". ($meta ? "attributes LIKE '%". check_input($meta) ."%' AND " : "") . ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10))); // prepare query
if ($or) {
foreach ((explode(",", $or)) as $t) {
$terms[] = "'".check_query($t)."'";
}
} else if ($and) {
foreach ((explode(",", $and)) as $t) {
$terms[] = "'".check_query($t)."'";
}
}
if ($or) {
// this is an OR of terms
$result = db_query("SELECT DISTINCT(n.nid), type FROM node n LEFT JOIN term_node r ON n.nid = r.nid WHERE tid IN (".implode(",", $terms).") AND ". ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
} else if ($and) {
// this is an AND
$result = db_query("SELECT n.nid, type, count(*) AS c FROM node n LEFT JOIN term_node r ON n.nid = r.nid WHERE tid IN (".implode(",", $terms).") AND ". ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' GROUP BY n.nid HAVING c = ".count($terms)." ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
} else {
$result = db_query("SELECT nid, type FROM node WHERE ". ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
}
while ($node = db_fetch_object($result)) { while ($node = db_fetch_object($result)) {
node_view(node_load(array("nid" => $node->nid, "type" => $node->type)), 1); node_view(node_load(array("nid" => $node->nid, "type" => $node->type)), 1);
} }
} }
$theme->footer(); $theme->footer();
} }

61
modules/node/node.module
View File

@ -149,7 +149,7 @@ function node_save($node, $filter) {
$node->created = time(); $node->created = time();
$node->changed = time(); $node->changed = time();
$node->nid = db_result(db_query("SELECT MAX(nid) + 1 FROM node")); $node->nid = db_result(db_query("SELECT MAX(nid) + 1 FROM node"));
$node->nid = empty($node->nid) ? 1 : $node->nid; $node->nid = empty($node->nid) ? 1 : $node->nid;
// Prepare the query: // Prepare the query:
foreach ($node as $key => $value) { foreach ($node as $key => $value) {
@ -363,6 +363,10 @@ function node_filter_line($text) {
return trim($text); return trim($text);
} }
function node_comment_mode($nid) {
return db_result(db_query("SELECT comment FROM node WHERE nid = '".check_query($nid)."'"));
}
function node_filter($text) { function node_filter($text) {
if (variable_get("filter_html", 0)) $text = node_filter_html($text); if (variable_get("filter_html", 0)) $text = node_filter_html($text);
if (variable_get("filter_link", 0)) $text = node_filter_link($text); if (variable_get("filter_link", 0)) $text = node_filter_link($text);
@ -867,7 +871,7 @@ function node_form($edit) {
$output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled")); $output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
$output .= form_select(t("Promote to front page"), "promote", $edit->promote, array("Disabled", "Enabled")); $output .= form_select(t("Promote to front page"), "promote", $edit->promote, array("Disabled", "Enabled"));
$output .= form_select(t("Static on front page"), "static", $edit->static, array("Disabled", "Enabled")); $output .= form_select(t("Static on front page"), "static", $edit->static, array("Disabled", "Enabled"));
$output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Enabled")); $output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
$output .= form_select(t("Create new revision"), "revision", $edit->revision, array("Disabled", "Enabled")); $output .= form_select(t("Create new revision"), "revision", $edit->revision, array("Disabled", "Enabled"));
} }
@ -985,9 +989,10 @@ function node_preview($node) {
} }
function node_submit($node) { function node_submit($node) {
global $theme, $user; global $theme, $user, $tid;
if (user_access("post content")) { $context->tid = $tid;
if (user_access("post content", $context)) {
/* /*
** Fixup the node when required: ** Fixup the node when required:
@ -1024,6 +1029,12 @@ function node_submit($node) {
$nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "update", $node))); $nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "update", $node)));
/*
** Update terms of the node
*/
taxonomy_node_save($nid, $node->taxonomy);
watchdog("special", "$node->type: updated '$node->title'"); watchdog("special", "$node->type: updated '$node->title'");
$output = t("The node has been updated."); $output = t("The node has been updated.");
} }
@ -1055,14 +1066,20 @@ function node_submit($node) {
*/ */
if (user_access("administer nodes")) { if (user_access("administer nodes")) {
$fields = array("uid", "body", "comment" => 1, "promote", "moderate", "status" => 1, "teaser", "title", "type" => $node->type); $fields = array("uid", "body", "comment" => 2, "promote", "moderate", "status" => 1, "teaser", "title", "type" => $node->type);
} }
else { else {
$fields = array("uid" => ($user->uid ? $user->uid : 0), "body", "comment" => 1, "teaser", "title", "type" => $node->type); $fields = array("uid" => ($user->uid ? $user->uid : 0), "body", "comment" => 2, "teaser", "title", "type" => $node->type);
} }
$nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "create", $node))); $nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "create", $node)));
/*
** Insert terms of the node
*/
taxonomy_node_save($nid, $node->taxonomy);
watchdog("special", "$node->type: added '$node->title'"); watchdog("special", "$node->type: added '$node->title'");
$output = t("Thanks for your submission."); $output = t("Thanks for your submission.");
} }
@ -1119,6 +1136,12 @@ function node_delete($edit) {
db_query("DELETE FROM node WHERE nid = '$node->nid'"); db_query("DELETE FROM node WHERE nid = '$node->nid'");
db_query("DELETE FROM comments WHERE nid = '$node->nid'"); db_query("DELETE FROM comments WHERE nid = '$node->nid'");
/*
** Delete any taxonomy terms
*/
taxonomy_node_delete($node->nid);
/* /*
** Call the node specific callback (if any): ** Call the node specific callback (if any):
*/ */
@ -1145,7 +1168,7 @@ function node_delete($edit) {
} }
function node_page() { function node_page() {
global $op, $id, $user, $edit, $type, $theme, $meta; global $op, $id, $user, $edit, $type, $theme, $or, $and;
if ($op == "feed") { if ($op == "feed") {
node_feed(); node_feed();
@ -1185,11 +1208,31 @@ function node_page() {
$theme->box($title, node_delete($edit)); $theme->box($title, node_delete($edit));
break; break;
default: default:
$result = db_query("SELECT nid, type FROM node WHERE ". ($meta ? "attributes LIKE '%". check_input($meta) ."%' AND " : "") . ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10))); // prepare query
if ($or) {
foreach ((explode(",", $or)) as $t) {
$terms[] = "'".check_query($t)."'";
}
} else if ($and) {
foreach ((explode(",", $and)) as $t) {
$terms[] = "'".check_query($t)."'";
}
}
if ($or) {
// this is an OR of terms
$result = db_query("SELECT DISTINCT(n.nid), type FROM node n LEFT JOIN term_node r ON n.nid = r.nid WHERE tid IN (".implode(",", $terms).") AND ". ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
} else if ($and) {
// this is an AND
$result = db_query("SELECT n.nid, type, count(*) AS c FROM node n LEFT JOIN term_node r ON n.nid = r.nid WHERE tid IN (".implode(",", $terms).") AND ". ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' GROUP BY n.nid HAVING c = ".count($terms)." ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
} else {
$result = db_query("SELECT nid, type FROM node WHERE ". ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
}
while ($node = db_fetch_object($result)) { while ($node = db_fetch_object($result)) {
node_view(node_load(array("nid" => $node->nid, "type" => $node->type)), 1); node_view(node_load(array("nid" => $node->nid, "type" => $node->type)), 1);
} }
} }
$theme->footer(); $theme->footer();
} }

10
modules/page.module
View File

@ -106,22 +106,22 @@ function page_view($node, $main = 0) {
global $theme; global $theme;
if ($main) { if ($main) {
$theme->node($node, $main); $theme->node($node, $main);
} }
else { else {
/* /*
** Extract the page body. If body is dynamic (using PHP code), the body ** Extract the page body. If body is dynamic (using PHP code), the body
** will be generated. ** will be generated.
*/ */
$output .= page_body($node); $output .= page_body($node);
/* /*
** Add the node specific links: ** Add the node specific links:
*/ */
$output .= "<div align=\"right\">". $theme->links(link_node($node, $main)) ."</div>"; $output .= "<div align=\"right\">". $theme->links(link_node($node, $main)) ."</div>";
$theme->box($node->title, $output); $theme->box($node->title, $output);
} }
} }

10
modules/page/page.module
View File

@ -106,22 +106,22 @@ function page_view($node, $main = 0) {
global $theme; global $theme;
if ($main) { if ($main) {
$theme->node($node, $main); $theme->node($node, $main);
} }
else { else {
/* /*
** Extract the page body. If body is dynamic (using PHP code), the body ** Extract the page body. If body is dynamic (using PHP code), the body
** will be generated. ** will be generated.
*/ */
$output .= page_body($node); $output .= page_body($node);
/* /*
** Add the node specific links: ** Add the node specific links:
*/ */
$output .= "<div align=\"right\">". $theme->links(link_node($node, $main)) ."</div>"; $output .= "<div align=\"right\">". $theme->links(link_node($node, $main)) ."</div>";
$theme->box($node->title, $output); $theme->box($node->title, $output);
} }
} }

34
modules/poll.module
View File

@ -29,9 +29,9 @@ function poll_block() {
function poll_cron() { function poll_cron() {
// Close polls that have exceeded their allowed runtime // Close polls that have exceeded their allowed runtime
$result = db_query("SELECT p.lid FROM poll p LEFT JOIN node n ON p.nid=n.nid WHERE (n.created + p.runtime) < '" . time() . "' AND p.active = '1' AND p.runtime != '0'"); $result = db_query("SELECT p.lid FROM poll p LEFT JOIN node n ON p.nid=n.nid WHERE (n.created + p.runtime) < '" . time() . "' AND p.active = '1' AND p.runtime != '0'");
while ($poll = db_fetch_object($result)) { while ($poll = db_fetch_object($result)) {
db_query("UPDATE poll SET active='0' WHERE lid='$poll->lid'"); db_query("UPDATE poll SET active='0' WHERE lid='$poll->lid'");
} }
} }
function poll_delete($node) { function poll_delete($node) {
@ -103,7 +103,7 @@ function poll_insert($node) {
} }
db_query("INSERT INTO poll (nid, runtime, voters, active) VALUES ('$node->nid', '$node->runtime', '', '$node->active')"); db_query("INSERT INTO poll (nid, runtime, voters, active) VALUES ('$node->nid', '$node->runtime', '', '$node->active')");
for ($i = 0; $i < $node->choices; $i++) { for ($i = 0; $i < $node->choices; $i++) {
$choice->chtext = filter($node->choice[$i]); $choice->chtext = filter($node->choice[$i]);
$choice->chvotes = (int)$node->chvotes[$i]; $choice->chvotes = (int)$node->chvotes[$i];
@ -126,7 +126,7 @@ function poll_link($type) {
function poll_load($node) { function poll_load($node) {
// Load the appropriate choices into the $node object // Load the appropriate choices into the $node object
$poll = db_fetch_object(db_query("SELECT runtime, voters, active FROM poll WHERE nid = '$node->nid'")); $poll = db_fetch_object(db_query("SELECT runtime, voters, active FROM poll WHERE nid = '$node->nid'"));
$result = db_query("SELECT chtext, chvotes, chorder FROM poll_choices WHERE nid='$node->nid' ORDER BY chorder"); $result = db_query("SELECT chtext, chvotes, chorder FROM poll_choices WHERE nid='$node->nid' ORDER BY chorder");
while ($choice = db_fetch_object($result)) { while ($choice = db_fetch_object($result)) {
$poll->choice[$choice->chorder] = $choice->chtext; $poll->choice[$choice->chorder] = $choice->chtext;
@ -181,12 +181,12 @@ function poll_teaser($node) {
function poll_view(&$node, $main = 0, $block = 0) { function poll_view(&$node, $main = 0, $block = 0) {
global $theme, $user; global $theme, $user;
/* When a poll is displayed twice on the same page (e.g. on the front page and in the side bar) /* When a poll is displayed twice on the same page (e.g. on the front page and in the side bar)
we only want to vote on one of them. We keep count using $pollid */ we only want to vote on one of them. We keep count using $pollid */
global $pollidcount, $pollvote, $pollid, $REMOTE_ADDR, $REQUEST_URI; global $pollidcount, $pollvote, $pollid, $REMOTE_ADDR, $REQUEST_URI;
$pollidcount++; $pollidcount++;
// Only accept votes on specific cases to prevent double voting // Only accept votes on specific cases to prevent double voting
$allowvotes = false; $allowvotes = false;
if (user_access("vote on polls")) { if (user_access("vote on polls")) {
@ -200,11 +200,11 @@ function poll_view(&$node, $main = 0, $block = 0) {
if (!strstr($node->voters, $id)) { if (!strstr($node->voters, $id)) {
$allowvotes = $node->active; $allowvotes = $node->active;
} }
} }
if (($pollid == $pollidcount) && isset($pollvote) && ($allowvotes)) { if (($pollid == $pollidcount) && isset($pollvote) && ($allowvotes)) {
// The user has submitted a valid vote // The user has submitted a valid vote
if (!empty($node->choice[$pollvote])) { if (!empty($node->choice[$pollvote])) {
$node->voters = $node->voters ? ($node->voters . " " . $id) : $id; $node->voters = $node->voters ? ($node->voters . " " . $id) : $id;
db_query("UPDATE poll SET voters='$node->voters' WHERE nid='$node->nid'"); db_query("UPDATE poll SET voters='$node->voters' WHERE nid='$node->nid'");
db_query("UPDATE poll_choices SET chvotes = chvotes + 1 WHERE nid='$node->nid' AND chorder='$pollvote'"); db_query("UPDATE poll_choices SET chvotes = chvotes + 1 WHERE nid='$node->nid' AND chorder='$pollvote'");
@ -212,10 +212,10 @@ function poll_view(&$node, $main = 0, $block = 0) {
$node->chvotes[$pollvote]++; $node->chvotes[$pollvote]++;
} }
} }
if ($allowvotes) { if ($allowvotes) {
// Display the vote form // Display the vote form
$url = $REQUEST_URI . (strstr($REQUEST_URI, "?") ? "&" : "?") . "pollid=" . $pollidcount; $url = $REQUEST_URI . (strstr($REQUEST_URI, "?") ? "&" : "?") . "pollid=" . $pollidcount;
$output .= "<form action=\"$url\" method=\"post\">"; $output .= "<form action=\"$url\" method=\"post\">";
$output .= "<table border=\"0\" align=\"center\"><tr><td>"; $output .= "<table border=\"0\" align=\"center\"><tr><td>";
@ -231,22 +231,22 @@ function poll_view(&$node, $main = 0, $block = 0) {
} }
$output .= "</form>"; $output .= "</form>";
} }
else { else {
// Display the results // Display the results
// Count the votes and find the maximum // Count the votes and find the maximum
foreach ($node->choice as $key => $value) { foreach ($node->choice as $key => $value) {
$votestotal += $node->chvotes[$key]; $votestotal += $node->chvotes[$key];
$votesmax = max($votesmax, $node->chvotes[$key]); $votesmax = max($votesmax, $node->chvotes[$key]);
} }
$votesmax = max($votesmax, 1); $votesmax = max($votesmax, 1);
// Define CSS classes for the bars // Define CSS classes for the bars
$output .= "<style type=\"text/css\">"; $output .= "<style type=\"text/css\">";
$output .= "td.pollfg { background-color: " . $theme->foreground . "; font-size: 5pt; }"; $output .= "td.pollfg { background-color: " . $theme->foreground . "; font-size: 5pt; }";
$output .= "td.pollbg { background-color: " . $theme->background . "; font-size: 5pt; }"; $output .= "td.pollbg { background-color: " . $theme->background . "; font-size: 5pt; }";
$output .= "</style>"; $output .= "</style>";
foreach ($node->choice as $key => $value) { foreach ($node->choice as $key => $value) {
if ($value != "") { if ($value != "") {
$width = round($node->chvotes[$key] * 100 / $votesmax); $width = round($node->chvotes[$key] * 100 / $votesmax);
@ -254,7 +254,7 @@ function poll_view(&$node, $main = 0, $block = 0) {
$output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td>$value</td><td><div align=\"right\"> $percentage%" . (!$block ? " (" . $node->chvotes[$key] . " votes)" : "") . "</div></td></tr></table>"; $output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td>$value</td><td><div align=\"right\"> $percentage%" . (!$block ? " (" . $node->chvotes[$key] . " votes)" : "") . "</div></td></tr></table>";
if ($width == 0) { if ($width == 0) {
$output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td class=\"pollbg\" width=\"100%\">&nbsp;</td></tr></table>"; $output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td class=\"pollbg\" width=\"100%\">&nbsp;</td></tr></table>";
} }
else if ($width == 100) { else if ($width == 100) {
$output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td class=\"pollfg\" width=\"100%\">&nbsp;</td></tr></table>"; $output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td class=\"pollfg\" width=\"100%\">&nbsp;</td></tr></table>";
@ -283,7 +283,7 @@ function poll_update($node) {
for ($i = 0; $i < $node->choices; $i++) { for ($i = 0; $i < $node->choices; $i++) {
$choice->chtext = filter($node->choice[$i]); $choice->chtext = filter($node->choice[$i]);
$choice->chvotes = (int)$node->chvotes[$i]; $choice->chvotes = (int)$node->chvotes[$i];
$choice->chorder = $i; $choice->chorder = $i;
if ($choice->chtext != "") { if ($choice->chtext != "") {
db_query("INSERT INTO poll_choices (nid, chtext, chvotes, chorder) VALUES ('$node->nid', '$choice->chtext', '$choice->chvotes', '$choice->chorder')"); db_query("INSERT INTO poll_choices (nid, chtext, chvotes, chorder) VALUES ('$node->nid', '$choice->chtext', '$choice->chvotes', '$choice->chorder')");

34
modules/poll/poll.module
View File

@ -29,9 +29,9 @@ function poll_block() {
function poll_cron() { function poll_cron() {
// Close polls that have exceeded their allowed runtime // Close polls that have exceeded their allowed runtime
$result = db_query("SELECT p.lid FROM poll p LEFT JOIN node n ON p.nid=n.nid WHERE (n.created + p.runtime) < '" . time() . "' AND p.active = '1' AND p.runtime != '0'"); $result = db_query("SELECT p.lid FROM poll p LEFT JOIN node n ON p.nid=n.nid WHERE (n.created + p.runtime) < '" . time() . "' AND p.active = '1' AND p.runtime != '0'");
while ($poll = db_fetch_object($result)) { while ($poll = db_fetch_object($result)) {
db_query("UPDATE poll SET active='0' WHERE lid='$poll->lid'"); db_query("UPDATE poll SET active='0' WHERE lid='$poll->lid'");
} }
} }
function poll_delete($node) { function poll_delete($node) {
@ -103,7 +103,7 @@ function poll_insert($node) {
} }
db_query("INSERT INTO poll (nid, runtime, voters, active) VALUES ('$node->nid', '$node->runtime', '', '$node->active')"); db_query("INSERT INTO poll (nid, runtime, voters, active) VALUES ('$node->nid', '$node->runtime', '', '$node->active')");
for ($i = 0; $i < $node->choices; $i++) { for ($i = 0; $i < $node->choices; $i++) {
$choice->chtext = filter($node->choice[$i]); $choice->chtext = filter($node->choice[$i]);
$choice->chvotes = (int)$node->chvotes[$i]; $choice->chvotes = (int)$node->chvotes[$i];
@ -126,7 +126,7 @@ function poll_link($type) {
function poll_load($node) { function poll_load($node) {
// Load the appropriate choices into the $node object // Load the appropriate choices into the $node object
$poll = db_fetch_object(db_query("SELECT runtime, voters, active FROM poll WHERE nid = '$node->nid'")); $poll = db_fetch_object(db_query("SELECT runtime, voters, active FROM poll WHERE nid = '$node->nid'"));
$result = db_query("SELECT chtext, chvotes, chorder FROM poll_choices WHERE nid='$node->nid' ORDER BY chorder"); $result = db_query("SELECT chtext, chvotes, chorder FROM poll_choices WHERE nid='$node->nid' ORDER BY chorder");
while ($choice = db_fetch_object($result)) { while ($choice = db_fetch_object($result)) {
$poll->choice[$choice->chorder] = $choice->chtext; $poll->choice[$choice->chorder] = $choice->chtext;
@ -181,12 +181,12 @@ function poll_teaser($node) {
function poll_view(&$node, $main = 0, $block = 0) { function poll_view(&$node, $main = 0, $block = 0) {
global $theme, $user; global $theme, $user;
/* When a poll is displayed twice on the same page (e.g. on the front page and in the side bar) /* When a poll is displayed twice on the same page (e.g. on the front page and in the side bar)
we only want to vote on one of them. We keep count using $pollid */ we only want to vote on one of them. We keep count using $pollid */
global $pollidcount, $pollvote, $pollid, $REMOTE_ADDR, $REQUEST_URI; global $pollidcount, $pollvote, $pollid, $REMOTE_ADDR, $REQUEST_URI;
$pollidcount++; $pollidcount++;
// Only accept votes on specific cases to prevent double voting // Only accept votes on specific cases to prevent double voting
$allowvotes = false; $allowvotes = false;
if (user_access("vote on polls")) { if (user_access("vote on polls")) {
@ -200,11 +200,11 @@ function poll_view(&$node, $main = 0, $block = 0) {
if (!strstr($node->voters, $id)) { if (!strstr($node->voters, $id)) {
$allowvotes = $node->active; $allowvotes = $node->active;
} }
} }
if (($pollid == $pollidcount) && isset($pollvote) && ($allowvotes)) { if (($pollid == $pollidcount) && isset($pollvote) && ($allowvotes)) {
// The user has submitted a valid vote // The user has submitted a valid vote
if (!empty($node->choice[$pollvote])) { if (!empty($node->choice[$pollvote])) {
$node->voters = $node->voters ? ($node->voters . " " . $id) : $id; $node->voters = $node->voters ? ($node->voters . " " . $id) : $id;
db_query("UPDATE poll SET voters='$node->voters' WHERE nid='$node->nid'"); db_query("UPDATE poll SET voters='$node->voters' WHERE nid='$node->nid'");
db_query("UPDATE poll_choices SET chvotes = chvotes + 1 WHERE nid='$node->nid' AND chorder='$pollvote'"); db_query("UPDATE poll_choices SET chvotes = chvotes + 1 WHERE nid='$node->nid' AND chorder='$pollvote'");
@ -212,10 +212,10 @@ function poll_view(&$node, $main = 0, $block = 0) {
$node->chvotes[$pollvote]++; $node->chvotes[$pollvote]++;
} }
} }
if ($allowvotes) { if ($allowvotes) {
// Display the vote form // Display the vote form
$url = $REQUEST_URI . (strstr($REQUEST_URI, "?") ? "&" : "?") . "pollid=" . $pollidcount; $url = $REQUEST_URI . (strstr($REQUEST_URI, "?") ? "&" : "?") . "pollid=" . $pollidcount;
$output .= "<form action=\"$url\" method=\"post\">"; $output .= "<form action=\"$url\" method=\"post\">";
$output .= "<table border=\"0\" align=\"center\"><tr><td>"; $output .= "<table border=\"0\" align=\"center\"><tr><td>";
@ -231,22 +231,22 @@ function poll_view(&$node, $main = 0, $block = 0) {
} }
$output .= "</form>"; $output .= "</form>";
} }
else { else {
// Display the results // Display the results
// Count the votes and find the maximum // Count the votes and find the maximum
foreach ($node->choice as $key => $value) { foreach ($node->choice as $key => $value) {
$votestotal += $node->chvotes[$key]; $votestotal += $node->chvotes[$key];
$votesmax = max($votesmax, $node->chvotes[$key]); $votesmax = max($votesmax, $node->chvotes[$key]);
} }
$votesmax = max($votesmax, 1); $votesmax = max($votesmax, 1);
// Define CSS classes for the bars // Define CSS classes for the bars
$output .= "<style type=\"text/css\">"; $output .= "<style type=\"text/css\">";
$output .= "td.pollfg { background-color: " . $theme->foreground . "; font-size: 5pt; }"; $output .= "td.pollfg { background-color: " . $theme->foreground . "; font-size: 5pt; }";
$output .= "td.pollbg { background-color: " . $theme->background . "; font-size: 5pt; }"; $output .= "td.pollbg { background-color: " . $theme->background . "; font-size: 5pt; }";
$output .= "</style>"; $output .= "</style>";
foreach ($node->choice as $key => $value) { foreach ($node->choice as $key => $value) {
if ($value != "") { if ($value != "") {
$width = round($node->chvotes[$key] * 100 / $votesmax); $width = round($node->chvotes[$key] * 100 / $votesmax);
@ -254,7 +254,7 @@ function poll_view(&$node, $main = 0, $block = 0) {
$output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td>$value</td><td><div align=\"right\"> $percentage%" . (!$block ? " (" . $node->chvotes[$key] . " votes)" : "") . "</div></td></tr></table>"; $output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td>$value</td><td><div align=\"right\"> $percentage%" . (!$block ? " (" . $node->chvotes[$key] . " votes)" : "") . "</div></td></tr></table>";
if ($width == 0) { if ($width == 0) {
$output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td class=\"pollbg\" width=\"100%\">&nbsp;</td></tr></table>"; $output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td class=\"pollbg\" width=\"100%\">&nbsp;</td></tr></table>";
} }
else if ($width == 100) { else if ($width == 100) {
$output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td class=\"pollfg\" width=\"100%\">&nbsp;</td></tr></table>"; $output .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"95%\" align=\"center\"><tr><td class=\"pollfg\" width=\"100%\">&nbsp;</td></tr></table>";
@ -283,7 +283,7 @@ function poll_update($node) {
for ($i = 0; $i < $node->choices; $i++) { for ($i = 0; $i < $node->choices; $i++) {
$choice->chtext = filter($node->choice[$i]); $choice->chtext = filter($node->choice[$i]);
$choice->chvotes = (int)$node->chvotes[$i]; $choice->chvotes = (int)$node->chvotes[$i];
$choice->chorder = $i; $choice->chorder = $i;
if ($choice->chtext != "") { if ($choice->chtext != "") {
db_query("INSERT INTO poll_choices (nid, chtext, chvotes, chorder) VALUES ('$node->nid', '$choice->chtext', '$choice->chvotes', '$choice->chorder')"); db_query("INSERT INTO poll_choices (nid, chtext, chvotes, chorder) VALUES ('$node->nid', '$choice->chtext', '$choice->chvotes', '$choice->chorder')");

14
modules/queue.module
View File

@ -121,28 +121,28 @@ function queue_view($nid) {
/* /*
** If it is a valid vote, record it. ** If it is a valid vote, record it.
*/ */
queue_vote($node, $edit["vote"]); queue_vote($node, $edit["vote"]);
$output = t("Your vote has been recorded."); $output = t("Your vote has been recorded.");
} }
else { else {
/* /*
** Display some explanation or voting guidelines: ** Display some explanation or voting guidelines:
*/ */
$output .= "<p>". t("When new content get submitted it goes to the submission queue. Most, if not all, registered users can access this queue and can vote whether they think the content should be approved or not. When enough people vote to approve the content, it is pushed over the threshold and up it goes. On the other hand, when too many people voted to drop some content, the content will get trashed.") ."</p>"; $output .= "<p>". t("When new content get submitted it goes to the submission queue. Most, if not all, registered users can access this queue and can vote whether they think the content should be approved or not. When enough people vote to approve the content, it is pushed over the threshold and up it goes. On the other hand, when too many people voted to drop some content, the content will get trashed.") ."</p>";
/* /*
** Display a voting form: ** Display a voting form:
*/ */
$output .= form_select(t("Your vote"), "vote", "", $votes); $output .= form_select(t("Your vote"), "vote", "", $votes);
$output .= form_hidden("id", $node->nid); $output .= form_hidden("id", $node->nid);
$output .= form_submit(t("Vote")); $output .= form_submit(t("Vote"));
$output = form($output); $output = form($output);
} }
} }
$theme->header(); $theme->header();

38
modules/search.module
View File

@ -12,7 +12,7 @@ function search_help() {
$output .= "<p>". t("Some words which commonly occur are filtered out by the searching process, these are commonly called 'noisewords'. Examples are 'a, at, and, are, as, ask', and the list goes on. Words shorter than ". variable_get("minimum_word_size", 2) ." letters are also filtered from the search index."); $output .= "<p>". t("Some words which commonly occur are filtered out by the searching process, these are commonly called 'noisewords'. Examples are 'a, at, and, are, as, ask', and the list goes on. Words shorter than ". variable_get("minimum_word_size", 2) ." letters are also filtered from the search index.");
$output .= "<p>". t("These words will never be matched when specified, even if they appear in the node you are searching for."); $output .= "<p>". t("These words will never be matched when specified, even if they appear in the node you are searching for.");
return $output; return $output;
} }
/** /**
* Return an array of valid search access permissions * Return an array of valid search access permissions
@ -66,7 +66,7 @@ function search_admin() {
} }
/** /**
* perform a regularly run action across all modules that have the * perform a regularly run action across all modules that have the
* <module>_update_index function in them. * <module>_update_index function in them.
* *
*/ */
@ -86,10 +86,10 @@ function search_cron() {
* *
* Search function called by each node that supports the indexed search * Search function called by each node that supports the indexed search
* *
* @param $search_array an array as returned from <module>_search * @param $search_array an array as returned from <module>_search
* of type array("keys" => ..., * of type array("keys" => ...,
* "type" => ..., "select" => ...) * "type" => ..., "select" => ...)
* see node_search in node.module for an * see node_search in node.module for an
* explanation of array items * explanation of array items
*/ */
function do_search($search_array) { function do_search($search_array) {
@ -107,7 +107,7 @@ function do_search($search_array) {
foreach ($words as $word) { foreach ($words as $word) {
// If the word is too short, and we've got it set to skip them, // If the word is too short, and we've got it set to skip them,
// loop // loop
if (strlen($word) < variable_get("remove_short", 0)) { if (strlen($word) < variable_get("remove_short", 0)) {
continue; continue;
@ -131,8 +131,8 @@ function do_search($search_array) {
// If we got any results // If we got any results
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {
$found = 1; $found = 1;
// Create an in memory array of the results, // Create an in memory array of the results,
while ($row = db_fetch_array($result)) { while ($row = db_fetch_array($result)) {
$lno = $row["lno"]; $lno = $row["lno"];
$nid = $row["nid"]; $nid = $row["nid"];
@ -170,7 +170,7 @@ function do_search($search_array) {
} }
} }
} }
} }
} }
if ($found) { if ($found) {
@ -208,10 +208,10 @@ function do_search($search_array) {
/** /**
* Update the search_index table * Update the search_index table
* *
* @param $search_array an array as returned from <module>_update_index * @param $search_array an array as returned from <module>_update_index
* of type array("last_update" => ..., * of type array("last_update" => ...,
* "node_type" => ..., "select" => ...) * "node_type" => ..., "select" => ...)
* see node_update_index in node.module for an * see node_update_index in node.module for an
* explanation of array items * explanation of array items
*/ */
function update_index($search_array) { function update_index($search_array) {
@ -227,12 +227,12 @@ function update_index($search_array) {
if (db_num_rows($result)) { if (db_num_rows($result)) {
// Wohoo, found some, look through the nodes we just selected // Wohoo, found some, look through the nodes we just selected
while ($node = db_fetch_array ($result)) { while ($node = db_fetch_array ($result)) {
// Trash any existing entries in the search index for this node, // Trash any existing entries in the search index for this node,
// in case its a modified node. // in case its a modified node.
db_query("DELETE from search_index where lno = '". $node["lno"] ."' and type = '". $node_type ."'"); db_query("DELETE from search_index where lno = '". $node["lno"] ."' and type = '". $node_type ."'");
// Build the wordlist, teaser not included, as it then gives a // Build the wordlist, teaser not included, as it then gives a
// false count of the number of hist, and doesn't show up // false count of the number of hist, and doesn't show up
// when clicking on a node from the search interface anyway. // when clicking on a node from the search interface anyway.
$wordlist = $node["text1"] . $node["text2"]; $wordlist = $node["text1"] . $node["text2"];
@ -244,7 +244,7 @@ function update_index($search_array) {
$wordlist = preg_replace("'[0-9]'", "", $wordlist); $wordlist = preg_replace("'[0-9]'", "", $wordlist);
// Remove punctuation and stuff // Remove punctuation and stuff
$wordlist = preg_replace("'(!|%|,|:|;|\(|\)|\&|\"|\'|\.|-|\/|\?|\\\)'", $wordlist = preg_replace("'(!|%|,|:|;|\(|\)|\&|\"|\'|\.|-|\/|\?|\\\)'",
"", "",
$wordlist); $wordlist);
@ -276,14 +276,14 @@ function update_index($search_array) {
if (strlen($word) > $minimum_word_size) { if (strlen($word) > $minimum_word_size) {
if ($newwords[$word]) { if ($newwords[$word]) {
$newwords[$word]++; $newwords[$word]++;
} }
else { else {
$newwords[$word] = 1; $newwords[$word] = 1;
} }
} }
} }
// Walk through the weighted words array, inserting them into // Walk through the weighted words array, inserting them into
// the search index // the search index
foreach ($newwords as $key => $value) { foreach ($newwords as $key => $value) {
$inputword = ("INSERT INTO search_index VALUES('$key', ". $node["lno"] .", '$node_type', $value)"); $inputword = ("INSERT INTO search_index VALUES('$key', ". $node["lno"] .", '$node_type', $value)");
@ -338,7 +338,7 @@ function search_invalidate() {
/** /**
* Save the values entered by the administrator for the search module * Save the values entered by the administrator for the search module
* *
* @param $edit An array of fields as setup via calling form_textfield, * @param $edit An array of fields as setup via calling form_textfield,
* form_textarea etc * form_textarea etc
*/ */
function search_save($edit) { function search_save($edit) {
@ -352,7 +352,7 @@ function search_view() {
global $theme, $edit, $type, $keys; global $theme, $edit, $type, $keys;
if (user_access("search content")) { if (user_access("search content")) {
/* /*
** Verify the user input: ** Verify the user input:
*/ */

38
modules/search/search.module
View File

@ -12,7 +12,7 @@ function search_help() {
$output .= "<p>". t("Some words which commonly occur are filtered out by the searching process, these are commonly called 'noisewords'. Examples are 'a, at, and, are, as, ask', and the list goes on. Words shorter than ". variable_get("minimum_word_size", 2) ." letters are also filtered from the search index."); $output .= "<p>". t("Some words which commonly occur are filtered out by the searching process, these are commonly called 'noisewords'. Examples are 'a, at, and, are, as, ask', and the list goes on. Words shorter than ". variable_get("minimum_word_size", 2) ." letters are also filtered from the search index.");
$output .= "<p>". t("These words will never be matched when specified, even if they appear in the node you are searching for."); $output .= "<p>". t("These words will never be matched when specified, even if they appear in the node you are searching for.");
return $output; return $output;
} }
/** /**
* Return an array of valid search access permissions * Return an array of valid search access permissions
@ -66,7 +66,7 @@ function search_admin() {
} }
/** /**
* perform a regularly run action across all modules that have the * perform a regularly run action across all modules that have the
* <module>_update_index function in them. * <module>_update_index function in them.
* *
*/ */
@ -86,10 +86,10 @@ function search_cron() {
* *
* Search function called by each node that supports the indexed search * Search function called by each node that supports the indexed search
* *
* @param $search_array an array as returned from <module>_search * @param $search_array an array as returned from <module>_search
* of type array("keys" => ..., * of type array("keys" => ...,
* "type" => ..., "select" => ...) * "type" => ..., "select" => ...)
* see node_search in node.module for an * see node_search in node.module for an
* explanation of array items * explanation of array items
*/ */
function do_search($search_array) { function do_search($search_array) {
@ -107,7 +107,7 @@ function do_search($search_array) {
foreach ($words as $word) { foreach ($words as $word) {
// If the word is too short, and we've got it set to skip them, // If the word is too short, and we've got it set to skip them,
// loop // loop
if (strlen($word) < variable_get("remove_short", 0)) { if (strlen($word) < variable_get("remove_short", 0)) {
continue; continue;
@ -131,8 +131,8 @@ function do_search($search_array) {
// If we got any results // If we got any results
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {
$found = 1; $found = 1;
// Create an in memory array of the results, // Create an in memory array of the results,
while ($row = db_fetch_array($result)) { while ($row = db_fetch_array($result)) {
$lno = $row["lno"]; $lno = $row["lno"];
$nid = $row["nid"]; $nid = $row["nid"];
@ -170,7 +170,7 @@ function do_search($search_array) {
} }
} }
} }
} }
} }
if ($found) { if ($found) {
@ -208,10 +208,10 @@ function do_search($search_array) {
/** /**
* Update the search_index table * Update the search_index table
* *
* @param $search_array an array as returned from <module>_update_index * @param $search_array an array as returned from <module>_update_index
* of type array("last_update" => ..., * of type array("last_update" => ...,
* "node_type" => ..., "select" => ...) * "node_type" => ..., "select" => ...)
* see node_update_index in node.module for an * see node_update_index in node.module for an
* explanation of array items * explanation of array items
*/ */
function update_index($search_array) { function update_index($search_array) {
@ -227,12 +227,12 @@ function update_index($search_array) {
if (db_num_rows($result)) { if (db_num_rows($result)) {
// Wohoo, found some, look through the nodes we just selected // Wohoo, found some, look through the nodes we just selected
while ($node = db_fetch_array ($result)) { while ($node = db_fetch_array ($result)) {
// Trash any existing entries in the search index for this node, // Trash any existing entries in the search index for this node,
// in case its a modified node. // in case its a modified node.
db_query("DELETE from search_index where lno = '". $node["lno"] ."' and type = '". $node_type ."'"); db_query("DELETE from search_index where lno = '". $node["lno"] ."' and type = '". $node_type ."'");
// Build the wordlist, teaser not included, as it then gives a // Build the wordlist, teaser not included, as it then gives a
// false count of the number of hist, and doesn't show up // false count of the number of hist, and doesn't show up
// when clicking on a node from the search interface anyway. // when clicking on a node from the search interface anyway.
$wordlist = $node["text1"] . $node["text2"]; $wordlist = $node["text1"] . $node["text2"];
@ -244,7 +244,7 @@ function update_index($search_array) {
$wordlist = preg_replace("'[0-9]'", "", $wordlist); $wordlist = preg_replace("'[0-9]'", "", $wordlist);
// Remove punctuation and stuff // Remove punctuation and stuff
$wordlist = preg_replace("'(!|%|,|:|;|\(|\)|\&|\"|\'|\.|-|\/|\?|\\\)'", $wordlist = preg_replace("'(!|%|,|:|;|\(|\)|\&|\"|\'|\.|-|\/|\?|\\\)'",
"", "",
$wordlist); $wordlist);
@ -276,14 +276,14 @@ function update_index($search_array) {
if (strlen($word) > $minimum_word_size) { if (strlen($word) > $minimum_word_size) {
if ($newwords[$word]) { if ($newwords[$word]) {
$newwords[$word]++; $newwords[$word]++;
} }
else { else {
$newwords[$word] = 1; $newwords[$word] = 1;
} }
} }
} }
// Walk through the weighted words array, inserting them into // Walk through the weighted words array, inserting them into
// the search index // the search index
foreach ($newwords as $key => $value) { foreach ($newwords as $key => $value) {
$inputword = ("INSERT INTO search_index VALUES('$key', ". $node["lno"] .", '$node_type', $value)"); $inputword = ("INSERT INTO search_index VALUES('$key', ". $node["lno"] .", '$node_type', $value)");
@ -338,7 +338,7 @@ function search_invalidate() {
/** /**
* Save the values entered by the administrator for the search module * Save the values entered by the administrator for the search module
* *
* @param $edit An array of fields as setup via calling form_textfield, * @param $edit An array of fields as setup via calling form_textfield,
* form_textarea etc * form_textarea etc
*/ */
function search_save($edit) { function search_save($edit) {
@ -352,7 +352,7 @@ function search_view() {
global $theme, $edit, $type, $keys; global $theme, $edit, $type, $keys;
if (user_access("search content")) { if (user_access("search content")) {
/* /*
** Verify the user input: ** Verify the user input:
*/ */

2
modules/story.module
View File

@ -90,6 +90,8 @@ function story_form(&$node, &$help, &$error) {
$output .= form_textarea(t("Teaser"), "teaser", $node->teaser, 60, 5, $error["teaser"]); $output .= form_textarea(t("Teaser"), "teaser", $node->teaser, 60, 5, $error["teaser"]);
} }
$output .= implode("<p>", taxonomy_node_form("story", $node));
$output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", ""))); $output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", "")));
return $output; return $output;

2
modules/story/story.module
View File

@ -90,6 +90,8 @@ function story_form(&$node, &$help, &$error) {
$output .= form_textarea(t("Teaser"), "teaser", $node->teaser, 60, 5, $error["teaser"]); $output .= form_textarea(t("Teaser"), "teaser", $node->teaser, 60, 5, $error["teaser"]);
} }
$output .= implode("<p>", taxonomy_node_form("story", $node));
$output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", ""))); $output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", "")));
return $output; return $output;

569
modules/taxonomy.module Normal file
View File

@ -0,0 +1,569 @@
<?php
function taxonomy_perm() {
return array("administer taxonomy");
}
function taxonomy_link($type) {
if ($type == "admin" && user_access("administer taxonomy")) {
$links[] = "<a href=\"admin.php?mod=taxonomy\">taxonomy</a>";
}
return $links ? $links : array();
}
function taxonomy_help() {
?>
<b>Background</b><br /><br />
Classifying nodes allows for the organization of content into categories and subcategories of description. These categories can be used to organize and retrieve similarly described content. Drupal's classifier module is an extremely flexible classification system that allows for multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms) and taxonomies (controlled vocabularies where relationships are indicated hierarchically). <br /><br />
<b>Vocabularies</b><br />When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each node of content (blog, story, etc.) that you submit to Drupal using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slash's "Sections". For more complex implementations, you might create a hierarchical list of categories for describing content.<br /><br />
<b>Setting up a vocabulary</b><br />When you set up a controlled vocabulary, you will be asked to enter some descriptive data and define the attributes of this vocabulary. For example, if you select the "Hierarchy" option, you will be defining a taxonomy or thesaurus. If you select "Relationships" you are allowing the definition of related terms as in a thesaurus. Selecting "Multiple Select" will allow you to describe a node using more than one term.<br /><br />
<i>Vocabulary name</i><br />Required. The name for this vocabulary. Example: 'Topic'.<br /><br />
<i>Description</i><br />Optional. Description of the vocabulary, can be used by modules.<br /><br />
<i>Types</i><br />Required. A comma-seperated list of node types you want to associate this vocabulary with. Available types: blog, book, forum, page, story.<br /><br />
<i>Relationships</i><br />Allows relationships between terms within this vocabulary. This is synonymous with "See also" type references.<br /><br />
<i>Hierarchy</i><br />Allows a tree-like hierarchy <br /><br />
<i>Multiple Select</i><br />Allows nodes to be described using more than one term.<br /><br />
<b>Adding terms to a vocabulary</b><br />The options you see when adding a term to a vocabulary will depend on what you selected for "Relationships", "Hierarchy" and "Multiple Select" when you created the vocabulary.<br /><br />
Term name<br />Required. The name for this term. Example: 'Linux'.<br /><br />
Description<br />Optional. Description of the term, can be used by modules. This is synonymous with a "Scope note".<br /><br />
Relationships<br />Optional. Select one or many related terms.<br /><br />
Parent<br />Select the term under which this term is a subset -- the branch of the hierarchy this term belongs under. This is also known as the "Broader term" indicator used in thesauri.<br /><br />
Synonyms<br />Enter synonyms for this term, one synonym per line. Synonyms can be used for variant spellings, acronyms, and other terms that have the same meaning as the added term, but which are not explicitly listed in this thesaurus (unauthorized terms).
<?php
}
/*
** admin pages (form, save, overview)
*/
function taxonomy_form_vocabulary($edit = array()) {
foreach (module_list() as $name) {
if (module_hook($name, "node")) {
$nodetypes[$name] = $name;
}
}
$form .= form_textfield("Vocabulary name", "name", $edit[name], 50, 64, "Required. The name for this vocabulary. Example: 'Topic'.");
$form .= form_textarea("Description", "description", $edit[description], 60, 5, "Optional. Description of the vocabulary, can be used by modules.");
$form .= form_select("Types", "types", explode(",", $edit[types]), $nodetypes, "Required. A list of node types you want to associate this vocabulary with.", "", 1);
$form .= form_checkbox("Related terms", "relations", 1, $edit[relations], "Optional. Allows <a href=\"admin.php?mod=taxonomy&op=help#relatedterms\">related terms</a> in this vocabulary.");
$form .= form_select("Hierarchy", "hierarchy", $edit[hierarchy], array("Disabled", "Single", "Multiple"), "Optional. Allows <a href=\"admin.php?mod=taxonomy&op=help#hierarchy\">a tree-like hierarchy</a> between terms of this vocabulary.", "", 0);
$form .= form_checkbox("Multiple select", "multiple", 1, $edit[multiple], "Optional. Allows nodes to have more than one term in this vocabulary.");
$form .= form_checkbox("Required", "required", 1, $edit[required], "If enabled every node MUST have at least one meta in this collection");
$form .= form_textfield("Weight", "weight", $edit["weight"], 3, 3, "Optional. In listings, the heavier vocabularies will sink and the lighter vocabularies will be positioned nearer the top.");
$form .= form_submit("Submit");
if ($edit[vid]) {
$form .= form_submit("Delete");
$form .= form_hidden("vid", $edit[vid]);
}
return form($form);
}
function taxonomy_save_vocabulary($edit) {
$data = array(
"name" => $edit["name"],
"types" => implode(",", $edit["types"]),
"description" => $edit["description"],
"multiple" => $edit["multiple"],
"required" => $edit["required"],
"hierarchy" => $edit["hierarchy"],
"relations" => $edit["relations"],
"weight" => $edit["weight"]
);
if ($edit["vid"] && $edit["name"]) {
db_query("UPDATE vocabulary SET "._prepare_update($data)." WHERE vid = '". check_input($edit["vid"])."'");
}
else if ($edit["vid"]) {
taxonomy_del_vocabulary($edit["vid"]);
}
else {
db_query("INSERT INTO vocabulary "._prepare_insert($data, 1)." VALUES "._prepare_insert($data, 2));
}
}
function taxonomy_del_vocabulary($vid) {
db_query("DELETE FROM vocabulary WHERE vid = '". check_input($vid) ."'");
$result = db_query("SELECT tid FROM term_data WHERE vid = '". check_input($vid) ."'");
while ($term = db_fetch_object($result)) {
taxonomy_del_term($term->tid);
}
}
function taxonomy_form_term($edit = array()) {
global $vocabulary_id;
if (!$vocabulary_id) {
$vocabulary_id = $edit["vid"];
}
$vocabulary = taxonomy_get_vocabulary($vocabulary_id);
#print_r($vocabulary);
$form .= form_textfield("Term name", "name", $edit["name"], 50, 64, "Required. The name for this term. Example: 'Linux'.");
$form .= form_textarea("Description", "description", $edit["description"], 60, 5, "Optional. Description of the term, can be used by modules.");
if ($vocabulary->relations) {
$form .= _taxonomy_term_select("Related terms", "relations", @array_keys(taxonomy_get_related($edit["tid"])), $vocabulary_id, "Optional.", 1, "<none>", array($edit["tid"]));
}
if ($vocabulary->hierarchy) {
$parent = array_keys(taxonomy_get_parents($edit["tid"]));
taxonomy_get_tree($vocabulary_id, $children, $edit["tid"]);
// you can be son of yourself or your children
$exclude = array_keys($children);
$exclude[] = $edit["tid"];
if ($vocabulary->hierarchy == 1) {
$form .= _taxonomy_term_select("Parent", "parent", $parent, $vocabulary_id, "Required. Parent term.", 0, "<root>", $exclude);
} elseif ($vocabulary->hierarchy == 2) {
$form .= _taxonomy_term_select("Parents", "parent", $parent, $vocabulary_id, "Required. Parent terms.", 1, "<root>", $exclude);
}
}
$form .= form_textarea("Synonyms", "synonyms", @implode("\n", taxonomy_get_synonyms($edit["tid"])), 30, 5, "Optional. Synonyms of this term, one synonym per line.");
$form .= form_textfield("Weight", "weight", $edit["weight"], 3, 3, "Optional. In listings, the heavier terms will sink and the lighter terms will be positioned nearer the top.");
$form .= form_hidden("vid", $vocabulary->vid);
$form .= form_submit("Submit");
if ($edit["tid"]) {
$form .= form_submit("Delete");
$form .= form_hidden("tid", $edit["tid"]);
}
return form($form);
}
function taxonomy_save_term($edit) {
if ($edit["tid"] && $edit["name"]) {
$data = array(
"name" => $edit["name"],
"description" => $edit["description"],
"weight" => $edit["weight"]
);
db_query("UPDATE term_data SET "._prepare_update($data)." WHERE tid = '". check_input($edit["tid"]) ."'");
}
else if ($edit["tid"]) {
taxonomy_del_term($edit["tid"]);
}
else {
$edit["tid"] = db_result(db_query("SELECT MAX(tid) + 1 FROM term_data"));
if (!$edit["tid"]) {
// first term
$edit["tid"] = 1;
}
$data = array(
"tid" => $edit["tid"],
"name" => $edit["name"],
"description" => $edit["description"],
"vid" => $edit["vid"],
"weight" => $edit["weight"]
);
db_query("INSERT INTO term_data "._prepare_insert($data, 1)." VALUES "._prepare_insert($data, 2));
}
// relations (seem very powerful, but I have to understand it completely)
db_query("DELETE FROM term_relation WHERE tid1 = '". check_input($edit["tid"]) ."' OR tid2 = '". check_input($edit["tid"]) ."'");
if ($edit["relations"]) {
foreach ($edit["relations"] as $related_id) {
if ($related_id != 0) {
$rel_q[] = "('". check_input($edit["tid"]) ."', '". check_input($related_id) ."')";
}
}
if ($rel_q) {
$related_query = implode(", ", $rel_q);
db_query("INSERT INTO term_relation (tid1, tid2) VALUES $related_query");
}
}
// hierarchy
db_query("DELETE FROM term_hierarchy WHERE tid = '". check_input($edit["tid"]) ."'");
if (!isset($edit["parent"])) {
$edit["parent"] = 0;
}
if (is_array($edit["parent"])) {
foreach ($edit["parent"] as $parent) {
$sql[] = "('". check_input($edit["tid"]) ."', '". check_input($parent) ."')";
}
db_query("INSERT INTO term_hierarchy (tid, parent) VALUES ".implode(", ", $sql));
} else {
db_query("INSERT INTO term_hierarchy (tid, parent) VALUES ('". check_input($edit["tid"]) ."', '". check_input($edit["parent"][0]) ."')");
}
// synonyms (very cool idea indeed)
db_query("DELETE FROM term_synonym WHERE tid = '". check_input($edit["tid"]) ."'");
if ($edit["synonyms"]) {
foreach (explode ("\n", $edit["synonyms"]) as $synonym) {
$syn_q[] = "('". check_input($edit["tid"]) ."', '". check_input(chop($synonym)) ."')";
}
$synonyms_query = implode(", ", $syn_q);
db_query("INSERT INTO term_synonym (tid, name) VALUES $synonyms_query");
}
}
function taxonomy_del_term($tid) {
db_query("DELETE FROM term_data WHERE tid = '". check_input($tid) ."'");
db_query("DELETE FROM term_hierarchy WHERE tid = '". check_input($tid) ."'");
db_query("DELETE FROM term_relation WHERE tid1 = '". check_input($tid) ."' OR tid2 = '". check_input($tid) ."'");
db_query("DELETE FROM term_synonym WHERE tid = '". check_input($tid) ."'");
db_query("DELETE FROM term_node WHERE tid = '". check_input($tid) ."'");
}
function taxonomy_overview() {
global $tree;
$output .= "<h3>vocabularies overview</h3>";
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= " <tr><th>name</th><th>node types</th><th>operations</th></tr>\n";
$vocabularies = taxonomy_get_vocabularies();
foreach ($vocabularies as $vocabulary) {
$output .= " <tr><td>". check_output($vocabulary->name) ."</td><td>". check_output($vocabulary->types) ."</td><td><a href=\"admin.php?mod=taxonomy&type=vocabulary&op=edit&id=".$vocabulary->vid."\">edit vocabulary</a> | <a href=\"admin.php?mod=taxonomy&op=add&type=leaf&vocabulary_id=".$vocabulary->vid."\">add term</a> | <a href=\"admin.php?mod=taxonomy&type=vocabulary&op=preview&id=".$vocabulary->vid."\">preview form</a></td></tr>\n";
unset($tree);
taxonomy_get_tree($vocabulary->vid, $tree);
if ($tree) {
$output .= "<tr><td colspan=\"3\"><table><tr><td>";
#print_r($tree);
foreach ($tree as $term) {
$output .= "<tr><td><a href=\"admin.php?mod=taxonomy&op=edit&type=term&id=".check_output($term->tid)."\">"._taxonomy_depth($term->depth).check_output($term->name)."</a></td></tr>";
}
$output .= "</td></tr></table></td></tr>\n";
}
}
$output .= "</table>\n";
return $output;
}
function taxonomy_form($vocabulary_id, $value = 0) {
$vocabulary = taxonomy_get_vocabulary($vocabulary_id);
if ($vocabulary->required) {
$verb = "must";
$blank = 0;
} else {
$verb = "can";
$blank = "<none>";
}
if ($vocabulary->multiple) {
$description = "You $verb choose one or more terms for this node";
$multiple = 1;
} else {
$description = "You $verb choose one term for this node";
$multiple = 0;
}
return _taxonomy_term_select($vocabulary->name, "taxonomy", $value, $vocabulary_id, $description, $multiple, $blank);
}
/*
** API functions
*/
// return array of vocabularies, as objects
function taxonomy_get_vocabularies($type = '', $key = "vid") {
if ($type) {
$result = db_query("SELECT * FROM vocabulary WHERE types LIKE '%".check_query($type)."%' ORDER BY weight, name");
} else {
$result = db_query("SELECT * FROM vocabulary ORDER BY weight, name");
}
$vocabularies = array();
while ($voc = db_fetch_object($result)) {
$vocabularies[$voc->$key] = $voc;
}
return $vocabularies;
}
// return form with current term
function taxonomy_node_form($type, $node = '') {
if (!$node->taxonomy) {
if ($node->nid) {
$terms = array_keys(taxonomy_node_get_terms($node->nid));
} else {
$terms = 0;
}
} else {
$terms = $node->taxonomy;
}
$c = db_query("SELECT * FROM vocabulary WHERE types LIKE '%". check_query($type) ."%' ORDER BY weight, name");
while ($vocabulary = db_fetch_object($c)) {
$result[] .= taxonomy_form($vocabulary->vid, $terms);
}
return $result;
}
// return 1 if node identified by $nid contains a taxonomy term identified by $tid in his body or title
function taxonomy_node_has_term($nid, $tid) {
$term_name = db_result(db_query("SELECT name FROM term_data WHERE tid = ". check_query($tid)));
return db_result(db_query("SELECT COUNT(n.nid) FROM node n WHERE n.nid = '" . check_query($nid). "' AND ((n.body LIKE '%$term_name%') OR (n.body LIKE '%$term_name%'))"));
}
// return array of terms of a node beloging to a particular vocabulary identified by $vid
function taxonomy_node_get_terms_by_vocabulary($nid, $vid, $key = "tid") {
$result = db_query("SELECT t.* FROM term_data t, term_node r WHERE t.tid = r.tid AND t.vid = '".check_query($vid)."' AND r.nid = '" . check_query($nid) . "' ORDER BY weight");
$terms = array();
while ($term = db_fetch_object($result)) {
$terms[$term->$key] = $term;
}
return $terms;
}
// return array of terms of a node
function taxonomy_node_get_terms($nid, $key = "tid") {
static $terms;
if (!$terms[$nid]) {
$result = db_query("SELECT t.* FROM term_data t, term_node r WHERE r.tid = t.tid AND r.nid = '".check_query($nid)."' ORDER BY weight");
$terms[$nid] = array();
while ($term = db_fetch_object($result)) {
$terms[$nid][$term->$key] = $term;
}
}
return $terms[$nid];
}
// save terms of a node
function taxonomy_node_save($nid, $terms) {
taxonomy_node_delete($nid);
#print_r($terms);
if ($terms) {
foreach ($terms as $t) {
$query[] = "('".check_query($nid)."', '".check_query($t)."')";
}
db_query("INSERT INTO term_node (nid, tid) VALUES ".implode(", ", $query));
}
}
// clean up terms
function taxonomy_node_delete($nid) {
db_query("DELETE FROM term_node WHERE nid = '".check_query($nid)."'");
}
// relations: return array of related terms
function taxonomy_get_related($tid, $key = "tid") {
if ($tid) {
$result = db_query("SELECT t.*, tid1, tid2 FROM term_relation, term_data t WHERE (t.tid = tid1 OR t.tid = tid2) AND (tid1 = '".check_query($tid)."' OR tid2 = '".check_query($tid)."') ORDER BY weight");
$related = array();
while ($term = db_fetch_object($result)) {
$related[$term->$key] = $term;
}
return $related;
}
}
// hierarchy: get parent term
function taxonomy_get_parents($tid, $key = "tid") {
if ($tid) {
$result = db_query("SELECT t.* FROM term_hierarchy h, term_data t WHERE h.parent = t.tid AND h.tid = '".check_query($tid)."' ORDER BY weight, name");
$parents = array();
while ($parent = db_fetch_object($result)) {
$parents[$parent->$key] = $parent;
}
#print_r($parents);
return $parents;
} else {
return array();
}
}
// hierarchy: get children
function taxonomy_get_children($tid, $vid = 0, $key = "tid") {
if ($vid) {
$result = db_query("SELECT t.* FROM term_hierarchy h, term_data t WHERE t.vid = '".check_query($vid)."' AND h.tid = t.tid AND h.parent = '".check_query($tid)."' ORDER BY weight, name");
} else {
$result = db_query("SELECT t.* FROM term_hierarchy h, term_data t WHERE h.tid = t.tid AND parent = '".check_query($tid)."' ORDER BY weight");
}
$children = array();
while ($term = db_fetch_object($result)) {
$children[$term->$key] = $term;
}
return $children;
}
// hierarchy: get whole family, with tid, parent and depth; useful to show
function taxonomy_get_tree($vocabulary_id, &$tree, $parent = 0, $depth = -1, $key = "tid") {
static $children, $terms;
if ($depth == -1) {
$children = array();
$tree = array();
// $terms = array(); // we should be able to safely do this
}
$depth++;
if ($vocabulary_id) {
if (!$children) {
$result = db_query("SELECT t.*, parent FROM term_data t, term_hierarchy h WHERE t.tid = h.tid AND t.vid = '".check_query($vocabulary_id)."' ORDER BY weight, name");
while ($term = db_fetch_object($result)) {
$children[$term->parent][] = $term->tid;
$terms[$term->tid] = $term;
}
#print_r($children);
}
if ($children[$parent]) {
foreach ($children[$parent] as $child) {
#print_r($terms[$child]);
$terms[$child]->depth = $depth;
$tree[$terms[$child]->$key] = $terms[$child];
taxonomy_get_tree($vocabulary_id, $tree, $child, $depth, $key);
}
}
#print_r($tree);
} else {
return 0;
}
}
// synonyms: return array of synonyms
function taxonomy_get_synonyms($tid) {
if ($tid) {
$result = db_query("SELECT name FROM term_synonym WHERE tid = '".check_query($tid)."'");
while ($synonym = db_fetch_array($result)) {
$synonyms[] = $synonym["name"];
}
return $synonyms;
} else {
return "";
}
}
// synonyms: return original term
function taxonomy_get_synonym_root($term) {
return db_fetch_object(db_query("SELECT * FROM term_synonym s, term_data t WHERE t.tid = s.tid AND s.name = '".check_query($term)."'"));
}
function taxonomy_get_vocabulary($vid) {
// simple cache using a static var?
return db_fetch_object(db_query("SELECT * FROM vocabulary WHERE vid = '".check_query($vid)."'"));
}
function taxonomy_get_term($tid) {
// simple cache using a static var?
return db_fetch_object(db_query("SELECT * FROM term_data WHERE tid = '".check_query($tid)."'"));
}
/*
** service functions
*/
function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $description, $multiple, $blank, $exclude = array()) {
taxonomy_get_tree($vocabulary_id, $tree);
if ($blank) {
$options[0] = $blank;
}
if ($tree) {
foreach ($tree as $term) {
if (!in_array($term->tid, $exclude)) {
$options[$term->tid] = _taxonomy_depth($term->depth, '-').$term->name;
}
}
if (!$blank && !$value) {
// required but without a predefined value, so set first as predefined
$value = $tree[0]->tid;
}
}
if (count($options) > 0) {
foreach ($options as $key=>$choice) {
$select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected=\"selected\"" : "") : ($key == $value ? " selected=\"selected\"" : "")) .">". check_form($choice) ."</option>";
}
// min 8, possibly options/3 (set max too?)
$size = max(8, round(count($options)) / 3);
return form_item($title, "<select name=\"edit[$name][]\"" .($multiple ? " multiple size=\"$size\"" : "").($extra ? " $extra" : "") .">$select</select>", $description);
}
}
function _taxonomy_depth($depth, $graphic = '--') {
for ($n=0; $n<$depth; $n++) {
$result .= $graphic;
}
return $result;
}
function _prepare_update($data) {
foreach ($data as $key => $value) {
$q[] = "$key = '". check_input($value) ."'";
}
$result = implode(", ", $q);
return $result;
}
function _prepare_insert($data, $stage) {
if ($stage == 1) {
$result = implode(", ", array_keys($data));
} else {
foreach (array_values($data) as $value) {
$q[] = "'". check_input($value) ."'";
}
$result = implode(", ", $q);
}
return "($result)";
}
/*
** admin
*/
function taxonomy_admin() {
global $edit, $type, $op, $id, $tree;
if (user_access("administer taxonomy")) {
print "<SMALL><A HREF=\"admin.php?mod=taxonomy&op=add&type=vocabulary\">add new vocabulary</A> | <A HREF=\"admin.php?mod=taxonomy\">overview</A> | <A HREF=\"admin.php?mod=taxonomy&op=help\">help</A></SMALL><HR>\n";
switch ($op) {
case "add":
if ($type == "vocabulary")
print taxonomy_form_vocabulary();
else
print taxonomy_form_term();
break;
case "edit":
if ($type == "vocabulary")
print taxonomy_form_vocabulary(object2array(taxonomy_get_vocabulary($id)));
else
print taxonomy_form_term(object2array(taxonomy_get_term($id)));
break;
case "preview":
print taxonomy_form($id);
break;
case "help":
print taxonomy_help();
break;
case "Delete":
$edit[name] = 0;
// fall through:
case "Submit":
if ($type == "vocabulary")
print status(taxonomy_save_vocabulary($edit));
else
print status(taxonomy_save_term($edit));
// fall through:
default:
print taxonomy_overview();
}
}
else {
print message_access();
}
#print_r(taxonomy_get_children(2));
}
?>

569
modules/taxonomy/taxonomy.module Normal file
View File

@ -0,0 +1,569 @@
<?php
function taxonomy_perm() {
return array("administer taxonomy");
}
function taxonomy_link($type) {
if ($type == "admin" && user_access("administer taxonomy")) {
$links[] = "<a href=\"admin.php?mod=taxonomy\">taxonomy</a>";
}
return $links ? $links : array();
}
function taxonomy_help() {
?>
<b>Background</b><br /><br />
Classifying nodes allows for the organization of content into categories and subcategories of description. These categories can be used to organize and retrieve similarly described content. Drupal's classifier module is an extremely flexible classification system that allows for multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms) and taxonomies (controlled vocabularies where relationships are indicated hierarchically). <br /><br />
<b>Vocabularies</b><br />When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each node of content (blog, story, etc.) that you submit to Drupal using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slash's "Sections". For more complex implementations, you might create a hierarchical list of categories for describing content.<br /><br />
<b>Setting up a vocabulary</b><br />When you set up a controlled vocabulary, you will be asked to enter some descriptive data and define the attributes of this vocabulary. For example, if you select the "Hierarchy" option, you will be defining a taxonomy or thesaurus. If you select "Relationships" you are allowing the definition of related terms as in a thesaurus. Selecting "Multiple Select" will allow you to describe a node using more than one term.<br /><br />
<i>Vocabulary name</i><br />Required. The name for this vocabulary. Example: 'Topic'.<br /><br />
<i>Description</i><br />Optional. Description of the vocabulary, can be used by modules.<br /><br />
<i>Types</i><br />Required. A comma-seperated list of node types you want to associate this vocabulary with. Available types: blog, book, forum, page, story.<br /><br />
<i>Relationships</i><br />Allows relationships between terms within this vocabulary. This is synonymous with "See also" type references.<br /><br />
<i>Hierarchy</i><br />Allows a tree-like hierarchy <br /><br />
<i>Multiple Select</i><br />Allows nodes to be described using more than one term.<br /><br />
<b>Adding terms to a vocabulary</b><br />The options you see when adding a term to a vocabulary will depend on what you selected for "Relationships", "Hierarchy" and "Multiple Select" when you created the vocabulary.<br /><br />
Term name<br />Required. The name for this term. Example: 'Linux'.<br /><br />
Description<br />Optional. Description of the term, can be used by modules. This is synonymous with a "Scope note".<br /><br />
Relationships<br />Optional. Select one or many related terms.<br /><br />
Parent<br />Select the term under which this term is a subset -- the branch of the hierarchy this term belongs under. This is also known as the "Broader term" indicator used in thesauri.<br /><br />
Synonyms<br />Enter synonyms for this term, one synonym per line. Synonyms can be used for variant spellings, acronyms, and other terms that have the same meaning as the added term, but which are not explicitly listed in this thesaurus (unauthorized terms).
<?php
}
/*
** admin pages (form, save, overview)
*/
function taxonomy_form_vocabulary($edit = array()) {
foreach (module_list() as $name) {
if (module_hook($name, "node")) {
$nodetypes[$name] = $name;
}
}
$form .= form_textfield("Vocabulary name", "name", $edit[name], 50, 64, "Required. The name for this vocabulary. Example: 'Topic'.");
$form .= form_textarea("Description", "description", $edit[description], 60, 5, "Optional. Description of the vocabulary, can be used by modules.");
$form .= form_select("Types", "types", explode(",", $edit[types]), $nodetypes, "Required. A list of node types you want to associate this vocabulary with.", "", 1);
$form .= form_checkbox("Related terms", "relations", 1, $edit[relations], "Optional. Allows <a href=\"admin.php?mod=taxonomy&op=help#relatedterms\">related terms</a> in this vocabulary.");
$form .= form_select("Hierarchy", "hierarchy", $edit[hierarchy], array("Disabled", "Single", "Multiple"), "Optional. Allows <a href=\"admin.php?mod=taxonomy&op=help#hierarchy\">a tree-like hierarchy</a> between terms of this vocabulary.", "", 0);
$form .= form_checkbox("Multiple select", "multiple", 1, $edit[multiple], "Optional. Allows nodes to have more than one term in this vocabulary.");
$form .= form_checkbox("Required", "required", 1, $edit[required], "If enabled every node MUST have at least one meta in this collection");
$form .= form_textfield("Weight", "weight", $edit["weight"], 3, 3, "Optional. In listings, the heavier vocabularies will sink and the lighter vocabularies will be positioned nearer the top.");
$form .= form_submit("Submit");
if ($edit[vid]) {
$form .= form_submit("Delete");
$form .= form_hidden("vid", $edit[vid]);
}
return form($form);
}
function taxonomy_save_vocabulary($edit) {
$data = array(
"name" => $edit["name"],
"types" => implode(",", $edit["types"]),
"description" => $edit["description"],
"multiple" => $edit["multiple"],
"required" => $edit["required"],
"hierarchy" => $edit["hierarchy"],
"relations" => $edit["relations"],
"weight" => $edit["weight"]
);
if ($edit["vid"] && $edit["name"]) {
db_query("UPDATE vocabulary SET "._prepare_update($data)." WHERE vid = '". check_input($edit["vid"])."'");
}
else if ($edit["vid"]) {
taxonomy_del_vocabulary($edit["vid"]);
}
else {
db_query("INSERT INTO vocabulary "._prepare_insert($data, 1)." VALUES "._prepare_insert($data, 2));
}
}
function taxonomy_del_vocabulary($vid) {
db_query("DELETE FROM vocabulary WHERE vid = '". check_input($vid) ."'");
$result = db_query("SELECT tid FROM term_data WHERE vid = '". check_input($vid) ."'");
while ($term = db_fetch_object($result)) {
taxonomy_del_term($term->tid);
}
}
function taxonomy_form_term($edit = array()) {
global $vocabulary_id;
if (!$vocabulary_id) {
$vocabulary_id = $edit["vid"];
}
$vocabulary = taxonomy_get_vocabulary($vocabulary_id);
#print_r($vocabulary);
$form .= form_textfield("Term name", "name", $edit["name"], 50, 64, "Required. The name for this term. Example: 'Linux'.");
$form .= form_textarea("Description", "description", $edit["description"], 60, 5, "Optional. Description of the term, can be used by modules.");
if ($vocabulary->relations) {
$form .= _taxonomy_term_select("Related terms", "relations", @array_keys(taxonomy_get_related($edit["tid"])), $vocabulary_id, "Optional.", 1, "<none>", array($edit["tid"]));
}
if ($vocabulary->hierarchy) {
$parent = array_keys(taxonomy_get_parents($edit["tid"]));
taxonomy_get_tree($vocabulary_id, $children, $edit["tid"]);
// you can be son of yourself or your children
$exclude = array_keys($children);
$exclude[] = $edit["tid"];
if ($vocabulary->hierarchy == 1) {
$form .= _taxonomy_term_select("Parent", "parent", $parent, $vocabulary_id, "Required. Parent term.", 0, "<root>", $exclude);
} elseif ($vocabulary->hierarchy == 2) {
$form .= _taxonomy_term_select("Parents", "parent", $parent, $vocabulary_id, "Required. Parent terms.", 1, "<root>", $exclude);
}
}
$form .= form_textarea("Synonyms", "synonyms", @implode("\n", taxonomy_get_synonyms($edit["tid"])), 30, 5, "Optional. Synonyms of this term, one synonym per line.");
$form .= form_textfield("Weight", "weight", $edit["weight"], 3, 3, "Optional. In listings, the heavier terms will sink and the lighter terms will be positioned nearer the top.");
$form .= form_hidden("vid", $vocabulary->vid);
$form .= form_submit("Submit");
if ($edit["tid"]) {
$form .= form_submit("Delete");
$form .= form_hidden("tid", $edit["tid"]);
}
return form($form);
}
function taxonomy_save_term($edit) {
if ($edit["tid"] && $edit["name"]) {
$data = array(
"name" => $edit["name"],
"description" => $edit["description"],
"weight" => $edit["weight"]
);
db_query("UPDATE term_data SET "._prepare_update($data)." WHERE tid = '". check_input($edit["tid"]) ."'");
}
else if ($edit["tid"]) {
taxonomy_del_term($edit["tid"]);
}
else {
$edit["tid"] = db_result(db_query("SELECT MAX(tid) + 1 FROM term_data"));
if (!$edit["tid"]) {
// first term
$edit["tid"] = 1;
}
$data = array(
"tid" => $edit["tid"],
"name" => $edit["name"],
"description" => $edit["description"],
"vid" => $edit["vid"],
"weight" => $edit["weight"]
);
db_query("INSERT INTO term_data "._prepare_insert($data, 1)." VALUES "._prepare_insert($data, 2));
}
// relations (seem very powerful, but I have to understand it completely)
db_query("DELETE FROM term_relation WHERE tid1 = '". check_input($edit["tid"]) ."' OR tid2 = '". check_input($edit["tid"]) ."'");
if ($edit["relations"]) {
foreach ($edit["relations"] as $related_id) {
if ($related_id != 0) {
$rel_q[] = "('". check_input($edit["tid"]) ."', '". check_input($related_id) ."')";
}
}
if ($rel_q) {
$related_query = implode(", ", $rel_q);
db_query("INSERT INTO term_relation (tid1, tid2) VALUES $related_query");
}
}
// hierarchy
db_query("DELETE FROM term_hierarchy WHERE tid = '". check_input($edit["tid"]) ."'");
if (!isset($edit["parent"])) {
$edit["parent"] = 0;
}
if (is_array($edit["parent"])) {
foreach ($edit["parent"] as $parent) {
$sql[] = "('". check_input($edit["tid"]) ."', '". check_input($parent) ."')";
}
db_query("INSERT INTO term_hierarchy (tid, parent) VALUES ".implode(", ", $sql));
} else {
db_query("INSERT INTO term_hierarchy (tid, parent) VALUES ('". check_input($edit["tid"]) ."', '". check_input($edit["parent"][0]) ."')");
}
// synonyms (very cool idea indeed)
db_query("DELETE FROM term_synonym WHERE tid = '". check_input($edit["tid"]) ."'");
if ($edit["synonyms"]) {
foreach (explode ("\n", $edit["synonyms"]) as $synonym) {
$syn_q[] = "('". check_input($edit["tid"]) ."', '". check_input(chop($synonym)) ."')";
}
$synonyms_query = implode(", ", $syn_q);
db_query("INSERT INTO term_synonym (tid, name) VALUES $synonyms_query");
}
}
function taxonomy_del_term($tid) {
db_query("DELETE FROM term_data WHERE tid = '". check_input($tid) ."'");
db_query("DELETE FROM term_hierarchy WHERE tid = '". check_input($tid) ."'");
db_query("DELETE FROM term_relation WHERE tid1 = '". check_input($tid) ."' OR tid2 = '". check_input($tid) ."'");
db_query("DELETE FROM term_synonym WHERE tid = '". check_input($tid) ."'");
db_query("DELETE FROM term_node WHERE tid = '". check_input($tid) ."'");
}
function taxonomy_overview() {
global $tree;
$output .= "<h3>vocabularies overview</h3>";
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= " <tr><th>name</th><th>node types</th><th>operations</th></tr>\n";
$vocabularies = taxonomy_get_vocabularies();
foreach ($vocabularies as $vocabulary) {
$output .= " <tr><td>". check_output($vocabulary->name) ."</td><td>". check_output($vocabulary->types) ."</td><td><a href=\"admin.php?mod=taxonomy&type=vocabulary&op=edit&id=".$vocabulary->vid."\">edit vocabulary</a> | <a href=\"admin.php?mod=taxonomy&op=add&type=leaf&vocabulary_id=".$vocabulary->vid."\">add term</a> | <a href=\"admin.php?mod=taxonomy&type=vocabulary&op=preview&id=".$vocabulary->vid."\">preview form</a></td></tr>\n";
unset($tree);
taxonomy_get_tree($vocabulary->vid, $tree);
if ($tree) {
$output .= "<tr><td colspan=\"3\"><table><tr><td>";
#print_r($tree);
foreach ($tree as $term) {
$output .= "<tr><td><a href=\"admin.php?mod=taxonomy&op=edit&type=term&id=".check_output($term->tid)."\">"._taxonomy_depth($term->depth).check_output($term->name)."</a></td></tr>";
}
$output .= "</td></tr></table></td></tr>\n";
}
}
$output .= "</table>\n";
return $output;
}
function taxonomy_form($vocabulary_id, $value = 0) {
$vocabulary = taxonomy_get_vocabulary($vocabulary_id);
if ($vocabulary->required) {
$verb = "must";
$blank = 0;
} else {
$verb = "can";
$blank = "<none>";
}
if ($vocabulary->multiple) {
$description = "You $verb choose one or more terms for this node";
$multiple = 1;
} else {
$description = "You $verb choose one term for this node";
$multiple = 0;
}
return _taxonomy_term_select($vocabulary->name, "taxonomy", $value, $vocabulary_id, $description, $multiple, $blank);
}
/*
** API functions
*/
// return array of vocabularies, as objects
function taxonomy_get_vocabularies($type = '', $key = "vid") {
if ($type) {
$result = db_query("SELECT * FROM vocabulary WHERE types LIKE '%".check_query($type)."%' ORDER BY weight, name");
} else {
$result = db_query("SELECT * FROM vocabulary ORDER BY weight, name");
}
$vocabularies = array();
while ($voc = db_fetch_object($result)) {
$vocabularies[$voc->$key] = $voc;
}
return $vocabularies;
}
// return form with current term
function taxonomy_node_form($type, $node = '') {
if (!$node->taxonomy) {
if ($node->nid) {
$terms = array_keys(taxonomy_node_get_terms($node->nid));
} else {
$terms = 0;
}
} else {
$terms = $node->taxonomy;
}
$c = db_query("SELECT * FROM vocabulary WHERE types LIKE '%". check_query($type) ."%' ORDER BY weight, name");
while ($vocabulary = db_fetch_object($c)) {
$result[] .= taxonomy_form($vocabulary->vid, $terms);
}
return $result;
}
// return 1 if node identified by $nid contains a taxonomy term identified by $tid in his body or title
function taxonomy_node_has_term($nid, $tid) {
$term_name = db_result(db_query("SELECT name FROM term_data WHERE tid = ". check_query($tid)));
return db_result(db_query("SELECT COUNT(n.nid) FROM node n WHERE n.nid = '" . check_query($nid). "' AND ((n.body LIKE '%$term_name%') OR (n.body LIKE '%$term_name%'))"));
}
// return array of terms of a node beloging to a particular vocabulary identified by $vid
function taxonomy_node_get_terms_by_vocabulary($nid, $vid, $key = "tid") {
$result = db_query("SELECT t.* FROM term_data t, term_node r WHERE t.tid = r.tid AND t.vid = '".check_query($vid)."' AND r.nid = '" . check_query($nid) . "' ORDER BY weight");
$terms = array();
while ($term = db_fetch_object($result)) {
$terms[$term->$key] = $term;
}
return $terms;
}
// return array of terms of a node
function taxonomy_node_get_terms($nid, $key = "tid") {
static $terms;
if (!$terms[$nid]) {
$result = db_query("SELECT t.* FROM term_data t, term_node r WHERE r.tid = t.tid AND r.nid = '".check_query($nid)."' ORDER BY weight");
$terms[$nid] = array();
while ($term = db_fetch_object($result)) {
$terms[$nid][$term->$key] = $term;
}
}
return $terms[$nid];
}
// save terms of a node
function taxonomy_node_save($nid, $terms) {
taxonomy_node_delete($nid);
#print_r($terms);
if ($terms) {
foreach ($terms as $t) {
$query[] = "('".check_query($nid)."', '".check_query($t)."')";
}
db_query("INSERT INTO term_node (nid, tid) VALUES ".implode(", ", $query));
}
}
// clean up terms
function taxonomy_node_delete($nid) {
db_query("DELETE FROM term_node WHERE nid = '".check_query($nid)."'");
}
// relations: return array of related terms
function taxonomy_get_related($tid, $key = "tid") {
if ($tid) {
$result = db_query("SELECT t.*, tid1, tid2 FROM term_relation, term_data t WHERE (t.tid = tid1 OR t.tid = tid2) AND (tid1 = '".check_query($tid)."' OR tid2 = '".check_query($tid)."') ORDER BY weight");
$related = array();
while ($term = db_fetch_object($result)) {
$related[$term->$key] = $term;
}
return $related;
}
}
// hierarchy: get parent term
function taxonomy_get_parents($tid, $key = "tid") {
if ($tid) {
$result = db_query("SELECT t.* FROM term_hierarchy h, term_data t WHERE h.parent = t.tid AND h.tid = '".check_query($tid)."' ORDER BY weight, name");
$parents = array();
while ($parent = db_fetch_object($result)) {
$parents[$parent->$key] = $parent;
}
#print_r($parents);
return $parents;
} else {
return array();
}
}
// hierarchy: get children
function taxonomy_get_children($tid, $vid = 0, $key = "tid") {
if ($vid) {
$result = db_query("SELECT t.* FROM term_hierarchy h, term_data t WHERE t.vid = '".check_query($vid)."' AND h.tid = t.tid AND h.parent = '".check_query($tid)."' ORDER BY weight, name");
} else {
$result = db_query("SELECT t.* FROM term_hierarchy h, term_data t WHERE h.tid = t.tid AND parent = '".check_query($tid)."' ORDER BY weight");
}
$children = array();
while ($term = db_fetch_object($result)) {
$children[$term->$key] = $term;
}
return $children;
}
// hierarchy: get whole family, with tid, parent and depth; useful to show
function taxonomy_get_tree($vocabulary_id, &$tree, $parent = 0, $depth = -1, $key = "tid") {
static $children, $terms;
if ($depth == -1) {
$children = array();
$tree = array();
// $terms = array(); // we should be able to safely do this
}
$depth++;
if ($vocabulary_id) {
if (!$children) {
$result = db_query("SELECT t.*, parent FROM term_data t, term_hierarchy h WHERE t.tid = h.tid AND t.vid = '".check_query($vocabulary_id)."' ORDER BY weight, name");
while ($term = db_fetch_object($result)) {
$children[$term->parent][] = $term->tid;
$terms[$term->tid] = $term;
}
#print_r($children);
}
if ($children[$parent]) {
foreach ($children[$parent] as $child) {
#print_r($terms[$child]);
$terms[$child]->depth = $depth;
$tree[$terms[$child]->$key] = $terms[$child];
taxonomy_get_tree($vocabulary_id, $tree, $child, $depth, $key);
}
}
#print_r($tree);
} else {
return 0;
}
}
// synonyms: return array of synonyms
function taxonomy_get_synonyms($tid) {
if ($tid) {
$result = db_query("SELECT name FROM term_synonym WHERE tid = '".check_query($tid)."'");
while ($synonym = db_fetch_array($result)) {
$synonyms[] = $synonym["name"];
}
return $synonyms;
} else {
return "";
}
}
// synonyms: return original term
function taxonomy_get_synonym_root($term) {
return db_fetch_object(db_query("SELECT * FROM term_synonym s, term_data t WHERE t.tid = s.tid AND s.name = '".check_query($term)."'"));
}
function taxonomy_get_vocabulary($vid) {
// simple cache using a static var?
return db_fetch_object(db_query("SELECT * FROM vocabulary WHERE vid = '".check_query($vid)."'"));
}
function taxonomy_get_term($tid) {
// simple cache using a static var?
return db_fetch_object(db_query("SELECT * FROM term_data WHERE tid = '".check_query($tid)."'"));
}
/*
** service functions
*/
function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $description, $multiple, $blank, $exclude = array()) {
taxonomy_get_tree($vocabulary_id, $tree);
if ($blank) {
$options[0] = $blank;
}
if ($tree) {
foreach ($tree as $term) {
if (!in_array($term->tid, $exclude)) {
$options[$term->tid] = _taxonomy_depth($term->depth, '-').$term->name;
}
}
if (!$blank && !$value) {
// required but without a predefined value, so set first as predefined
$value = $tree[0]->tid;
}
}
if (count($options) > 0) {
foreach ($options as $key=>$choice) {
$select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected=\"selected\"" : "") : ($key == $value ? " selected=\"selected\"" : "")) .">". check_form($choice) ."</option>";
}
// min 8, possibly options/3 (set max too?)
$size = max(8, round(count($options)) / 3);
return form_item($title, "<select name=\"edit[$name][]\"" .($multiple ? " multiple size=\"$size\"" : "").($extra ? " $extra" : "") .">$select</select>", $description);
}
}
function _taxonomy_depth($depth, $graphic = '--') {
for ($n=0; $n<$depth; $n++) {
$result .= $graphic;
}
return $result;
}
function _prepare_update($data) {
foreach ($data as $key => $value) {
$q[] = "$key = '". check_input($value) ."'";
}
$result = implode(", ", $q);
return $result;
}
function _prepare_insert($data, $stage) {
if ($stage == 1) {
$result = implode(", ", array_keys($data));
} else {
foreach (array_values($data) as $value) {
$q[] = "'". check_input($value) ."'";
}
$result = implode(", ", $q);
}
return "($result)";
}
/*
** admin
*/
function taxonomy_admin() {
global $edit, $type, $op, $id, $tree;
if (user_access("administer taxonomy")) {
print "<SMALL><A HREF=\"admin.php?mod=taxonomy&op=add&type=vocabulary\">add new vocabulary</A> | <A HREF=\"admin.php?mod=taxonomy\">overview</A> | <A HREF=\"admin.php?mod=taxonomy&op=help\">help</A></SMALL><HR>\n";
switch ($op) {
case "add":
if ($type == "vocabulary")
print taxonomy_form_vocabulary();
else
print taxonomy_form_term();
break;
case "edit":
if ($type == "vocabulary")
print taxonomy_form_vocabulary(object2array(taxonomy_get_vocabulary($id)));
else
print taxonomy_form_term(object2array(taxonomy_get_term($id)));
break;
case "preview":
print taxonomy_form($id);
break;
case "help":
print taxonomy_help();
break;
case "Delete":
$edit[name] = 0;
// fall through:
case "Submit":
if ($type == "vocabulary")
print status(taxonomy_save_vocabulary($edit));
else
print status(taxonomy_save_term($edit));
// fall through:
default:
print taxonomy_overview();
}
}
else {
print message_access();
}
#print_r(taxonomy_get_children(2));
}
?>

2
themes/unconed/unconed.theme
View File

@ -41,7 +41,7 @@
$system["name"] = "UnConeD"; $system["name"] = "UnConeD";
$system["author"] = "Steven Wittens"; $system["author"] = "Steven Wittens";
$system["description"] = "Internet explorer, Netscape, Opera"; $system["description"] = "Internet explorer, Netscape, Opera";
return $system[$field]; return $system[$field];
} }

55
update.php
View File

@ -49,7 +49,8 @@ $mysql_updates = array(
"2002-02-19" => "update_22", "2002-02-19" => "update_22",
"2002-03-05" => "update_23", "2002-03-05" => "update_23",
"2002-04-08" => "update_24", "2002-04-08" => "update_24",
"2002-03-11 : modules/themes web config" => "update_25" "2002-04-14 : modules/themes web config" => "update_25",
"2002-04-14 : new taxonomy system" => "update_26"
); );
// Update functions // Update functions
@ -352,7 +353,57 @@ function update_25() {
update_sql("REPLACE system SET name = 'system', type = 'module', filename = 'system.module', status = '1';"); update_sql("REPLACE system SET name = 'system', type = 'module', filename = 'system.module', status = '1';");
update_sql("REPLACE system SET name = 'user', type = 'module', filename = 'user.module', status = '1';"); update_sql("REPLACE system SET name = 'user', type = 'module', filename = 'user.module', status = '1';");
update_sql("REPLACE system SET name = 'watchdog', type = 'module', filename = 'watchdog.module', status = '1';"); update_sql("REPLACE system SET name = 'watchdog', type = 'module', filename = 'watchdog.module', status = '1';");
update_sql("UPDATE users SET theme = LOWER(theme);'); update_sql("UPDATE users SET theme = LOWER(theme);");
}
function update_26() {
update_sql("CREATE TABLE vocabulary (
vid int UNSIGNED NOT NULL PRIMARY KEY auto_increment,
name varchar(255) NOT NULL,
description TEXT,
relations TINYINT UNSIGNED NOT NULL,
hierarchy TINYINT UNSIGNED NOT NULL,
multiple TINYINT UNSIGNED NOT NULL,
required TINYINT UNSIGNED NOT NULL,
types TEXT,
weight TINYINT NOT NULL);");
update_sql("CREATE TABLE term_data (
tid int UNSIGNED NOT NULL PRIMARY KEY auto_increment,
vid int UNSIGNED NOT NULL,
name varchar(255) NOT NULL,
description TEXT,
weight TINYINT NOT NULL);");
update_sql("CREATE TABLE term_hierarchy (
tid int UNSIGNED NOT NULL,
parent int UNSIGNED NOT NULL
);");
update_sql("CREATE TABLE term_relation (
tid1 int UNSIGNED NOT NULL,
tid2 int UNSIGNED NOT NULL
);");
update_sql("CREATE TABLE term_synonym (
tid int UNSIGNED NOT NULL,
name varchar(255) NOT NULL
);");
update_sql("CREATE TABLE term_node (
nid int UNSIGNED NOT NULL,
tid int UNSIGNED NOT NULL
);");
update_sql("ALTER TABLE term_data ADD INDEX (vid);");
update_sql("ALTER TABLE term_hierarchy ADD INDEX (tid);");
update_sql("ALTER TABLE term_hierarchy ADD INDEX (parent);");
update_sql("ALTER TABLE term_relation ADD INDEX (tid1);");
update_sql("ALTER TABLE term_relation ADD INDEX (tid2);");
update_sql("ALTER TABLE term_synonym ADD INDEX (tid);");
update_sql("ALTER TABLE term_synonym ADD INDEX (name(3));");
update_sql("ALTER TABLE term_node ADD INDEX (nid);");
update_sql("ALTER TABLE term_node ADD INDEX (tid);");
} }
/* /*