Archived
4
2

Compare commits

..

2 Commits

Author SHA1 Message Date
83d9156f17
Fix file existence logic for get_avatar MACRO
Test for existence on filesystem
2022-08-01 20:19:44 -04:00
d4e8422677
Fix listing of shows on HPR front page
Fix the number of shows listed by quantity not date.
2022-08-01 18:54:01 -04:00
4 changed files with 26 additions and 14 deletions

View File

@ -32,7 +32,7 @@
<!--% this_host = hosts.$id %--> <!--% this_host = hosts.$id %-->
<h2 class="title">Correspondent</h2> <h2 class="title">Correspondent</h2>
<h2><!--% this_host.host %--></h2> <h2><!--% this_host.host %--></h2>
<p><img src="./images/<!--% get_avatar(this_host.local_image, this_host.hostid) %-->" <p><img src="./images/<!--% get_avatar(this_host.hostid) %-->"
height="80" alt="Host Image" /><br> height="80" alt="Host Image" /><br>
<label>Host ID</label>: <!--% this_host.hostid %--><br><br> <label>Host ID</label>: <!--% this_host.hostid %--><br><br>
<label>email:</label> <u><!--% this_host.email %--></u><br> <label>email:</label> <u><!--% this_host.email %--></u><br>

View File

@ -17,7 +17,7 @@
on h.hostid = e.hostid ' on h.hostid = e.hostid '
) %--> ) %-->
<tr height="80" bgcolor="#CCCCCC"> <tr height="80" bgcolor="#CCCCCC">
<td><img src="./images/<!--% get_avatar(host.local_image, host.hostid) %-->" height="80" width="80" alt="avatar" /></td> <td><img src="./images/<!--% get_avatar(host.hostid) %-->" height="80" width="80" alt="avatar" /></td>
<td><strong><!--% host.host %--></strong><br /> <td><strong><!--% host.host %--></strong><br />

View File

@ -1,4 +1,5 @@
<!--% PROCESS 'shared-avatar.tpl.html' %--> <!--% PROCESS 'shared-avatar.tpl.html' %-->
<!--% PROCESS 'shared-utils.tpl.html' %-->
<hr> <hr>
<article> <article>
<header> <header>
@ -28,20 +29,25 @@
CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit , CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
eps.date, eps.license, eps.duration, eps.date, eps.license, eps.duration,
eps.title, eps.summary, eps.tags, eps.title, eps.summary, eps.tags,
eps.series, eps.notes, eps.notes,
hosts.local_image, hosts.local_image,
hosts.hostid, hosts.hostid,
hosts.host, hosts.email hosts.host, hosts.email,
FROM eps INNER JOIN hosts ON eps.hostid = hosts.hostid miniseries.name AS series
WHERE eps.date BETWEEN date(\'now\', \'-7 days\') AND date(\'now\') FROM eps
ORDER BY date DESC ') INNER JOIN hosts ON eps.hostid = hosts.hostid
INNER JOIN miniseries ON eps.series = miniseries.id
WHERE eps.date < date(\'now\', \'+1 days\')
ORDER BY date DESC
LIMIT 10
')
%--> %-->
<hr> <hr>
<article> <article>
<header> <header>
<h1><a href="episodes/hpr<!--% latest_episodes.id %-->.html">hpr<!--% latest_episodes.id %--> :: <!--% latest_episodes.title %--></a></h1> <h1><a href="episodes/hpr<!--% latest_episodes.id %-->.html">hpr<!--% latest_episodes.id %--> :: <!--% latest_episodes.title %--></a></h1>
<h3><!--% latest_episodes.summary%--></h3> <h3><!--% latest_episodes.summary%--></h3>
<p class="meta"$><img src="./images/<!--% get_avatar(latest_episodes.local_image, latest_episodes.hostid) %-->" height="80" width="80" alt="" /></a><br>Hosted by <a href="correspondents/host<!--% latest_episodes.host_id %-->.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% latest_episodes.explicit %--> and released under a <!--% latest_episodes.license %--> license. <br> <p class="meta"$><img src="./images/<!--% get_avatar(latest_episodes.hostid) %-->" height="80" width="80" alt="" /></a><br>Hosted by <a href="correspondents/<!--% zero_pad_left(latest_episodes.host_id) %-->/index.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% latest_episodes.explicit %--> and released under a <!--% latest_episodes.license %--> license. <br>
<strong>Tags:</strong> <!--% latest_episodes.tags %--><em></em>.<br> <strong>Tags:</strong> <!--% latest_episodes.tags %--><em></em>.<br>
<small>listen in <a href="local/hpr<!--% latest_episodes.id %-->.ogg">ogg</a>, <a href="local/hpr<!--% latest_episodes.id %-->.spx">spx</a>, or <a href="local/hpr<!--% latest_episodes.id %-->.mp3">mp3</a> format. <!--% show_series(latest_episodes.series) %--> <small>listen in <a href="local/hpr<!--% latest_episodes.id %-->.ogg">ogg</a>, <a href="local/hpr<!--% latest_episodes.id %-->.spx">spx</a>, or <a href="local/hpr<!--% latest_episodes.id %-->.mp3">mp3</a> format. <!--% show_series(latest_episodes.series) %-->
<a href="eps.php?id=3628#comments">comments (0)</a></small> <a href="eps.php?id=3628#comments">comments (0)</a></small>
@ -73,12 +79,16 @@ ORDER BY date DESC ')
substr(\'0000\' || eps.id, -4, 4) AS [id], substr(\'0000\' || eps.id, -4, 4) AS [id],
CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit , CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
eps.date, eps.license, eps.title, eps.summary, eps.date, eps.license, eps.title, eps.summary,
eps.series, eps.duration, eps.notes, eps.tags, eps.duration, eps.notes, eps.tags,
substr(\'0000\' || hosts.hostid, -4, 4) AS [hostid], substr(\'0000\' || hosts.hostid, -4, 4) AS [hostid],
hosts.host, hosts.email, hosts.local_image hosts.host, hosts.email, hosts.local_image,
FROM eps INNER JOIN hosts ON eps.hostid = hosts.hostid miniseries.name AS series
WHERE eps.date BETWEEN date(\'now\', \'-35 days\') AND date(\'now\', \'-8 days\') FROM eps
INNER JOIN hosts ON eps.hostid = hosts.hostid
INNER JOIN miniseries ON eps.series = miniseries.id
WHERE eps.date < date(\'now\', \'+1 days\')
ORDER BY date DESC ORDER BY date DESC
LIMIT 30 OFFSET 10
') ')
%--> %-->
<!--% show_summary(last_5_weeks_episodes) %--> <!--% show_summary(last_5_weeks_episodes) %-->

View File

@ -1,3 +1,5 @@
<!--% MACRO get_avatar(has_avatar, host_id) BLOCK %--> <!--% MACRO get_avatar(host_id) BLOCK %-->
<!--% IF has_avatar == 0 %-->hpr_logo.png<!--% ELSE %-->hosts/<!--% host_id %-->.png<!--% END %--> <!--% TRY %-->
<!--% USE File ("./public_html/images/hosts/${host_id}.png") %-->hosts/<!--% File.name %-->
<!--% CATCH File %-->hpr_logo.png<!--% END %-->
<!--% END %--> <!--% END %-->