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

clockwerx                                Sat, 09 Apr 2011 14:28:12 +0000

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

Log:
Shifting

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

Modified: pear/pearweb/trunk/include/pear-database-channel.php
===================================================================
--- pear/pearweb/trunk/include/pear-database-channel.php	2011-04-09 14:26:04 UTC (rev 310094)
+++ pear/pearweb/trunk/include/pear-database-channel.php	2011-04-09 14:28:12 UTC (rev 310095)
@@ -138,11 +138,7 @@
             throw new Exception("Invalid channel file");
         }

-        if ($url->getHost() != $chan->getServer()) {
-            throw new Exception("Channel server for wrong host");
-        }

-
         return true;
     }
 }

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php	2011-04-09 14:26:04 UTC (rev 310094)
+++ pear/pearweb/trunk/public_html/channels/add.php	2011-04-09 14:28:12 UTC (rev 310095)
@@ -119,10 +119,17 @@
         $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");
+        }
+
+
         if (channel::exists($project_name)) {
             throw new Exception("Already exists");
         }

+
+
         $text = sprintf("[Channels] Please activate %s (%s) on the channel index.",
                         $project_name->getValue(),
                         $project_link->getValue());