summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/node.inc25
-rw-r--r--modules/story.module4
-rw-r--r--modules/story/story.module4
-rw-r--r--themes/example/example.theme30
4 files changed, 24 insertions, 39 deletions
diff --git a/includes/node.inc b/includes/node.inc
index b58609d04..5cde16949 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -88,18 +88,27 @@ function node_save($node) {
$f2 = implode(", ", $f2);
$v2 = implode(", ", $v2);
- db_query("INSERT INTO node ($f1) VALUES ($v1)");
- if ($nid = db_insert_id()) {
- $lid = db_query("INSERT INTO $node[type] ($f2, nid) VALUES ($v2, $nid)");
- if ($lid = db_insert_id()) {
- db_query("UPDATE node SET lid = '$lid' WHERE nid = '$nid'");
+ // insert data, try to roll-back when something goes wrong:
+ $result = db_query("INSERT INTO node ($f1) VALUES ($v1)");
+ if ($result && $nid = db_insert_id()) {
+ $result = db_query("INSERT INTO $node[type] ($f2, nid) VALUES ($v2, $nid)");
+ if ($result && $lid = db_insert_id()) {
+ $result = db_query("UPDATE node SET lid = '$lid' WHERE nid = '$nid'");
+ if ($result) {
+ watchdog("message", "node: added '$node[title]'");
+ }
+ else {
+ watchdog("warning", "node: added '$node[title]' - failed");
+ }
}
else {
db_query("DELETE FROM node WHERE nid = '$nid'");
+ watchdog("warning", "node: added '$node[title]' - failed");
}
}
-
- watchdog("message", "node: added '$node[title]'");
+ else {
+ watchdog("warning", "node: added '$node[title]' - failed");
+ }
}
}
@@ -137,7 +146,7 @@ function node_info($node) {
</SCRIPT>
<?php
- $choices = array("/node.php?id=$node->nid" => t("view node"), "/submit.php?mod=$node->type&op=update&id=$node->nid" => t("suggest update"), "/node.php?op=history&id=$node->nid" => t("view history"));
+ $choices = array("node.php?id=$node->nid" => t("view node"), "/submit.php?mod=$node->type&op=update&id=$node->nid" => t("suggest update"), "node.php?op=history&id=$node->nid" => t("view history"));
$output .= "<FORM METHOD=\"get\" ACTION=\"\">\n";
foreach ($choices as $key => $value) $options .= "<OPTION VALUE=\"$key\"". ($key == $REQUEST_URI ? " SELECTED" : "") .">". check_select($value) ."</OPTION>\n";
diff --git a/modules/story.module b/modules/story.module
index f47a93e0b..81f46be78 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -133,9 +133,9 @@ function story_form($edit = array()) {
if (user_access($user, "story")) {
$output .= "<B>". t("Status") .":</B><BR>\n";
$output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[scheduled]\"". ($edit[status] == $status[scheduled] ? " CHECKED" : "") ."> scheduled for <INPUT TYPE=\"text\" NAME=\"edit[timestamp]\" SIZE=\"30\" VALUE=\"". date("j F Y G:i", ($edit[timetsamp] ? $edit[timestamp] : time())) ."\"><BR>\n";
- $output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[posted]\"". ($edit[status] == $status[posted] ? " CHECKED" : "") ."> posted<BR>\n";
- $output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[queued]\"". ($edit[status] == $status[queued] ? " CHECKED" : "") ."> queued<BR>\n";
$output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[dumped]\"". ($edit[status] == $status[dumped] ? " CHECKED" : "") ."> dumped<BR>\n";
+ $output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[queued]\"". ($edit[status] == $status[queued] ? " CHECKED" : "") ."> queued<BR>\n";
+ $output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[posted]\"". ($edit[status] == $status[posted] ? " CHECKED" : "") ."> posted<BR>\n";
$output .= "<SMALL><I>The textfield for scheduled stories expects a string containing an English date format of when you want to have your story automatically published. Example input: '". date("j F Y G:i") ."', '". date("m/d/y H:i") ."', '". date("F j, Y H:i") ."', ...</I></SMALL><P>\n";
$output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[timestamp]\" VALUE=\"$edit[timestamp]\">\n";
diff --git a/modules/story/story.module b/modules/story/story.module
index f47a93e0b..81f46be78 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -133,9 +133,9 @@ function story_form($edit = array()) {
if (user_access($user, "story")) {
$output .= "<B>". t("Status") .":</B><BR>\n";
$output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[scheduled]\"". ($edit[status] == $status[scheduled] ? " CHECKED" : "") ."> scheduled for <INPUT TYPE=\"text\" NAME=\"edit[timestamp]\" SIZE=\"30\" VALUE=\"". date("j F Y G:i", ($edit[timetsamp] ? $edit[timestamp] : time())) ."\"><BR>\n";
- $output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[posted]\"". ($edit[status] == $status[posted] ? " CHECKED" : "") ."> posted<BR>\n";
- $output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[queued]\"". ($edit[status] == $status[queued] ? " CHECKED" : "") ."> queued<BR>\n";
$output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[dumped]\"". ($edit[status] == $status[dumped] ? " CHECKED" : "") ."> dumped<BR>\n";
+ $output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[queued]\"". ($edit[status] == $status[queued] ? " CHECKED" : "") ."> queued<BR>\n";
+ $output .= "<INPUT TYPE=\"radio\" NAME=\"edit[status]\" VALUE=\"$status[posted]\"". ($edit[status] == $status[posted] ? " CHECKED" : "") ."> posted<BR>\n";
$output .= "<SMALL><I>The textfield for scheduled stories expects a string containing an English date format of when you want to have your story automatically published. Example input: '". date("j F Y G:i") ."', '". date("m/d/y H:i") ."', '". date("F j, Y H:i") ."', ...</I></SMALL><P>\n";
$output .= "<INPUT TYPE=\"hidden\" NAME=\"edit[timestamp]\" VALUE=\"$edit[timestamp]\">\n";
diff --git a/themes/example/example.theme b/themes/example/example.theme
index b3fe9de7f..640eaed55 100644
--- a/themes/example/example.theme
+++ b/themes/example/example.theme
@@ -8,11 +8,9 @@
?>
<HTML>
-
<HEAD>
<TITLE><? echo $site_name; ?></TITLE>
</HEAD>
-
<BODY>
<TABLE BORDER="1">
<TR>
@@ -36,7 +34,7 @@
?>
</TD>
- <TD>
+ <TD VALIGN="top">
<?php
@@ -154,36 +152,14 @@
<TABLE>
<TR>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
<TD>
- <? echo $subject; ?>
+ <DIV ALIGN="center"><B><? echo $subject; ?></B></DIV><HR>
</TD>
- <TD></TD>
</TR>
<TR>
- <TD></TD>
<TD>
- <TABLE>
- <TR>
- <TD>
- <?php echo $content; ?>
- </TD>
- </TR>
- </TABLE>
+ <?php echo $content; ?>
</TD>
- <TD></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- <TD></TD>
</TR>
</TABLE>
<BR>
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 02:08:09 +0000