diff options
| author | Patrick Davison <snapwilliam@gmail.com> | 2013-02-21 21:35:28 -0800 |
|---|---|---|
| committer | Patrick Davison <snapwilliam@gmail.com> | 2013-02-21 21:35:28 -0800 |
| commit | 1d9b40d68889da8126f8a647f594c0f849baa008 (patch) | |
| tree | 1f1bd9c64522a47cf8e0556ac3e38887edb10a3a /includes | |
| parent | 1a1c2cb7d359a057600d1f0db3efc4a92029ab32 (diff) | |
| download | pathery-1d9b40d68889da8126f8a647f594c0f849baa008.tar.xz | |
Moved sqli connection to sqlEmbeded.php
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/chats.php | 2 | ||||
| -rw-r--r-- | includes/emails.php | 2 | ||||
| -rw-r--r-- | includes/sqlEmbedded.php | 3 | ||||
| -rw-r--r-- | includes/sqli.php | 4 |
4 files changed, 5 insertions, 6 deletions
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 |