--- inc/newsEdit.php	2001/08/03 09:12:42	1.1
+++ inc/newsEdit.php	2001/08/03 11:21:16	1.2
@@ -152,8 +152,8 @@
 					$i++;
 				}
 			}
-			if (!$art["limit"]) $art["limit"] = 1;
-			if (!$art["npar"]) $art["npar"] = 1;
+			if (!isset($art["limit"])) $art["limit"] = 1;
+			if (!isset($art["npar"])) $art["npar"] = 1;
 			return array_shift(newsLoad($ed_id, $ed_cat,
 				$art["limit"], $art["npar"]));
 		}
@@ -222,6 +222,7 @@
 			array_keys(array_merge($HTTP_GET_VARS,
 			$HTTP_POST_VARS)))) > 0);
 		$ed_pgfs = array();
+		$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;
@@ -230,6 +231,8 @@
 			if (!$titlepic_url && !($clear_main || $clr_main))
 				$titlepic_url = $art["pic_url"];
 			list($width, $height) = PicSize($titlepic_url);
+			global $ed_title_force;
+			if ($titlepic_url && !$ed_titlepic_pos && !$ed_title_force) $ed_warning = 2;
 			$i = 1;
 			while (isset(${"ed_text_id_".$i})) {
 				$id = ${"ed_text_id_".$i};
@@ -278,8 +281,8 @@
 				array_push($ed_pgfs, array(-1, "", "", -1, "", "", "", "", 0, 0, 0, true));
 		}
 		$ed_text = array();
-		$ed_empties = false;
 		$ed_records = array();
+		$ed_warnings = ($ed_warning ? true : false);
 		$i = 1;
 		while (list($key, $val) = each($ed_pgfs)) {
 			list($id, $txt, $tit, $lev, $cls, $pic, $name, $alt, $pos, $w, $h, $new) = $val;
@@ -299,10 +302,14 @@
 			if (!$name) $name = $picurl;
 			$txt = MyEscape($txt);
 			$txt2 = ParseNewline($txt);
+			global ${"ed_text_force_".$i};
+			$force = ${"ed_text_force_".$i};
 			$empty = (($ed_preview && !$txt && !$pos && !$new) ? true : false);
+			$warning = 0;
+			if ($empty && !$force) $warning = 1;
+			if ($picurl && !$pos && !$force) $warning = 2;
 			$ed_empty = $ed_empty && $empty;
-			global ${"ed_text_force_".$i};
-			$ed_empties = $ed_empties || ($empty && !${"ed_text_force_".$i});
+			$ed_warnings = $ed_warnings || ($warning && !$force);
 			array_push($ed_text, array(
 				"id" => $id,
 				"n" => $i,
@@ -317,12 +324,12 @@
 				"width" => $w,
 				"height" => $h,
 				"pos" => $pos,
-				"empty" => $empty,
+				"warning" => $warning,
 				"clr" => (${"clear_".$i} || ${"clr_".$i} || !$picurl) ? true : false
 			));
 			$i++;
 		}
-		if ($ed_empties) $ed_preview = false;
+		if ($ed_warnings) $ed_preview = false;
 		$tp->assign("ed_id", $ed_id);
 		$tp->assign("ed_cat", $ed_cat);
 		$tp->assign("ed_preview", $ed_preview);
@@ -340,8 +347,8 @@
 		$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);
-		$tp->assign("ed_empties", $ed_empties);
-		$tp->assign("ed_read", count($ed_text) > 1);
+		$tp->assign("ed_warning", $ed_warning);
+		$tp->assign("ed_warnings", $ed_warnings);
 		$tp->assign("ed_records", $ed_records);
 		$tp->assign("newspicdir", "$picdir/");
 		$params = array();