diff --git a/modules/node.module b/modules/node.module index 6387a6a905a1..663e4a4132c2 100644 --- a/modules/node.module +++ b/modules/node.module @@ -19,7 +19,7 @@ function node_help() { if ($mod == "node") { foreach (module_list() as $name) { if (module_hook($name, "status") && $name != "node") { - print "
"), 64, 128, "If enabled, optionally specify tags which should not be stripped. 'STYLE' attributes, 'ON' attributes and unclosed tags are always stripped."); - $output .= "
\n"; + $output .= "\n"; return $output; } @@ -291,11 +291,11 @@ function node_admin() { foreach (module_list() as $name) { if (module_hook($name, "status") && $name != "node") { - $link[] = "add $name"; + $link[] = "add $name"; } } - print "". implode(" | ", $link) ." | node settings | node listings | search node | overview | help
"; + $output .= "
"; $output .= form_select("Enable link tags", "filter_link", variable_get("filter_link", 0), array("Disabled", "Enabled"), "Substitute special [[link]] tags."); - $output .= "
"; + $output .= "
"; return $output; } @@ -108,19 +108,19 @@ function node_overview($query) { $color = array("#ffffff", "#e5e5e5"); $query = node_query($query ? $query : 0); - $result = db_query("SELECT n.* FROM node n $query[1] LIMIT 50"); + $result = db_query("SELECT n.*, u.name FROM node n LEFT JOIN users u ON n.author = u.id $query[1] LIMIT 50"); $output .= status($query[0]); - $output .= "\n"; - $output .= "
\n"; return $output; } @@ -269,11 +269,11 @@ function node_module_find() { } } - $output .= "\n"; + $output .= " title type status meta attributes author date \n"; + $output .= "
\n"; + $output .= "\n"; while ($node = db_fetch_object($result)) { $bg = $color[$i++ % sizeof($color)]; - $output .= " title type status meta attributes author date \n"; - $output .= " nid\">". check_output($node->title) ." $node->type ". node_status($node->status) ." ". check_output($node->attributes) ." ". format_name($node->name) ." ". format_date($node->timestamp, "small") ." ". implode(", ", node_links($node->nid, $node->type)) ." \n"; + $output .= "\n"; + $output .= " nid\">". check_output($node->title) ." $node->type ". node_status($node->status) ." ". check_output($node->attributes) ." ". format_name($node->name) ." ". format_date($node->timestamp, "small") ." ". implode(", ", node_links($node->nid, $node->type)) ." \n"; } - $output .= "
\n"; + print "". implode(" | ", $link) ." | node settings | node listings | search node | overview | help
\n"; $id = check_input($edit[nid] ? $edit[nid] : $id); diff --git a/modules/node/node.module b/modules/node/node.module index 6387a6a905a1..663e4a4132c2 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -19,7 +19,7 @@ function node_help() { if ($mod == "node") { foreach (module_list() as $name) { if (module_hook($name, "status") && $name != "node") { - print "". ucfirst($name) ." type
"; + print "". ucfirst($name) ." type
"; print module_invoke($name, "help"); } } @@ -38,9 +38,9 @@ function node_conf_options() { function node_conf_filters() { $output .= form_select("Enable HTML tags", "filter_html", variable_get("filter_html", 0), array("Disabled", "Enabled"), "Allow HTML and PHP tags in user-contributed content."); $output .= form_textfield("Allowed HTML tags", "allowed_html", variable_get("allowed_html", "
"), 64, 128, "If enabled, optionally specify tags which should not be stripped. 'STYLE' attributes, 'ON' attributes and unclosed tags are always stripped."); - $output .= "
\n"; + $output .= "\n"; return $output; } @@ -291,11 +291,11 @@ function node_admin() { foreach (module_list() as $name) { if (module_hook($name, "status") && $name != "node") { - $link[] = "add $name"; + $link[] = "add $name"; } } - print "". implode(" | ", $link) ." | node settings | node listings | search node | overview | help
"; + $output .= "
"; $output .= form_select("Enable link tags", "filter_link", variable_get("filter_link", 0), array("Disabled", "Enabled"), "Substitute special [[link]] tags."); - $output .= "
"; + $output .= "
"; return $output; } @@ -108,19 +108,19 @@ function node_overview($query) { $color = array("#ffffff", "#e5e5e5"); $query = node_query($query ? $query : 0); - $result = db_query("SELECT n.* FROM node n $query[1] LIMIT 50"); + $result = db_query("SELECT n.*, u.name FROM node n LEFT JOIN users u ON n.author = u.id $query[1] LIMIT 50"); $output .= status($query[0]); - $output .= "\n"; - $output .= "
\n"; return $output; } @@ -269,11 +269,11 @@ function node_module_find() { } } - $output .= "\n"; + $output .= " title type status meta attributes author date \n"; + $output .= "
\n"; + $output .= "\n"; while ($node = db_fetch_object($result)) { $bg = $color[$i++ % sizeof($color)]; - $output .= " title type status meta attributes author date \n"; - $output .= " nid\">". check_output($node->title) ." $node->type ". node_status($node->status) ." ". check_output($node->attributes) ." ". format_name($node->name) ." ". format_date($node->timestamp, "small") ." ". implode(", ", node_links($node->nid, $node->type)) ." \n"; + $output .= "\n"; + $output .= " nid\">". check_output($node->title) ." $node->type ". node_status($node->status) ." ". check_output($node->attributes) ." ". format_name($node->name) ." ". format_date($node->timestamp, "small") ." ". implode(", ", node_links($node->nid, $node->type)) ." \n"; } - $output .= "
\n"; + print "". implode(" | ", $link) ." | node settings | node listings | search node | overview | help
\n"; $id = check_input($edit[nid] ? $edit[nid] : $id);