svn: /pear/pearweb/trunk/public_html/channels/ add.php

[Daniel O'Connor]

clockwerx Sat, 09 Apr 2011 13:10:25 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310085

Log:
Update to HTML_QuickForm2, html5 controls

Changed paths:
U pear/pearweb/trunk/public_html/channels/add.php

[Daniel O'Connor]

clockwerx Sat, 09 Apr 2011 13:51:57 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310089

Log:
Prompt for project label ("PEAR"), add to database

Changed paths:
U pear/pearweb/trunk/public_html/channels/add.php

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 13:44:44 UTC (rev 310088)
+++ pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 13:51:57 UTC (rev 310089)
@@ -24,7 +24,7 @@
require_once "Net/URL2.php";
require_once "Damblan/Log.php";
require_once "Damblan/Log/Mail.php";
-
+require_once 'pear-database-channel.php';
require_once 'HTML/QuickForm2/Renderer.php';
require_once 'HTML/QuickForm2/Element/Input.php';

@@ -89,7 +89,12 @@
$email->addRule('callback', '', array('callback' => 'filter_var',
'arguments' => array(FILTER_VALIDATE_EMAIL)));

-$project_name = $form->addElement("text", "project[name]", array('required' => 'required', 'placeholder' => 'PHPUnit'))
+$project_name = $form->addElement("text", "project[name]", array('required' => 'required', 'placeholder' => 'pear.phpunit.de'))
+ ->setLabel("Channel discover")
+ ->addFilter("htmlspecialchars")
+ ->addRule('required', "Please enter your project channel discover line");
+
+$project_label = $form->addElement("text", "project[label]", array('required' => 'required', 'placeholder' => 'PHPUnit'))
->setLabel("Project Name")
->addFilter("htmlspecialchars")
->addRule('required', "Please enter your project name");
@@ -186,7 +191,7 @@
echo $form;
break;
}
- $text = sprintf("[Channels] Please add %s (%s) to the channel index.",
+ $text = sprintf("[Channels] Please activate %s (%s) on the channel index.",
$project_name->getValue(),
$link->getValue());
$from = sprintf('"%s" <%s>',
@@ -203,6 +208,10 @@

$logger->log($text);

+ // Add the channel to the DB, but not yet activated
+ channel::add($project_name);
+ channel::edit($project_name, $project_label, $project_link, $name, $email);
+
echo "<div class=\"success\">Thanks for your submission. It will ";
echo "be reviewed as soon as possible.</div>\n";
} while (false);

[Daniel O'Connor]

clockwerx Sat, 09 Apr 2011 14:00:24 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310090

Log:
Fix getValue() errors

Changed paths:
U pear/pearweb/trunk/public_html/channels/add.php

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 13:51:57 UTC (rev 310089)
+++ pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:00:24 UTC (rev 310090)
@@ -89,25 +89,26 @@
$email->addRule('callback', '', array('callback' => 'filter_var',
'arguments' => array(FILTER_VALIDATE_EMAIL)));

-$project_name = $form->addElement("text", "project[name]", array('required' => 'required', 'placeholder' => 'pear.phpunit.de'))
- ->setLabel("Channel discover")
- ->addFilter("htmlspecialchars")
- ->addRule('required', "Please enter your project channel discover line");
+$project_name = $form->addElement("text", "project[name]", array('required' => 'required', 'placeholder' => 'pear.phpunit.de'));

-$project_label = $form->addElement("text", "project[label]", array('required' => 'required', 'placeholder' => 'PHPUnit'))
- ->setLabel("Project Name")
- ->addFilter("htmlspecialchars")
- ->addRule('required', "Please enter your project name");
+$project_name->setLabel("Channel discover");
+$project_name->addFilter("htmlspecialchars");
+$project_name->addRule('required', "Please enter your project channel discover line");

+$project_label = $form->addElement("text", "project[label]", array('required' => 'required', 'placeholder' => 'PHPUnit'));
+$project_label->setLabel("Project Name");
+$project_label->addFilter("htmlspecialchars");
+$project_label->addRule('required', "Please enter your project name");
+
$link = $form->addElement("url", "project[link]", array('required' => 'required', 'placeholder' => 'http://pear.phpunit.de/'));
-$link->setLabel("Link");
+$link->setLabel("Project Homepage");
$link->addFilter("htmlspecialchars");
$link->addRule('required', "Please enter your project link");

$form->addElement("submit");

if ($form->validate()) {
- $url = new Net_URL2($link->getValue());
+ $url = new Net_URL2('http://' . $project_name->getValue());

try {
$req = new HTTP_Request2;

[Daniel O'Connor]

clockwerx Sat, 09 Apr 2011 14:02:10 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310091

Log:
Fix getValue() errors

Changed paths:
U pear/pearweb/trunk/public_html/channels/add.php

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:00:24 UTC (rev 310090)
+++ pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:02:10 UTC (rev 310091)
@@ -76,14 +76,14 @@
"email" => $auth_user->email)));
}

-$name = $form->addElement("text", "name", array('required' => 'required', 'placeholder' => 'John Doe'))
- ->setLabel("Your name")
- ->addFilter("htmlspecialchars")
- ->addRule('required', "Please enter your name");
+$name = $form->addElement("text", "name", array('required' => 'required', 'placeholder' => 'John Doe'));
+$name->setLabel("Your name");
+$name->addFilter("htmlspecialchars");
+$name->addRule('required', "Please enter your name");

-$email = $form->addElement("email", "email", array('required' => 'required', '***@example.com'))
- ->setLabel("Email")
- ->addFilter("htmlspecialchars");
+$email = $form->addElement("email", "email", array('required' => 'required', '***@example.com'));
+$email->setLabel("Email");
+$email->addFilter("htmlspecialchars");

$email->addRule('required', "Please enter your email address");
$email->addRule('callback', '', array('callback' => 'filter_var',

[Daniel O'Connor]

clockwerx Sat, 09 Apr 2011 14:03:31 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310092

Log:
Missed a var name

Changed paths:
U pear/pearweb/trunk/public_html/channels/add.php

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:02:10 UTC (rev 310091)
+++ pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:03:31 UTC (rev 310092)
@@ -100,10 +100,10 @@
$project_label->addFilter("htmlspecialchars");
$project_label->addRule('required', "Please enter your project name");

-$link = $form->addElement("url", "project[link]", array('required' => 'required', 'placeholder' => 'http://pear.phpunit.de/'));
-$link->setLabel("Project Homepage");
-$link->addFilter("htmlspecialchars");
-$link->addRule('required', "Please enter your project link");
+$project_link = $form->addElement("url", "project[link]", array('required' => 'required', 'placeholder' => 'http://pear.phpunit.de/'));
+$project_link->setLabel("Project Homepage");
+$project_link->addFilter("htmlspecialchars");
+$project_link->addRule('required', "Please enter your project link");

$form->addElement("submit");

@@ -194,7 +194,7 @@
}
$text = sprintf("[Channels] Please activate %s (%s) on the channel index.",
$project_name->getValue(),
- $link->getValue());
+ $project_link->getValue());
$from = sprintf('"%s" <%s>',
$name->getValue(),
$email->getValue());

[Daniel O'Connor]

clockwerx Sat, 09 Apr 2011 14:26:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310094

Log:
Typo

Changed paths:
U pear/pearweb/trunk/public_html/channels/add.php

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:25:07 UTC (rev 310093)
+++ pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:26:04 UTC (rev 310094)
@@ -117,7 +117,7 @@
$req = new HTTP_Request2;

$req->setURL($url->getScheme() . "://" . $url->getHost() . ":" . $url->getPort() . "/channel.xml");
- channel::validate($request, $chan, $project_name);
+ channel::validate($req, $chan, $project_name);

if (channel::exists($project_name)) {
throw new Exception("Already exists");

[Daniel O'Connor]

clockwerx Sat, 09 Apr 2011 14:29:22 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310096

Log:
Error message position

Changed paths:
U pear/pearweb/trunk/public_html/channels/add.php

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:28:12 UTC (rev 310095)
+++ pear/pearweb/trunk/public_html/channels/add.php 2011-04-09 14:29:22 UTC (rev 310096)
@@ -183,9 +183,10 @@
break;
}

- echo "If you think that this mechanism does not work ";
+ echo '</div>';
+ echo "<p>If you think that this mechanism does not work ";
echo "properly, please drop a mail to the ";
- echo '<a href="mailto:' . PEAR_WEBMASTER_EMAIL . '">webmasters</a>.';
+ echo '<a href="mailto:' . PEAR_WEBMASTER_EMAIL . '">webmasters</a>.</p>';

echo $form;
}