diff options
| -rw-r--r-- | includes/database.inc | 6 | ||||
| -rw-r--r-- | includes/section.inc | 13 | ||||
| -rw-r--r-- | modules/book.module | 5 | ||||
| -rw-r--r-- | modules/book/book.module | 5 | ||||
| -rw-r--r-- | modules/page.module | 7 | ||||
| -rw-r--r-- | modules/page/page.module | 7 | ||||
| -rw-r--r-- | modules/story.module | 5 | ||||
| -rw-r--r-- | modules/story/story.module | 5 | ||||
| -rw-r--r-- | updates/2.00-to-x.xx.sql | 14 |
9 files changed, 57 insertions, 10 deletions
diff --git a/includes/database.inc b/includes/database.inc index 30b1c5a1f..139dee1b4 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -6,8 +6,10 @@ function db_connect($host, $user, $pass, $name) { // NOTE: we are using a persistent connection! } -function db_query($query) { - if ($result = mysql_query($query)) return $result; +function db_query($query, $debug = 0) { + $result = mysql_query($query); + if ($debug) print "<P>query: $query<BR>error". mysql_error() ."</P>"; + if ($result) return $result; else watchdog("error", "database: ". mysql_error() ."<BR>query: ". htmlspecialchars($query)); } diff --git a/includes/section.inc b/includes/section.inc index b5e825b05..6ed1d4030 100644 --- a/includes/section.inc +++ b/includes/section.inc @@ -13,12 +13,13 @@ function section_get_array($field, $value) { } function section_save($edit) { - if ($edit["sid"]) { // ? - db_query("UPDATE section SET name = '". check_input($edit[name]) ."', pid = '". check_input($edit[pid]) ."' WHERE sid = $edit[sid]", 1); - } - else { - db_query("INSERT INTO section (name, pid) VALUES ('". check_input($edit[name])."', '". check_input($edit[pid]) ."')", 1); - } + if ($edit["sid"]) db_query("UPDATE section SET name = '". check_input($edit[name]) ."', pid = '". check_input($edit[pid]) ."' WHERE sid = $edit[sid]", 1); + else db_query("INSERT INTO section (name, pid) VALUES ('". check_input($edit[name])."', '". check_input($edit[pid]) ."')", 1); + + $sid = ($edit[sid] ? $edit[sid] : db_insert_id()); + + db_query("DELETE FROM section_type WHERE sid = '$sid'", 1); + foreach ($edit[type] as $key=>$type) db_query("INSERT INTO section_type (sid, type) VALUES ('". check_input($sid) ."', '". check_input($type) ."')", 1); } function section_tree($parent = 0, $name = "", $tree = array()) { diff --git a/modules/book.module b/modules/book.module index 80a8da754..b1696d540 100644 --- a/modules/book.module +++ b/modules/book.module @@ -1,6 +1,7 @@ <?php $module = array("find" => "book_find", + "type" => "book_type", "page" => "book_page", "user" => "book_user", "admin" => "book_admin", @@ -43,6 +44,10 @@ function book_location($node, $nodes = array()) { return $nodes; } +function book_type() { + return array("book", t("book page")); +} + function book_view($node, $page = 1) { global $theme; diff --git a/modules/book/book.module b/modules/book/book.module index 80a8da754..b1696d540 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -1,6 +1,7 @@ <?php $module = array("find" => "book_find", + "type" => "book_type", "page" => "book_page", "user" => "book_user", "admin" => "book_admin", @@ -43,6 +44,10 @@ function book_location($node, $nodes = array()) { return $nodes; } +function book_type() { + return array("book", t("book page")); +} + function book_view($node, $page = 1) { global $theme; diff --git a/modules/page.module b/modules/page.module index 1d712a9ba..08d5c6946 100644 --- a/modules/page.module +++ b/modules/page.module @@ -1,10 +1,15 @@ <?php -$module = array("page" => "page_page", +$module = array("type" => "page_type", + "page" => "page_page", "admin" => "page_admin"); $format = array(0 => HTML, 1 => PHP, 2 => text); +function page_type() { + return array("page", "static page"); +} + function page_view($node) { global $format, $theme; diff --git a/modules/page/page.module b/modules/page/page.module index 1d712a9ba..08d5c6946 100644 --- a/modules/page/page.module +++ b/modules/page/page.module @@ -1,10 +1,15 @@ <?php -$module = array("page" => "page_page", +$module = array("type" => "page_type", + "page" => "page_page", "admin" => "page_admin"); $format = array(0 => HTML, 1 => PHP, 2 => text); +function page_type() { + return array("page", "static page"); +} + function page_view($node) { global $format, $theme; diff --git a/modules/story.module b/modules/story.module index 852ed7053..8c831fad1 100644 --- a/modules/story.module +++ b/modules/story.module @@ -2,6 +2,7 @@ $module = array("help" => "story_help", "find" => "story_find", + "type" => "story_type", "user" => "story_user", "queue" => "story_queue", "admin" => "story_admin", @@ -53,6 +54,10 @@ function story_help() { <?php } +function story_type() { + return array("story", t("story")); +} + function story_view($node, $page = 1) { global $id, $cid, $op, $moderate, $pid, $subject, $comment, $theme, $mode, $order, $threshold; diff --git a/modules/story/story.module b/modules/story/story.module index 852ed7053..8c831fad1 100644 --- a/modules/story/story.module +++ b/modules/story/story.module @@ -2,6 +2,7 @@ $module = array("help" => "story_help", "find" => "story_find", + "type" => "story_type", "user" => "story_user", "queue" => "story_queue", "admin" => "story_admin", @@ -53,6 +54,10 @@ function story_help() { <?php } +function story_type() { + return array("story", t("story")); +} + function story_view($node, $page = 1) { global $id, $cid, $op, $moderate, $pid, $subject, $comment, $theme, $mode, $order, $threshold; diff --git a/updates/2.00-to-x.xx.sql b/updates/2.00-to-x.xx.sql index 314775494..642cc6a37 100644 --- a/updates/2.00-to-x.xx.sql +++ b/updates/2.00-to-x.xx.sql @@ -1,3 +1,17 @@ +# 14/04/2001: +CREATE TABLE section ( + sid int(10) unsigned DEFAULT '0' NOT NULL auto_increment, + pid int(10) unsigned DEFAULT '0' NOT NULL, + name varchar(32) DEFAULT '' NOT NULL, + PRIMARY KEY (sid) +); + +CREATE TABLE section_type ( + sid int(10) unsigned DEFAULT '0' NOT NULL auto_increment, + type varchar(16) DEFAULT '' NOT NULL, + PRIMARY KEY (sid, type) +); + # 07/04/2001: CREATE TABLE page ( lid int(10) unsigned DEFAULT '0' NOT NULL auto_increment, |