Skip to content
Snippets Groups Projects
Commit 86552cb4 authored by Kjartan Mannes's avatar Kjartan Mannes
Browse files

- changed block, module and theme config pages to use checkboxes. 

- coding style clean ups.
- fixed taxonomy causing errors.
parent c72bf4b5
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Show whitespace changes
Inline Side-by-side
Showing
with 81 additions and 46 deletions
includes/common.inc
+ 6
− 6
View file @ 86552cb4
modules/archive.module
+ 2
− 3
View file @ 86552cb4
......@@ -146,9 +146,8 @@ function archive_page() {
$edit["day"] = date("d", $date);
}
$start = str_replace("<b>:</b><br />", " ", form_select("", "year", ($edit["year"] ? $edit["year"] : date("Y")), $years) . form_select("", "month", ($edit["month"] ? $edit["month"] : date("m")), $months) . form_select("", "day", ($edit["day"] ? $edit["day"] : date("d")), $days) . form_submit(t("Show")));
$start = str_replace("<p>", "", $start);
$start = str_replace("</p>\n", " ", $start);
$start = form_select("", "year", ($edit["year"] ? $edit["year"] : date("Y")), $years) . form_select("", "month", ($edit["month"] ? $edit["month"] : date("m")), $months) . form_select("", "day", ($edit["day"] ? $edit["day"] : date("d")), $days) . form_submit(t("Show"));
$start = ereg_replace("<[/]?p>", "", $start);
$theme->box(t("Archives"), form($start));
......
modules/archive/archive.module
+ 2
− 3
View file @ 86552cb4
......@@ -146,9 +146,8 @@ function archive_page() {
$edit["day"] = date("d", $date);
}
$start = str_replace("<b>:</b><br />", " ", form_select("", "year", ($edit["year"] ? $edit["year"] : date("Y")), $years) . form_select("", "month", ($edit["month"] ? $edit["month"] : date("m")), $months) . form_select("", "day", ($edit["day"] ? $edit["day"] : date("d")), $days) . form_submit(t("Show")));
$start = str_replace("<p>", "", $start);
$start = str_replace("</p>\n", " ", $start);
$start = form_select("", "year", ($edit["year"] ? $edit["year"] : date("Y")), $years) . form_select("", "month", ($edit["month"] ? $edit["month"] : date("m")), $months) . form_select("", "day", ($edit["day"] ? $edit["day"] : date("d")), $days) . form_submit(t("Show"));
$start = ereg_replace("<[/]?p>", "", $start);
$theme->box(t("Archives"), form($start));
......
modules/block.module
+ 4
− 4
View file @ 86552cb4
......@@ -71,7 +71,7 @@ function block_admin_display() {
// Generate output:
$output = "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= "<tr><th>block</th><th>module</th><th>status</th><th>custom</th><th>weight</th><th>region</th><th>path</th><th colspan=\"2\">operations</th></tr>\n";
$output .= "<tr><th>block</th><th>module</th><th>enabled</th><th>custom</th><th>weight</th><th>region</th><th>path</th><th colspan=\"2\">operations</th></tr>\n";
while ($block = db_fetch_object($result)) {
$weights = array(0 => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
......@@ -80,8 +80,8 @@ function block_admin_display() {
//$output .= '<td>'. la($block->name, array("mod" => "block", "op" => "view", "id" => $block->delta), t("View the block details")) .'</td>';
$output .= "<td>$block->name</td>";
$output .= '<td>'. (module_hook($block->module, "admin") ? la($block->module, array("mod" => $block->module), "Administer module") : $block->module) .'</td>';
$output .= '<td>'. form_select(NULL, "$block->name][status", $block->status, array("disabled", "enabled")) .'</td>';
$output .= '<td>'. form_select(NULL, "$block->name][custom", $block->custom, array("disabled", "enabled")) .'</td>';
$output .= '<td align="center">'. form_checkbox(NULL, "$block->name][status", 1, $block->status) .'</td>';
$output .= '<td align="center">'. form_checkbox(NULL, "$block->name][custom", 1, $block->custom) .'</td>';
$output .= '<td>'. form_select(NULL, "$block->name][weight", $block->weight, $weights) .'</td>';
$output .= '<td>'. form_select(NULL, "$block->name][region", $block->region, array("left", "right")) .'</td>';
$output .= '<td>'. form_textfield(NULL, "$block->name][path", $block->path, 10, 255) .'</td>';
......
modules/block/block.module
+ 4
− 4
View file @ 86552cb4
......@@ -71,7 +71,7 @@ function block_admin_display() {
// Generate output:
$output = "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= "<tr><th>block</th><th>module</th><th>status</th><th>custom</th><th>weight</th><th>region</th><th>path</th><th colspan=\"2\">operations</th></tr>\n";
$output .= "<tr><th>block</th><th>module</th><th>enabled</th><th>custom</th><th>weight</th><th>region</th><th>path</th><th colspan=\"2\">operations</th></tr>\n";
while ($block = db_fetch_object($result)) {
$weights = array(0 => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
......@@ -80,8 +80,8 @@ function block_admin_display() {
//$output .= '<td>'. la($block->name, array("mod" => "block", "op" => "view", "id" => $block->delta), t("View the block details")) .'</td>';
$output .= "<td>$block->name</td>";
$output .= '<td>'. (module_hook($block->module, "admin") ? la($block->module, array("mod" => $block->module), "Administer module") : $block->module) .'</td>';
$output .= '<td>'. form_select(NULL, "$block->name][status", $block->status, array("disabled", "enabled")) .'</td>';
$output .= '<td>'. form_select(NULL, "$block->name][custom", $block->custom, array("disabled", "enabled")) .'</td>';
$output .= '<td align="center">'. form_checkbox(NULL, "$block->name][status", 1, $block->status) .'</td>';
$output .= '<td align="center">'. form_checkbox(NULL, "$block->name][custom", 1, $block->custom) .'</td>';
$output .= '<td>'. form_select(NULL, "$block->name][weight", $block->weight, $weights) .'</td>';
$output .= '<td>'. form_select(NULL, "$block->name][region", $block->region, array("left", "right")) .'</td>';
$output .= '<td>'. form_textfield(NULL, "$block->name][path", $block->path, 10, 255) .'</td>';
......
modules/node.module
+ 11
− 5
View file @ 86552cb4
......@@ -1031,7 +1031,9 @@ function node_submit($node) {
** Update terms of the node
*/
if (function_exists("taxonomy_node_save")) {
taxonomy_node_save($nid, $node->taxonomy);
}
watchdog("special", "$node->type: updated '$node->title'");
$output = t("The node has been updated.");
......@@ -1076,7 +1078,9 @@ function node_submit($node) {
** Insert terms of the node
*/
if (function_exists("taxonomy_node_save")) {
taxonomy_node_save($nid, $node->taxonomy);
}
watchdog("special", "$node->type: added '$node->title'");
$output = t("Thanks for your submission.");
......@@ -1138,7 +1142,9 @@ function node_delete($edit) {
** Delete any taxonomy terms
*/
taxonomy_node_delete($node->nid);
if (function_exists("taxonomy_node_delete")) {
taxonomy_node_delete($nid, $node->taxonomy);
}
/*
** Call the node specific callback (if any):
......
modules/node/node.module
+ 11
− 5
View file @ 86552cb4
......@@ -1031,7 +1031,9 @@ function node_submit($node) {
** Update terms of the node
*/
if (function_exists("taxonomy_node_save")) {
taxonomy_node_save($nid, $node->taxonomy);
}
watchdog("special", "$node->type: updated '$node->title'");
$output = t("The node has been updated.");
......@@ -1076,7 +1078,9 @@ function node_submit($node) {
** Insert terms of the node
*/
if (function_exists("taxonomy_node_save")) {
taxonomy_node_save($nid, $node->taxonomy);
}
watchdog("special", "$node->type: added '$node->title'");
$output = t("Thanks for your submission.");
......@@ -1138,7 +1142,9 @@ function node_delete($edit) {
** Delete any taxonomy terms
*/
taxonomy_node_delete($node->nid);
if (function_exists("taxonomy_node_delete")) {
taxonomy_node_delete($nid, $node->taxonomy);
}
/*
** Call the node specific callback (if any):
......
modules/system.module
+ 19
− 7
View file @ 86552cb4
......@@ -163,9 +163,15 @@ function system_modules() {
$required = array("user", "drupal", "system", "watchdog");
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= " <tr><th>module</th><th>description</th><th>status</th><th colspan=\"2\">operations</th></tr>\n";
$output .= "<tr><th>module</th><th>description</th><th>enabled</th><th colspan=\"2\">operations</th></tr>\n";
foreach ($modules as $name => $module) {
$output .= " <tr><td>$name</td><td>". check_output(module_invoke($name, "system", "description")) ."</td><td>". (in_array($name, $required) ? "Enabled" : form_select("", "status][$name", $module["status"], array(t("Disabled"), t("Enabled")))) ."</td><td>". (module_hook($name, "page") ? lm(t("view"), array("mod" => $name)) : "&nbsp;") ."</td><td>". (module_hook($name, "admin") ? la(t("admin"), array("mod" => $name)) : "&nbsp;") ."</td></tr>\n";
$output .= "<tr>";
$output .= "<td>$name</td>";
$output .= "<td>". check_output(module_invoke($name, "system", "description")) ."</td>";
$output .= "<td align=\"center\">". (in_array($name, $required) ? "Enabled" : form_checkbox("", "status][$name", 1, $module["status"])) ."</td>";
$output .= "<td>". (module_hook($name, "page") ? lm(t("view"), array("mod" => $name)) : "&nbsp;") ."</td>";
$output .= "<td>". (module_hook($name, "admin") ? la(t("admin"), array("mod" => $name)) : "&nbsp;") ."</td>";
$output .= "</tr>\n";
if (!in_array($name, $required)) {
db_query("INSERT INTO system SET name = '$name', type = 'module', filename = '$module[filename]', status = '$module[status]'");
}
......@@ -229,9 +235,15 @@ function system_themes() {
db_query("DELETE FROM system WHERE type = 'theme'");
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= " <tr><th>theme</th><th>name</th><th>description</th><th>author</th><th>status</th></tr>\n";
$output .= "<tr><th>theme</th><th>name</th><th>description</th><th>author</th><th>enabled</th></tr>\n";
foreach ($themes as $name => $theme) {
$output .= " <tr><td>$name</td><td>$theme->displayname</td><td>". form_textfield("", "$name][description", $theme->description, 40, 255)."</td><td>$theme->author</td><td>". form_select("", "$name][status", $theme->status, array(t("Disabled"), t("Enabled"))) ."</td></tr>\n";
$output .= "<tr>";
$output .= "<td>$name</td>";
$output .= "<td>$theme->displayname</td>";
$output .= "<td>". form_textfield("", "$name][description", $theme->description, 40, 255)."</td>";
$output .= "<td>$theme->author</td>";
$output .= "<td align=\"center\">". form_checkbox("", "$name][status", 1, $theme->status) ."</td>";
$output .= "</tr>\n";
db_query("INSERT INTO system SET name = '$name', type = 'theme', filename = '$theme->filename', status = '$theme->status', description = '$theme->description'");
}
$output .= "</table><br />\n";
......
modules/system/system.module
+ 19
− 7
View file @ 86552cb4
......@@ -163,9 +163,15 @@ function system_modules() {
$required = array("user", "drupal", "system", "watchdog");
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= " <tr><th>module</th><th>description</th><th>status</th><th colspan=\"2\">operations</th></tr>\n";
$output .= "<tr><th>module</th><th>description</th><th>enabled</th><th colspan=\"2\">operations</th></tr>\n";
foreach ($modules as $name => $module) {
$output .= " <tr><td>$name</td><td>". check_output(module_invoke($name, "system", "description")) ."</td><td>". (in_array($name, $required) ? "Enabled" : form_select("", "status][$name", $module["status"], array(t("Disabled"), t("Enabled")))) ."</td><td>". (module_hook($name, "page") ? lm(t("view"), array("mod" => $name)) : "&nbsp;") ."</td><td>". (module_hook($name, "admin") ? la(t("admin"), array("mod" => $name)) : "&nbsp;") ."</td></tr>\n";
$output .= "<tr>";
$output .= "<td>$name</td>";
$output .= "<td>". check_output(module_invoke($name, "system", "description")) ."</td>";
$output .= "<td align=\"center\">". (in_array($name, $required) ? "Enabled" : form_checkbox("", "status][$name", 1, $module["status"])) ."</td>";
$output .= "<td>". (module_hook($name, "page") ? lm(t("view"), array("mod" => $name)) : "&nbsp;") ."</td>";
$output .= "<td>". (module_hook($name, "admin") ? la(t("admin"), array("mod" => $name)) : "&nbsp;") ."</td>";
$output .= "</tr>\n";
if (!in_array($name, $required)) {
db_query("INSERT INTO system SET name = '$name', type = 'module', filename = '$module[filename]', status = '$module[status]'");
}
......@@ -229,9 +235,15 @@ function system_themes() {
db_query("DELETE FROM system WHERE type = 'theme'");
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= " <tr><th>theme</th><th>name</th><th>description</th><th>author</th><th>status</th></tr>\n";
$output .= "<tr><th>theme</th><th>name</th><th>description</th><th>author</th><th>enabled</th></tr>\n";
foreach ($themes as $name => $theme) {
$output .= " <tr><td>$name</td><td>$theme->displayname</td><td>". form_textfield("", "$name][description", $theme->description, 40, 255)."</td><td>$theme->author</td><td>". form_select("", "$name][status", $theme->status, array(t("Disabled"), t("Enabled"))) ."</td></tr>\n";
$output .= "<tr>";
$output .= "<td>$name</td>";
$output .= "<td>$theme->displayname</td>";
$output .= "<td>". form_textfield("", "$name][description", $theme->description, 40, 255)."</td>";
$output .= "<td>$theme->author</td>";
$output .= "<td align=\"center\">". form_checkbox("", "$name][status", 1, $theme->status) ."</td>";
$output .= "</tr>\n";
db_query("INSERT INTO system SET name = '$name', type = 'theme', filename = '$theme->filename', status = '$theme->status', description = '$theme->description'");
}
$output .= "</table><br />\n";
......
update.php
+ 3
− 2
View file @ 86552cb4
......@@ -403,6 +403,7 @@ function update_26() {
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);");
update_sql("UPDATE node SET comment = 2 WHERE comment = 1");
}
function update_27() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment