cvs: docweb /include/rfc rfc.php /www/rfc rfc-comments-show.php rfc-vote-show.php rfc-votes-show.php
[email protected] ("Vincent Gevers")
| Newsgroups | php.doc.web |
|---|---|
| Message-ID | <cvsvincent1122719540@cvsserver> |
vincent Sat Jul 30 06:32:20 2005 EDT
Modified files:
/docweb/include/rfc rfc.php
/docweb/www/rfc rfc-comments-show.php rfc-vote-show.php
rfc-votes-show.php
Log:
more real name places
http://cvs.php.net/diff.php/docweb/include/rfc/rfc.php?r1=1.17&r2=1.18&ty=u
Index: docweb/include/rfc/rfc.php
diff -u docweb/include/rfc/rfc.php:1.17 docweb/include/rfc/rfc.php:1.18
--- docweb/include/rfc/rfc.php:1.17 Sat Jul 30 05:41:02 2005
+++ docweb/include/rfc/rfc.php Sat Jul 30 06:32: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.17 2005/07/30 09:41:02 vincent Exp $
+ * @version $Id: rfc.php,v 1.18 2005/07/30 10:32:19 vincent Exp $
*/
$path = realpath(dirname(__FILE__));
@@ -880,9 +880,15 @@
$headers .= "In-Reply-To: <proposal-" . $this->id . "@doc.php.net>\n";
}
- $res = mail($email['to'], $email['subject'], $email['text'],
+ if (DEVBOX == false) {
+ $res = mail($email['to'], $email['subject'], $email['text'],
$headers, '-f [email protected]'); // !!!
-
+ } else {
+ $res = true; // fake that everything is ok
+ }
+
+
+
if (!$res) {
return PEAR::raiseError('Could not send notification email.');
}
http://cvs.php.net/diff.php/docweb/www/rfc/rfc-comments-show.php?r1=1.6&r2=1.7&ty=u
Index: docweb/www/rfc/rfc-comments-show.php
diff -u docweb/www/rfc/rfc-comments-show.php:1.6 docweb/www/rfc/rfc-comments-show.php:1.7
--- docweb/www/rfc/rfc-comments-show.php:1.6 Fri Jul 29 15:31:13 2005
+++ docweb/www/rfc/rfc-comments-show.php Sat Jul 30 06:32:20 2005
@@ -19,7 +19,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-comments-show.php,v 1.6 2005/07/29 19:31:13 nlopess Exp $
+ * @version $Id: rfc-comments-show.php,v 1.7 2005/07/30 10:32:20 vincent Exp $
*/
/**
@@ -161,7 +161,7 @@
//$userInfos[$comment->user_handle] = user_name();
}
echo '<li><p style="margin: 0em 0em 0.3em 0em;">';
- echo make_link('/user/'.$comment->user_handle, $comment->user_handle);
+ echo make_link('/user/'.$comment->user_handle, user_name($comment->user_handle));
echo ' [' . make_utc_date($comment->timestamp) . ']</p>';
echo nl2br(htmlentities(trim($comment->comment))) . "\n</li>";
}
http://cvs.php.net/diff.php/docweb/www/rfc/rfc-vote-show.php?r1=1.4&r2=1.5&ty=u
Index: docweb/www/rfc/rfc-vote-show.php
diff -u docweb/www/rfc/rfc-vote-show.php:1.4 docweb/www/rfc/rfc-vote-show.php:1.5
--- docweb/www/rfc/rfc-vote-show.php:1.4 Sun Sep 12 03:39:02 2004
+++ docweb/www/rfc/rfc-vote-show.php Sat Jul 30 06:32:20 2005
@@ -19,7 +19,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-vote-show.php,v 1.4 2004/09/12 07:39:02 vincent Exp $
+ * @version $Id: rfc-vote-show.php,v 1.5 2005/07/30 10:32:20 vincent Exp $
*/
/**
@@ -68,8 +68,8 @@
echo "<ul>\n";
echo ' <li>Voter: ';
- // echo user_link($handle); // !!! user_link() will return the full name
- echo $handle;
+ print_link('/user/' . htmlspecialchars($handle),
+ htmlspecialchars(user_name($handle)));
echo "</li>\n";
echo ' <li>Vote: ';
http://cvs.php.net/diff.php/docweb/www/rfc/rfc-votes-show.php?r1=1.6&r2=1.7&ty=u
Index: docweb/www/rfc/rfc-votes-show.php
diff -u docweb/www/rfc/rfc-votes-show.php:1.6 docweb/www/rfc/rfc-votes-show.php:1.7
--- docweb/www/rfc/rfc-votes-show.php:1.6 Fri Jul 29 08:47:15 2005
+++ docweb/www/rfc/rfc-votes-show.php Sat Jul 30 06:32:20 2005
@@ -19,7 +19,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-votes-show.php,v 1.6 2005/07/29 12:47:15 vincent Exp $
+ * @version $Id: rfc-votes-show.php,v 1.7 2005/07/30 10:32:20 vincent Exp $
*/
/**
@@ -250,8 +250,7 @@
foreach ($proposal->votes as $vote) {
if (!isset($users[$vote->user_handle])) {
- // $users[$vote->user_handle] =& user::info($vote->user_handle); // !!!
- $users[$vote->user_handle] = array('name'=>$vote->user_handle);
+ $users[$vote->user_handle] = array('name'=>user_name($vote->user_handle));
}
if ($vote->value > 0) {
$vote->value = '+' . $vote->value;