From 9f2eec079c5f7ed215d125d30f672e1573d02829 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 18 Jun 2001 18:00:13 +0000 Subject: - block.module: + renamed 'overview' to 'preview' as suggested by Kristjan. - meta.module: + renamed 'verify' to 'preview' to make it consistent with block.module. + fixed comma-bug with attribute list reported by Kristjan. - node.module: + fixed typo: "id$nid" should have been "id=$nid" --- modules/block.module | 14 +++++++------- modules/block/block.module | 14 +++++++------- modules/meta.module | 12 ++++++------ modules/node.module | 2 +- modules/node/node.module | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'modules') diff --git a/modules/block.module b/modules/block.module index 284ba2247..108ee645c 100644 --- a/modules/block.module +++ b/modules/block.module @@ -57,7 +57,7 @@ function block_admin_display() { print $output; } -function block_admin_overview() { +function block_admin_preview() { $result = db_query("SELECT * FROM blocks WHERE status > 0 AND region = 0 ORDER BY weight"); $lblocks .= "\n"; @@ -69,7 +69,7 @@ function block_admin_overview() { while ($block = db_fetch_object($result)) $rblocks .= " \n"; $rblocks .= "
". ($block->status == 2 ? "$block->name" : $block->name) ."$block->weight
\n"; - $output .= "

layout 1:

\n"; + $output .= "

layout scheme #1:

\n"; $output .= "\n"; $output .= " \n"; $output .= " \n"; @@ -81,14 +81,14 @@ function block_admin_overview() { while ($block = db_fetch_object($result)) $blocks .= " \n"; $blocks .= "
header
\n". ($lblocks ? $lblocks : " ") ." \n". ($rblocks ? $rblocks : " ") ."
". ($block->status == 2 ? "$block->name" : $block->name) ."$block->weight
\n"; - $output .= "

layout 2:

\n"; + $output .= "

layout scheme #2:

\n"; $output .= "\n"; $output .= " \n"; $output .= " \n"; $output .= " \n"; $output .= "
header
 \n". ($blocks ? $blocks : " ") ."
footer
\n"; - $output .= "

layout 3:

\n"; + $output .= "

layout scheme #3:

\n"; $output .= "\n"; $output .= " \n"; $output .= " \n"; @@ -101,14 +101,14 @@ function block_admin_overview() { function block_admin() { global $op, $edit; - print "configure | overview | help
\n"; + print "configure | preview | help
\n"; switch ($op) { case "help": block_help(); break; - case "overview": - block_admin_overview(); + case "preview": + block_admin_preview(); break; case "Save blocks": block_admin_save($edit); diff --git a/modules/block/block.module b/modules/block/block.module index 284ba2247..108ee645c 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -57,7 +57,7 @@ function block_admin_display() { print $output; } -function block_admin_overview() { +function block_admin_preview() { $result = db_query("SELECT * FROM blocks WHERE status > 0 AND region = 0 ORDER BY weight"); $lblocks .= "
header
\n". ($blocks ? $blocks : " ") ." 
\n"; @@ -69,7 +69,7 @@ function block_admin_overview() { while ($block = db_fetch_object($result)) $rblocks .= " \n"; $rblocks .= "
". ($block->status == 2 ? "$block->name" : $block->name) ."$block->weight
\n"; - $output .= "

layout 1:

\n"; + $output .= "

layout scheme #1:

\n"; $output .= "\n"; $output .= " \n"; $output .= " \n"; @@ -81,14 +81,14 @@ function block_admin_overview() { while ($block = db_fetch_object($result)) $blocks .= " \n"; $blocks .= "
header
\n". ($lblocks ? $lblocks : " ") ." \n". ($rblocks ? $rblocks : " ") ."
". ($block->status == 2 ? "$block->name" : $block->name) ."$block->weight
\n"; - $output .= "

layout 2:

\n"; + $output .= "

layout scheme #2:

\n"; $output .= "\n"; $output .= " \n"; $output .= " \n"; $output .= " \n"; $output .= "
header
 \n". ($blocks ? $blocks : " ") ."
footer
\n"; - $output .= "

layout 3:

\n"; + $output .= "

layout scheme #3:

\n"; $output .= "\n"; $output .= " \n"; $output .= " \n"; @@ -101,14 +101,14 @@ function block_admin_overview() { function block_admin() { global $op, $edit; - print "configure | overview | help
\n"; + print "configure | preview | help
\n"; switch ($op) { case "help": block_help(); break; - case "overview": - block_admin_overview(); + case "preview": + block_admin_preview(); break; case "Save blocks": block_admin_save($edit); diff --git a/modules/meta.module b/modules/meta.module index 32af339e7..a46857ec1 100644 --- a/modules/meta.module +++ b/modules/meta.module @@ -22,9 +22,9 @@ function meta_form($type, $edit = array()) { function meta_save($type, $edit = array()) { $result = db_query("SELECT * FROM collection WHERE types LIKE '%". check_input($type) ."%'"); while ($collection = db_fetch_object($result)) { - $output .= ", ". $edit[$collection->name]; + $array[] = $edit[$collection->name]; } - return $output; + return implode(", ", $array); } function meta_get_collection($cid) { @@ -90,7 +90,7 @@ function meta_save_tag($edit) { } } -function meta_verify() { +function meta_preview() { foreach (module_list() as $name) { if (module_hook($name, "status") && $name != "node") { $output .= "

". ucfirst($name) ." type

"; @@ -127,7 +127,7 @@ function meta_overview() { function meta_admin() { global $edit, $type, $op, $id; - print "add new collection | add new meta-tag | verify node forms | overview | help
\n"; + print "add new collection | add new meta-tag | preview node forms | overview | help
\n"; switch ($op) { case "add": @@ -145,8 +145,8 @@ function meta_admin() { case "help": print meta_help(); break; - case "verify": - print meta_verify(); + case "preview": + print meta_preview(); break; case "Delete": $edit[name] = 0; diff --git a/modules/node.module b/modules/node.module index 3415a9fc2..8e600e867 100644 --- a/modules/node.module +++ b/modules/node.module @@ -68,7 +68,7 @@ function node_cron() { function node_link($nid, $type) { global $op; - $link[] = ($op == "view") ? "view node" : "view node"; + $link[] = ($op == "view") ? "view node" : "view node"; $link[] = ($op == "content") ? "edit content" : "edit content"; $link[] = ($op == "option") ? "edit options" : "edit options"; $link[] = ($op == "status") ? "edit status" : "edit status"; diff --git a/modules/node/node.module b/modules/node/node.module index 3415a9fc2..8e600e867 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -68,7 +68,7 @@ function node_cron() { function node_link($nid, $type) { global $op; - $link[] = ($op == "view") ? "view node" : "view node"; + $link[] = ($op == "view") ? "view node" : "view node"; $link[] = ($op == "content") ? "edit content" : "edit content"; $link[] = ($op == "option") ? "edit options" : "edit options"; $link[] = ($op == "status") ? "edit status" : "edit status"; -- cgit v1.2.3
header
\n". ($blocks ? $blocks : " ") ."