svn: /pear/pearweb/trunk/ include/pear-database-channel.php public_html/channels/add.php sql/channels.sql

clockwerx                                Sat, 09 Apr 2011 15:50:47 +0000

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

Log:
Sort by project label by default
Fix regression with contact_name/contact_email

Changed paths:
    U   pear/pearweb/trunk/include/pear-database-channel.php
    U   pear/pearweb/trunk/public_html/channels/add.php
    U   pear/pearweb/trunk/sql/channels.sql

Modified: pear/pearweb/trunk/include/pear-database-channel.php
===================================================================
--- pear/pearweb/trunk/include/pear-database-channel.php	2011-04-09 15:38:46 UTC (rev 310104)
+++ pear/pearweb/trunk/include/pear-database-channel.php	2011-04-09 15:50:47 UTC (rev 310105)
@@ -107,7 +107,7 @@
     static function listActive()
     {
         global $dbh;
-        $query = 'SELECT name, project_label, project_link, contact_name, contact_email FROM channels WHERE is_active = 1';
+        $query = 'SELECT name, project_label, project_link, contact_name, contact_email FROM channels WHERE is_active = 1 ORDER BY project_label';
         return $dbh->getAll($query, null, DB_FETCHMODE_ASSOC);
     }

@@ -119,7 +119,7 @@
     static function listInactive()
     {
         global $dbh;
-        $query = 'SELECT name, project_label, project_link, contact_name, contact_email FROM channels WHERE is_active = 0';
+        $query = 'SELECT name, project_label, project_link, contact_name, contact_email FROM channels WHERE is_active = 0 ORDER BY project_label';
         return $dbh->getAll($query, null, DB_FETCHMODE_ASSOC);
     }


Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php	2011-04-09 15:38:46 UTC (rev 310104)
+++ pear/pearweb/trunk/public_html/channels/add.php	2011-04-09 15:50:47 UTC (rev 310105)
@@ -75,11 +75,11 @@
 $form->removeAttribute('name');

 if (isset($auth_user)) {
-    $form->addDataSource(new HTML_QuickForm2_DataSource_Array(array("name" => $auth_user->name,
-                             "email" => $auth_user->email)));
+    $form->addDataSource(new HTML_QuickForm2_DataSource_Array(array("contact_name" => $auth_user->name,
+                             "contact_email" => $auth_user->email)));
 }

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

Modified: pear/pearweb/trunk/sql/channels.sql
===================================================================
--- pear/pearweb/trunk/sql/channels.sql	2011-04-09 15:38:46 UTC (rev 310104)
+++ pear/pearweb/trunk/sql/channels.sql	2011-04-09 15:50:47 UTC (rev 310105)
@@ -19,7 +19,7 @@
 INSERT INTO channels VALUES ('pear.domain51.com', 1, 'Domain51', 'http://pear.domain51.com/', '', '');
 INSERT INTO channels VALUES ('components.ez.no', 1, 'eZ components', 'http://components.ez.no/', '', '');
 INSERT INTO channels VALUES ('pear.horde.org', 1, 'Horde', 'http://pear.horde.org/', '', '');
-INSERT INTO channels VALUES ('pear.midcom-project.org', 1, 'Midgard Project', 'http://pear.midcom-project.org/', '', '');
+INSERT INTO channels VALUES ('ragnaroek.pear.midgard-project.org', 1, 'Midgard Project', 'http://www.midguard-project.org/', '', '');
 INSERT INTO channels VALUES ('pear.phing.info', 1, 'Phing', 'http://pear.phing.info/', '', '');
 INSERT INTO channels VALUES ('pear.php-tools.net', 1, 'PHP Application Tools', 'http://pear.php-tools.net/', '', '');
 INSERT INTO channels VALUES ('pear.phpunit.de', 1, 'PHPUnit', 'http://pear.phpunit.de/', '', '');