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

clockwerx                                Sat, 09 Apr 2011 16:01:51 +0000

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

Log:
DRY, swap back to expecting the web URI

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

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php	2011-04-09 15:50:47 UTC (rev 310105)
+++ pear/pearweb/trunk/public_html/channels/add.php	2011-04-09 16:01:51 UTC (rev 310106)
@@ -92,18 +92,18 @@
 $contact_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'));
+$project_name = $form->addElement("url", "project_name", array('required' => 'required', 'placeholder' => 'http://pear.phpunit.de/'));

-$project_name->setLabel("Channel discover");
+$project_name->setLabel("Channel URI");
 $project_name->addFilter("htmlspecialchars");
-$project_name->addRule('required', "Please enter your project channel discover line");
+$project_name->addRule('required', "Please enter your project channel discover web address");

-$project_label = $form->addElement("text", "project[label]", array('required' => 'required', 'placeholder' => 'PHPUnit'));
+$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");

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

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

     try {
         $req = new HTTP_Request2;
@@ -173,16 +173,10 @@
         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>.</p>';
-
-        echo $form;
     }
-} else {
-    echo $form;
-
-    echo "<p>The &quot;Project Link&quot; should not point to the main ";
-    echo "homepage of the project, but rather to a page with installation ";
-    echo "instructures.</p>";
 }
+echo $form;
+
 ?>

 <p><a href="/channels/">Back to the index</a></p>

Modified: pear/pearweb/trunk/public_html/channels/edit.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/edit.php	2011-04-09 15:50:47 UTC (rev 310105)
+++ pear/pearweb/trunk/public_html/channels/edit.php	2011-04-09 16:01:51 UTC (rev 310106)
@@ -105,7 +105,7 @@
 $project_label->addFilter("htmlspecialchars");
 $project_label->addRule('required', "Please enter your project name");

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

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

     try {
         $req = new HTTP_Request2;
@@ -138,7 +138,6 @@


         echo "<div class=\"success\">Changes saved</div>\n";
-        echo $form;
     } catch (Exception $exception) {
         echo '<div class="errors">';

@@ -160,16 +159,9 @@
         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>.</p>';
-
-        echo $form;
     }
-} else {
-    echo $form;
-
-    echo "<p>The &quot;Project Link&quot; should not point to the main ";
-    echo "homepage of the project, but rather to a page with installation ";
-    echo "instructures.</p>";
 }
+echo $form;
 ?>

 <p><a href="/channels/">Back to the index</a></p>