Skip to content
Permalink
Browse files

merged 2.2.1

  • Loading branch information...
RocketMan committed Jul 3, 2019
2 parents 7b4a7d0 + a708e25 commit 1a76e1952d48b7c05609ad383560b02c8a13b340
Showing with 27 additions and 10 deletions.
  1. +3 −1 config/config.kzsu.php
  2. +3 −3 custom/KzsuContacts.php
  3. +1 −1 engine/impl/User.php
  4. +20 −5 ui/Charts.php
@@ -38,7 +38,7 @@
'reviewlist' => '',
],
'md_name' => 'Juan Luna-Avin, Sarah Thomas', // TBD move me to db
'md_name' => 'Juan Luna-Avin et al.', // TBD move me to db
/**
* Local subnet
@@ -189,6 +189,8 @@
* 0 to limit spin count per show; 1 to limit spin count per DJ
*/
'apply_limit_per_dj' => 1,
'weekly_subscribe' => "https://mailman.stanford.edu/mailman/listinfo/weekly-charts",
'monthly_subscribe' => "https://mailman.stanford.edu/mailman/listinfo/monthly-charts",
'weekly_footer' => "\n\n--\n
If you ever want to remove yourself from this mailing list,
visit https://mailman.stanford.edu/mailman/listinfo/weekly-charts.\n
@@ -72,7 +72,7 @@ public function emitContacts() {
<TABLE BORDER=0 WIDTH="100%">
<TR>
<TD ALIGN="left" VALIGN="top">
<B>Music Director:</B><BR> <A HREF="mailto:music@kzsu.stanford.edu">Sarah Thomas</A><BR><BR><!--BR-->
<B>Music Directors:</B><BR> <A HREF="mailto:music@kzsu.stanford.edu">Madeline Casas / Bill Cuevas /<BR>Maryam Khademi / Juan Luna-Avin</A><BR><BR><!--BR-->
<B>Hip-hop Directors:</B><BR> <A HREF="mailto:hiphop@kzsu.stanford.edu">Mike McDowell, Johnathan Martin</A><BR>
<I>Office Hours:</I> Thursday 6-9pm<BR><BR>
<B>Jazz Director:</B> <A HREF="mailto:jazz@kzsu.stanford.edu">Tom McCarter</A><BR>
@@ -81,14 +81,14 @@ public function emitContacts() {
<I>Office Hours:</I> Sunday noon-4<BR><BR>
<B>RPM/Electronica Director:</B> <A HREF="mailto:rpm@kzsu.stanford.edu">Johnathan Martin</A><BR>
<I>Office Hours:</I> tba<BR><BR>
<B>Reggae Director:</B> <A HREF="mailto:reggae@kzsu.stanford.edu">Sadie McFarlane</A><BR>
<B>Reggae Director:</B> <A HREF="mailto:reggae@kzsu.stanford.edu">Margy Kahn</A><BR>
<I>Office Hours:</I> tba<BR><BR>
</TD>
<TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
<TD ALIGN="left" VALIGN="bottom">
<B>Classical Director:</B> <A HREF="mailto:classical@kzsu.stanford.edu">Larry Koran</A><BR>
<I>Office Hours:</I> tba<BR><BR>
<B>World Directors:</B> <A HREF="mailto:world@kzsu.stanford.edu">Margy Kahn, Kamla Bhatt</A><BR>
<B>World Directors:</B> <A HREF="mailto:world@kzsu.stanford.edu">Margy Kahn</A><BR>
<I>Office Hours:</I> tba<BR><BR>
<B>Blues Director:</B> <A HREF="mailto:blues@kzsu.stanford.edu">Byrd Hale</A><BR>
<I>Office Hours:</I> Wednesday 6-9pm, Saturday 9-noon<BR><BR>
@@ -251,7 +251,7 @@ public function insertUser($user, $password, $realname, $groups, $expiration) {
$stmt->bindValue(2, $salt.md5($salt.$password));
$stmt->bindValue(3, $realname);
$stmt->bindValue(4, $groups);
$stmt->bindValue(5, $expiration);
$stmt->bindValue(5, $expiration?$expiration:'0000-00-00');
$stmt->execute();
return ($stmt->rowCount() > 0);
}
@@ -698,6 +698,11 @@ function copymetasearch() {
public function emitSubscribe() {
$station = Engine::param('station');
$chart = Engine::param('chart');
$weeklyPage = array_key_exists('weekly_subscribe', $chart)?
$chart['weekly_subscribe']:"";
$monthlyPage = array_key_exists('monthly_subscribe', $chart)?
$chart['monthly_subscribe']:"";
?>
<P>
The <?php echo $station; ?> Music Department maintains two e-mail lists:</P>
@@ -706,18 +711,28 @@ public function emitSubscribe() {
<LI><B>Weekly Charts e-mail list</B> - Each week, the number of plays of
the releases in rotation are tallied up, and a chart is made showing a
ranked list of the most played stuff on our airwaves for that week.
This is what's reported to the trades (CMJ, Gavin, etc). If you'd like
to receive this chart each week by e-mail, please visit the Weekly Charts page.
This is what's reported to the trades (CMJ, Gavin, etc). <?php
if($weeklyPage) {
echo "If you'd like\n to receive this chart each week by e-mail, ";
echo "please visit the\n ";
echo "<A HREF=\"$weeklyPage\">Weekly Charts</A> page.\n";
}
?>

<LI><B>Monthly Charts e-mail list</B> - Each month, the number of plays
of the releases in rotation for the previous month are tallied up, and
a chart is made showing a ranked list of the most played stuff on our
airwaves for that month. If you'd like to receive this chart each week
by e-mail, please visit the Monthly Charts page.
airwaves for that month. <?php
if($monthlyPage) {
echo "If you'd like to receive this chart each week\n ";
echo "by e-mail, please visit the <A HREF=\"$monthlyPage\">Monthly Charts</A> page.\n";
}
?>
</UL>

<P>These mailing lists are one-way lists, which means you'll receive
e-mail only from <?php echo $station; ?>. Any reply by a subscriber will return to <?php echo $station; ?>

but will not be sent to everyone else on the list. Also, each
subscriber's e-mail address is suppressed from the header so other
subscribers can't collect the addresses to create a spamming list.</P>
@@ -728,7 +743,7 @@ public function emitSubscribe() {
<?php
$email = Engine::param('email')['md'];
if($email)
echo " <P>Any questions can be sent to <A HREF=\"mailto:$email\">$email</A>.</P>\n";
echo "<P>Any questions can be sent to <A HREF=\"mailto:$email\">$email</A>.</P>\n";
UI::setFocus();
}
}

0 comments on commit 1a76e19

Please sign in to comment.
You can’t perform that action at this time.