From 5184524480f39a76f89f6de59c4a5f21c778ae33 Mon Sep 17 00:00:00 2001
From: short <>
Date: Tue, 8 Oct 2002 21:48:49 +0000
Subject: [PATCH] energie_obsah.contents now permitted NULL to show just the
 title image

---
 common.php    | 10 ++++++----
 obsah.php     |  6 +++---
 obsah_init.pl |  7 ++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/common.php b/common.php
index 34f3ec6..85835de 100644
--- a/common.php
+++ b/common.php
@@ -245,7 +245,7 @@ function title_month($year,$month)
 			);
 }
 
-function title_icons_table_month($year,$month,$month_last,$sequential)
+function title_icons_table_month($year,$month,$month_last,$sequential,$has_contents)
 {
 	global $tb_clanek;
 
@@ -256,7 +256,9 @@ function title_icons_table_month($year,$month,$month_last,$sequential)
 				.img($month_a["icon"],"titulní stránka ".$month_a["name_full"])."</td></tr>\n"
 			."<tr><td align=\"left\" valign=\"top\" class=\"nowrap\">\n"
 				."&bull;&nbsp;<a href=\"title.php?year=$year&amp;month=$month\">titulní strana</a><br />\n"
-				."&bull;&nbsp;<a href=\"obsah.php?year=$year&amp;month=$month\">obsah</a><br />\n");
+			);
+	if ($has_contents)
+		print("&bull;&nbsp;<a href=\"obsah.php?year=$year&amp;month=$month\">obsah</a><br />\n");
 	$result=db_query("select name,id from $tb_clanek where year=$year and month=$month order by id");
 	while ($row=mysql_fetch_array($result))
 		print("&bull;&nbsp;<a href=\"clanek.php?year=$year&amp;month=$month&amp;id=".$row["id"]."\">"
@@ -275,7 +277,7 @@ function title_icons($year,$month)
 		.(isset($year) ? "</a>" : "")
 		."</h2>\n");
 
-	$result=db_query("select year,month,month_last,sequential from $tb_obsah"
+	$result=db_query("select year,month,month_last,sequential,contents is not null as has_contents from $tb_obsah"
 			.(isset($year) || isset($month) ? " where" : "")
 			.(isset($year ) ? " year=$year"   : "")
 			.(isset($year) && isset($month) ? " and" : "")
@@ -321,7 +323,7 @@ function title_icons($year,$month)
 		print("<td align=\"center\" valign=\"top\""
 				.($row["month_last"]!=$row["month"] ? " colspan=\"".($row["month_last"]+1-$row["month"])."\"" : "")
 				.">");
-		title_icons_table_month($year,$row["month"]+1,$row["month_last"]+1,$row["sequential"]);
+		title_icons_table_month($year,$row["month"]+1,$row["month_last"]+1,$row["sequential"],$row["has_contents"]);
 		print("</td>\n");
 		$month=$row["month_last"];
 		}
diff --git a/obsah.php b/obsah.php
index eb262e1..f1737c9 100644
--- a/obsah.php
+++ b/obsah.php
@@ -28,9 +28,9 @@
 
 	print("<h1>$title_tail</h1>\n");
 
-	$result=db_query("select year,month,month_last,contents from $tb_obsah"
-			.($year  ? " where year=$year"   : "")
-			.($month ?   " and month=$month" : "")
+	$result=db_query("select year,month,month_last,contents from $tb_obsah where contents is not null"
+			.($year  ? " and year=$year"   : "")
+			.($month ? " and month=$month" : "")
 			." order by year,month"
 			);
 	if (!mysql_num_rows($result))
diff --git a/obsah_init.pl b/obsah_init.pl
index d2ded01..1f7be33 100755
--- a/obsah_init.pl
+++ b/obsah_init.pl
@@ -37,7 +37,7 @@ eval { &db_do("drop table $tb_obsah") };
 		."month tinyint not null,"
 		."month_last tinyint not null,"
 		."sequential smallint not null,"
-		."contents text not null"
+		."contents text null"
 		.")");
 
 &db_do("alter table $tb_obsah add unique (year,month)");
@@ -66,7 +66,8 @@ sub flush_month
 	$_=$contents;
 	return if !defined $_;
 	if (!$_) {
-		print("Empty contents".&where()."!\n");
+		# Permitted to show just the title image
+		#print("Empty contents".&where()."!\n");
 		}
 	else {
 		tr/ \t\n/  \n/s;
@@ -76,7 +77,7 @@ sub flush_month
 		tr/\002//d;
 		$_=substr($_,1);
 		}
-	$insert_tb_obsah->execute($year,$month,$month_last,$sequential,$_) or die "SQL insert failure: $!";
+	$insert_tb_obsah->execute($year,$month,$month_last,$sequential,($_ || undef())) or die "SQL insert failure: $!";
 	undef $year,$month;
 	undef $contents;
 	undef $first;
-- 
1.8.3.1