Commit: f038854680d7bd625713757555bead86b789e1fe Author: Peter Kokot <peterko...@gmail.com> Tue, 18 Dec 2018 19:55:20 +0100 Parents: 7203dec380656b953170f5aa63f4d271c2801f65 Branches: master
Link: http://git.php.net/?p=web/bugs.git;a=commitdiff;h=f038854680d7bd625713757555bead86b789e1fe Log: Remove unneeded check for database handle presence This check(s) were once used in previous code for local testings. Changed paths: M scripts/cron/no-feedback Diff: diff --git a/scripts/cron/no-feedback b/scripts/cron/no-feedback index 25f15b5..55fb7d6 100755 --- a/scripts/cron/no-feedback +++ b/scripts/cron/no-feedback @@ -14,44 +14,41 @@ $after = "7 DAY"; $in = ['status' => 'No Feedback']; # Update relevant reports -if ($dbh) +$reasonRepository = new ReasonRepository($dbh); + +list($RESOLVE_REASONS, $FIX_VARIATIONS) = $reasonRepository->findByProject($site); + +$res = $dbh->prepare(" + SELECT id, package_name, bug_type, email, passwd, sdesc, ldesc, php_version, + php_os, status, ts1, ts2, assign, UNIX_TIMESTAMP(ts1) AS submitted, + private, reporter_name, UNIX_TIMESTAMP(ts2) AS modified + FROM bugdb + WHERE status = 'Feedback' AND ts2 < DATE_SUB(NOW(), INTERVAL {$after}) +")->execute([]); + +while ($bug = $res->fetch()) { - $reasonRepository = new ReasonRepository($dbh); - - list($RESOLVE_REASONS, $FIX_VARIATIONS) = $reasonRepository->findByProject($site); - - $res = $dbh->prepare(" - SELECT id, package_name, bug_type, email, passwd, sdesc, ldesc, php_version, - php_os, status, ts1, ts2, assign, UNIX_TIMESTAMP(ts1) AS submitted, - private, reporter_name, UNIX_TIMESTAMP(ts2) AS modified - FROM bugdb - WHERE status = 'Feedback' AND ts2 < DATE_SUB(NOW(), INTERVAL {$after}) - ")->execute([]); - - while ($bug = $res->fetch()) - { - list($mailto, $mailfrom, $bcc, $params) = get_package_mail($bug['package_name'], false, $bug['bug_type']); - - // No feedback message - if (isset($FIX_VARIATIONS) && isset($FIX_VARIATIONS['nofeedback'][$bug['package_name']])) { - $message = $FIX_VARIATIONS['nofeedback'][$bug['package_name']]; - } elseif (isset($RESOLVE_REASONS['nofeedback'])) { - $message = $RESOLVE_REASONS['nofeedback']['message']; - } else { - die('[no-feedback] Could not find resolve reason! (this should not happen!)'); - } - bugs_add_comment($bug['id'], $mailfrom, '', $message, 'comment'); - - // Update status - $dbh->prepare(' - UPDATE bugdb - SET status = "No Feedback", ts2 = NOW() - WHERE id = ? - ')->execute([ - $bug['id'], - ]); - - // Send emails - mail_bug_updates($bug, $in, $mailfrom, $message); + list($mailto, $mailfrom, $bcc, $params) = get_package_mail($bug['package_name'], false, $bug['bug_type']); + + // No feedback message + if (isset($FIX_VARIATIONS) && isset($FIX_VARIATIONS['nofeedback'][$bug['package_name']])) { + $message = $FIX_VARIATIONS['nofeedback'][$bug['package_name']]; + } elseif (isset($RESOLVE_REASONS['nofeedback'])) { + $message = $RESOLVE_REASONS['nofeedback']['message']; + } else { + die('[no-feedback] Could not find resolve reason! (this should not happen!)'); } + bugs_add_comment($bug['id'], $mailfrom, '', $message, 'comment'); + + // Update status + $dbh->prepare(' + UPDATE bugdb + SET status = "No Feedback", ts2 = NOW() + WHERE id = ? + ')->execute([ + $bug['id'], + ]); + + // Send emails + mail_bug_updates($bug, $in, $mailfrom, $message); } -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php