From 1d9b40d68889da8126f8a647f594c0f849baa008 Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Thu, 21 Feb 2013 21:35:28 -0800
Subject: Moved sqli connection to sqlEmbeded.php

---
 ajax/scores.ajax.php     | 2 +-
 ajax/users.ajax.php      | 2 +-
 includes/chats.php       | 2 +-
 includes/emails.php      | 2 +-
 includes/sqlEmbedded.php | 3 +++
 includes/sqli.php        | 4 ----
 pages/admin.php          | 2 +-
 pages/massemail.php      | 2 +-
 8 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 includes/sqli.php

diff --git a/ajax/scores.ajax.php b/ajax/scores.ajax.php
index 7ba25d0..1404a19 100644
--- a/ajax/scores.ajax.php
+++ b/ajax/scores.ajax.php
@@ -8,7 +8,7 @@ $userID = $_SESSION['userID'];
 require('../includes/maps.php');
 require('../includes/mapclass.php');
 require('../includes/datas.php');
-include_once('../includes/sqli.php');
+include_once('../includes/sqlEmbedded.php');
 
 if ($_GET['getmap'] == 'true') {
 	$mapID = $_GET['mapID'];
diff --git a/ajax/users.ajax.php b/ajax/users.ajax.php
index 7ee9cc2..9ac3754 100644
--- a/ajax/users.ajax.php
+++ b/ajax/users.ajax.php
@@ -3,7 +3,7 @@ ob_start("ob_gzhandler");
 
 //include('../includes/mapclass.php');
 //include('../includes/maps.php');
-include_once('../includes/sqli.php');
+include_once('../includes/sqlEmbedded.php');
 
 //Remove the ending .js
 $tmp = explode(".", $_GET['userid']);
diff --git a/includes/chats.php b/includes/chats.php
index dcd46c9..18d0810 100644
--- a/includes/chats.php
+++ b/includes/chats.php
@@ -2,7 +2,7 @@
 /*
  * addChat, getChat functions
 */
-include_once('sqli.php');
+include_once('sqlEmbedded.php');
 
 define('CHAT_ROWS_TO_KEEP', 75);
 
diff --git a/includes/emails.php b/includes/emails.php
index 182749c..74658ad 100644
--- a/includes/emails.php
+++ b/includes/emails.php
@@ -2,7 +2,7 @@
 /*
  * Email methods; QueueEmail and SendQueuedEmail
 */
-include_once('sqli.php');
+include_once('sqlEmbedded.php');
 //Email sending lock
 define('FILE_EMAIL_LOCK', './emailLockFile');
 
diff --git a/includes/sqlEmbedded.php b/includes/sqlEmbedded.php
index b7a32b5..64fa5c5 100644
--- a/includes/sqlEmbedded.php
+++ b/includes/sqlEmbedded.php
@@ -1,6 +1,9 @@
 <?php
 include_once('db.inc.php');
 
+global $mysqli;
+$mysqli = @mysqli_connect($db_host, $db_user, $db_pass, $db_name) or die("SQLI Failed to connect to database");
+
 global $mysqlid;
 $mysqlid = @mysql_connect($db_host,$db_user, $db_pass) or die("Cannot connect to database.");
 @mysql_select_db($db_name, $mysqlid) or die("Invalid database.");
diff --git a/includes/sqli.php b/includes/sqli.php
deleted file mode 100644
index d19069b..0000000
--- a/includes/sqli.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-include_once('db.inc.php');
-$mysqli = mysqli_connect($db_host, $db_user, $db_pass, $db_name) or die("Failed to connect to database");
-?>
\ No newline at end of file
diff --git a/pages/admin.php b/pages/admin.php
index 24feda4..e98dc49 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -9,7 +9,7 @@ topbar($Links);
 include_once('./includes/datas.php');
 include_once('./includes/maps.php');
 include_once('./includes/mapoftheday.php');
-include_once('./includes/sqli.php');
+include_once('./includes/sqlEmbedded.php');
 include_once('./includes/playerStats.php');
 include_once('./includes/chats.php');
 
diff --git a/pages/massemail.php b/pages/massemail.php
index 4bbd26b..d2634ef 100644
--- a/pages/massemail.php
+++ b/pages/massemail.php
@@ -77,7 +77,7 @@ if ($_POST['queueMassEmail'] == 'true') {
 	exit;
 }
 
-include_once('./includes/sqli.php');
+include_once('./includes/sqlEmbedded.php');
 
 $res = mysqli_query($mysqli, "SELECT count(*) as count FROM `emailQueue`");
 $row = mysqli_fetch_assoc($res);
-- 
cgit v1.2.3