Changeset 25001

Timestamp:

02/04/10 10:28:17 (7 months ago)

Author:

jval

Message:

Add firephp channel (I guess we should actually have an array of channels and methods which handle them because their handling is the same for all and only channel address changes, but that's a different issue from the ticket of course), fixes #1578

Files:

• branches/ragnaroek/midgard/data/midgard/setup/php/midgard_setup_pear.php (modified) (5 diffs)

branches/ragnaroek/midgard/data/midgard/setup/php/midgard_setup_pear.php

@@ -33 +33 @@
-    private $midcom_channel_base;
-    private $htmlpurifier_channel;
+    private $firephp_channel;
-    private $initial_base_packages;
-    private $initial_midgard_packages = array();
@@ -60 +61 @@
-
-        $this->htmlpurifier_channel = "htmlpurifier.org";       
+        $this->firephp_channel = "pear.firephp.org";
-
-        $this->initial_base_packages = array
@@ -627 +629 @@
-        }
-
+        /* discover firephp */
+        if (!$this->pear_registry->channelExists($this->firephp_channel))
+        {
+            $ret = $this->pear_channel->doDiscover('channel-add', array(), array($this->firephp_channel));
+
+            if(PEAR::isError($ret))
+            {
+                midgard_setup_ui_cli::error($ret->getMessage());
+            }
+        }
+
-        $this->update_channels();
-    }
@@ -636 +649 @@
-        /* update midcom channel */
-        $ret = $this->pear_channel->doUpdate('channel-update', array(), array($this->midcom_channel));
-        
-        if (PEAR::isError($ret)) 
-        {
@@ -644 +656 @@
-        /* update htmlpurified */
-        $ret = $this->pear_channel->doUpdate('channel-update', array(), array($this->htmlpurifier_channel));
-
+
+
+
+
+
+
+
-        if (PEAR::isError($ret))
-        {