From b1f4cf8bdc4b49c02ebebbee2553202bc46ab720 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Tue, 4 Jul 2006 04:26:20 +0000
Subject: Bug 342869: Use Bugzilla->params everywhere except templates Patch By
 Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=justdave

---
 contrib/bug_email.pl   |  8 ++++----
 contrib/sendbugmail.pl |  4 ++--
 contrib/syncLDAP.pl    | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'contrib')

diff --git a/contrib/bug_email.pl b/contrib/bug_email.pl
index 5f95e9272..3cb796b7e 100755
--- a/contrib/bug_email.pl
+++ b/contrib/bug_email.pl
@@ -38,7 +38,7 @@
 #
 # You need to work with bug_email.pl the MIME::Parser installed.
 # 
-# $Id: bug_email.pl,v 1.42 2006/06/21 00:44:48 lpsolit%gmail.com Exp $
+# $Id: bug_email.pl,v 1.43 2006/07/03 21:26:22 mkanat%bugzilla.org Exp $
 ###############################################################
 
 # 02/12/2000 (SML)
@@ -274,12 +274,12 @@ sub CheckPriority
         my $Text = "You sent wrong priority-setting, valid values are:" .
             join( "\n\t", @$all_prios ) . "\n\n";
         $Text .= "*  The priority is set to the default value ". 
-            Param('defaultpriority') . "\n";
+            Bugzilla->params->{'defaultpriority'} . "\n";
 
         BugMailError( 0, $Text );
 
         # set default value from param-file
-        $Control{'priority'} = Param( 'defaultpriority' );
+        $Control{'priority'} = Bugzilla->params->{ 'defaultpriority' };
     } else {
         # Nothing to do
     }
@@ -767,7 +767,7 @@ if (! CheckPermissions("CreateBugs", $SenderShort ) ) {
 }
 
 # Set QA
-if (Param("useqacontact")) {
+if (Bugzilla->params->{"useqacontact"}) {
     if (defined($Control{'qa_contact'}) 
         && $Control{'qa_contact'} !~ /^\s*$/ ) {
         $Control{'qa_contact'} = DBname_to_id($Control{'qa_contact'});
diff --git a/contrib/sendbugmail.pl b/contrib/sendbugmail.pl
index bcc01666c..8537f66ce 100644
--- a/contrib/sendbugmail.pl
+++ b/contrib/sendbugmail.pl
@@ -4,7 +4,7 @@
 #
 # Nick Barnes, Ravenbrook Limited, 2004-04-01.
 #
-# $Id: sendbugmail.pl,v 1.5 2006/06/21 00:44:48 lpsolit%gmail.com Exp $
+# $Id: sendbugmail.pl,v 1.6 2006/07/03 21:26:22 mkanat%bugzilla.org Exp $
 # 
 # Bugzilla email script for Bugzilla 2.17.4 and later.  Invoke this to send
 # bugmail for a bug which has been changed directly in the database.
@@ -54,7 +54,7 @@ if (!$id) {
 }
 
 # Validate the changer address.
-my $match = Param('emailregexp');
+my $match = Bugzilla->params->{'emailregexp'};
 if ($changer !~ /$match/) {
     print STDERR "Changer \"$changer\" doesn't match email regular expression.\n";
     usage();
diff --git a/contrib/syncLDAP.pl b/contrib/syncLDAP.pl
index b3ca80705..4ddabacea 100755
--- a/contrib/syncLDAP.pl
+++ b/contrib/syncLDAP.pl
@@ -92,7 +92,7 @@ foreach my $login_name (keys %$bugzilla_users) {
 ###
 # Get current LDAP users
 ###
-my $LDAPserver = Param("LDAPserver");
+my $LDAPserver = Bugzilla->params->{"LDAPserver"};
 if ($LDAPserver eq "") {
    print "No LDAP server defined in bugzilla preferences.\n";
    exit;
@@ -108,8 +108,8 @@ if(!$LDAPconn) {
    exit;
 }
 my $mesg;
-if (Param("LDAPbinddn")) {
-    my ($LDAPbinddn,$LDAPbindpass) = split(":",Param("LDAPbinddn"));
+if (Bugzilla->params->{"LDAPbinddn"}) {
+    my ($LDAPbinddn,$LDAPbindpass) = split(":",Bugzilla->params->{"LDAPbinddn"});
     $mesg = $LDAPconn->bind($LDAPbinddn, password => $LDAPbindpass);
 }
 else {
@@ -121,9 +121,9 @@ if($mesg->code) {
 }
 
 # We've got our anonymous bind;  let's look up the users.
-$mesg = $LDAPconn->search( base   => Param("LDAPBaseDN"),
+$mesg = $LDAPconn->search( base   => Bugzilla->params->{"LDAPBaseDN"},
                            scope  => "sub",
-                           filter => '(&(' . Param("LDAPuidattribute") . "=*)" . Param("LDAPfilter") . ')',
+                           filter => '(&(' . Bugzilla->params->{"LDAPuidattribute"} . "=*)" . Bugzilla->params->{"LDAPfilter"} . ')',
                          );
                          
 
@@ -136,7 +136,7 @@ my $val = $mesg->as_struct;
 
 while( my ($key, $value) = each(%$val) ) {
 
-   my $login_name = @$value{Param("LDAPmailattribute")};
+   my $login_name = @$value{Bugzilla->params->{"LDAPmailattribute"}};
    my $realname  = @$value{"cn"};
 
    # no mail entered? go to next
@@ -147,7 +147,7 @@ while( my ($key, $value) = each(%$val) ) {
 
    # no cn entered? use uid instead
    if(! defined $realname) { 
-      $realname = @$value{Param("LDAPuidattribute")};
+      $realname = @$value{Bugzilla->params->{"LDAPuidattribute"}};
    }
   
    my $login = shift @$login_name;
-- 
cgit v1.2.3-24-g4f1b