From c56ee67e29e89f5158801ba7bbe8f574a93215b4 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 11 Jun 2001 20:01:13 +0000
Subject: - Changed field_set(), field_get() and field_merge() to use ',' and  
 '=' instead of ';' and ':'.  It is considered to be more readable.   --> A
 _first_ step towards and improved index.module.  Stay tuned       for more.

  + Important:
     If you update from CVS - apply the queries in 2.00-to-x.xx.sql!

- Changed all 'attribute' to 'attributes'.

  + Important:
     If you update from CVS - apply the queries in 2.00-to-x.xx.sql!

  + Important:
     This might require to ieni-wieni small update to your custom
     themes and/or node-related modules:
      - themes: node_index($node->attribute) -> node_index($node)
      - node modules: attribute -> attributes
---
 includes/common.inc | 24 ++++++++++++------------
 includes/node.inc   | 17 +++++++++--------
 includes/theme.inc  |  4 ++--
 3 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index a60ca3236..1702ccb32 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -197,8 +197,8 @@ function form_submit($value) {
 }
 
 function field_get($string, $name) {
-  foreach (explode(";", $string) as $data) {
-    $entry = explode(":", $data);
+  foreach (explode(",", $string) as $data) {
+    $entry = explode("=", $data);
     if ($entry[0] == $name) return $entry[1];
   }
 }
@@ -206,30 +206,30 @@ function field_get($string, $name) {
 function field_set($string, $name, $value) {
   if (!$value) {
     // remove entry:
-    foreach (explode(";", $string) as $data) {
-      $entry = explode(":", $data);
-      if ($entry[0] != $name) $rval .= "$entry[0]:$entry[1];";
+    foreach (explode(",", $string) as $data) {
+      $entry = explode("=", $data);
+      if ($entry[0] != $name) $rval .= "$entry[0]=$entry[1],";
     }
   }
-  else if (strstr($string, "$name:")) {
+  else if (strstr($string, "$name=")) {
     // found: update exsisting entry:
-    foreach (explode(";", $string) as $data) {
-      $entry = explode(":", $data);
+    foreach (explode(",", $string) as $data) {
+      $entry = explode("=", $data);
       if ($entry[0] == $name) $entry[1] = $value;
-      $rval .= "$entry[0]:$entry[1];";
+      $rval .= "$entry[0]=$entry[1],";
     }
   }
   else {
     // not found:
-    $rval = "$string$name:$value;";
+    $rval = "$string$name=$value,";
   }
 
   return $rval;
 }
 
 function field_merge($a, $b) {
-  foreach (explode(";", $b) as $data) {
-    $entry = explode(":", $data);
+  foreach (explode(",", $b) as $data) {
+    $entry = explode("=", $data);
     $a = field_set($a, $entry[0], $entry[1]);
   }
   return $a;
diff --git a/includes/node.inc b/includes/node.inc
index 73b8f8c1c..892dde6aa 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -63,7 +63,7 @@ function node_get_comments($nid) {
 }
 
 function node_save($node, $filter) {
-  $rows = array(nid, pid, lid, cid, tid, log, type, title, score, votes, author, status, comment, promote, moderate, attribute, timestamp, timestamp_posted, timestamp_queued, timestamp_hidden);
+  $rows = array(nid, pid, lid, cid, tid, log, type, title, score, votes, author, status, comment, promote, moderate, attributes, timestamp, timestamp_posted, timestamp_queued, timestamp_hidden);
 
   if ($node[nid] > 0) {
     $n = node_get_object(array("nid" => $node[nid]));
@@ -211,17 +211,14 @@ function node_preview($node) {
   return $node;
 }
 
-function node_index($string) {
-  return $string ? implode(" / ", node_attributes_view($string)) : "&nbsp;";
-}
 
 function node_attributes_edit($edit) {
-  return index_collection_form("section", ($edit[section] ? $edit[section] : "section:". field_get($edit[attribute], "section") .";"));
+  return index_collection_form("section", ($edit[section] ? $edit[section] : "section:". field_get($edit[attributes], "section") .";"));
 }
 
 function node_attributes_save($edit) {
   if ($edit[nid] && $node = node_get_array(array("nid" => $edit[nid]))) {
-    return field_merge($node[attribute], $edit[section]);
+    return field_merge($node[attributes], $edit[section]);
   }
   else {
     return $edit[section];
@@ -229,8 +226,8 @@ function node_attributes_save($edit) {
 }
 
 function node_attributes_view($string) {
-  foreach (explode(";", $string) as $data) {
-    $entry = explode(":", $data);
+  foreach (explode(",", $string) as $data) {
+    $entry = explode("=", $data);
     if (in_array($entry[0], array("section"))) {
       $array[] = "<a href=\"?$entry[0]=$entry[1]\">$entry[1]</a>";
     }
@@ -238,6 +235,10 @@ function node_attributes_view($string) {
   return $array ? $array : array();
 }
 
+function node_index($node) {
+  return $node->attributes ? implode(" / ", node_attributes_view($node->attributes)) : "&nbsp;";
+}
+
 function node_visible($node) {
   global $user, $status;
   return ($node->status == $status[posted]) || ($node->status == $status[queued] && $user->id) || user_access($user, $node->type) || user_access($user, "node");
diff --git a/includes/theme.inc b/includes/theme.inc
index d37b73cd9..fc34e68b3 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -113,9 +113,9 @@ function theme_blocks($region, $theme) {
 }
 
 function theme_moderation_results($theme, $node) {
-  foreach (explode(";", $node->users) as $vote) {
+  foreach (explode(",", $node->users) as $vote) {
     if ($vote) {
-      $data = explode(":", $vote);
+      $data = explode("=", $vote);
       $output .= format_username($data[0]) ." voted '$data[1]'.<BR>";
     }
   }
-- 
cgit v1.2.3