From 031e4d420891a4a7b9e3b18623cae4e2400b7691 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 17 May 2001 20:50:15 +0000
Subject: - Tidied up the field_get() API and improved the implementation of  
 both field_set() and field_get().

---
 modules/node.module      | 7 +++++++
 modules/node/node.module | 7 +++++++
 modules/queue.module     | 6 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/node.module b/modules/node.module
index e469bbfea..53c32219f 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -11,6 +11,13 @@ class Node {
   }
 }
 
+function node_macro($text) {
+  $src = array("/\[\[(([^\|]*?)(\|([^\|]*?))?)\]\]/e");  // [link|description]
+  $dst = array(format_tag('\\2', '\\4'));                // [link|description]
+
+  return preg_replace($src, $dst, $text);
+}
+
 function node_overview($query = array()) {
   global $user;
 
diff --git a/modules/node/node.module b/modules/node/node.module
index e469bbfea..53c32219f 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -11,6 +11,13 @@ class Node {
   }
 }
 
+function node_macro($text) {
+  $src = array("/\[\[(([^\|]*?)(\|([^\|]*?))?)\]\]/e");  // [link|description]
+  $dst = array(format_tag('\\2', '\\4'));                // [link|description]
+
+  return preg_replace($src, $dst, $text);
+}
+
 function node_overview($query = array()) {
   global $user;
 
diff --git a/modules/queue.module b/modules/queue.module
index d5844bfde..bf4cb7cc2 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -20,7 +20,7 @@ function queue_vote($id, $vote) {
 
   if ($node = node_get_object(nid, $id)) {
 
-    if (!field_get($node, "users", $user->userid)) {
+    if (!field_get($node->users, $user->userid)) {
 
       // Update submission's score- and votes-field:
       db_query("UPDATE node SET score = score $vote, votes = votes + 1, users = '". field_set($node->users, $user->userid, $vote) ."' WHERE nid = $id");
@@ -49,7 +49,7 @@ function queue_overview() {
   $content .= "<TABLE BORDER=\"0\" CELLSPACING=\"4\" CELLPADDING=\"4\">\n";
   $content .= " <TR><TH>". t("Subject") ."</TH><TH>". t("Author") ."</TH><TH>". t("Type") ."</TH><TH>". t("Score") ."</TH></TR>\n";
   while ($node = db_fetch_object($result)) {
-    if ($user->id == $node->author || field_get($node, "users", $user->userid)) $content .= " <TR><TD><A HREF=\"module.php?mod=queue&op=view&id=$node->nid\">". check_output($node->title) ."</A></TD><TD ALIGN=\"center\">". format_username($node->userid) ."</TD><TD ALIGN=\"center\">". check_output($node->type) ."</TD><TD ALIGN=\"center\">". queue_score($node->nid) ."</TD></TR>\n";
+    if ($user->id == $node->author || field_get($node->users, $user->userid)) $content .= " <TR><TD><A HREF=\"module.php?mod=queue&op=view&id=$node->nid\">". check_output($node->title) ."</A></TD><TD ALIGN=\"center\">". format_username($node->userid) ."</TD><TD ALIGN=\"center\">". check_output($node->type) ."</TD><TD ALIGN=\"center\">". queue_score($node->nid) ."</TD></TR>\n";
     else $content .= " <TR><TD><A HREF=\"module.php?mod=queue&op=view&id=$node->nid\">". check_output($node->title) ."</A></TD><TD ALIGN=\"center\">". format_username($node->userid) ."</TD><TD ALIGN=\"center\">". check_output($node->type) ."</TD><TD ALIGN=\"center\"><A HREF=\"module.php?mod=queue&op=view&id=$node->nid\">". t("vote") ."</A></TD></TR>\n";
   }
   $content .= "</TABLE>\n";
@@ -65,7 +65,7 @@ function queue_node($id) {
 
   $node = node_get_object(nid, $id);
 
-  if ($user->id == $node->author || field_get($node, "users", $user->userid)) {
+  if ($user->id == $node->author || field_get($node->users, $user->userid)) {
     header("Location: node.php?id=$node->nid");
   }
   else {
-- 
cgit v1.2.3