X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=obsah.php;h=1213d27066204af966dc89595354e74a22bb105e;hb=b38a94c5d4fc9d794b34628974632b0172897538;hp=3a8f994b76cebb22a1bf7b7464db2dddcf642807;hpb=1fefc86af15388c530a7b979fc079f203469341e;p=www.energie.vellum.cz.git

diff --git a/obsah.php b/obsah.php
index 3a8f994..1213d27 100644
--- a/obsah.php
+++ b/obsah.php
@@ -13,8 +13,10 @@
 		$title_tail="Obsahy v¹ech èísel";
 	else if (!$month)
 		$title_tail="Obsahy èísel roku $year";
-	else
-		$title_tail="Obsah èísla $year/".month_full($year,$month);
+	else {
+		$month_a=month_a($year,$month);
+		$title_tail="Obsah èísla ".$month_a["name_full"];
+		}
 
 	$head_css="
 .page { font-style: italic; }
@@ -22,24 +24,40 @@
 	heading();
 	print("<h1>$title_tail</h1>\n");
 
-	db_connect();
 	$result=db_query("select year,month,month_last,contents from $tb_obsah"
-			.($year  ? " where year='$year'"   : "")
-			.($month ?   " and month='$month'" : "")
+			.($year  ? " where year=$year"   : "")
+			.($month ?   " and month=$month" : "")
 			." order by year,month"
 			);
 	if (!mysql_num_rows($result))
 		fatal("Obsah po¾adovan".($month ? "ého èísla" : "ých èísel")." bohu¾el není ulo¾en");
 	while ($row=mysql_fetch_array($result)) {
-		if (!$month)
-			print("<h2>Èíslo ".$row["year"]."/".month_full($row["year"],$row["month"],$row["month_last"])."</h2>\n");
-		$contents=htmlspecialchars($sep_obsah_contents.$row["contents"]);
+		if (!$month) {
+			$month_a=month_a($row["year"],$row["month"],$row["month_last"]);
+			print("<h2>Èíslo ".$month_a["name_full"]."</h2>\n");
+			}
+		$contents=$sep_obsah_contents.$row["contents"];
+
+		$article_result=db_query("select name,id from $tb_clanek"
+				." where  year=".$row[ "year"]
+				.  " and month=".$row["month"]
+				);
+		while ($article_row=mysql_fetch_array($article_result))
+			$contents=ereg_replace("$sep_obsah_contents(".quotemeta($article_row["name"]).")$page_obsah_contents",
+					"$sep_obsah_contents"
+							."<a href=\"clanek.php?year=".$row["year"]."&amp;month=".$row["month"]."&amp;id=".$article_row["id"]."\">"
+							."\\1</a>"
+					."$page_obsah_contents",$contents);
+		mysql_free_result($article_result);
+
 		$contents=ereg_replace("http://[^[:space:]$page_obsah_contents$sep_obsah_contents]+",
 				"<a href=\"\\0\">\\0</a>",$contents);
-		$contents=ereg_replace("$page_obsah_contents([^$sep_obsah_contents]+)",
-				"<br /><div class=\"page\">strana ... \\1</div>",$contents);
+		$contents=ereg_replace("$page_obsah_contents([^$sep_obsah_contents$appendix_obsah_contents]+)",
+				"<br /><span class=\"page\">strana ... \\1</span>",$contents);
 		$contents=ereg_replace("\n","<br />\n\t\t",$contents);
-		$contents=ereg_replace("$sep_obsah_contents([^$sep_obsah_contents]*)","\t<li>\\1</li>\n",$contents);
+		$contents=ereg_replace("$sep_obsah_contents([^$sep_obsah_contents$appendix_obsah_contents]*)","\t<li>\\1</li>\n",$contents);
+		if (1<count($contents_a=split("$appendix_obsah_contents",$contents,2)))
+			$contents=$contents_a[0]."\t<li>Pøílohy:<ul>\n".ereg_replace("\t","\t\t",$contents_a[1])."\t</ul></li>\n";
 		print("<ul>\n$contents</ul>\n");
 		}
 	mysql_free_result($result);