Added new arguments to gnucomo_config::Database(): user and password.

[gnucomo.git] / src / phpclasses / gnucomo_config.php

diff --git a/src/phpclasses/gnucomo_config.php b/src/phpclasses/gnucomo_config.php
index 8453adb..507a462 100644 (file)
--- a/src/phpclasses/gnucomo_config.php
+++ b/src/phpclasses/gnucomo_config.php
@@ -19,7 +19,7 @@ require_once('configuration.class.php');
 //
 //  RELATIONS      :
 //  SEE ALSO       :
-//  LAST MODIFIED  : Sep 26, 2002
+//  LAST MODIFIED  : Nov 21, 2002
 ///////////////////////////////////////////////////////////////////////////
 */
 
@@ -28,7 +28,7 @@ class gnucomo_config extends configuration
 
    // Return the database access string.
 
-   function Database()
+   function Database($usr = "", $pw = "")
    {
       $access_string = "";
 
@@ -38,16 +38,30 @@ class gnucomo_config extends configuration
          $access_string .= "dbname=" . $param;
       }
 
-      $param = $this->find_parameter("database", "user");
-      if ($param != "")
+      if ($usr == "")
+      {
+         $param = $this->find_parameter("database", "user");
+         if ($param != "")
+         {
+            $access_string .= " user=" . $param;
+         }
+      }
+      else
       {
-         $access_string .= " user=" . $param;
+         $access_string .= " user=" . $usr;
       }
 
-      $param = $this->find_parameter("database", "password");
-      if ($param != "")
+      if ($pw == "")
+      {
+         $param = $this->find_parameter("database", "password");
+         if ($param != "")
+         {
+            $access_string .= " password=" . $param;
+         }
+      }
+      else
       {
-         $access_string .= " password=" . $param;
+         $access_string .= " password=" . $pw;
       }
 
       $param = $this->find_parameter("database", "host");