--- inc/newsEdit.php	2001/08/30 16:35:36	1.5
+++ inc/newsEdit.php	2001/09/03 15:52:15	1.6
@@ -14,7 +14,7 @@
 		# echo "<TT><B>[SQL]</B> $sql<BR>\n";
 	}
 	function newsEdit($art, $trigger = "") {
-		global $phptmp, $picdir, $syspicdir, $section, $dbh, $tpl;
+		global $phptmp, $picdir, $syspicdir, $section, $section_menu, $dbh, $tpl;
 		global $ed_id, $ed_cat;
 		$i = 1;
 		global $ed_delete_main, $ed_del_main;
@@ -61,19 +61,21 @@
 					if ($row) MyDelete($syspicdir."/".$row);
 				}
 				global $ed_title, $ed_lead, $ed_titlepic_alt,
-					$ed_titlepic_pos, $ed_more, $ed_cat;
+					$ed_titlepic_pos, $ed_more, $ed_more_title,
+					$ed_cat;
 				$ed_title = MyQuote($ed_title);
 				$ed_lead = MyQuote($ed_lead);
 				$ed_titlepic_nm = MyQuote(basename($titlepic_name));
 				$ed_titlepic_alt = MyQuote($ed_titlepic_alt);
 				$ed_more = MyQuote($ed_more);
+				$ed_more_title = MyQuote($ed_more_title);
 				if (!$ed_titlepic_pos) $ed_titlepic_pos = 0;
 				if ($ed_id > 0) {
-					$sql = "UPDATE news SET category = '$ed_cat', title = $ed_title, lead = $ed_lead, title_pic = $ed_titlepic_nm, title_alt = $ed_titlepic_alt, title_pos = $ed_titlepic_pos, url = $ed_more, date = CURRENT_TIMESTAMP WHERE (news_id = $ed_id)";
+					$sql = "UPDATE news SET category = '$ed_cat', title = $ed_title, lead = $ed_lead, title_pic = $ed_titlepic_nm, title_alt = $ed_titlepic_alt, title_pos = $ed_titlepic_pos, url = $ed_more, url_title = $ed_more_title, date = CURRENT_TIMESTAMP WHERE (news_id = $ed_id)";
 sql($sql);
 					$dbh->dbh_do($sql);
 				} else {
-					$sql = "INSERT INTO news (category, title, lead, title_pic, title_alt, title_pos, url, date) VALUES ('$ed_cat', $ed_title, $ed_lead, $ed_titlepic_nm, $ed_titlepic_alt, $ed_titlepic_pos, $ed_more, CURRENT_TIMESTAMP)";
+					$sql = "INSERT INTO news (category, title, lead, title_pic, title_alt, title_pos, url, url_title, date) VALUES ('$ed_cat', $ed_title, $ed_lead, $ed_titlepic_nm, $ed_titlepic_alt, $ed_titlepic_pos, $ed_more, $ed_more_title, CURRENT_TIMESTAMP)";
 sql($sql);
 					$dbh->dbh_do($sql);
 					$sql = "SELECT news_id FROM news WHERE (title = $ed_title)";
@@ -210,7 +212,8 @@
 		$tp->assign("levels", $levels);
 		// -----
 		global $ed_id, $ed_title, $ed_lead, $ed_titlepic_pos,
-			$ed_titlepic_alt, $ed_cat, $ed_more;
+			$ed_titlepic_alt, $ed_cat, $ed_more,
+			$ed_more_title;
 		global $ed_edit, $ed_preview, $preview, $add;
 		if (!$ed_preview) $ed_preview = ($preview ? true : false);
 		if ($ed_edit) $ed_preview = false;
@@ -225,7 +228,8 @@
 		$ed_warning = 0;
 		if ($ed_edit || $ed_preview || $add || $delete || $clear) {
 			global $ed_title, $ed_lead, $ed_titlepic_pos,
-				$ed_titlepic_alt, $ed_cat, $ed_more;
+				$ed_titlepic_alt, $ed_cat, $ed_more,
+				$ed_more_title;
 			if (!$HTTP_POST_FILES["ed_titlepic_url"]["name"]) $titlepic_url = "";
 			if (!$titlepic_url) $titlepic_url = $titlepic_url2;
 			if (!$titlepic_url && !($clear_main || $clr_main))
@@ -260,10 +264,11 @@
 		} else {
 			list($ed_title, $ed_lead, $ed_titlepic_pos, $titlepic_url,
 				$titlepic_url2, $titlepic_name, $ed_titlepic_alt,
-				$ed_cat, $ed_more, $width, $height) = array($art["title"],
-				$art["lead"], $art["pic_pos"], $art["pic_url"],
-				$art["pic_url"], $art["pic_url"], $art["pic_alt"],
-				$art["category"], $art["more"], $art["pic_w"], $art["pic_h"]);
+				$ed_cat, $ed_more, $ed_more_title, $width, $height) =
+				array($art["title"], $art["lead"], $art["pic_pos"],
+				$art["pic_url"], $art["pic_url"], $art["pic_url"],
+				$art["pic_alt"], $art["category"], $art["more"],
+				$art["more_title"], $art["pic_w"], $art["pic_h"]);
 			while ($art["text"] && list($id, $val) = each($art["text"])) {
 				list($id, $txt, $title, $lev, $cls, $pic, $alt, $pos, $w, $h) = array(
 					$val["id"], $val["text"], $val["title"], $val["level"],
@@ -345,6 +350,7 @@
 		$tp->assign("ed_titlepic_width", $width);
 		$tp->assign("ed_titlepic_height", $height);
 		$tp->assign("ed_more", MyEscape($ed_more));
+		$tp->assign("ed_more_title", MyEscape($ed_more_title));
 		$tp->assign("ed_clr_main", ($clear_main || $clr_main || !$titlepic_url) ? true : false);
 		$tp->assign("ed_text", $ed_text);
 		$tp->assign("ed_empty", $ed_empty);
@@ -354,6 +360,7 @@
 		$tp->assign("newspicdir", "$picdir/");
 		$params = array();
 		if ($section) array_push($params, "section=$section");
+		if ($section_menu) array_push($params, "section_menu=$section_menu");
 		if ($ed_id) array_push($params, "ed_id=$ed_id");
 		if ($ed_preview) array_push($params, "ed_preview=$ed_preview");
 		if ($trigger) array_push($params, "$trigger=1");