svn: /pear/pearweb/trunk/ package.xml public_html/channels/edit.php public_html/channels/index.php

Modified: pear/pearweb/trunk/package.xml
===================================================================
--- pear/pearweb/trunk/package.xml	2011-04-09 14:29:22 UTC (rev 310096)
+++ pear/pearweb/trunk/package.xml	2011-04-09 14:48:25 UTC (rev 310097)
@@ -89,8 +89,8 @@
   <email>[email protected]</email>
   <active>yes</active>
  </developer>
- <date>2011-03-27</date>
- <time>17:47:07</time>
+ <date>2011-04-09</date>
+ <time>23:47:17</time>
  <version>
   <release>1.24.3</release>
   <api>0.1.1</api>
@@ -256,6 +256,7 @@
     </dir> <!-- /public_html/bugs -->
     <dir name="channels">
      <file name="add.php" role="www" />
+     <file name="edit.php" role="www" />
      <file name="index.php" role="www" />
     </dir> <!-- /public_html/channels -->
     <dir name="css">
@@ -2697,7 +2698,7 @@
     <release>stable</release>
     <api>stable</api>
    </stability>
-   <date>2011-03-27</date>
+   <date>2011-04-09</date>
    <license uri="http://www.php.net/license">PHP License</license>
    <notes>
 Bug #17717 	package.xml XSD does not support __uri channels

Added: pear/pearweb/trunk/public_html/channels/edit.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/edit.php	                        (rev 0)
+++ pear/pearweb/trunk/public_html/channels/edit.php	2011-04-09 14:48:25 UTC (rev 310097)
@@ -0,0 +1,187 @@
+<?php
+/*
+   +----------------------------------------------------------------------+
+   | PEAR Web site version 1.0                                            |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2005 The PEAR Group                                    |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.0 of the PHP license,       |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/3_0.txt.                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | [email protected] so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Martin Jansen <[email protected]>                                  |
+   +----------------------------------------------------------------------+
+   $Id: add.php 310096 2011-04-09 14:29:22Z clockwerx $
+*/
+require_once "HTML/QuickForm2.php";
+require_once "HTTP/Request2.php";
+require_once "Net/URL2.php";
+require_once 'pear-database-channel.php';
+require_once 'HTML/QuickForm2/Renderer.php';
+require_once 'HTML/QuickForm2/Element/Input.php';
+require_once 'PEAR/ChannelFile.php';
+
+
+/** @todo Shift ! */
+if (!class_exists('HTML_QuickForm2_Element_InputUrl')) {
+    class HTML_QuickForm2_Element_InputUrl extends HTML_QuickForm2_Element_Input
+    {
+        protected $attributes = array('type' => 'url');
+    }
+
+    HTML_QuickForm2_Factory::registerElement('url', 'HTML_QuickForm2_Element_InputUrl');
+}
+
+
+/** @todo Shift ! */
+if (!class_exists('HTML_QuickForm2_Element_InputEmai')) {
+    class HTML_QuickForm2_Element_InputEmail extends HTML_QuickForm2_Element_Input
+    {
+        protected $attributes = array('type' => 'email');
+    }
+
+    HTML_QuickForm2_Factory::registerElement('email', 'HTML_QuickForm2_Element_InputEmail');
+}
+
+auth_require('pear.admin');
+
+if (empty($_GET['channel']) || !channel::exists($_GET['channel'])) {
+    die("Invalid channel specified");
+}
+
+$channel = $dbh->query("SELECT * FROM channels WHERE name = ?", array($_GET['channel']), DB_FETCHMODE_ASSOC);
+
+$chan = new PEAR_ChannelFile;
+
+$tabs = array("List" => array("url" => "/channels/index.php",
+                              "title" => "List Sites."),
+              "Add Site" => array("url" => "/channels/add.php",
+                                  "title" => "Add your site.")
+              );
+
+
+response_header("Channels :: Edit");
+
+?>
+
+<h1>Channels</h1>
+
+<?php print_tabbed_navigation($tabs); ?>
+
+<h2>Edit Channel</h2>
+
+<?php
+$form = new HTML_QuickForm2("submitForm");
+$form->removeAttribute('name');
+
+$form->addDataSource(new HTML_QuickForm2_DataSource_Array(array("name" => $channel['contact_name'],
+                         "email" => $channel['contact_email'],
+                         "project[label]" => $channel["project_label"],
+                         "project[link]" => $channel["project_link"],
+                         "is_active" => 1,
+                        )));
+
+$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', '[email protected]'));
+$email->setLabel("Email");
+$email->addFilter("htmlspecialchars");
+
+$email->addRule('required', "Please enter your email address");
+$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->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");
+
+$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");
+
+$is_active = $form->addElement("checkbox", 'is_active', array('checked' => $channel["is_active"]));
+$is_active->setLabel("Active?");
+
+$form->addElement("submit");
+
+if ($form->validate()) {
+    $url = new Net_URL2('http://' . $project_name->getValue());
+
+    try {
+        $req = new HTTP_Request2;
+
+        $req->setURL($url->getScheme() . "://" . $url->getHost() . ":" . $url->getPort() . "/channel.xml");
+        channel::validate($req, $chan, $project_name);
+
+        if ($url->getHost() != $chan->getServer()) {
+            throw new Exception("Channel server for wrong host");
+        }
+
+        channel::edit($project_name, $project_label, $project_link, $name, $email);
+
+
+        echo "<div class=\"success\">Changes saved</div>\n";
+    } catch (Exception $exception) {
+        echo '<div class="errors">';
+
+        switch ($exception->getMessage()) {
+            case "Invalid channel site":
+                echo "The submitted URL does not ";
+                echo "appear to point to a valid channel site.  You will ";
+                echo "have to make sure that <tt>/channel.xml</tt> at least ";
+                echo "exists and is valid.";
+            break;
+
+            case "Empty channel.xml":
+                echo "The submitted URL does not ";
+                echo "appear to point to a valid channel site.  You will ";
+                echo "have to make sure that <tt>/channel.xml</tt> at least ";
+                echo "exists and is valid.";
+            break;
+
+            case "Channel.xml too large":
+                echo "The submitted URL does not ";
+                echo "appear to point to a valid channel site.  You will ";
+                echo "have to make sure that <tt>/channel.xml</tt> at least ";
+                echo "exists and is not huge.";
+            break;
+            default:
+                echo $exception->getMessage();
+            break;
+        }
+
+        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>.</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>";
+}
+?>
+
+<p><a href="/channels/">Back to the index</a></p>
+
+<?php
+response_footer();

Modified: pear/pearweb/trunk/public_html/channels/index.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/index.php	2011-04-09 14:29:22 UTC (rev 310096)
+++ pear/pearweb/trunk/public_html/channels/index.php	2011-04-09 14:48:25 UTC (rev 310097)
@@ -85,11 +85,11 @@
 <p><a href="/channels/add.php">Add your site</a></p>

 <h2>Channel server software</h2>
-
+<p>Want to host your own channel? </p>
 <ul>
-    <li><a href="http://pear.chiaraquartet.net">Chiara_PEAR_Server</a> (<a href="http://greg.chiaraquartet.net/archives/123-Setting-up-your-own-PEAR-channel-with-Chiara_PEAR_Server-the-official-way.html">Documentation</a></li>
+    <li><a href="http://pear.chiaraquartet.net">Chiara_PEAR_Server</a> (<a href="http://greg.chiaraquartet.net/archives/123-Setting-up-your-own-PEAR-channel-with-Chiara_PEAR_Server-the-official-way.html">Documentation</a>)</li>
     <li><a href="http://svn.php.net/viewvc/pear2/sandbox/SimpleChannelServer/trunk/">SimpleChannelServer</a> (<a href="http://saltybeagle.com/2008/12/using-simplechannelserver-to-manage-a-pear-channel-on-google-code/">documentation</a>)</li>
-    <li><a href="http://www.pirum-project.org/">Pirum</a></li>
+    <li><a href="http://www.pirum-project.org/">Pirum</a> (<a href="http://blog.stuartherbert.com/php/2011/03/30/setting-up-your-own-pear-channel/">documentation</a>)</li>
     <li><a href="http://pearfarm.org/">Pearfarm</a></li>
 </ul>