cvs: docweb /include/rfc rfc-cron.php /www/rfc rfc-proposal-show.php rfc-votes-show.php

vincent Wed Aug 25 07:02:59 2004 EDT Modified files: /docweb/include/rfc rfc-cron.php /docweb/www/rfc rfc-proposal-show.php rfc-votes-show.php Log: more PEPr patches http://cvs.php.net/diff.php/docweb/include/rfc/rfc-cron.php?r1=1.1&r2=1.2&ty=u Index: docweb/include/rfc/rfc-cron.php diff -u docweb/include/rfc/rfc-cron.php:1.1 docweb/include/rfc/rfc-cron.php:1.2 --- docweb/include/rfc/rfc-cron.php:1.1 Wed Aug 18 17:25:26 2004 +++ docweb/include/rfc/rfc-cron.php Wed Aug 25 07:02:59 2004 @@ -22,11 +22,12 @@ * @author Tobias Schlitt <toby@php.net> * @copyright Copyright (c) 1997-2004 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License - * @version $Id: rfc-cron.php,v 1.1 2004/08/18 21:25:26 vincent Exp $ + * @version $Id: rfc-cron.php,v 1.2 2004/08/25 11:02:59 vincent Exp $ */ /* * This file needs to run every day + * the system expects it to run at 4 am */ require_once './../lib_general.inc.php'; http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-show.php?r1=1.3&r2=1.4&ty=u Index: docweb/www/rfc/rfc-proposal-show.php diff -u docweb/www/rfc/rfc-proposal-show.php:1.3 docweb/www/rfc/rfc-proposal-show.php:1.4 --- docweb/www/rfc/rfc-proposal-show.php:1.3 Thu Aug 19 08:29:32 2004 +++ docweb/www/rfc/rfc-proposal-show.php Wed Aug 25 07:02:59 2004 @@ -19,7 +19,7 @@ * @author Daniel Convissor <danielc@php.net> * @copyright Copyright (c) 1997-2004 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License - * @version $Id: rfc-proposal-show.php,v 1.3 2004/08/19 12:29:32 vincent Exp $ + * @version $Id: rfc-proposal-show.php,v 1.4 2004/08/25 11:02:59 vincent Exp $ */ /** @@ -113,10 +113,20 @@ echo ' (' . $proposalVotesSum['conditional'] . ' conditional)'; echo "</li>\n"; } elseif ($proposal->status == 'vote') { + // Cron job runs at 4 am + $pepr_end = mktime(4, 0, 0, date('m', $proposal->vote_date), + date('d', $proposal->vote_date), + date('Y', $proposal->vote_date)); + + if (date('H', $proposal->vote_date) > '03') { + // add a day + $pepr_end += 86400; + } + if ($proposal->longened_date) { - $pepr_end = $proposal->vote_date + (PROPOSAL_STATUS_VOTE_TIMELINE * 2); + $pepr_end += PROPOSAL_STATUS_VOTE_TIMELINE * 2; } else { - $pepr_end = $proposal->vote_date + PROPOSAL_STATUS_VOTE_TIMELINE; + $pepr_end += PROPOSAL_STATUS_VOTE_TIMELINE; } echo ' <li>Voting Will End: '; echo make_utc_date($pepr_end); http://cvs.php.net/diff.php/docweb/www/rfc/rfc-votes-show.php?r1=1.2&r2=1.3&ty=u Index: docweb/www/rfc/rfc-votes-show.php diff -u docweb/www/rfc/rfc-votes-show.php:1.2 docweb/www/rfc/rfc-votes-show.php:1.3 --- docweb/www/rfc/rfc-votes-show.php:1.2 Thu Aug 19 06:30:53 2004 +++ docweb/www/rfc/rfc-votes-show.php Wed Aug 25 07:02:59 2004 @@ -19,7 +19,7 @@ * @author Daniel Convissor <danielc@php.net> * @copyright Copyright (c) 1997-2004 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License - * @version $Id: rfc-votes-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ + * @version $Id: rfc-votes-show.php,v 1.3 2004/08/25 11:02:59 vincent Exp $ */ /** @@ -136,13 +136,21 @@ if ($form) { echo ' <td class="textcell" valign="top">' . "\n"; - + + // Cron job runs at 4 am + $pepr_end = mktime(4, 0, 0, date('m', $proposal->vote_date), + date('d', $proposal->vote_date), + date('Y', $proposal->vote_date)); + + if (date('H', $proposal->vote_date) > '03') { + // add a day + $pepr_end += 86400; + } + if ($proposal->longened_date) { - $pepr_end = $proposal->vote_date + - (PROPOSAL_STATUS_VOTE_TIMELINE * 2); + $pepr_end += PROPOSAL_STATUS_VOTE_TIMELINE * 2; } else { - $pepr_end = $proposal->vote_date + - PROPOSAL_STATUS_VOTE_TIMELINE; + $pepr_end += PROPOSAL_STATUS_VOTE_TIMELINE; } echo ' <p>Voting Will End approximately '; echo make_utc_date($pepr_end);