From f74323a49897c9e646d586b68ec80cc0f3773d02 Mon Sep 17 00:00:00 2001
From: uckelman <uckelman@nomic.net>
Date: Mon, 22 Nov 2010 22:12:50 +0000
Subject: Renamed $db so as not to clobber phpbb's $db global.

git-svn-id: https://vassalengine.svn.sourceforge.net/svnroot/vassalengine/site-src/trunk@7477 67b53d14-2c14-4ace-a08f-0dab2b34000c
---
 src/forum_post_delete.php | 4 ++--
 src/forum_post_send.php   | 4 ++--
 src/list_post_receive.php | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/forum_post_delete.php b/src/forum_post_delete.php
index be3fa0f..ae01850 100644
--- a/src/forum_post_delete.php
+++ b/src/forum_post_delete.php
@@ -41,8 +41,8 @@ function remove_post($postId) {
   require_once(__DIR__ . '/BridgeConf.php')
   require_once(__DIR__ . '/BridgeImpl.php');
 
-  $db = new PDO('mysql:host=' . DB_HOST . ';dbname=' . DB, DB_USER, DB_PASS);
-  $bridge = new BridgeImpl($db);
+  $bdb = new PDO('mysql:host=' . DB_HOST . ';dbname=' . DB, DB_USER, DB_PASS);
+  $bridge = new BridgeImpl($bdb);
 
   if ($bridge->removePost($postId)) {
     $logger->info($postId . ' deleted');
diff --git a/src/forum_post_send.php b/src/forum_post_send.php
index 723ed66..08a713a 100644
--- a/src/forum_post_send.php
+++ b/src/forum_post_send.php
@@ -52,8 +52,8 @@ function send_post_to_lists($config, $user, $mode, $data, $post_data) {
   require_once(__DIR__ . '/PhpBB3Impl.php');
   require_once(__DIR__ . '/PhpBB3ToMailman.php');
  
-  $db = new PDO('mysql:host=' . DB_HOST . ';dbname=' . DB, DB_USER, DB_PASS);
-  $bridge = new BridgeImpl($db);
+  $bdb = new PDO('mysql:host=' . DB_HOST . ';dbname=' . DB, DB_USER, DB_PASS);
+  $bridge = new BridgeImpl($bdb);
 
   $phpbb = new PhpBB3Impl();
 
diff --git a/src/list_post_receive.php b/src/list_post_receive.php
index 2c5ddc2..a8a00fe 100644
--- a/src/list_post_receive.php
+++ b/src/list_post_receive.php
@@ -30,14 +30,15 @@ try {
 
   require_once(__DIR__ . '/BridgeConf.php');
   require_once(__DIR__ . '/BridgeImpl.php');
+  require_once(__DIR__ . '/MailmanMessage.php');
+  require_once(__DIR__ . '/MailmanToPhpBB3.php');
   require_once(__DIR__ . '/PhpBB3Conf.php');
   require_once(__DIR__ . '/PhpBB3Impl.php');
-  require_once(__DIR__ . '/MailmanToPhpBB3.php');
 
   $msg = new MailmanMessage($_POST['message']);
 
-  $db = new PDO('mysql:host=' . DB_HOST . ';dbname=' . DB, DB_USER, DB_PASS);
-  $bridge = new BridgeImpl($db);
+  $bdb = new PDO('mysql:host=' . DB_HOST . ';dbname=' . DB, DB_USER, DB_PASS);
+  $bridge = new BridgeImpl($bdb);
 
   $phpbb = new PhpBB3Impl();
 
-- 
cgit v1.2.1