cvs: docweb / INSTALL.txt /include/rfc rfc.php /www/rfc rfc-comments-show.php rfc-proposal-delete.php rfc-proposal-edit.php rfc-proposal-show.php
rfc-vote-show.php rfc-votes-show.php /www/style site.css
| From: | Vincent Gevers | Date: | Thu, 19 Aug 2004 10:30:54 +0000 |
| Subject: | cvs: docweb / INSTALL.txt /include/rfc rfc.php /www/rfc rfc-comments-show.php rfc-proposal-delete.php rfc-proposal-edit.php rfc-proposal-show.php rfc-vote-show.php rfc-votes-show.php /www/style site.css |
||
| Groups: | php.doc.web | ||
| Request: | Send a blank email to doc-web+get-190@lists.php.net to get a copy of this message | ||
vincent Thu Aug 19 06:30:54 2004 EDT
Modified files:
/docweb INSTALL.txt
/docweb/include/rfc rfc.php
/docweb/www/rfc rfc-comments-show.php rfc-proposal-delete.php
rfc-proposal-edit.php rfc-proposal-show.php
rfc-vote-show.php rfc-votes-show.php
/docweb/www/style site.css
Log:
Updated install instructions for RFC System
code cleanups in the RFC System
added css for the RFC System
http://cvs.php.net/diff.php/docweb/INSTALL.txt?r1=1.1&r2=1.2&ty=u Index: docweb/INSTALL.txt diff -u docweb/INSTALL.txt:1.1 docweb/INSTALL.txt:1.2 --- docweb/INSTALL.txt:1.1 Thu Aug 19 00:02:18 2004 +++ docweb/INSTALL.txt Thu Aug 19 06:30:52 2004 @@ -5,7 +5,10 @@ documentation for the site. 2. Create the sqlite directory and 'chown www:www sqlite' or the equivalent user who apache runs under. -3. Configure the virtual host under apache. Current 'suggested settings' are: +3. Create the files directory and 'chown www:www files' or the equivalent + user who apache runs under. +4. The PEAR packages for the RFC System can be found at include/rfc/PACKAGES +5. Configure the virtual host under apache. Current 'suggested settings' are: <VirtualHost 65.75.184.99:80> ServerName docweb.php.mirrors.powertrip.co.za http://cvs.php.net/diff.php/docweb/include/rfc/rfc.php?r1=1.1&r2=1.2&ty=u Index: docweb/include/rfc/rfc.php diff -u docweb/include/rfc/rfc.php:1.1 docweb/include/rfc/rfc.php:1.2 --- docweb/include/rfc/rfc.php:1.1 Wed Aug 18 17:25:26 2004 +++ docweb/include/rfc/rfc.php Thu Aug 19 06:30:53 2004 @@ -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.1 2004/08/18 21:25:26 vincent Exp $ + * @version $Id: rfc.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ require_once 'DB.php'; @@ -826,9 +826,9 @@ $headers = "CC: ". implode(", ", $to) . "\n"; $headers .= "From: " . PROPOSAL_MAIL_FROM . "\n"; $headers .= "Reply-To: " . $actorinfo['email'] . "\n"; - $headers .= "X-Mailer: " . "RFC, Docweb Proposal System" . "\n"; // !!! + $headers .= "X-Mailer: " . "RFC, Docweb Proposal System <http://docs.php.net/>" . "\n"; // !!! $headers .= "X-RFC-Category: " . $this->pkg_category . "\n"; - $headers .= "X-RFC-Package: " . $this->pkg_name . "\n"; + $headers .= "X-RFC-Name: " . $this->pkg_name . "\n"; $headers .= "X-RFC-Status: " . $this->getStatus() . "\n"; $res = mail($email['to'], $email['subject'], $email['text'], http://cvs.php.net/diff.php/docweb/www/rfc/rfc-comments-show.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-comments-show.php diff -u docweb/www/rfc/rfc-comments-show.php:1.1 docweb/www/rfc/rfc-comments-show.php:1.2 --- docweb/www/rfc/rfc-comments-show.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-comments-show.php Thu Aug 19 06:30:53 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-comments-show.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-comments-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -30,7 +30,7 @@ if (!$proposal =& proposal::get($dbh, @$_GET['id'])) { echo site_header('RFC :: Comments :: Invalid Request'); - echo "<h1>Comments for</h1>\n"; + echo "<h1>Comments Error</h1>\n"; report_error('The requested proposal does not exist.'); echo site_footer(); exit; http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-delete.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-proposal-delete.php diff -u docweb/www/rfc/rfc-proposal-delete.php:1.1 docweb/www/rfc/rfc-proposal-delete.php:1.2 --- docweb/www/rfc/rfc-proposal-delete.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-proposal-delete.php Thu Aug 19 06:30:53 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-delete.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-proposal-delete.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -44,7 +44,7 @@ if (!$proposal =& proposal::get($dbh, @$_GET['id'])) { echo site_header('RFC :: Delete :: Invalid Request'); - echo "<h1>Delete Proposal</h1>\n"; + echo "<h1>Delete Proposal Error</h1>\n"; report_error('The requested proposal does not exist.'); echo site_footer(); exit; http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-edit.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-proposal-edit.php diff -u docweb/www/rfc/rfc-proposal-edit.php:1.1 docweb/www/rfc/rfc-proposal-edit.php:1.2 --- docweb/www/rfc/rfc-proposal-edit.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-proposal-edit.php Thu Aug 19 06:30:53 2004 @@ -22,7 +22,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-edit.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-proposal-edit.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -73,7 +73,7 @@ $res = $dbh->query($sql); // this might need some more security - unlink('./../../' . $hash); + unlink('./../../files/' . $hash); report_success('File deleted!'); } @@ -150,7 +150,6 @@ $categoryNew = $form->addGroup($categoryNewElements, 'pkg_category_new', 'New category:', '(only use if really needed)<br />'); $form->addElement('text', 'pkg_name', 'Name:'); -//$form->addElement('text', 'pkg_license', 'License:'); // not needed IMO $form->addElement('textarea', 'pkg_describtion', 'Description:', array('rows' => 20, 'cols' => '80')); $form->addElement('select', 'markup', 'Markup', array('bbcode' => 'BBCode', 'wiki' => 'Wiki')); @@ -159,10 +158,6 @@ $helpLinks[] =& HTML_QuickForm::createElement('link', 'help_wiki', '_blank', 'http://wiki.ciaweb.net/yawiki/index.php?area=Text_Wiki&page=WikiRules', 'or Wiki markup', array('target' => '_blank')); $form->addGroup($helpLinks, 'markup_help', '', ' '); -// this seems not needed for an RFC system // !!! -//$form->addElement('textarea', 'pkg_deps', 'Package dependencies <small>(list)</small>:', array('rows' => 6, 'cols' => '80')); -//$form->addElement('static', '', '', 'List seperated by linefeeds. Please use the word \'none\' if you are sure there are no dependencies'); - $form->addElement('file', 'thefile', ''); $form->addElement('static', '', '', 'Upload a file or link to your files'); @@ -179,18 +174,16 @@ $filecount++; $form->addElement('static', '', '', 'You have uploaded '.$filecount.' file(s). To delete, click on the file'); -//$form->addElement('static', '', '', 'To delete, click on the file'); - if (!empty($proposal->pkg_filehash)) { $list = explode("|", htmlspecialchars($proposal->pkg_filehash)); -foreach ($list as $hash) { -if ($hash == '') - continue; + foreach ($list as $hash) { + if ($hash == '') + continue; - $file = substr($hash, 0, -32); + $file = substr($hash, 0, -32); -$form->addElement('static', '', '', '<a href="?id='.$id.'&delete='.$hash.'">'.$file.'</a>'); + $form->addElement('static', '', '', '<li><a href="?id='.$id.'&delete='.$hash.'">'.$file.'</a></li>'); } } @@ -276,15 +269,11 @@ $form->applyFilter('pkg_name', 'trim'); $form->applyFilter('pkg_describtion', 'trim'); -//$form->applyFilter('pkg_deps', 'trim'); $form->addRule('pkg_category', 'You have to select a category!', 'required', '', 'server'); $form->addRule('pkg_name', 'You have to enter a name!', 'required', '', 'server'); -//$form->addRule('pkg_license', 'you have to specify the license of your package!', 'required', '', 'server'); // not needed IMO $form->addRule('pkg_describtion', 'You have to enter a description!', 'required', '', 'server'); -//$form->addRule('link[0]', '2 links are required as minimum!', 'required', '', 'server'); -//$form->addRule('link[1]', '2 links are required as minimum!', 'required', '', 'server'); -// links are not always needed + if (isset($_POST['submit'])) { if ($form->validate()) { http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-show.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-proposal-show.php diff -u docweb/www/rfc/rfc-proposal-show.php:1.1 docweb/www/rfc/rfc-proposal-show.php:1.2 --- docweb/www/rfc/rfc-proposal-show.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-proposal-show.php Thu Aug 19 06:30:53 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.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-proposal-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -86,9 +86,6 @@ <li> Proposer: <?php echo $proposal->user_handle; ?> </li> - <!-- Not needed IMO <li> - License: <?php echo htmlspecialchars($proposal->pkg_license) ?> - </li>--> </ul> </td> @@ -144,9 +141,8 @@ </tr> <tr> - <!-- <th class="headrow" style="width: 50%">» Dependencies</th>--> <th class="headrow" style="width: 50%">» Links</th> - <!-- new --><th class="headrow" style="width: 50%">»Files</th> + <th class="headrow" style="width: 50%">»Files</th> </tr> <tr> http://cvs.php.net/diff.php/docweb/www/rfc/rfc-vote-show.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-vote-show.php diff -u docweb/www/rfc/rfc-vote-show.php:1.1 docweb/www/rfc/rfc-vote-show.php:1.2 --- docweb/www/rfc/rfc-vote-show.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-vote-show.php Thu Aug 19 06:30:53 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-vote-show.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-vote-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -33,7 +33,7 @@ if (!$proposal =& proposal::get($dbh, @$_GET['id']) || !$handle) { echo site_header('RFC :: Vote Details :: Invalid Request'); - echo "<h1>Vote Details</h1>\n"; + echo "<h1>Vote Details Error</h1>\n"; report_error('The requested proposal or user does not exist.'); echo site_footer(); exit; @@ -68,7 +68,7 @@ echo "<ul>\n"; echo ' <li>Voter: '; - // echo user_link($handle); // !!! + // echo user_link($handle); // !!! user_link() will return the full name echo $handle; echo "</li>\n"; http://cvs.php.net/diff.php/docweb/www/rfc/rfc-votes-show.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-votes-show.php diff -u docweb/www/rfc/rfc-votes-show.php:1.1 docweb/www/rfc/rfc-votes-show.php:1.2 --- docweb/www/rfc/rfc-votes-show.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-votes-show.php Thu Aug 19 06:30:53 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.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-votes-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -31,7 +31,7 @@ if (!$proposal =& proposal::get($dbh, @$_GET['id'])) { echo site_header('RFC :: Votes :: Invalid Request'); - echo "<h1>Proposal Votes</h1>\n"; + echo "<h1>Proposal Votes Error</h1>\n"; report_error('The requested proposal does not exist.'); echo site_footer(); exit; http://cvs.php.net/diff.php/docweb/www/style/site.css?r1=1.2&r2=1.3&ty=u Index: docweb/www/style/site.css diff -u docweb/www/style/site.css:1.2 docweb/www/style/site.css:1.3 --- docweb/www/style/site.css:1.2 Wed Aug 18 17:23:03 2004 +++ docweb/www/style/site.css Thu Aug 19 06:30:53 2004 @@ -139,14 +139,13 @@ #nav { width: 100%; - /*border-top: 1px solid #000;*/ + padding: 6px; display: block; margin-bottom: 35px; clear: left; } #nav a { - /*float: left;*/ font-weight: bold; font-size: 80%; text-decoration: none; @@ -154,7 +153,6 @@ margin-right: 5px; padding: 5px; border: 1px solid #ccc; - /*border-right: 1px solid #ccc;*/ } #nav a.active { @@ -163,4 +161,48 @@ #nav a:hover { background: #ddf; +} + +/* === User Submission Responses === */ + +div.errors, +div.warnings, +div.explain, +div.success { + margin: 4px; + padding: 6px; + width: 65%; + font-size: 1.1em; + font-weight: bold; +} + +div.errors { + border: 1px dashed #660000; + background: #fee; + color: #660000; +} + +div.warnings { + border: 1px dashed #ff8c00; + background: #ffa; + color: #ff8c00; +} + +div.explain { + border: 1px dashed #000066; + color: #000066; +} + +div.success { + border: 1px dashed #006600; + background-color: #CCFF99; + color: #006600; +} + +div.errors ul, +div.warnings ul, +div.explain ul, +div.success ul { + margin-top: 0em; + margin-bottom: 0em; }
http://cvs.php.net/diff.php/docweb/INSTALL.txt?r1=1.1&r2=1.2&ty=u Index: docweb/INSTALL.txt diff -u docweb/INSTALL.txt:1.1 docweb/INSTALL.txt:1.2 --- docweb/INSTALL.txt:1.1 Thu Aug 19 00:02:18 2004 +++ docweb/INSTALL.txt Thu Aug 19 06:30:52 2004 @@ -5,7 +5,10 @@ documentation for the site. 2. Create the sqlite directory and 'chown www:www sqlite' or the equivalent user who apache runs under. -3. Configure the virtual host under apache. Current 'suggested settings' are: +3. Create the files directory and 'chown www:www files' or the equivalent + user who apache runs under. +4. The PEAR packages for the RFC System can be found at include/rfc/PACKAGES +5. Configure the virtual host under apache. Current 'suggested settings' are: <VirtualHost 65.75.184.99:80> ServerName docweb.php.mirrors.powertrip.co.za http://cvs.php.net/diff.php/docweb/include/rfc/rfc.php?r1=1.1&r2=1.2&ty=u Index: docweb/include/rfc/rfc.php diff -u docweb/include/rfc/rfc.php:1.1 docweb/include/rfc/rfc.php:1.2 --- docweb/include/rfc/rfc.php:1.1 Wed Aug 18 17:25:26 2004 +++ docweb/include/rfc/rfc.php Thu Aug 19 06:30:53 2004 @@ -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.1 2004/08/18 21:25:26 vincent Exp $ + * @version $Id: rfc.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ require_once 'DB.php'; @@ -826,9 +826,9 @@ $headers = "CC: ". implode(", ", $to) . "\n"; $headers .= "From: " . PROPOSAL_MAIL_FROM . "\n"; $headers .= "Reply-To: " . $actorinfo['email'] . "\n"; - $headers .= "X-Mailer: " . "RFC, Docweb Proposal System" . "\n"; // !!! + $headers .= "X-Mailer: " . "RFC, Docweb Proposal System <http://docs.php.net/>" . "\n"; // !!! $headers .= "X-RFC-Category: " . $this->pkg_category . "\n"; - $headers .= "X-RFC-Package: " . $this->pkg_name . "\n"; + $headers .= "X-RFC-Name: " . $this->pkg_name . "\n"; $headers .= "X-RFC-Status: " . $this->getStatus() . "\n"; $res = mail($email['to'], $email['subject'], $email['text'], http://cvs.php.net/diff.php/docweb/www/rfc/rfc-comments-show.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-comments-show.php diff -u docweb/www/rfc/rfc-comments-show.php:1.1 docweb/www/rfc/rfc-comments-show.php:1.2 --- docweb/www/rfc/rfc-comments-show.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-comments-show.php Thu Aug 19 06:30:53 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-comments-show.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-comments-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -30,7 +30,7 @@ if (!$proposal =& proposal::get($dbh, @$_GET['id'])) { echo site_header('RFC :: Comments :: Invalid Request'); - echo "<h1>Comments for</h1>\n"; + echo "<h1>Comments Error</h1>\n"; report_error('The requested proposal does not exist.'); echo site_footer(); exit; http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-delete.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-proposal-delete.php diff -u docweb/www/rfc/rfc-proposal-delete.php:1.1 docweb/www/rfc/rfc-proposal-delete.php:1.2 --- docweb/www/rfc/rfc-proposal-delete.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-proposal-delete.php Thu Aug 19 06:30:53 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-delete.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-proposal-delete.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -44,7 +44,7 @@ if (!$proposal =& proposal::get($dbh, @$_GET['id'])) { echo site_header('RFC :: Delete :: Invalid Request'); - echo "<h1>Delete Proposal</h1>\n"; + echo "<h1>Delete Proposal Error</h1>\n"; report_error('The requested proposal does not exist.'); echo site_footer(); exit; http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-edit.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-proposal-edit.php diff -u docweb/www/rfc/rfc-proposal-edit.php:1.1 docweb/www/rfc/rfc-proposal-edit.php:1.2 --- docweb/www/rfc/rfc-proposal-edit.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-proposal-edit.php Thu Aug 19 06:30:53 2004 @@ -22,7 +22,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-edit.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-proposal-edit.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -73,7 +73,7 @@ $res = $dbh->query($sql); // this might need some more security - unlink('./../../' . $hash); + unlink('./../../files/' . $hash); report_success('File deleted!'); } @@ -150,7 +150,6 @@ $categoryNew = $form->addGroup($categoryNewElements, 'pkg_category_new', 'New category:', '(only use if really needed)<br />'); $form->addElement('text', 'pkg_name', 'Name:'); -//$form->addElement('text', 'pkg_license', 'License:'); // not needed IMO $form->addElement('textarea', 'pkg_describtion', 'Description:', array('rows' => 20, 'cols' => '80')); $form->addElement('select', 'markup', 'Markup', array('bbcode' => 'BBCode', 'wiki' => 'Wiki')); @@ -159,10 +158,6 @@ $helpLinks[] =& HTML_QuickForm::createElement('link', 'help_wiki', '_blank', 'http://wiki.ciaweb.net/yawiki/index.php?area=Text_Wiki&page=WikiRules', 'or Wiki markup', array('target' => '_blank')); $form->addGroup($helpLinks, 'markup_help', '', ' '); -// this seems not needed for an RFC system // !!! -//$form->addElement('textarea', 'pkg_deps', 'Package dependencies <small>(list)</small>:', array('rows' => 6, 'cols' => '80')); -//$form->addElement('static', '', '', 'List seperated by linefeeds. Please use the word \'none\' if you are sure there are no dependencies'); - $form->addElement('file', 'thefile', ''); $form->addElement('static', '', '', 'Upload a file or link to your files'); @@ -179,18 +174,16 @@ $filecount++; $form->addElement('static', '', '', 'You have uploaded '.$filecount.' file(s). To delete, click on the file'); -//$form->addElement('static', '', '', 'To delete, click on the file'); - if (!empty($proposal->pkg_filehash)) { $list = explode("|", htmlspecialchars($proposal->pkg_filehash)); -foreach ($list as $hash) { -if ($hash == '') - continue; + foreach ($list as $hash) { + if ($hash == '') + continue; - $file = substr($hash, 0, -32); + $file = substr($hash, 0, -32); -$form->addElement('static', '', '', '<a href="?id='.$id.'&delete='.$hash.'">'.$file.'</a>'); + $form->addElement('static', '', '', '<li><a href="?id='.$id.'&delete='.$hash.'">'.$file.'</a></li>'); } } @@ -276,15 +269,11 @@ $form->applyFilter('pkg_name', 'trim'); $form->applyFilter('pkg_describtion', 'trim'); -//$form->applyFilter('pkg_deps', 'trim'); $form->addRule('pkg_category', 'You have to select a category!', 'required', '', 'server'); $form->addRule('pkg_name', 'You have to enter a name!', 'required', '', 'server'); -//$form->addRule('pkg_license', 'you have to specify the license of your package!', 'required', '', 'server'); // not needed IMO $form->addRule('pkg_describtion', 'You have to enter a description!', 'required', '', 'server'); -//$form->addRule('link[0]', '2 links are required as minimum!', 'required', '', 'server'); -//$form->addRule('link[1]', '2 links are required as minimum!', 'required', '', 'server'); -// links are not always needed + if (isset($_POST['submit'])) { if ($form->validate()) { http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-show.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-proposal-show.php diff -u docweb/www/rfc/rfc-proposal-show.php:1.1 docweb/www/rfc/rfc-proposal-show.php:1.2 --- docweb/www/rfc/rfc-proposal-show.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-proposal-show.php Thu Aug 19 06:30:53 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.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-proposal-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -86,9 +86,6 @@ <li> Proposer: <?php echo $proposal->user_handle; ?> </li> - <!-- Not needed IMO <li> - License: <?php echo htmlspecialchars($proposal->pkg_license) ?> - </li>--> </ul> </td> @@ -144,9 +141,8 @@ </tr> <tr> - <!-- <th class="headrow" style="width: 50%">» Dependencies</th>--> <th class="headrow" style="width: 50%">» Links</th> - <!-- new --><th class="headrow" style="width: 50%">»Files</th> + <th class="headrow" style="width: 50%">»Files</th> </tr> <tr> http://cvs.php.net/diff.php/docweb/www/rfc/rfc-vote-show.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-vote-show.php diff -u docweb/www/rfc/rfc-vote-show.php:1.1 docweb/www/rfc/rfc-vote-show.php:1.2 --- docweb/www/rfc/rfc-vote-show.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-vote-show.php Thu Aug 19 06:30:53 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-vote-show.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-vote-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -33,7 +33,7 @@ if (!$proposal =& proposal::get($dbh, @$_GET['id']) || !$handle) { echo site_header('RFC :: Vote Details :: Invalid Request'); - echo "<h1>Vote Details</h1>\n"; + echo "<h1>Vote Details Error</h1>\n"; report_error('The requested proposal or user does not exist.'); echo site_footer(); exit; @@ -68,7 +68,7 @@ echo "<ul>\n"; echo ' <li>Voter: '; - // echo user_link($handle); // !!! + // echo user_link($handle); // !!! user_link() will return the full name echo $handle; echo "</li>\n"; http://cvs.php.net/diff.php/docweb/www/rfc/rfc-votes-show.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-votes-show.php diff -u docweb/www/rfc/rfc-votes-show.php:1.1 docweb/www/rfc/rfc-votes-show.php:1.2 --- docweb/www/rfc/rfc-votes-show.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-votes-show.php Thu Aug 19 06:30:53 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.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-votes-show.php,v 1.2 2004/08/19 10:30:53 vincent Exp $ */ /** @@ -31,7 +31,7 @@ if (!$proposal =& proposal::get($dbh, @$_GET['id'])) { echo site_header('RFC :: Votes :: Invalid Request'); - echo "<h1>Proposal Votes</h1>\n"; + echo "<h1>Proposal Votes Error</h1>\n"; report_error('The requested proposal does not exist.'); echo site_footer(); exit; http://cvs.php.net/diff.php/docweb/www/style/site.css?r1=1.2&r2=1.3&ty=u Index: docweb/www/style/site.css diff -u docweb/www/style/site.css:1.2 docweb/www/style/site.css:1.3 --- docweb/www/style/site.css:1.2 Wed Aug 18 17:23:03 2004 +++ docweb/www/style/site.css Thu Aug 19 06:30:53 2004 @@ -139,14 +139,13 @@ #nav { width: 100%; - /*border-top: 1px solid #000;*/ + padding: 6px; display: block; margin-bottom: 35px; clear: left; } #nav a { - /*float: left;*/ font-weight: bold; font-size: 80%; text-decoration: none; @@ -154,7 +153,6 @@ margin-right: 5px; padding: 5px; border: 1px solid #ccc; - /*border-right: 1px solid #ccc;*/ } #nav a.active { @@ -163,4 +161,48 @@ #nav a:hover { background: #ddf; +} + +/* === User Submission Responses === */ + +div.errors, +div.warnings, +div.explain, +div.success { + margin: 4px; + padding: 6px; + width: 65%; + font-size: 1.1em; + font-weight: bold; +} + +div.errors { + border: 1px dashed #660000; + background: #fee; + color: #660000; +} + +div.warnings { + border: 1px dashed #ff8c00; + background: #ffa; + color: #ff8c00; +} + +div.explain { + border: 1px dashed #000066; + color: #000066; +} + +div.success { + border: 1px dashed #006600; + background-color: #CCFF99; + color: #006600; +} + +div.errors ul, +div.warnings ul, +div.explain ul, +div.success ul { + margin-top: 0em; + margin-bottom: 0em; }