cvs: docweb /include/rfc rfc.php /www/rfc rfc-proposal-edit.php

vincent		Sat Jul 30 12:17:19 2005 EDT

  Modified files:              
    /docweb/include/rfc	rfc.php 
    /docweb/www/rfc	rfc-proposal-edit.php 
  Log:
  never allow users to vote on there own proposal
  
  
http://cvs.php.net/diff.php/docweb/include/rfc/rfc.php?r1=1.18&r2=1.19&ty=u
Index: docweb/include/rfc/rfc.php
diff -u docweb/include/rfc/rfc.php:1.18 docweb/include/rfc/rfc.php:1.19
--- docweb/include/rfc/rfc.php:1.18	Sat Jul 30 06:32:19 2005
+++ docweb/include/rfc/rfc.php	Sat Jul 30 12:17:19 2005
@@ -24,7 +24,7 @@
  * @author    Daniel Convissor <[email protected]>
  * @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.18 2005/07/30 10:32:19 vincent Exp $
+ * @version   $Id: rfc.php,v 1.19 2005/07/30 16:17:19 vincent Exp $
  */
 
 $path = realpath(dirname(__FILE__));
@@ -621,9 +621,7 @@
 
         if ($this->getStatus() == 'vote' &&
             !ppVote::hasVoted($dbh, $userHandle, $this->id) &&
-            (!$this->isOwner($userHandle) ||
-             ($this->isOwner($userHandle) &&
-              $this->pkg_category == 'RFC')))
+            !$this->isOwner($userHandle))
         {
             return true;
         } else {
http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-edit.php?r1=1.14&r2=1.15&ty=u
Index: docweb/www/rfc/rfc-proposal-edit.php
diff -u docweb/www/rfc/rfc-proposal-edit.php:1.14 docweb/www/rfc/rfc-proposal-edit.php:1.15
--- docweb/www/rfc/rfc-proposal-edit.php:1.14	Fri Jul 29 07:24:49 2005
+++ docweb/www/rfc/rfc-proposal-edit.php	Sat Jul 30 12:17:19 2005
@@ -22,7 +22,7 @@
  * @author    Daniel Convissor <[email protected]>
  * @copyright Copyright (c) 1997-2004 The PHP Group
  * @license   http://www.php.net/license/3_0.txt  PHP License
- * @version   $Id: rfc-proposal-edit.php,v 1.14 2005/07/29 11:24:49 vincent Exp $
+ * @version   $Id: rfc-proposal-edit.php,v 1.15 2005/07/30 16:17:19 vincent Exp $
  */
 
 /**
@@ -82,7 +82,7 @@
                      . ' probably due to it having reached the "'
                      . $proposal->getStatus(true) . '" phase.'
                      . ' If this MUST be edited, contact someone ELSE'
-                     . ' who has pear.pepr.admin karma.');
+                     . ' who has admin karma.');
         site_footer();
         exit;
     }
@@ -280,6 +280,7 @@
             if ($_FILES['thefile']['size'] >= round((1024 * 1024)/10)) {
                 report_error('The file should NOT be bigger then 100kb, please upload
                               it somewhere and link to it');
+                unlink($_FILES['thefile']['tmp_name']);
             } else {
                 $filehash = md5($_FILES['thefile']['name'] . time());
                 move_uploaded_file($_FILES['thefile']['tmp_name'],