git://git.jankratochvil.net
/
www.energie.vellum.cz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
energie_obsah.contents now permitted NULL to show just the title image
[www.energie.vellum.cz.git]
/
common.php
diff --git
a/common.php
b/common.php
index
b755991
..
85835de
100644
(file)
--- a/
common.php
+++ b/
common.php
@@
-67,7
+67,7
@@
function fatal($msg="UNKNOWN")
{
global $admin_mail;
{
global $admin_mail;
- heading(false/*title*/
); // it is always saf
e
+ heading(false/*title*/
,false/*indexme*/); // notitle is always safe, don't index the error messag
e
print("\n<p> <br /> </p><hr /><h1 class=\"error\">Nastala chyba pøi zpracování: $msg!</h1>\n"
."<p>Mù¾ete tento problém nahlásit <a href=\"mailto:$admin_mail\">správci tohoto webu</a>.</p>\n");
footer();
print("\n<p> <br /> </p><hr /><h1 class=\"error\">Nastala chyba pøi zpracování: $msg!</h1>\n"
."<p>Mù¾ete tento problém nahlásit <a href=\"mailto:$admin_mail\">správci tohoto webu</a>.</p>\n");
footer();
@@
-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;
{
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"
."• <a href=\"title.php?year=$year&month=$month\">titulní strana</a><br />\n"
.img($month_a["icon"],"titulní stránka ".$month_a["name_full"])."</td></tr>\n"
."<tr><td align=\"left\" valign=\"top\" class=\"nowrap\">\n"
."• <a href=\"title.php?year=$year&month=$month\">titulní strana</a><br />\n"
- ."• <a href=\"obsah.php?year=$year&month=$month\">obsah</a><br />\n");
+ );
+ if ($has_contents)
+ print("• <a href=\"obsah.php?year=$year&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("• <a href=\"clanek.php?year=$year&month=$month&id=".$row["id"]."\">"
$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("• <a href=\"clanek.php?year=$year&month=$month&id=".$row["id"]."\">"
@@
-275,7
+277,7
@@
function title_icons($year,$month)
.(isset($year) ? "</a>" : "")
."</h2>\n");
.(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" : "")
.(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"])."\"" : "")
.">");
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"];
}
print("</td>\n");
$month=$row["month_last"];
}
@@
-710,7
+712,7
@@
function no_cache()
header("Pragma: no-cache"); // HTTP/1.0
}
header("Pragma: no-cache"); // HTTP/1.0
}
-function heading($title=
fals
e)
+function heading($title=
true,$indexme=tru
e)
{
global $msie_major,$mozilla_major,$title_tail,$head_css,$have_css,$head,$heading_done,$title_prefix,$force_charset;
{
global $msie_major,$mozilla_major,$title_tail,$head_css,$have_css,$head,$heading_done,$title_prefix,$force_charset;
@@
-755,6
+757,7
@@
h1,h2 { color: yellow; background-color: transparent; }
print(trim($head_css)."\n");
print("--></style>\n");
}
print(trim($head_css)."\n");
print("--></style>\n");
}
+ print('<meta name="robots" content="'.($indexme ? "" : "no" ).'index,follow" />'."\n");
if (isset($head))
print($head);
print("</head><body");
if (isset($head))
print($head);
print("</head><body");
@@
-762,8
+765,8
@@
h1,h2 { color: yellow; background-color: transparent; }
print(" bgcolor=\"black\" text=\"white\" link=\"aqua\" vlink=\"teal\"");
print(">\n");
if ($title)
print(" bgcolor=\"black\" text=\"white\" link=\"aqua\" vlink=\"teal\"");
print(">\n");
if ($title)
- print("<h1 class=\"centered\">"
+ print("<h1 class=\"centered\">
<a href=\"/\">
"
.img("img/eap-title.".(image_supported("image/png") ? "png" : "gif"),"Energie & Peníze")
.img("img/eap-title.".(image_supported("image/png") ? "png" : "gif"),"Energie & Peníze")
- ."</h1>\n");
+ ."</
a></
h1>\n");
}
?>
}
?>