Changeset 4178

Timestamp:

09/22/06 15:01:31 (2 years ago)

Author:

bergie

Message:

Now uploading to different SGs works properly, but requires you to set "MidgardUsername?" and "MidgardPassword?" in conf.d file

Files:

• trunk/support/Role_Midgardelement/Midgardelement.php (modified) (4 diffs)
• trunk/support/Role_Midgardelement/package.xml (modified) (2 diffs)

trunk/support/Role_Midgardelement/Midgardelement.php

@@ -66 +66 @@
-            }
-            
+            if (method_exists($new_style, 'setsitegroup'))
+            {
+                $new_style->setsitegroup($this->sitegroup);
+            }
+            
-            return $new_style;
-        }
@@ -92 +97 @@
-        PEAR::raiseError("Failed to load Midgard sitegroup \"{$sitegroup_config}\". Error: " . mgd_errstr(), mgd_errno(), PEAR_ERROR_DIE);
-        return false;
+    }
+    
+    function initializeMidgard($init_file)
+    {
+        mgd_config_init($init_file);
+        if (!isset($_MIDGARD))
+        {
+            PEAR::raiseError("Failed to initialize Midgard using configuration file \"{$init_file}\".", mgd_errno(), PEAR_ERROR_DIE);
+            return false;
+        }
+        
+        if ($this->config->get('midgard_sitegroup') != 'root')
+        {
+            // We have to dig up the init file to read the MidgardUsername and MidgardPassword properties
+            switch ($_MIDGARD['config']['prefix'])
+            {
+                case '/usr':
+                case '/usr/local':
+                    $midgard_path = '/etc/midgard';
+                    break;
+                
+                default:
+                    $midgard_path = "{$_MIDGARD['config']['prefix']}/etc/midgard";
+                    break;
+            }
+            
+            $init_file_path =  "{$midgard_path}/conf.d/{$init_file}";
+            if (!file_exists($init_file_path))
+            {
+                PEAR::raiseError("Midgard configuration file \"{$init_file_path}\" not found.", mgd_errno(), PEAR_ERROR_DIE);
+                return false;
+            }
+            $midgard_username = null;
+            $midgard_password = null;
+            
+            $lines = explode("\n", file_get_contents($init_file_path));
+            foreach ($lines as $line)
+            {
+                if (substr($line, 0, 1) == '#')
+                {
+                    // This is a comment line, skip
+                    continue;
+                }
+            
+                $parts = explode('=', $line);
+                if (count($parts) != 2)
+                {
+                    // This is not valid config field, skip
+                    continue;
+                }
+                
+                switch ($parts[0])
+                {
+                    case 'MidgardUsername':
+                        $midgard_username = $parts[1];
+                        break;
+
+                    case 'MidgardPassword':
+                        $midgard_password = $parts[1];
+                        break;
+                }
+            }
+            
+            if (   is_null($midgard_username)
+                || is_null($midgard_password))
+            {
+                PEAR::raiseError("Midgard configuration file \"{$init_file}\" did not contain MidgardUsername and MidgardPassword directives.", mgd_errno(), PEAR_ERROR_DIE);
+                return false;
+            }
+            
+            if (!mgd_auth_midgard($midgard_username, $midgard_password))
+            {
+                PEAR::raiseError("Failed to authenticate as Midgard user \"{$midgard_username}\" using credentials from configuration file \"{$init_file}\".", mgd_errno(), PEAR_ERROR_DIE);
+                return false;
+            }
+            
+            return true;
+        }
-    }
-
@@ -114 +197 @@
-        // $style_name = $pkg->getPackage();
-        $init_file = basename($installing_paths[0]);
-
-
-
-
-
+
-        
-        $element_name = str_replace('.php', '', basename($file));
@@ -173 +252 @@
-                $element = new midgard_element();
-                $element->get_by_id($new_element->id);
+                
+                if (method_exists($element, 'setsitegroup'))
+                {
+                    $element->setsitegroup($this->sitegroup);
+                }
-            }
-            else

trunk/support/Role_Midgardelement/package.xml

@@ -19 +19 @@
-        <active>yes</active>
-    </developer>
-1
+2
-    <time>20:55:14</time>
-    <version>
-0
+1
-        <api>1.0.0</api>
-    </version>
@@ -30 +30 @@
-    </stability>
-    <license uri="http://www.php.net/license/3_01.txt">PHP License</license>
-
+
+
+
-    <contents>
-        <dir name="/">