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

From: Date: Fri, 29 Jul 2005 12:47:15 +0000
Subject: cvs: docweb /include/rfc rfc-config.php rfc.php /www/rfc rfc-proposal-delete.php rfc-votes-show.php
Groups: php.doc.web 
Request: Send a blank email to doc-web+get-692@lists.php.net to get a copy of this message
vincent Fri Jul 29 08:47:15 2005 EDT Modified files: /docweb/include/rfc rfc-config.php rfc.php /docweb/www/rfc rfc-proposal-delete.php rfc-votes-show.php Log: Removing 'Testing' parts. the emails it will mail are not perfect yet.. http://cvs.php.net/diff.php/docweb/include/rfc/rfc-config.php?r1=1.3&r2=1.4&ty=u Index: docweb/include/rfc/rfc-config.php diff -u docweb/include/rfc/rfc-config.php:1.3 docweb/include/rfc/rfc-config.php:1.4 --- docweb/include/rfc/rfc-config.php:1.3 Sun Sep 5 02:36:08 2004 +++ docweb/include/rfc/rfc-config.php Fri Jul 29 08:47:13 2005 @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ | Authors: Vincent Gevers <vincent@php.net> | +----------------------------------------------------------------------+ -$Id: rfc-config.php,v 1.3 2004/09/05 06:36:08 sean Exp $ +$Id: rfc-config.php,v 1.4 2005/07/29 12:47:13 vincent Exp $ */ /* @@ -48,7 +48,7 @@ * To override default, set the value in $_SERVER['PROPOSAL_MAIL_PEAR_DEV'] * before this file is included. */ - define('PROPOSAL_MAIL_DOC_DEV', 'PHP Documentation <vincent@php.net>'); + define('PROPOSAL_MAIL_DOC_DEV', 'PHP Documentation <doc-web@lists.php.net>'); } if (isset($_SERVER['PROPOSAL_MAIL_DOC_GROUP'])) { @@ -65,7 +65,7 @@ * To override default, set the value in $_SERVER['PROPOSAL_MAIL_PEAR_GROUP'] * before this file is included. */ - define('PROPOSAL_MAIL_DOC_GROUP', 'Documentation Group <vincent@php.net>'); + define('PROPOSAL_MAIL_DOC_GROUP', 'Documentation Group <doc-web@lists.php.net>'); } if (isset($_SERVER['PROPOSAL_MAIL_FROM'])) { @@ -80,7 +80,7 @@ * To override default, set the value in $_SERVER['PROPOSAL_MAIL_FROM'] * before this file is included. */ - define('PROPOSAL_MAIL_FROM', 'RFC System <vincent@php.net>'); + define('PROPOSAL_MAIL_FROM', 'RFC System <doc-web@lists.php.net>'); } /** http://cvs.php.net/diff.php/docweb/include/rfc/rfc.php?r1=1.13&r2=1.14&ty=u Index: docweb/include/rfc/rfc.php diff -u docweb/include/rfc/rfc.php:1.13 docweb/include/rfc/rfc.php:1.14 --- docweb/include/rfc/rfc.php:1.13 Fri Jul 29 07:24:49 2005 +++ docweb/include/rfc/rfc.php Fri Jul 29 08:47:13 2005 @@ -24,7 +24,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.php,v 1.13 2005/07/29 11:24:49 vincent Exp $ + * @version $Id: rfc.php,v 1.14 2005/07/29 12:47:13 vincent Exp $ */ $path = realpath(dirname(__FILE__)); @@ -715,11 +715,11 @@ } function delete(&$dbh) - { // !!! + { if (empty($this->id)) { return PEAR::raiseError("Proposal does not exist!"); } - return true; // !!! for testing + $sql = "DELETE FROM package_proposals WHERE id = ".$this->id; $res = $dbh->query($sql); if (DB::isError($res)) { @@ -773,8 +773,8 @@ $prefix = ""; } $prefix = PROPOSAL_EMAIL_PREFIX . $prefix . " "; - $actorinfo = $user_handle; // !!! - $ownerinfo = $this->user_handle; // !!! + $actorinfo = array('name' => $user_handle, 'email' => 'doc-web@lists.php.net', 'handle' => $user_handle); // !!! + $ownerinfo = array('name' => $this->user_handle, 'email' => 'doc-web@lists.php.net', 'handle' => $this->user_handle); // !!! $this->getVotes($dbh); $vote = @$this->votes[$user_handle]; @@ -1037,11 +1037,10 @@ if (empty($this->comment)) { $this->comment = '-'; } - // !!! - // $this->user_handle.time() is a hack, remove '.time()' after karma system works + $sql = "INSERT INTO package_proposal_votes (pkg_prop_id, user_handle, value, is_conditional, comment, reviews, timestamp) VALUES (".$proposalId.", - ".$dbh->quoteSmart($this->user_handle.time()).", + ".$dbh->quoteSmart($this->user_handle).", ".$this->value.", ".(int)$this->is_conditional.", ".$dbh->quoteSmart($this->comment).", ".$dbh->quoteSmart(serialize($this->reviews)).", http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-delete.php?r1=1.4&r2=1.5&ty=u Index: docweb/www/rfc/rfc-proposal-delete.php diff -u docweb/www/rfc/rfc-proposal-delete.php:1.4 docweb/www/rfc/rfc-proposal-delete.php:1.5 --- docweb/www/rfc/rfc-proposal-delete.php:1.4 Fri Jul 29 07:24:49 2005 +++ docweb/www/rfc/rfc-proposal-delete.php Fri Jul 29 08:47:14 2005 @@ -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-delete.php,v 1.4 2005/07/29 11:24:49 vincent Exp $ + * @version $Id: rfc-proposal-delete.php,v 1.5 2005/07/29 12:47:14 vincent Exp $ */ /** @@ -32,7 +32,7 @@ if (!empty($_GET['isDeleted'])) { echo site_header('RFC :: Delete'); echo "<h1>Delete Proposal</h1>\n"; - report_success('Proposal deleted successfully. (Disabled in testing mode)'); // !!! + report_success('Proposal deleted successfully.'); echo '<p>'; print_link('rfc-overview.php', 'Back to RFC Home Page'); echo "</p>\n"; http://cvs.php.net/diff.php/docweb/www/rfc/rfc-votes-show.php?r1=1.5&r2=1.6&ty=u Index: docweb/www/rfc/rfc-votes-show.php diff -u docweb/www/rfc/rfc-votes-show.php:1.5 docweb/www/rfc/rfc-votes-show.php:1.6 --- docweb/www/rfc/rfc-votes-show.php:1.5 Fri Jul 29 07:24:49 2005 +++ docweb/www/rfc/rfc-votes-show.php Fri Jul 29 08:47:15 2005 @@ -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.5 2005/07/29 11:24:49 vincent Exp $ + * @version $Id: rfc-votes-show.php,v 1.6 2005/07/29 12:47:15 vincent Exp $ */ /** @@ -58,7 +58,7 @@ array('size' => count($proposalReviewsMap), 'multiple' => 'multiple')); $form->addElement('static', '', '', - '<small>Note that you can only vote once!(Modified for testing!)<br />' // !!! + '<small>Note that you can only vote once!<br />' . 'For conditional votes, please leave a comment and' . ' vote +1 (<i>e.g.</i>, &quot;I\'m +1 if you' . ' change...&quot;).</small>');

« previous php.doc.web (#692) next »