diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fe67d00
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+plog-config.php
+.idea
diff --git a/.htaccess b/.htaccess
index e69de29..f3323bb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -0,0 +1,4 @@
+
+
+# BEGIN Plogger
+# END Plogger
diff --git a/plog-admin/includes/install-functions.php b/plog-admin/includes/install-functions.php
index 97dff83..7ea898f 100644
--- a/plog-admin/includes/install-functions.php
+++ b/plog-admin/includes/install-functions.php
@@ -10,13 +10,13 @@ require_once(PLOGGER_DIR.'plog-admin/plog-admin-functions.php');
 
 function maybe_add_column($table, $column, $add_sql) {
 	$sql = "DESCRIBE $table";
-	$res = mysql_query($sql);
+	$res = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	$found = false;
-	while($row = mysql_fetch_array($res, MYSQL_NUM)) {
+	while($row = mysqli_fetch_array($res, MYSQL_NUM)) {
 		if ($row[0] == $column) $found = true;
 	}
 	if (!$found) {
-		mysql_query("ALTER TABLE $table ADD `$column` ".$add_sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],"ALTER TABLE $table ADD `$column` ".$add_sql);
 		return plog_tr('Added new field to database').': '.$column;
 	} else {
 		if (defined('PLOGGER_DEBUG')) {
@@ -28,14 +28,14 @@ function maybe_add_column($table, $column, $add_sql) {
 
 function maybe_drop_column($table, $column) {
 	$sql = "DESCRIBE $table";
-	$res = mysql_query($sql);
+	$res = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	$found = false;
-	while($row = mysql_fetch_array($res, MYSQL_NUM)) {
+	while($row = mysqli_fetch_array($res, MYSQL_NUM)) {
 		if ($row[0] == $column) $found = true;
 	}
 	if ($found) {
 		$sql = "ALTER TABLE $table DROP `$column`";
-		mysql_query($sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		return plog_tr('Dropped column').': '.$column;
 	} else {
 		if (defined('PLOGGER_DEBUG')) {
@@ -47,12 +47,12 @@ function maybe_drop_column($table, $column) {
 
 function maybe_add_table($table, $add_sql, $options = '') {
 	$sql = "DESCRIBE $table";
-	$res = mysql_query($sql);
+	$res = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	if (!$res) {
 		$q = "CREATE table `$table` ($add_sql) $options";
-		mysql_query($q);
-		if (mysql_error()) {
-			var_dump(mysql_error());
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$q);
+		if (mysqli_error($GLOBALS["PLOGGER_DBH"])) {
+			var_dump(mysqli_error($GLOBALS["PLOGGER_DBH"]));
 		} else {
 			return true;
 		}
@@ -68,7 +68,7 @@ function get_default_charset() {
 	// Since 4.1 MySQL has support for specifying character encoding for tables
 	// and I really want to use it if available. So we need figure out what version
 	// we are running on and to the right thing
-	$mysql_version = mysql_get_server_info();
+	$mysql_version = mysqli_get_server_info($GLOBALS["PLOGGER_DBH"]);
 	$mysql_charset_support = '4.1';
 	$default_charset = '';
 
@@ -351,7 +351,7 @@ function create_tables() {
 	`id` int(11) NOT NULL auto_increment,
 	`thumbnail_id` int(11) NOT NULL DEFAULT '0',
 	PRIMARY KEY (`id`)"
-	,"Type=MyISAM $default_charset");
+	,"Engine=MyISAM $default_charset");
 
 	maybe_add_table(
 	PLOGGER_TABLE_PREFIX.'albums'
@@ -363,7 +363,7 @@ function create_tables() {
 	`thumbnail_id` int(11) NOT NULL default '0',
 	PRIMARY KEY (`id`),
 	INDEX pid_idx (`parent_id`)"
-	," Type=MyISAM $default_charset");
+	," Engine=MyISAM $default_charset");
 
 	maybe_add_table(
 	PLOGGER_TABLE_PREFIX.'pictures'
@@ -373,8 +373,8 @@ function create_tables() {
 	`caption` mediumtext NOT NULL,
 	`description` text NOT NULL,
 	`id` int(11) NOT NULL auto_increment,
-	`date_modified` timestamp(14) NOT NULL,
-	`date_submitted` timestamp(14) NOT NULL,
+	`date_modified` timestamp(6) NOT NULL,
+	`date_submitted` timestamp(6) NOT NULL,
 	`EXIF_date_taken` varchar(64) NOT NULL default '',
 	`EXIF_camera` varchar(64) NOT NULL default '',
 	`EXIF_shutterspeed` varchar(64) NOT NULL default '',
@@ -386,7 +386,7 @@ function create_tables() {
 	PRIMARY KEY (`id`),
 	INDEX pa_idx (`parent_album`),
 	INDEX pc_idx (`parent_collection`)"
-	,"Type=MyISAM $default_charset");
+	,"Engine=MyISAM $default_charset");
 
 	maybe_add_table(
 	PLOGGER_TABLE_PREFIX.'comments'
@@ -402,7 +402,7 @@ function create_tables() {
 	PRIMARY KEY (`id`),
 	INDEX pid_idx (`parent_id`),
 	INDEX approved_idx (`approved`)"
-	,"Type=MyISAM $default_charset");
+	,"Engine=MyISAM $default_charset");
 
 	maybe_add_table(
 	PLOGGER_TABLE_PREFIX.'config'
@@ -435,7 +435,7 @@ function create_tables() {
 	`thumb_nav_range` int(11) NOT NULL default '0',
 	`allow_fullpic` tinyint default '1',
 	PRIMARY KEY (`thumb_num`)"
-	,"Type=MyISAM $default_charset");
+	,"Engine=MyISAM $default_charset");
 
 	maybe_add_table(
 	PLOGGER_TABLE_PREFIX.'thumbnail_config'
@@ -445,7 +445,7 @@ function create_tables() {
 	`disabled` tinyint default '0',
 	`resize_option` tinyint default '2',
 	PRIMARY KEY (`id`)"
-	,"Type=MyISAM $default_charset");
+	,"Engine=MyISAM $default_charset");
 
 	/*maybe_add_table(
 	PLOGGER_TABLE_PREFIX.'tag2picture'
@@ -454,7 +454,7 @@ function create_tables() {
 	`tagdate` datetime default NULL,
 	KEY `tag_id` (`tag_id`),
 	KEY `picture_id` (`picture_id`)"
-	,"Type=MyISAM $default_charset");
+	,"Engine=MyISAM $default_charset");
 
 	maybe_add_table(
 	PLOGGER_TABLE_PREFIX.'tags'
@@ -465,7 +465,7 @@ function create_tables() {
 	PRIMARY KEY  (`id`),
 	UNIQUE `tag` (`tag`),
 	UNIQUE `urlified` (`urlified`)"
-	,"Type=MyISAM $default_charset");*/
+	,"Engine=MyISAM $default_charset");*/
 
 }
 
@@ -484,7 +484,7 @@ function configure_plogger($form) {
 		$resize = ($key == THUMB_SMALL || $key == THUMB_NAV) ? 3: 2;
 		$sql = "INSERT INTO `".PLOGGER_TABLE_PREFIX."thumbnail_config` (`id`, `update_timestamp`, `max_size`, `resize_option`)
 		VALUES('$key', '$long_ago', '$size', '$resize')";
-		mysql_query($sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	}
 
 	$config['gallery_url'] = 'http://'.$_SERVER['SERVER_NAME'].dirname(dirname($_SERVER['PHP_SELF']));
@@ -507,8 +507,8 @@ function configure_plogger($form) {
 
 	$config = array_map('mysql_real_escape_string', $config);
 
-	$row_exist = mysql_query("SELECT * FROM `".PLOGGER_TABLE_PREFIX."config`");
-	$row_exist_num = mysql_num_rows($row_exist);
+	$row_exist = mysqli_query($GLOBALS["PLOGGER_DBH"],"SELECT * FROM `".PLOGGER_TABLE_PREFIX."config`");
+	$row_exist_num = mysqli_num_rows($row_exist);
 
 	if ($row_exist_num == 0) {
 		$query = "INSERT INTO `".PLOGGER_TABLE_PREFIX."config`
@@ -546,7 +546,7 @@ function configure_plogger($form) {
 			`gallery_name` = '${config['gallery_name']}',
 			`gallery_url` = '${config['gallery_url']}'";
 	}
-	mysql_query($query);
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 
 	// Create the FTP columns in the config table if safe_mode enabled/
 	if (is_safe_mode() && isset($_SESSION['ftp_values'])) {
@@ -570,11 +570,11 @@ function configure_ftp($form) {
 	maybe_add_column(PLOGGER_TABLE_PREFIX.'config', 'ftp_pass', "varchar(64) NOT NULL default ''");
 	maybe_add_column(PLOGGER_TABLE_PREFIX.'config', 'ftp_path', "varchar(255) NOT NULL default ''");
 	$query = "UPDATE `".PLOGGER_TABLE_PREFIX."config` SET
-		`ftp_host` = '".mysql_real_escape_string($form['ftp_host'])."',
-		`ftp_user` = '".mysql_real_escape_string($form['ftp_user'])."',
-		`ftp_pass` = '".mysql_real_escape_string($form['ftp_pass'])."',
-		`ftp_path` = '".mysql_real_escape_string($form['ftp_path'])."'";
-	mysql_query($query);
+		`ftp_host` = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$form['ftp_host'])."',
+		`ftp_user` = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$form['ftp_user'])."',
+		`ftp_pass` = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$form['ftp_pass'])."',
+		`ftp_path` = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$form['ftp_path'])."'";
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 }
 
 function fix_open_perms($dirs, $action = 'rename') {
@@ -664,7 +664,7 @@ function upgrade_database() {
 		if (!isset($thumbnail_config[THUMB_SMALL]) || empty($thumbnail_config[THUMB_SMALL]['size'])) {
 			$sql = "INSERT INTO `".PLOGGER_TABLE_PREFIX."thumbnail_config` (id, update_timestamp, max_size)
 				VALUES('".THUMB_SMALL."', '".$long_ago."', '".$config['max_thumbnail_size']."')";
-			mysql_query($sql);
+			mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		}
 
 		if (!isset($config['max_display_size'])) {
@@ -673,7 +673,7 @@ function upgrade_database() {
 		if (!isset($thumbnail_config[THUMB_LARGE]) || empty($thumbnail_config[THUMB_LARGE]['size'])) {
 			$sql = "INSERT INTO `".PLOGGER_TABLE_PREFIX."thumbnail_config` (id, update_timestamp, max_size)
 				VALUES('".THUMB_LARGE."', '".$long_ago."', '".$config['max_display_size']."')";
-			mysql_query($sql);
+			mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		}
 
 		if (!isset($config['rss_thumbsize'])) {
@@ -682,7 +682,7 @@ function upgrade_database() {
 		if (!isset($thumbnail_config[THUMB_RSS]) || empty($thumbnail_config[THUMB_RSS]['size'])) {
 			$sql = "INSERT INTO `".PLOGGER_TABLE_PREFIX."thumbnail_config` (id, update_timestamp, max_size)
 				VALUES('".THUMB_RSS."', '".$long_ago."', '".$config['rss_thumbsize']."')";
-			mysql_query($sql);
+			mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		}
 
 		if (!isset($config['nav_thumbsize'])) {
@@ -691,7 +691,7 @@ function upgrade_database() {
 		if (!isset($thumbnail_config[THUMB_NAV]) || empty($thumbnail_config[THUMB_NAV]['size'])) {
 			$sql = "INSERT INTO `".PLOGGER_TABLE_PREFIX."thumbnail_config` (id, update_timestamp, max_size)
 				VALUES('".THUMB_NAV."', '".$long_ago."', '".$config['nav_thumbsize']."')";
-			mysql_query($sql);
+			mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		}
 	}
 
@@ -709,19 +709,19 @@ function upgrade_database() {
 	// Make sure to set the resize_option to square for small thumbs if previously set
 	if (isset($config['square_thumbs']) && $config['square_thumbs'] == 1) {
 		$sql = "UPDATE `".PLOGGER_TABLE_PREFIX."thumbnail_config` SET `resize_option` = '3' WHERE `id` = '".THUMB_SMALL."'";
-		mysql_query($sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	}
 
 	// Move enable_thumb_nav setting to plogger_thumbnail_config table
 	if (isset($config['enable_thumb_nav'])) {
 		$disabled = ($config['enable_thumb_nav'] == 0) ? 1 : 0;
 		$sql = "UPDATE `".PLOGGER_TABLE_PREFIX."thumbnail_config` SET `disabled` = '$disabled' WHERE `id` = '".THUMB_NAV."'";
-		mysql_query($sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	}
 
 	// set navigation thumbnails to square
 	$sql = "UPDATE `".PLOGGER_TABLE_PREFIX."thumbnail_config` SET `resize_option` = '3' WHERE `id` = '".THUMB_NAV."'";
-	mysql_query($sql);
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	
 
 /** plogger_config **/
@@ -783,14 +783,14 @@ function upgrade_database() {
 		$config['baseurl'] = 'http://'.$_SERVER['HTTP_HOST'].dirname(dirname($_SERVER['PHP_SELF'])).'/';
 		$output[] = plog_tr('Setting gallery url to ').$config['baseurl'];
 		$sql = "UPDATE `".PLOGGER_TABLE_PREFIX."config` SET gallery_url = '".$config['baseurl']."'";
-		mysql_query($sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	}
 
 	// Insert default theme directory if not already set
 	if (!isset($config['theme_dir']) || empty($config['theme_dir'])) {
 		$output[] = plog_tr('Setting default theme directory to \'default\'');
 		$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."config SET `theme_dir` = 'default' WHERE 1";
-		mysql_query($sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	}
 
 /** plogger_collections **/
@@ -866,17 +866,17 @@ function upgrade_database() {
 	");*/
 
 	$sql = 'ALTER TABLE '.PLOGGER_TABLE_PREFIX.'comments ADD INDEX approved_idx (`approved`)';
-	mysql_query($sql);
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 
 	// Add ip and approved fields to comments table
 	$sql = 'ALTER TABLE '.PLOGGER_TABLE_PREFIX.'comments CHANGE `date` `date` datetime';
-	mysql_query($sql);
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 
 	// Convert charsets
 	// Since 4.1 MySQL has support for specifying character encoding for tables
 	// and I really want to use it if available. So we need figure out what version
 	// we are running on and to the right hting
-	$mysql_version = mysql_get_server_info();
+	$mysql_version = mysqli_get_server_info($GLOBALS["PLOGGER_DBH"]);
 	$mysql_charset_support = '4.1';
 	$default_charset = '';
 
@@ -886,8 +886,8 @@ function upgrade_database() {
 		foreach($tables as $table) {
 			$tablename = PLOGGER_TABLE_PREFIX.$table;
 			$sql = "ALTER TABLE $tablename DEFAULT CHARACTER SET $charset";
-			if (!mysql_query($sql)) {
-				$output[] = "failed to convert $tablename to $charset<br />".mysql_error();
+			if (!mysqli_query($GLOBALS["PLOGGER_DBH"],$sql)) {
+				$output[] = "failed to convert $tablename to $charset<br />".mysqli_error($GLOBALS["PLOGGER_DBH"]);
 			}
 		}
 	}
@@ -901,14 +901,14 @@ function upgrade_image_list() {
 
 	// Strip 'images/' prefix from pictures table
 	$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET path = SUBSTRING(path,8) WHERE SUBSTRING(path,1,7) = 'images/'"; 
-	mysql_query($sql);
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 
 	// Update 'path' for collections table
 	$sql = "SELECT id,name FROM ".PLOGGER_TABLE_PREFIX."collections";
-	$result = mysql_query($sql);
-	while($row = mysql_fetch_assoc($result)) {
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
+	while($row = mysqli_fetch_assoc($result)) {
 		$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."collections SET path = '".strtolower(sanitize_filename($row['name']))."' WHERE id = ".$row['id'];
-		mysql_query($sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		if (!file_exists(PLOGGER_DIR.'plog-content/images/'.strtolower(sanitize_filename($row['name'])))) {
 			$list[$total] = array('container' => 1, 'new_path' => 'plog-content/images/'.strtolower(sanitize_filename($row['name'])));
 			$total++;
@@ -919,10 +919,10 @@ function upgrade_image_list() {
 	$sql = "SELECT a.id AS id, a.name AS name, c.path AS collection_path
 					FROM ".PLOGGER_TABLE_PREFIX."albums a, ".PLOGGER_TABLE_PREFIX."collections c
 					WHERE a.parent_id = c.id";
-	$result = mysql_query($sql);
-	while($row = mysql_fetch_assoc($result)) {
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
+	while($row = mysqli_fetch_assoc($result)) {
 		$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."albums SET path = '".strtolower(sanitize_filename($row['name']))."' WHERE id = ".$row['id'];
-		mysql_query($sql);
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		if (!file_exists(PLOGGER_DIR.'plog-content/images/'.$row['collection_path'].'/'.strtolower(sanitize_filename($row['name'])))) {
 			$list[$total] = array('container' => 1, 'new_path' => 'plog-content/images/'.$row['collection_path'].'/'.strtolower(sanitize_filename($row['name'])));
 			$total++;
@@ -933,9 +933,9 @@ function upgrade_image_list() {
 	$sql = "SELECT p.path AS path, p.id AS pid,c.path AS collection_path, a.path AS album_path
 			FROM ".PLOGGER_TABLE_PREFIX."albums a, ".PLOGGER_TABLE_PREFIX."pictures p, ".PLOGGER_TABLE_PREFIX."collections c 
 			WHERE p.parent_album = a.id AND p.parent_collection = c.id";
-	$result = mysql_query($sql);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 		$filename = sanitize_filename(basename($row['path']));
 		$c_directory = $row['collection_path'].'/';
 		$a_directory = $row['collection_path'].'/'.$row['album_path'].'/';
@@ -996,7 +996,7 @@ function upgrade_images($num, $list) {
 					@chmod(PLOGGER_DIR.$new_path, PLOGGER_CHMOD_DIR);
 					$output[] = sprintf(plog_tr('Moved file %s -> %s'), '<strong>'.$image['old_path'].'</strong>', '<strong>'.'plog-content/images/'.$image['new_path'].'</strong>');
 					// Update database
-					$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET path = '".mysql_real_escape_string($image['new_path'])."' WHERE id = '".$image['id']."'";
+					$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET path = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$image['new_path'])."' WHERE id = '".$image['id']."'";
 					run_query($sql);
 					// Generate a new small thumbnail after database has been updated in case script times out
 					$thumbpath = generate_thumb($image['new_path'], $image['id'], THUMB_SMALL);
@@ -1142,4 +1142,4 @@ function cleanup_files($files, $folders) {
 	return array('errors' => $errors, 'output' => $output);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/plog-admin/plog-admin-functions.php b/plog-admin/plog-admin-functions.php
index 19f15c3..85735d7 100644
--- a/plog-admin/plog-admin-functions.php
+++ b/plog-admin/plog-admin-functions.php
@@ -235,7 +235,7 @@ function add_picture($album_id, $tmpname, $filename, $caption, $desc, $allow_com
 			WHERE c.id = a.parent_id AND a.id = '$album_id'";
 
 	$sql_result = run_query($sql);
-	$albumdata = mysql_fetch_assoc($sql_result);
+	$albumdata = mysqli_fetch_assoc($sql_result);
 
 	// This shouldn't happen in normal cases
 	if (empty($albumdata)) {
@@ -323,24 +323,24 @@ function add_picture($album_id, $tmpname, $filename, $caption, $desc, $allow_com
 			VALUES
 				('".$albumdata['collection_id']."',
 				'".$albumdata['album_id']."',
-				'".mysql_real_escape_string($picture_path)."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$picture_path)."',
 				NOW(),
 				NOW(),
 				".intval($allow_comm).",
-				'".mysql_real_escape_string($exif['date_taken'])."',
-				'".mysql_real_escape_string($exif['camera'])."',
-				'".mysql_real_escape_string($exif['shutter_speed'])."',
-				'".mysql_real_escape_string($exif['focal_length'])."',
-				'".mysql_real_escape_string($exif['flash'])."',
-				'".mysql_real_escape_string($exif['aperture'])."',
-				'".mysql_real_escape_string($exif['iso'])."',
-				'".mysql_real_escape_string($caption)."',
-				'".mysql_real_escape_string($desc)."')";
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$exif['date_taken'])."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$exif['camera'])."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$exif['shutter_speed'])."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$exif['focal_length'])."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$exif['flash'])."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$exif['aperture'])."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$exif['iso'])."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$caption)."',
+				'".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$desc)."')";
 
 		$sql_result = run_query($query);
 
 		$result['output'] .= sprintf(plog_tr('Your image %s was uploaded successfully.'), '<strong>'.$filename.'</strong>');
-		$result['picture_id'] = mysql_insert_id();
+		$result['picture_id'] = mysqli_insert_id($GLOBALS["PLOGGER_DBH"]);
 
 		// Let's generate the thumbnail and the large thumbnail right away.
 		// This way, the user won't see any latency from the thumbnail generation
@@ -357,19 +357,19 @@ function add_picture($album_id, $tmpname, $filename, $caption, $desc, $allow_com
 
 function update_picture($id, $caption, $allow_comments, $description) {
 	$id = intval($id);
-	$caption = mysql_real_escape_string($caption);
-	$description = mysql_real_escape_string($description);
+	$caption = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$caption);
+	$description = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$description);
 	$allow_comments = intval($allow_comments);
 	$query = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET
 			caption = '$caption',
 			description = '$description',
 			allow_comments = '$allow_comments'
 		WHERE id='$id'";
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 	if ($result) {
 		return array('output' => plog_tr('You have successfully modified the selected picture.'));
 	} else {
-		return array('errors' => mysql_error());
+		return array('errors' => mysqli_error($GLOBALS["PLOGGER_DBH"]));
 	}
 }
 
@@ -382,11 +382,11 @@ function update_picture_field($picture_id, $field, $value) {
 	$errors = $output = '';
 
 	$picture_id = intval($picture_id);
-	$value = mysql_real_escape_string(trim($value));
+	$value = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],trim($value));
 
 	$query = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET $field = '$value' WHERE id='$picture_id'";
 
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 	if ($result) {
 		return array('output' => plog_tr('You have successfully modified the selected picture.'));
 	} else {
@@ -403,7 +403,7 @@ function move_picture($pic_id, $to_album) {
 
 	$query = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."albums WHERE `id` = '".$to_album."'";
 	$result = run_query($query);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	if (!is_array($row)) {
 		return array('errors' => sprintf(plog_tr('There is no album with id %s.'), '<strong>'.$to_album.'</strong>'));
@@ -470,12 +470,12 @@ function move_picture($pic_id, $to_album) {
 
 	// Update database
 	$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET
-			path = '".mysql_real_escape_string($picture_path)."',
+			path = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$picture_path)."',
 			parent_album = '".$to_album."',
 			parent_collection = '".$new_collection."'
 		WHERE id = '".$pic_id."'";
-	if (!mysql_query($sql)) {
-		return array('errors' => mysql_error());
+	if (!mysqli_query($GLOBALS["PLOGGER_DBH"],$sql)) {
+		return array('errors' => mysqli_error($GLOBALS["PLOGGER_DBH"]));
 	}
 	return array('output' => plog_tr('Success'));
 }
@@ -570,12 +570,12 @@ function add_collection($collection_name, $description) {
 	if (!makeDirs($create_path)) {
 		$errors .= sprintf(plog_tr('Could not create directory %s!'), '<strong>'.$create_path.'</strong>');
 	} else {
-		$sql_name = mysql_real_escape_string($collection_name);
-		$description = mysql_real_escape_string($description);
-		$collection_folder = mysql_real_escape_string($collection_folder);
+		$sql_name = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$collection_name);
+		$description = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$description);
+		$collection_folder = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$collection_folder);
 		$query = "INSERT INTO ".PLOGGER_TABLE_PREFIX."collections (`name`,`description`,`path`) VALUES ('$sql_name', '$description', '$collection_folder')";
 		$result = run_query($query);
-		$id = mysql_insert_id();
+		$id = mysqli_insert_id($GLOBALS["PLOGGER_DBH"]);
 
 		$output .= sprintf(plog_tr('You have successfully created the collection %s.'), '<strong>'.$collection_name.'</strong>');
 	}
@@ -609,8 +609,8 @@ function update_collection($collection_id, $name, $description, $thumbnail_id =
 	$collection_id = intval($collection_id);
 	$thumbnail_id = intval($thumbnail_id);
 
-	$name = mysql_real_escape_string($name);
-	$description = mysql_real_escape_string($description);
+	$name = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$name);
+	$description = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$description);
 
 	// Rename the directory
 	// First, get the collection name of our source collection
@@ -619,7 +619,7 @@ function update_collection($collection_id, $name, $description, $thumbnail_id =
 			WHERE c.id = '$collection_id'";
 
 	$result = run_query($sql);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	$source_collection_name = SmartStripSlashes($row['collection_path']);
 	$source_path = $config['basedir'].'plog-content/images/'.$source_collection_name;
@@ -650,12 +650,12 @@ function update_collection($collection_id, $name, $description, $thumbnail_id =
 		}
 	}
 
-	$target_name = mysql_real_escape_string($target_name);
+	$target_name = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$target_name);
 
 	$query = "UPDATE ".PLOGGER_TABLE_PREFIX."collections SET name = '$name', path = '$target_name', description = '$description', thumbnail_id = '$thumbnail_id' WHERE id='$collection_id'";
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 	if (!$result) {
-		return array('errors' => mysql_error());
+		return array('errors' => mysqli_error($GLOBALS["PLOGGER_DBH"]));
 	}
 
 	$output = plog_tr('You have successfully modified the selected collection.');
@@ -670,16 +670,16 @@ function update_collection($collection_id, $name, $description, $thumbnail_id =
 
 	$result = run_query($sql);
 
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 
 		$filename = basename($row['path']);
 		$album_path = $row['album_path'];
 
-		$new_path = mysql_real_escape_string(SmartStripSlashes($target_name.'/'.$album_path.'/'.$filename));
+		$new_path = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],SmartStripSlashes($target_name.'/'.$album_path.'/'.$filename));
 
 		// Update database
 		$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET path = '$new_path' WHERE id = '$row[id]'";
-		mysql_query($sql) or ($output .= mysql_error());
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql) or ($output .= mysqli_error($GLOBALS["PLOGGER_DBH"]));
 	}
 
 	return array(
@@ -697,11 +697,11 @@ function update_collection_field($collection_id, $field, $value) {
 	$errors = $output = '';
 
 	$collection_id = intval($collection_id);
-	$value = mysql_real_escape_string(trim($value));
+	$value = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],trim($value));
 
 	$query = "UPDATE ".PLOGGER_TABLE_PREFIX."collections SET $field = '$value' WHERE id='$collection_id'";
 
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 	if ($result) {
 		return array('output' => plog_tr('You have successfully modified the selected collection.'));
 	} else {
@@ -717,7 +717,7 @@ function delete_collection($del_id) {
 		WHERE c.id = '$del_id'";
 
 	$result = run_query($sql);
-	$collection = mysql_fetch_assoc($result);
+	$collection = mysqli_fetch_assoc($result);
 
 	if (!$collection) {
 		return array('errors' => plog_tr('No such collection.'));
@@ -726,7 +726,7 @@ function delete_collection($del_id) {
 	// First delete all albums registered with this album
 	$sql = 'SELECT * FROM '.PLOGGER_TABLE_PREFIX.'albums WHERE parent_id = '.$collection['collection_id'];
 	$result = run_query($sql);
-	while ($row = mysql_fetch_assoc($result)) {
+	while ($row = mysqli_fetch_assoc($result)) {
 		delete_album($row['id']);
 	}
 
@@ -768,7 +768,7 @@ function add_album($album_name, $description, $pid) {
 	$query = "SELECT c.path as collection_path FROM ". PLOGGER_TABLE_PREFIX."collections c WHERE id = '$pid'";
 
 	$result = run_query($query);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	// This shouldn't happen
 	if (empty($row)) {
@@ -800,12 +800,12 @@ function add_album($album_name, $description, $pid) {
 	if (!makeDirs($create_path)) {
 		$errors .= sprintf(plog_tr('Could not create directory %s!'), '<strong>'.$path.'</strong>');
 	} else {
-		$sql_name = mysql_real_escape_string($album_name);
-		$description = mysql_real_escape_string($description);
-		$album_folder = mysql_real_escape_string($album_folder);
+		$sql_name = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$album_name);
+		$description = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$description);
+		$album_folder = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$album_folder);
 		$query = "INSERT INTO ".PLOGGER_TABLE_PREFIX."albums (`name`,`description`,`parent_id`,`path`) VALUES ('$sql_name', '$description', '$pid', '$album_folder')";
 		$result = run_query($query);
-		$id = mysql_insert_id();
+		$id = mysqli_insert_id($GLOBALS["PLOGGER_DBH"]);
 
 		$output .= sprintf(plog_tr('You have successfully created the album %s.'), '<strong>'.$album_name.'</strong>');
 	}
@@ -826,8 +826,8 @@ function update_album($album_id, $name, $description, $thumbnail_id = 0) {
 
 	$album_id = intval($album_id);
 	$thumbnail_id = intval($thumbnail_id);
-	$name = mysql_real_escape_string(SmartStripSlashes(trim($name)));
-	$description = mysql_real_escape_string(SmartStripSlashes($description));
+	$name = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],SmartStripSlashes(trim($name)));
+	$description = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],SmartStripSlashes($description));
 	if (empty($name)) {
 		return array('errors' => plog_tr('Please enter a valid name for the album.'));
 	}
@@ -840,7 +840,7 @@ function update_album($album_id, $name, $description, $thumbnail_id = 0) {
 			WHERE c.id = a.parent_id AND a.id = ".$album_id;
 
 	$result = run_query($sql);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	$source_album_name = SmartStripSlashes($row['album_path']);
 	$source_collection_name = SmartStripSlashes($row['collection_path']);
@@ -873,7 +873,7 @@ function update_album($album_id, $name, $description, $thumbnail_id = 0) {
 		}
 	}
 
-	$target_name = mysql_real_escape_string($target_name);
+	$target_name = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$target_name);
 
 	// Proceed only if rename succeeded
 	$query = "UPDATE ".PLOGGER_TABLE_PREFIX."albums SET
@@ -883,9 +883,9 @@ function update_album($album_id, $name, $description, $thumbnail_id = 0) {
 			path = '$target_name'
 		WHERE id='$album_id'";
 
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 	if (!$result) {
-		return array('errors' => mysql_error());
+		return array('errors' => mysqli_error($GLOBALS["PLOGGER_DBH"]));
 	}
 
 	$output .= plog_tr('You have successfully modified the selected album.');
@@ -897,14 +897,14 @@ function update_album($album_id, $name, $description, $thumbnail_id = 0) {
 
 	$result = run_query($sql);
 
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 
 		$filename = basename($row['path']);
-		$new_path = mysql_real_escape_string(SmartStripSlashes($source_collection_name.'/'.$target_name.'/'.$filename));
+		$new_path = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],SmartStripSlashes($source_collection_name.'/'.$target_name.'/'.$filename));
 
 		// Update database
 		$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET path = '$new_path' WHERE id = '$row[id]'";
-		mysql_query($sql) or ($errors .= mysql_error());
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql) or ($errors .= mysqli_error($GLOBALS["PLOGGER_DBH"]));
 	}
 
 	return array(
@@ -919,7 +919,7 @@ function update_album_field($album_id, $field, $value) {
 		return array('errors' => plog_tr('Invalid action'));
 	}
 
-	$value = mysql_real_escape_string(trim(SmartStripSlashes($value)));
+	$value = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],trim(SmartStripSlashes($value)));
 	$errors = $output = '';
 	$album_id = intval($album_id);
 
@@ -928,7 +928,7 @@ function update_album_field($album_id, $field, $value) {
 			$field = '$value'
 		WHERE id='$album_id'";
 
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 
 	if ($result) {
 		return array('output' => plog_tr('You have successfully modified the selected album.'));
@@ -957,7 +957,7 @@ function move_album($album_id, $to_collection) {
 			WHERE c.id = a.parent_id AND a.id = '$album_id'";
 
 	$result = run_query($sql);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	$source_album_name = SmartStripSlashes($row['album_path']);
 	$source_collection_name = SmartStripSlashes($row['collection_path']);
@@ -973,7 +973,7 @@ function move_album($album_id, $to_collection) {
 	$sql = "SELECT c.path as collection_path FROM ".PLOGGER_TABLE_PREFIX."collections c WHERE c.id = '$to_collection'";
 
 	$result = run_query($sql);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	$target_collection_name = SmartStripSlashes($row['collection_path']);
 	$source_path = $config['basedir'].'plog-content/images/'.$source_collection_name.'/'.$source_album_name.'/';
@@ -1009,7 +1009,7 @@ function move_album($album_id, $to_collection) {
 	$result = run_query($sql);
 	$pic_ids = array();
 
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 		$filename = SmartStripSlashes(basename($row['path']));
 		$pic_ids[] = $row['picture_id'];
 		$old_path = $source_path.$filename;
@@ -1021,13 +1021,13 @@ function move_album($album_id, $to_collection) {
 			@chmod($new_path, PLOGGER_CHMOD_FILE);
 		}
 
-		$path_insert = mysql_real_escape_string($target_collection_name.'/'.$source_album_name.'/'.$filename);
+		$path_insert = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$target_collection_name.'/'.$source_album_name.'/'.$filename);
 
 		$sql = "UPDATE ".PLOGGER_TABLE_PREFIX."pictures SET
 				parent_collection = '$to_collection',
 				path = '$path_insert'
 			WHERE id = '$row[picture_id]'";
-		mysql_query($sql) or ($res['errors'] .= mysql_error());
+		mysqli_query($GLOBALS["PLOGGER_DBH"],$sql) or ($res['errors'] .= mysqli_error($GLOBALS["PLOGGER_DBH"]));
 	}
 
 	// Check if collection thumbnail = picture moved to different collection and set to default if so
@@ -1058,7 +1058,7 @@ function delete_album($del_id) {
 		WHERE c.id = a.parent_id AND a.id = '$del_id'";
 
 	$result = run_query($sql);
-	$album = mysql_fetch_assoc($result);
+	$album = mysqli_fetch_assoc($result);
 
 	if (!$album) {
 		return array('errors' => plog_tr('No such album'));
@@ -1067,7 +1067,7 @@ function delete_album($del_id) {
 	// First delete all pictures registered with this album
 	$sql = 'SELECT * FROM '.PLOGGER_TABLE_PREFIX.'pictures WHERE parent_album = '.$album['album_id'];
 	$result = run_query($sql);
-	while ($row = mysql_fetch_assoc($result)) {
+	while ($row = mysqli_fetch_assoc($result)) {
 		delete_picture($row['id']);
 	}
 
@@ -1101,13 +1101,13 @@ function delete_album($del_id) {
 
 function update_comment($id, $author, $email, $url, $comment) {
 	$id = intval($id);
-	$author = mysql_real_escape_string($author);
-	$email = mysql_real_escape_string($email);
-	$url = mysql_real_escape_string($url);
-	$comment = mysql_real_escape_string(trim($comment));
+	$author = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$author);
+	$email = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$email);
+	$url = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$url);
+	$comment = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],trim($comment));
 
 	$query = "UPDATE ".PLOGGER_TABLE_PREFIX."comments SET author = '$author', comment = '$comment', url = '$url', email = '$email' WHERE id='$id'";
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 	if ($result) {
 		return array('output' => plog_tr('You have successfully modified the selected comment.'));
 	} else {
@@ -1122,10 +1122,10 @@ function update_comment_field($id, $field, $value) {
 	}
 
 	$id = intval($id);
-	$value = mysql_real_escape_string($value);
+	$value = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$value);
 
 	$query = "UPDATE ".PLOGGER_TABLE_PREFIX."comments SET $field = '$value' WHERE id='$id'";
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 	if ($result) {
 		return array('output' => plog_tr('You have successfully modified the selected comment.'));
 	} else {
@@ -1140,7 +1140,7 @@ function count_albums($parent_id = 0) {
 		$numquery = "SELECT COUNT(*) AS `num_albums` FROM `".PLOGGER_TABLE_PREFIX."albums` WHERE parent_id = '$parent_id'";
 
 	$numresult = run_query($numquery);
-	$num_albums = mysql_result($numresult, 0, 'num_albums');
+	$num_albums = mysqli_result($numresult, 0, 'num_albums');
 	return $num_albums;
 }
 
@@ -1149,7 +1149,7 @@ function count_collections() {
 	$numquery = "SELECT COUNT(*) AS `num_collections` FROM `".PLOGGER_TABLE_PREFIX."collections`";
 
 	$numresult = run_query($numquery);
-	$num_albums = mysql_result($numresult, 0, 'num_collections');
+	$num_albums = mysqli_result($numresult, 0, 'num_collections');
 	return $num_albums;
 }
 
@@ -1160,7 +1160,7 @@ function count_pictures($parent_id = 0) {
 		$numquery = "SELECT COUNT(*) AS `num_pics` FROM `".PLOGGER_TABLE_PREFIX."pictures` WHERE parent_album = '$parent_id'";
 
 	$numresult = run_query($numquery);
-	$num_pics = mysql_result($numresult, 0, 'num_pics');
+	$num_pics = mysqli_result($numresult, 0, 'num_pics');
 	return $num_pics;
 }
 
@@ -1171,7 +1171,7 @@ function count_comments($parent_id = false) {
 	}
 
 	$numresult = run_query($numquery);
-	$num_comments = mysql_result($numresult, 0, 'num_comments');
+	$num_comments = mysqli_result($numresult, 0, 'num_comments');
 	return $num_comments;
 }
 
@@ -1180,7 +1180,7 @@ function plog_edit_comment_form($comment_id) {
 	$comment_id = intval($comment_id);
 	$sql = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."comments c WHERE c.id = '$comment_id'";
 	$result = run_query($sql);
-	$comment = mysql_fetch_assoc($result);
+	$comment = mysqli_fetch_assoc($result);
 	if (!is_array($comment)) {
 		// XXX: return an error message instead
 		return false;
@@ -1530,7 +1530,7 @@ function plog_edit_collection_form($collection_id) {
 			ORDER BY a.name, p.date_submitted";
 
 	$result = run_query($sql);
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 		$selected = ($row['id'] == $collection['thumbnail_id']) ? ' selected="selected"' : '';
 		$style = 'class="thumboption" style="padding-left: '.($thumbnail_config[THUMB_SMALL]['size'] + 5).'px; background-image: url('.generate_thumb(SmartStripSlashes($row['path']), $row['id']).');"';
 
@@ -1582,7 +1582,7 @@ function plog_edit_album_form($album_id) {
 	$sql = "SELECT id, caption, path FROM ".PLOGGER_TABLE_PREFIX."pictures p WHERE p.parent_album = '".$album_id."'";
 
 	$result = run_query($sql);
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 			$selected = ($row['id'] == $album['thumbnail_id']) ? ' selected="selected"' : '';
 			$style = 'class="thumboption" style="padding-left: '.($thumbnail_config[THUMB_SMALL]['size'] + 5).'px; background-image: url('.generate_thumb(SmartStripSlashes($row['path']), $row['id']).');"';
 			$images .= "\n\t\t\t\t" . '<option '.$style.' value="'.$row['id'].'"'.$selected.'>';
@@ -1974,7 +1974,7 @@ function plogger_generate_server_info() {
 
 		$server_data .= "\n\t\t\t" . '<strong>'.plog_tr('Server Software').':</strong> '.$software_type.'/'.$software_version.' '.$software_distro.'<br />
 			<strong>'.plog_tr('PHP Version').':</strong> '.phpversion().' ('.strtoupper(php_sapi_name()).')<br />
-			<strong>'.plog_tr('MySQL Version').':</strong> '.mysql_get_server_info().'<br />
+			<strong>'.plog_tr('MySQL Version').':</strong> '.mysqli_get_server_info($GLOBALS["PLOGGER_DBH"]).'<br />
 			<strong>'.plog_tr('GD Version').':</strong>';
 
 /* Thanks to the Pixelpost Crew for the gd_info code below */
diff --git a/plog-admin/plog-feedback.php b/plog-admin/plog-feedback.php
index 837962a..890b1df 100644
--- a/plog-admin/plog-feedback.php
+++ b/plog-admin/plog-feedback.php
@@ -91,12 +91,12 @@ if (!isset($edit_page)) {
 
 	// Let's generate the pagination menu as well
 	$recordCount = "SELECT count(*) AS num_comments FROM ".PLOGGER_TABLE_PREFIX."comments WHERE `approved` = 1";
-	$totalRowsResult = mysql_query($recordCount);
-	$num_comments = mysql_result($totalRowsResult, 0, 'num_comments');
+	$totalRowsResult = mysqli_query($GLOBALS["PLOGGER_DBH"],$recordCount);
+	$num_comments = mysqli_result($totalRowsResult, 0, 'num_comments');
 
 	$query = "SELECT count(*) AS in_moderation FROM ".PLOGGER_TABLE_PREFIX."comments WHERE `approved` = 0";
 	$mod_result = run_query($query);
-	$num_comments_im = mysql_result($mod_result, 0, 'in_moderation');
+	$num_comments_im = mysqli_result($mod_result, 0, 'in_moderation');
 
 	// Filter based on whether were looking at approved comments or unmoderated comments
 	if (isset($_REQUEST['moderate']) && $_REQUEST['moderate'] == 1) {
@@ -118,11 +118,11 @@ if (!isset($edit_page)) {
 	// Generate javascript init function for ajax editing
 	$query = "SELECT *, UNIX_TIMESTAMP(`date`) AS `date` from ".PLOGGER_TABLE_PREFIX."comments WHERE `approved` = ".$approved." ORDER BY `id` DESC ".$limit;
 	$result = run_query($query);
-	if (mysql_num_rows($result) > 0) {
+	if (mysqli_num_rows($result) > 0) {
 		$output .= "\n\t\t" . '<script type="text/javascript">';
 		$output .= "\n\t\t\t" . 'Event.observe(window, \'load\', init, false);';
 		$output .= "\n\t\t\t" . 'function init() {' . "\n";
-		while($row = mysql_fetch_assoc($result)) {
+		while($row = mysqli_fetch_assoc($result)) {
 			$output .= "\t\t\t\tmakeEditable('comment-comment-".$row['id']."');
 				makeEditable('comment-author-".$row['id']."');
 				makeEditable('comment-url-".$row['id']."');
@@ -138,7 +138,7 @@ if (!isset($edit_page)) {
 	$empty = 0;
 
 	if ($result) {
-		if (mysql_num_rows($result) == 0) {
+		if (mysqli_num_rows($result) == 0) {
 			if ($approved) {
 				$output .= "\n\t\t" . '<p class="stats-info">'.plog_tr('You have no comments on your gallery').'.</p>';
 			} else {
@@ -162,7 +162,7 @@ if (!isset($edit_page)) {
 			$output .= $pagination_menu;
 		}
 
-		while($row = mysql_fetch_assoc($result)) {
+		while($row = mysqli_fetch_assoc($result)) {
 			// If we're on our first iteration, dump the header
 			if ($counter == 0) {
 				if ($approved) {
@@ -270,4 +270,4 @@ if (!isset($edit_page)) {
 
 display($output, 'feedback');
 
-?>
\ No newline at end of file
+?>
diff --git a/plog-admin/plog-import.php b/plog-admin/plog-import.php
index 0e27972..6c192aa 100644
--- a/plog-admin/plog-import.php
+++ b/plog-admin/plog-import.php
@@ -77,7 +77,7 @@ if (isset($_POST['upload'])) {
 					// Get the collection name for display
 					$sql = "SELECT `name` FROM ".PLOGGER_TABLE_PREFIX."collections WHERE id = ".intval($_REQUEST['collections_menu']);
 					$result = run_query($sql);
-					$row = mysql_fetch_assoc($result);
+					$row = mysqli_fetch_assoc($result);
 					$output .= "\n\t" . '<p class="actions">'.sprintf(plog_tr('Album already exists. Uploading file to existing album %s in collection %s'), '<strong>'.$_REQUEST['new_album_name'].'</strong>', '<strong>'.$row['name'].'</strong>').'</p>' . "\n";
 				} else {
 					// Error has nothing to do with an existing album, show the returned error
@@ -125,7 +125,7 @@ if (isset($_POST['upload'])) {
 			// Get album name for display
 			$sql = "SELECT name FROM ".PLOGGER_TABLE_PREFIX."albums WHERE id = $album_id";
 			$result = run_query($sql);
-			$row = mysql_fetch_assoc($result);
+			$row = mysqli_fetch_assoc($result);
 
 			$output .= "\n\t" . '<h1>'.plog_tr('Import').'</h1>';
 
@@ -346,12 +346,12 @@ if (isset($_POST['upload'])) {
 
 			// Check if album exists
 			if (is_null($album_name)) // file is only one level deep, assume folder name is album name
-			$sql = "SELECT id FROM ".PLOGGER_TABLE_PREFIX."albums WHERE name = '".mysql_real_escape_string($collection_name)."'";
+			$sql = "SELECT id FROM ".PLOGGER_TABLE_PREFIX."albums WHERE name = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$collection_name)."'";
 			else
-			$sql = "SELECT id FROM ".PLOGGER_TABLE_PREFIX."albums WHERE name = '".mysql_real_escape_string($album_name)."'";
+			$sql = "SELECT id FROM ".PLOGGER_TABLE_PREFIX."albums WHERE name = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$album_name)."'";
 
 			$result = run_query($sql);
-			$row = mysql_fetch_assoc($result);
+			$row = mysqli_fetch_assoc($result);
 			$new_album_name = '';
 
 			if(!isset($row['id'])) { // Album doesn't exist, place in new album box
diff --git a/plog-admin/plog-manage.php b/plog-admin/plog-manage.php
index 8be0886..93f9468 100644
--- a/plog-admin/plog-manage.php
+++ b/plog-admin/plog-manage.php
@@ -64,7 +64,7 @@ function generate_breadcrumb_admin($level, $id = 0) {
 		case 'comments':
 			$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."pictures` WHERE `id`='".$id."'";
 			$result = run_query($query);
-			$row = mysql_fetch_assoc($result);
+			$row = mysqli_fetch_assoc($result);
 
 			$picture_link = '<strong>'.SmartStripSlashes(basename($row['path'])).'</strong>';
 			$album_id = $row['parent_album'];
@@ -72,13 +72,13 @@ function generate_breadcrumb_admin($level, $id = 0) {
 
 			$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."albums` WHERE `id`='".$album_id."'";
 			$result = run_query($query);
-			$row = mysql_fetch_assoc($result);
+			$row = mysqli_fetch_assoc($result);
 
 			$album_link = '<a href="'.$_SERVER['PHP_SELF'].'?level=pictures&amp;id='.$album_id.'">'.SmartStripSlashes($row['name']).'</a>';
 
 			$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."collections` WHERE `id`='".$collection_id."'";
 			$result = run_query($query);
-			$row = mysql_fetch_assoc($result);
+			$row = mysqli_fetch_assoc($result);
 
 			$collection_link = '<a href="'.$_SERVER['PHP_SELF'].'?level=albums&amp;id='.$collection_id.'">'.SmartStripSlashes($row['name']).'</a>';
 
@@ -307,8 +307,8 @@ if (!isset($edit_page)) {
 
 	// Let's generate the pagination menu as well
 	$recordCount = "SELECT COUNT(*) AS num_items FROM ".PLOGGER_TABLE_PREFIX."$level $cond";
-	$totalRowsResult = mysql_query($recordCount);
-	$totalRows = mysql_result($totalRowsResult, 0, 'num_items');
+	$totalRowsResult = mysqli_query($GLOBALS["PLOGGER_DBH"],$recordCount);
+	$totalRows = mysqli_result($totalRowsResult, 0, 'num_items');
 
 	$pagination_menu = "\n\t\t" . '<div class="entries-page">'.generate_pagination_view_menu().'
 		</div><!-- /entries-page -->
diff --git a/plog-admin/plog-options.php b/plog-admin/plog-options.php
index 0db16db..108cd27 100644
--- a/plog-admin/plog-options.php
+++ b/plog-admin/plog-options.php
@@ -33,35 +33,35 @@ if (isset($_POST['submit'])) {
 	// Update general settings
 	$query = "UPDATE `".PLOGGER_TABLE_PREFIX."config` SET
 	`truncate`= '".intval($_POST['truncate'])."',
-	`feed_title`= '".mysql_real_escape_string($_POST['feed_title'])."',
+	`feed_title`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['feed_title'])."',
 	`feed_content` = '".intval($_POST['rss_content'])."',
 	`feed_num_entries`= '".intval($_POST['feed_num_entries'])."',
 	`allow_dl`= '".intval($allow_dl)."',
 	`allow_comments`= '".intval($allow_comments)."',
 	`allow_print`= '".intval($allow_print)."',
-	`default_sortby`= '".mysql_real_escape_string($_POST['default_sortby'])."',
-	`default_sortdir`= '".mysql_real_escape_string($_POST['default_sortdir'])."',
-	`album_sortby`= '".mysql_real_escape_string($_POST['album_sortby'])."',
-	`album_sortdir`= '".mysql_real_escape_string($_POST['album_sortdir'])."',
-	`collection_sortby`= '".mysql_real_escape_string($_POST['collection_sortby'])."',
-	`collection_sortdir`= '".mysql_real_escape_string($_POST['collection_sortdir'])."',
+	`default_sortby`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['default_sortby'])."',
+	`default_sortdir`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['default_sortdir'])."',
+	`album_sortby`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['album_sortby'])."',
+	`album_sortdir`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['album_sortdir'])."',
+	`collection_sortby`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['collection_sortby'])."',
+	`collection_sortdir`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['collection_sortdir'])."',
 	`thumb_num`= '".intval($_POST['thumb_num'])."',
 	`compression`= '".intval($_POST['image_quality'])."',
-	`admin_username`= '".mysql_real_escape_string($_POST['admin_username'])."',
-	`admin_email`= '".mysql_real_escape_string($_POST['admin_email'])."',
-	`date_format`= '".mysql_real_escape_string($_POST['date_format'])."',
+	`admin_username`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['admin_username'])."',
+	`admin_email`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['admin_email'])."',
+	`date_format`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['date_format'])."',
 	`use_mod_rewrite`= '".intval($use_mod_rewrite)."',
 	`comments_notify`= '".intval($comments_notify)."',
 	`comments_moderate`= '".intval($comments_moderate)."',
-	`gallery_url`= '".mysql_real_escape_string($_POST['gallery_url'])."',
-	`gallery_name`= '".mysql_real_escape_string($_POST['gallery_name'])."',
+	`gallery_url`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['gallery_url'])."',
+	`gallery_name`= '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_POST['gallery_name'])."',
 	`thumb_nav_range`= '".intval($_POST['thumb_nav_range'])."',
 	`allow_fullpic`= '".intval($allow_fullpic)."'";
 
 	// Update password if set and passwords match
 	if (trim($_POST['admin_password']) != '') {
 		if (trim($_POST['admin_password']) == trim($_POST['confirm_admin_password'])) {
-			$query .= ", `admin_password`= '".md5(mysql_real_escape_string(trim($_POST['admin_password'])))."'";
+			$query .= ", `admin_password`= '".md5(mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],trim($_POST['admin_password'])))."'";
 		} else {
 			$error_flag = true;
 			$output .= '<p class="errors">'.plog_tr('The passwords you entered did not match').'.</p>';
diff --git a/plog-admin/plog-themes.php b/plog-admin/plog-themes.php
index c546657..046cae6 100644
--- a/plog-admin/plog-themes.php
+++ b/plog-admin/plog-themes.php
@@ -47,7 +47,7 @@ if (isset($_REQUEST['activate'])) {
 		include($metafile);
 		$sql = 'UPDATE '.PLOGGER_TABLE_PREFIX.'config SET `theme_dir` = \''.$new_theme_dir.'\'';
 		$name = $theme_name.' '.$version;
-		if (mysql_query($sql)) {
+		if (mysqli_query($GLOBALS["PLOGGER_DBH"],$sql)) {
 			$output .= "\n\n\t\t" . '<p class="success">'.sprintf(plog_tr('Activated new theme %s'), '<strong>'.$name.'</strong>').'</p>';
 		} else {
 			$output .= "\n\n\t\t" . '<p class="errors">'.plog_tr('Error activating theme').'!</p>';
diff --git a/plog-admin/plog-upload.php b/plog-admin/plog-upload.php
index f308728..14c54ff 100644
--- a/plog-admin/plog-upload.php
+++ b/plog-admin/plog-upload.php
@@ -113,7 +113,7 @@ if (isset($_REQUEST['upload'])) {
 		} else {
 			if ($_REQUEST['destination_radio'] == 'new') {
 				// Create the new album
-				$result = add_album(mysql_real_escape_string($_REQUEST['new_album_name']), NULL, $_REQUEST['collections_menu']);
+				$result = add_album(mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$_REQUEST['new_album_name']), NULL, $_REQUEST['collections_menu']);
 				if (!$result['errors']) {
 					// No errors, add uploaded image to new album
 					$album_id = $result['id'];
@@ -126,7 +126,7 @@ if (isset($_REQUEST['upload'])) {
 						// Get the collection name for display
 						$sql = "SELECT `name` FROM ".PLOGGER_TABLE_PREFIX."collections WHERE id = ".intval($_REQUEST['collections_menu']);
 						$result = run_query($sql);
-						$row = mysql_fetch_assoc($result);
+						$row = mysqli_fetch_assoc($result);
 						$output .= "\n\t" . '<p class="actions">'.sprintf(plog_tr('Album already exists. Uploading file to existing album %s in collection %s'), '<strong>'.$_REQUEST['new_album_name'].'</strong>', '<strong>'.$row['name'].'</strong>').'</p>' . "\n";
 					} else {
 						// Error has nothing to do with an existing album, show the returned error
diff --git a/plog-content/plugins/latest-comments/latest-comments.php b/plog-content/plugins/latest-comments/latest-comments.php
index 5fff6a8..3883c68 100644
--- a/plog-content/plugins/latest-comments/latest-comments.php
+++ b/plog-content/plugins/latest-comments/latest-comments.php
@@ -49,17 +49,17 @@ $plog_lc_comment_trim = '100';
 /* The database query to pull the latest comments from the database */
 $plog_lc_query = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."comments WHERE `approved` = 1 ORDER BY `id` DESC LIMIT $plog_lc_amount";
 
-$plog_lc_result = mysql_query($plog_lc_query) or die ("Could not execute query: $plog_lc_query." .mysql_error());
+$plog_lc_result = mysqli_query($GLOBALS["PLOGGER_DBH"],$plog_lc_query) or die ("Could not execute query: $plog_lc_query." .mysqli_error($GLOBALS["PLOGGER_DBH"]));
 
 /* Start html output */
 
-if (mysql_num_rows($plog_lc_result) > 0) {
+if (mysqli_num_rows($plog_lc_result) > 0) {
 	echo "\n\t" . '<ul class="latest-comments">';
 
 $config['baseurl'] = $plog_lc_site_url;
 
 /* The latest comments loop */
-	while ($row = mysql_fetch_array($plog_lc_result)) {
+	while ($row = mysqli_fetch_array($plog_lc_result)) {
 		$id = $row['id'];
 		$parent_id = $row['parent_id'];
 		$author = $row['author'];
@@ -86,4 +86,4 @@ $config['baseurl'] = $plog_lc_site_url;
 	echo "\n\t" . '<p>'.plog_tr('No comments yet').'</p>' . "\n";
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/plog-content/plugins/latest-images/latest-images.php b/plog-content/plugins/latest-images/latest-images.php
index fa73a92..dc34e2a 100644
--- a/plog-content/plugins/latest-images/latest-images.php
+++ b/plog-content/plugins/latest-images/latest-images.php
@@ -50,12 +50,12 @@ $plog_latest_images_query = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."pictures ORDE
 /* The database query to pull the latest images from a specific collection. Uncomment and change the X to the ID of the desired collection. */
 //$plog_latest_images_query = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."pictures WHERE `parent_collection` = X ORDER BY `id` DESC LIMIT $plog_latest_images_amount";
 
-$plog_latest_images_result = mysql_query($plog_latest_images_query) or die ("Could not execute query: $plog_latest_images_query." .mysql_error());
+$plog_latest_images_result = mysqli_query($GLOBALS["PLOGGER_DBH"],$plog_latest_images_query) or die ("Could not execute query: $plog_latest_images_query." .mysqli_error($GLOBALS["PLOGGER_DBH"]));
 
 $config['baseurl'] = $plog_latest_images_site_url;
 
 /* The loop */
-while ($row = mysql_fetch_array($plog_latest_images_result)) {
+while ($row = mysqli_fetch_array($plog_latest_images_result)) {
 	$id = $row['id'];
 	$path = $row['path'];
 	$caption = SmartStripSlashes($row['caption']);
diff --git a/plog-content/plugins/random-images/random-images.php b/plog-content/plugins/random-images/random-images.php
index 1ea0241..aa042d2 100644
--- a/plog-content/plugins/random-images/random-images.php
+++ b/plog-content/plugins/random-images/random-images.php
@@ -50,12 +50,12 @@ $plog_random_images_query = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."pictures ORDE
 /* The database query to pull random images from a specific collection. Uncomment and change the X to the ID of the desired collection. */
 //$plog_random_images_query = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."pictures WHERE `parent_collection` = X ORDER BY RAND() LIMIT $plog_random_images_amount";
 
-$plog_random_images_result = mysql_query($plog_random_images_query) or die ("Could not execute query: $plog_random_images_query." .mysql_error());
+$plog_random_images_result = mysqli_query($GLOBALS["PLOGGER_DBH"],$plog_random_images_query) or die ("Could not execute query: $plog_random_images_query." .mysqli_error($GLOBALS["PLOGGER_DBH"]));
 
 $config['baseurl'] = $plog_random_images_site_url;
 
 /* The loop */
-while ($row = mysql_fetch_array($plog_random_images_result)) {
+while ($row = mysqli_fetch_array($plog_random_images_result)) {
 	$id = $row['id'];
 	$path = $row['path'];
 	$caption = SmartStripSlashes($row['caption']);
diff --git a/plog-content/themes/air/theme_functions.php b/plog-content/themes/air/theme_functions.php
index b3388a1..b8a3f4d 100644
--- a/plog-content/themes/air/theme_functions.php
+++ b/plog-content/themes/air/theme_functions.php
@@ -4,7 +4,7 @@
 function plogger_stats_count_total_collections() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."collections`";
 	$result = run_query($query);
-	$num_collections = mysql_result($result, 0, 'n');
+	$num_collections = mysqli_result($result, 0, 'n');
 	echo $num_collections . ' ';
 	echo ($num_collections == 1) ? plog_tr('collection') : plog_tr('collections');
 }
@@ -12,7 +12,7 @@ function plogger_stats_count_total_collections() {
 function plogger_stats_count_total_albums() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."albums`";
 	$result = run_query($query);
-	$num_albums = mysql_result($result, 0, 'n');
+	$num_albums = mysqli_result($result, 0, 'n');
 	echo $num_albums . ' ';
 	echo ($num_albums == 1) ? plog_tr('album') : plog_tr('albums');
 }
@@ -20,7 +20,7 @@ function plogger_stats_count_total_albums() {
 function plogger_stats_count_total_pictures() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."pictures`";
 	$result = run_query($query);
-	$num_pictures = mysql_result($result, 0, 'n');
+	$num_pictures = mysqli_result($result, 0, 'n');
 	echo $num_pictures . ' ';
 	echo ($num_pictures == 1) ? plog_tr('image') : plog_tr('images');
 }
@@ -28,7 +28,7 @@ function plogger_stats_count_total_pictures() {
 function plogger_stats_count_total_comments() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."comments` WHERE approved = 1";
 	$result = run_query($query);
-	$num_comments = mysql_result($result, 0, 'n');
+	$num_comments = mysqli_result($result, 0, 'n');
 	echo $num_comments . ' ';
 	echo ($num_comments == 1) ? plog_tr('comment') : plog_tr('comments');
 }
diff --git a/plog-content/themes/default/album.php b/plog-content/themes/default/album.php
index 6a8bc86..1bdfc52 100644
--- a/plog-content/themes/default/album.php
+++ b/plog-content/themes/default/album.php
@@ -32,4 +32,4 @@
 <?php endif; ?>
 		</div><!-- /thumbnail-container -->
 
-<?php plogger_get_footer(); ?>
\ No newline at end of file
+<?php plogger_get_footer(); ?>
diff --git a/plog-content/themes/default/collection.php b/plog-content/themes/default/collection.php
index 74b3937..4dabd76 100644
--- a/plog-content/themes/default/collection.php
+++ b/plog-content/themes/default/collection.php
@@ -29,4 +29,4 @@
 <?php endif; ?>
 		</div><!-- /thumbnail-container -->
 
-<?php plogger_get_footer(); ?>
\ No newline at end of file
+<?php plogger_get_footer(); ?>
diff --git a/plog-content/themes/default/collections.php b/plog-content/themes/default/collections.php
index 0b55a9a..fc4541e 100644
--- a/plog-content/themes/default/collections.php
+++ b/plog-content/themes/default/collections.php
@@ -29,4 +29,4 @@
 <?php endif; ?>
 		</div><!-- /thumbnail-container -->
 
-<?php plogger_get_footer(); ?>
\ No newline at end of file
+<?php plogger_get_footer(); ?>
diff --git a/plog-content/themes/default/theme_functions.php b/plog-content/themes/default/theme_functions.php
index b3388a1..b8a3f4d 100644
--- a/plog-content/themes/default/theme_functions.php
+++ b/plog-content/themes/default/theme_functions.php
@@ -4,7 +4,7 @@
 function plogger_stats_count_total_collections() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."collections`";
 	$result = run_query($query);
-	$num_collections = mysql_result($result, 0, 'n');
+	$num_collections = mysqli_result($result, 0, 'n');
 	echo $num_collections . ' ';
 	echo ($num_collections == 1) ? plog_tr('collection') : plog_tr('collections');
 }
@@ -12,7 +12,7 @@ function plogger_stats_count_total_collections() {
 function plogger_stats_count_total_albums() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."albums`";
 	$result = run_query($query);
-	$num_albums = mysql_result($result, 0, 'n');
+	$num_albums = mysqli_result($result, 0, 'n');
 	echo $num_albums . ' ';
 	echo ($num_albums == 1) ? plog_tr('album') : plog_tr('albums');
 }
@@ -20,7 +20,7 @@ function plogger_stats_count_total_albums() {
 function plogger_stats_count_total_pictures() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."pictures`";
 	$result = run_query($query);
-	$num_pictures = mysql_result($result, 0, 'n');
+	$num_pictures = mysqli_result($result, 0, 'n');
 	echo $num_pictures . ' ';
 	echo ($num_pictures == 1) ? plog_tr('image') : plog_tr('images');
 }
@@ -28,7 +28,7 @@ function plogger_stats_count_total_pictures() {
 function plogger_stats_count_total_comments() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."comments` WHERE approved = 1";
 	$result = run_query($query);
-	$num_comments = mysql_result($result, 0, 'n');
+	$num_comments = mysqli_result($result, 0, 'n');
 	echo $num_comments . ' ';
 	echo ($num_comments == 1) ? plog_tr('comment') : plog_tr('comments');
 }
diff --git a/plog-content/themes/lucid/theme_functions.php b/plog-content/themes/lucid/theme_functions.php
index b3388a1..b8a3f4d 100644
--- a/plog-content/themes/lucid/theme_functions.php
+++ b/plog-content/themes/lucid/theme_functions.php
@@ -4,7 +4,7 @@
 function plogger_stats_count_total_collections() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."collections`";
 	$result = run_query($query);
-	$num_collections = mysql_result($result, 0, 'n');
+	$num_collections = mysqli_result($result, 0, 'n');
 	echo $num_collections . ' ';
 	echo ($num_collections == 1) ? plog_tr('collection') : plog_tr('collections');
 }
@@ -12,7 +12,7 @@ function plogger_stats_count_total_collections() {
 function plogger_stats_count_total_albums() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."albums`";
 	$result = run_query($query);
-	$num_albums = mysql_result($result, 0, 'n');
+	$num_albums = mysqli_result($result, 0, 'n');
 	echo $num_albums . ' ';
 	echo ($num_albums == 1) ? plog_tr('album') : plog_tr('albums');
 }
@@ -20,7 +20,7 @@ function plogger_stats_count_total_albums() {
 function plogger_stats_count_total_pictures() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."pictures`";
 	$result = run_query($query);
-	$num_pictures = mysql_result($result, 0, 'n');
+	$num_pictures = mysqli_result($result, 0, 'n');
 	echo $num_pictures . ' ';
 	echo ($num_pictures == 1) ? plog_tr('image') : plog_tr('images');
 }
@@ -28,7 +28,7 @@ function plogger_stats_count_total_pictures() {
 function plogger_stats_count_total_comments() {
 	$query = "SELECT COUNT(*) AS `n` FROM `".PLOGGER_TABLE_PREFIX."comments` WHERE approved = 1";
 	$result = run_query($query);
-	$num_comments = mysql_result($result, 0, 'n');
+	$num_comments = mysqli_result($result, 0, 'n');
 	echo $num_comments . ' ';
 	echo ($num_comments == 1) ? plog_tr('comment') : plog_tr('comments');
 }
diff --git a/plog-download.php b/plog-download.php
index 9f264c3..b901647 100644
--- a/plog-download.php
+++ b/plog-download.php
@@ -234,13 +234,13 @@ function add_photos($checked, $type, $dir) {
 			$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."collections` WHERE `id`='".intval($cid)."'";
 			$result = run_query($query);
 
-			while ($row = mysql_fetch_assoc($result)) {
+			while ($row = mysqli_fetch_assoc($result)) {
 				$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."albums` WHERE `parent_id`='".$row['id']."'";
 				$newresult = run_query($query);
 
 				$newchecked = array();
 
-				while ($newrow = mysql_fetch_assoc($newresult)) {
+				while ($newrow = mysqli_fetch_assoc($newresult)) {
 					$newchecked[] = $newrow['id'];
 				}
 
@@ -262,13 +262,13 @@ function add_photos($checked, $type, $dir) {
 			$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."albums` WHERE `id`='".intval($aid)."'";
 			$result = run_query($query);
 
-			while ($row = mysql_fetch_assoc($result)) {
+			while ($row = mysqli_fetch_assoc($result)) {
 				$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."pictures` WHERE `parent_album`='".$row['id']."'";
 				$newresult = run_query($query);
 
 				$newchecked = array();
 
-				while ($newrow = mysql_fetch_assoc($newresult)) {
+				while ($newrow = mysqli_fetch_assoc($newresult)) {
 					$newchecked[] = $newrow['id'];
 				}
 
@@ -290,7 +290,7 @@ function add_photos($checked, $type, $dir) {
 			$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."pictures` WHERE `id`='".intval($pid)."'";
 			$result = run_query($query);
 
-			while ($row = mysql_fetch_assoc($result)) {
+			while ($row = mysqli_fetch_assoc($result)) {
 				$file_contents = file_get_contents('plog-content/images/'.$row['path'], true);
 				$zipfile -> add_file($file_contents, $row['path']);
 
diff --git a/plog-includes/lib/phpthumb/phpThumb.php b/plog-includes/lib/phpthumb/phpThumb.php
index c45840a..61041a5 100644
--- a/plog-includes/lib/phpthumb/phpThumb.php
+++ b/plog-includes/lib/phpthumb/phpThumb.php
@@ -168,28 +168,28 @@ if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_ima
 }
 
 if ($phpThumb->config_mysql_query) {
-	if ($cid = @mysql_connect($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password)) {
-		if (@mysql_select_db($phpThumb->config_mysql_database, $cid)) {
-			if ($result = @mysql_query($phpThumb->config_mysql_query, $cid)) {
-				if ($row = @mysql_fetch_array($result)) {
+	if ($cid = @mysqli_connect($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password)) {
+		if (@mysqli_select_db($GLOBALS["PLOGGER_DBH"],$phpThumb->config_mysql_database, $cid)) {
+			if ($result = @mysqli_query($GLOBALS["PLOGGER_DBH"],$phpThumb->config_mysql_query, $cid)) {
+				if ($row = @mysqli_fetch_array($result)) {
 
-					mysql_free_result($result);
-					mysql_close($cid);
+					mysqli_free_result($GLOBALS["PLOGGER_DBH"],$result);
+					mysqli_close($cid);
 					$phpThumb->setSourceData($row[0]);
 					unset($row);
 
 				} else {
-					mysql_free_result($result);
-					mysql_close($cid);
+					mysqli_free_result($GLOBALS["PLOGGER_DBH"],$result);
+					mysqli_close($cid);
 					$phpThumb->ErrorImage('no matching data in database.');
 				}
 			} else {
-				mysql_close($cid);
-				$phpThumb->ErrorImage('Error in MySQL query: "'.mysql_error($cid).'"');
+				mysqli_close($cid);
+				$phpThumb->ErrorImage('Error in MySQL query: "'.mysqli_error($cid).'"');
 			}
 		} else {
-			mysql_close($cid);
-			$phpThumb->ErrorImage('cannot select MySQL database: "'.mysql_error($cid).'"');
+			mysqli_close($cid);
+			$phpThumb->ErrorImage('cannot select MySQL database: "'.mysqli_error($cid).'"');
 		}
 	} else {
 		$phpThumb->ErrorImage('cannot connect to MySQL server');
@@ -537,4 +537,4 @@ if (@$_GET['phpThumbDebug'] == '9') {
 
 $phpThumb->OutputThumbnail();
 
-?>
\ No newline at end of file
+?>
diff --git a/plog-includes/plog-functions.php b/plog-includes/plog-functions.php
index ab8c5a4..6f94773 100644
--- a/plog-includes/plog-functions.php
+++ b/plog-includes/plog-functions.php
@@ -5,6 +5,18 @@ if (basename($_SERVER['PHP_SELF']) == basename( __FILE__ )) {
 	exit();
 }
 
+function mysqli_result($res,$row=0,$col=0){ 
+    $numrows = mysqli_num_rows($res); 
+    if ($numrows && $row <= ($numrows-1) && $row >=0){
+        mysqli_data_seek($res,$row);
+        $resrow = (is_numeric($col)) ? mysqli_fetch_row($res) : mysqli_fetch_assoc($res);
+        if (isset($resrow[$col])){
+            return $resrow[$col];
+        }
+    }
+    return false;
+}
+
 function generate_password($low = 5, $high = 8) {
 	$salt = md5(time().crypt('abcdefghkmnpqrstuvwxyz23456789'));
 	$src = preg_split('//', $salt, -1, PREG_SPLIT_NO_EMPTY);
@@ -199,7 +211,7 @@ function generate_jump_menu() {
 	GROUP BY `parent_album`";
 	$result = run_query($sql);
 
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 		$image_count[$row['parent_album']] = $row['imagecount'];
 	}
 
@@ -216,7 +228,7 @@ function generate_jump_menu() {
 
 	$last_collection = '';
 
-	while ($row = mysql_fetch_assoc($result)) {
+	while ($row = mysqli_fetch_assoc($result)) {
 		// skip albums with no images
 		if (empty($image_count[$row['album_id']])) {
 			continue;
@@ -239,8 +251,8 @@ function generate_exif_table($id) {
 	global $config;
 	$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."pictures` WHERE `id`=".intval($id);
 	$result = run_query($query);
-	if (mysql_num_rows($result) > 0) {
-		$row = mysql_fetch_assoc($result);
+	if (mysqli_num_rows($result) > 0) {
+		$row = mysqli_fetch_assoc($result);
 		foreach($row as $key => $val) if (trim($row[$key]) == '') $row[$key] = '&nbsp;';
 		// get image size
 		$img = $config['basedir'].'plog-content/images/'.SmartStripSlashes($row['path']);
@@ -482,12 +494,12 @@ function is_plogger_installed() {
 		$mysql = check_mysql(PLOGGER_DB_HOST, PLOGGER_DB_USER, PLOGGER_DB_PW, PLOGGER_DB_NAME);
 		if (empty($mysql)) {
 			$sql = "DESCRIBE `".PLOGGER_TABLE_PREFIX."config`";
-			$result = mysql_query($sql);
+			$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 			if ($result) {
 				$installed = true;
 				$config_sql = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."config`";
-				$config_result = mysql_query($config_sql);
-				$config = mysql_fetch_assoc($config_result);
+				$config_result = mysqli_query($GLOBALS["PLOGGER_DBH"],$config_sql);
+				$config = mysqli_fetch_assoc($config_result);
 			}
 		}
 	}
@@ -497,15 +509,16 @@ function is_plogger_installed() {
 function check_mysql($host, $user, $pass, $database) {
 	$errors = array();
 	if (function_exists('mysql_connect')) {
-		$connection = @mysql_connect($host, $user, $pass);
+		$connection = @mysqli_connect($host, $user, $pass);
 		if (!$connection) {
-			$errors[] = plog_tr('Cannot connect to MySQL with the information provided. MySQL error: ').mysql_error();
+			$errors[] = plog_tr('Cannot connect to MySQL with the information provided. MySQL error: ').mysqli_error($GLOBALS["PLOGGER_DBH"]);
 		}
 	}
-	$select = @mysql_select_db($database);
-	if (!$select) {
-		$errors[] = sprintf(plog_tr('Cannot find the database %s. MySQL error: '), '<strong>'.$database.'</strong>').mysql_error();
+	$select = @mysqli_select_db($GLOBALS["PLOGGER_DBH"],$database);
+	if ($select === false) {
+		$errors[] = sprintf(plog_tr('Cannot find the database %s. MySQL error: '), '<strong>'.$database.'</strong>').mysqli_error($GLOBALS["PLOGGER_DBH"]);
 	}
+	connect_db();
 	return $errors;
 }
 
@@ -513,15 +526,15 @@ function connect_db() {
 	global $config, $PLOGGER_DBH;
 
 	if (!isset($PLOGGER_DBH)) {
-		$PLOGGER_DBH = mysql_connect(PLOGGER_DB_HOST, PLOGGER_DB_USER, PLOGGER_DB_PW) or die(plog_tr('Plogger cannot connect to the database because: ').mysql_error());
+		$PLOGGER_DBH = mysqli_connect(PLOGGER_DB_HOST, PLOGGER_DB_USER, PLOGGER_DB_PW) or die(plog_tr('Plogger cannot connect to the database because: ').mysqli_error($GLOBALS["PLOGGER_DBH"]));
 
-		mysql_select_db(PLOGGER_DB_NAME);
+		mysqli_select_db($GLOBALS["PLOGGER_DBH"],PLOGGER_DB_NAME);
 
-		$mysql_version = mysql_get_server_info();
+		$mysql_version = mysqli_get_server_info($GLOBALS["PLOGGER_DBH"]);
 		$mysql_charset_support = '4.1';
 
 		if (1 == version_compare($mysql_version, $mysql_charset_support)) {
-			mysql_query('SET NAMES utf8');
+			mysqli_query($GLOBALS["PLOGGER_DBH"],'SET NAMES utf8');
 		}
 	}
 
@@ -531,7 +544,7 @@ function close_db() {
 	global $PLOGGER_DBH;
 
 	if (isset($PLOGGER_DBH)) {
-		mysql_close($PLOGGER_DBH);
+		mysqli_close($PLOGGER_DBH);
 	}
 }
 
@@ -543,12 +556,12 @@ function run_query($query) {
 		$GLOBALS['queries'][] = $query;
 	}
 
-	$result = @mysql_query($query, $PLOGGER_DBH);
-
+	$result = @mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
+	
 	if (!$result) {
 		$trace = debug_backtrace();
 
-		die(mysql_error($PLOGGER_DBH).'<br /><br />' .
+		die(mysqli_error($PLOGGER_DBH).'<br /><br />' .
 		$query.'<br /><br />
 		In file: '.$_SERVER['PHP_SELF'].'<br /><br />
 		On line: '.$trace[0]['line']);
@@ -566,7 +579,7 @@ function get_active_collections_albums() {
 
 	$sql = "SELECT parent_collection, parent_album FROM `".PLOGGER_TABLE_PREFIX."pictures` GROUP BY parent_collection, parent_album";
 	$result = run_query($sql);
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 		$image_collection_count[$row['parent_collection']] = 1;
 		$image_album_count[$row['parent_album']] = 1;
 	}
@@ -742,7 +755,7 @@ function generate_thumb($path, $prefix, $type = THUMB_SMALL) {
 function check_picture_id($id) {
 	$sql = "SELECT `parent_album` FROM ".PLOGGER_TABLE_PREFIX."pictures WHERE `id` = ".intval($id);
 	$result = run_query($sql);
-	if (mysql_num_rows($result) > 0) {
+	if (mysqli_num_rows($result) > 0) {
 		return true;
 	} else {
 		$GLOBALS['plogger_level'] = '404';
@@ -777,14 +790,14 @@ function get_picture_by_id($id, $album_id = null) {
 
 	$resultPicture = run_query($sql);
 
-	if (is_array($id) && mysql_num_rows($resultPicture) > 0) {
+	if (is_array($id) && mysqli_num_rows($resultPicture) > 0) {
 		$picdata = array();
-		while ($row = mysql_fetch_assoc($resultPicture)) {
+		while ($row = mysqli_fetch_assoc($resultPicture)) {
 			$row['url'] = $config['gallery_url'].'plog-content/images/'.$row['collection_path'].'/'.$row['album_path'].'/'.basename($row['path']);
 			array_unshift($picdata, $row);
 		}
-	} elseif (!is_array($id) && mysql_num_rows($resultPicture) > 0) {
-		$picdata = mysql_fetch_assoc($resultPicture);
+	} elseif (!is_array($id) && mysqli_num_rows($resultPicture) > 0) {
+		$picdata = mysqli_fetch_assoc($resultPicture);
 
 		// Eventually I want to get rid of the full path in pictures tables to avoid useless data duplication
 		// The following is a temporary solution so I don't have to break all the functionality at once
@@ -824,7 +837,7 @@ function get_pictures($album_id, $order = 'alpha', $sort = 'DESC') {
 
 	$pictures = array();
 
-	while ($row = mysql_fetch_assoc($result)) {
+	while ($row = mysqli_fetch_assoc($result)) {
 		// See comment in get_picture_by_id
 		$row['url'] = $config['gallery_url'].'plog-content/images/'.$row['collection_path'].'/'.$row['album_path'].'/'.basename($row['path']);
 		$pictures[$row['id']] = $row;
@@ -836,8 +849,8 @@ function get_pictures($album_id, $order = 'alpha', $sort = 'DESC') {
 function check_album_id($id) {
 	$sql = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."albums WHERE `id` = ".intval($id);
 	$result = run_query($sql);
-	if (mysql_num_rows($result) > 0) {
-		$GLOBALS['current_album'] = mysql_fetch_assoc($result);
+	if (mysqli_num_rows($result) > 0) {
+		$GLOBALS['current_album'] = mysqli_fetch_assoc($result);
 		return true;
 	} else {
 		$GLOBALS['plogger_level'] = '404';
@@ -860,8 +873,8 @@ function get_album_by_id($id) {
 	WHERE `a`.`id` = ".intval($id);
 	$result = run_query($sql);
 
-	if (mysql_num_rows($result) > 0) {
-		$album = mysql_fetch_assoc($result);
+	if (mysqli_num_rows($result) > 0) {
+		$album = mysqli_fetch_assoc($result);
 
 		if ($album['thumbnail_id'] == 0) {
 			$query = "SELECT `id`, `path`
@@ -871,8 +884,8 @@ function get_album_by_id($id) {
 			LIMIT 1";
 			$result = run_query($query);
 
-			if (mysql_num_rows($result) > 0) {
-				$row = mysql_fetch_assoc($result);
+			if (mysqli_num_rows($result) > 0) {
+				$row = mysqli_fetch_assoc($result);
 				$album['thumbnail_id'] = $row['id'];
 			}
 		}
@@ -886,11 +899,11 @@ function get_album_by_id($id) {
 function get_album_by_name($name, $collection_id) {
 	$sql = "SELECT *
 	FROM `".PLOGGER_TABLE_PREFIX."albums`
-	WHERE `name` = '".mysql_real_escape_string($name)."'
+	WHERE `name` = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$name)."'
 	AND `parent_id` = ".intval($collection_id);
 	$result = run_query($sql);
-	if (mysql_num_rows($result) > 0) {
-		$album = mysql_fetch_assoc($result);
+	if (mysqli_num_rows($result) > 0) {
+		$album = mysqli_fetch_assoc($result);
 	} else {
 		$album = false;
 	}
@@ -900,8 +913,8 @@ function get_album_by_name($name, $collection_id) {
 function check_collection_id($id) {
 	$sql = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."collections WHERE `id` = ".intval($id);
 	$result = run_query($sql);
-	if (mysql_num_rows($result) > 0) {
-		$GLOBALS['current_collection'] = mysql_fetch_assoc($result);
+	if (mysqli_num_rows($result) > 0) {
+		$GLOBALS['current_collection'] = mysqli_fetch_assoc($result);
 		return true;
 	} else {
 		$GLOBALS['plogger_level'] = '404';
@@ -920,10 +933,10 @@ function get_collection_by_id($id) {
 	ORDER BY `c`.`name` ASC";
 	$resultCollection = run_query($sqlCollection);
 
-	if (mysql_num_rows($resultCollection) == 0) {
+	if (mysqli_num_rows($resultCollection) == 0) {
 		$collection = false;
 	} else {
-		$collection = mysql_fetch_assoc($resultCollection);
+		$collection = mysqli_fetch_assoc($resultCollection);
 
 		if ($collection['thumbnail_id'] == 0) {
 			$query = "SELECT `id`, `path`
@@ -933,8 +946,8 @@ function get_collection_by_id($id) {
 			LIMIT 1";
 			$result = run_query($query);
 
-			if (mysql_num_rows($result) > 0) {
-				$row = mysql_fetch_assoc($result);
+			if (mysqli_num_rows($result) > 0) {
+				$row = mysqli_fetch_assoc($result);
 				$collection['thumbnail_id'] = $row['id'];
 			}
 		}
@@ -946,10 +959,10 @@ function get_collection_by_id($id) {
 function get_collection_by_name($name) {
 	$sql = "SELECT *
 	FROM `".PLOGGER_TABLE_PREFIX."collections`
-	WHERE name = '".mysql_real_escape_string($name)."'";
+	WHERE name = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$name)."'";
 	$result = run_query($sql);
-	if (mysql_num_rows($result) > 0) {
-		$collection = mysql_fetch_assoc($result);
+	if (mysqli_num_rows($result) > 0) {
+		$collection = mysqli_fetch_assoc($result);
 	} else {
 		$collection = false;
 	}
@@ -1008,7 +1021,7 @@ function get_albums($collection_id = null, $sort = 'alpha', $order = 'DESC') {
 
 	$result = run_query($query);
 
-	while ($album = mysql_fetch_assoc($result)) {
+	while ($album = mysqli_fetch_assoc($result)) {
 		if ($album['thumbnail_id'] == 0) {
 			$query = "SELECT `id`, `path`
 			FROM `".PLOGGER_TABLE_PREFIX."pictures`
@@ -1017,8 +1030,8 @@ function get_albums($collection_id = null, $sort = 'alpha', $order = 'DESC') {
 			LIMIT 1";
 			$thumb_result = run_query($query);
 
-			if (mysql_num_rows($thumb_result) > 0) {
-				$row = mysql_fetch_assoc($thumb_result);
+			if (mysqli_num_rows($thumb_result) > 0) {
+				$row = mysqli_fetch_assoc($thumb_result);
 				$album['thumbnail_id'] = $row['id'];
 			}
 		}
@@ -1061,7 +1074,7 @@ function get_collections($sort = 'alpha', $order = 'DESC') {
 
 	$collections = array();
 
-	while ($collection = mysql_fetch_assoc($resultCollection)) {
+	while ($collection = mysqli_fetch_assoc($resultCollection)) {
 		if ($collection['thumbnail_id'] == 0) {
 			$query = "SELECT `id`, `path`
 			FROM `".PLOGGER_TABLE_PREFIX."pictures`
@@ -1070,8 +1083,8 @@ function get_collections($sort = 'alpha', $order = 'DESC') {
 			LIMIT 1";
 			$result = run_query($query);
 
-			if (mysql_num_rows($result) > 0) {
-				$row = mysql_fetch_assoc($result);
+			if (mysqli_num_rows($result) > 0) {
+				$row = mysqli_fetch_assoc($result);
 				$collection['thumbnail_id'] = $row['id'];
 			}
 		}
@@ -1112,7 +1125,7 @@ function resolve_path($str = '') {
 
 	foreach($levels as $key => $level) {
 		if (isset($path_parts[$key])) {
-			$names[$level] = mysql_real_escape_string(urldecode(SmartStripSlashes($path_parts[$key])));
+			$names[$level] = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],urldecode(SmartStripSlashes($path_parts[$key])));
 			$current_level = $level;
 		}
 	}
@@ -1141,7 +1154,7 @@ function resolve_path($str = '') {
 		$result = run_query($sql);
 
 		// No such collection
-		if (mysql_num_rows($result) == 0) {
+		if (mysqli_num_rows($result) == 0) {
 			// Check if it's an RSS feed
 			if ($names['collection'] == 'feed') {
 				return array('level' => 'collections', 'id' => 0);
@@ -1151,7 +1164,7 @@ function resolve_path($str = '') {
 			}
 		}
 
-		$collection = mysql_fetch_assoc($result);
+		$collection = mysqli_fetch_assoc($result);
 
 		// What if there are multiple collections with same names? I hope there aren't .. this would
 		// suck. But here is an idea, we shouldn't allow the user to enter similar names
@@ -1170,7 +1183,7 @@ function resolve_path($str = '') {
 		$result = run_query($sql);
 
 		// No such album
-		if (mysql_num_rows($result) == 0) {
+		if (mysqli_num_rows($result) == 0) {
 			// Check if it's an RSS feed
 			if ($names['album'] == 'feed') {
 				return array('level' => 'collection', 'id' => $collection['id']);
@@ -1180,7 +1193,7 @@ function resolve_path($str = '') {
 			}
 		}
 
-		$album = mysql_fetch_assoc($result);
+		$album = mysqli_fetch_assoc($result);
 
 		// Try to detect slideshow. Downside is that you cannot have a picture with that name
 		if (isset($names['picture']) && $names['picture'] == 'slideshow') {
@@ -1214,7 +1227,7 @@ function resolve_path($str = '') {
 		AND `parent_album`=".intval($album['id']);
 		$result = run_query($sql);
 
-		$picture = mysql_fetch_assoc($result);
+		$picture = mysqli_fetch_assoc($result);
 
 		// No such caption, perhaps we have better luck with path?
 		if (!$picture) {
@@ -1231,7 +1244,7 @@ function resolve_path($str = '') {
 			WHERE `path` LIKE '".$filepath.".%'
 			AND `parent_album`=".intval($album['id']);
 			$result = run_query($sql);
-			$picture = mysql_fetch_assoc($result);
+			$picture = mysqli_fetch_assoc($result);
 		}
 
 		// No such picture
@@ -1404,12 +1417,11 @@ function generate_url($level, $id = -1, $arg = array(), $plaintext = false) {
 				$args .= $aval.'/';
 			}
 		}
-
 		switch($level) {
 			case 'collection':
 				$query = "SELECT `path` FROM `".PLOGGER_TABLE_PREFIX."collections` WHERE `id`=".intval($id);
 				$result = run_query($query);
-				$row = mysql_fetch_assoc($result);
+				$row = mysqli_fetch_assoc($result);
 				$rv = $config['baseurl'].rawurlencode(SmartStripSlashes($row['path'])).'/'.$args;
 				break;
 			case 'album':
@@ -1420,7 +1432,7 @@ function generate_url($level, $id = -1, $arg = array(), $plaintext = false) {
 				LEFT JOIN `".PLOGGER_TABLE_PREFIX."collections` AS `c` ON `a`.`parent_id`=`c`.`id`
 				WHERE `a`.`id`=".intval($id);
 				$result = run_query($query);
-				$row = mysql_fetch_assoc($result);
+				$row = mysqli_fetch_assoc($result);
 				$rv = $config['baseurl'].rawurlencode(SmartStripSlashes($row['collection_path'])).'/'.rawurlencode(SmartStripSlashes($row['album_path'])).'/'.$args;
 				break;
 			case 'picture':
@@ -1507,11 +1519,11 @@ function add_comment($parent_id, $author, $email, $url, $comment) {
 	$host = gethostbyaddr($ip);
 
 	// I want to use the original unescaped values later - to send the email
-	$sql_author = mysql_real_escape_string($author);
-	$sql_email = mysql_real_escape_string($email);
-	$sql_url = mysql_real_escape_string($url);
-	$sql_comment = mysql_real_escape_string($comment);
-	$sql_ip = mysql_real_escape_string($ip);
+	$sql_author = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$author);
+	$sql_email = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$email);
+	$sql_url = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$url);
+	$sql_comment = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$comment);
+	$sql_ip = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$ip);
 
 	$parent_id = intval($parent_id);
 
@@ -1545,10 +1557,10 @@ function add_comment($parent_id, $author, $email, $url, $comment) {
 	`parent_id`= '$parent_id',
 	`approved` = '$approved',
 	`ip` = '$ip'";
-	$result = mysql_query($query);
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
 
 	if (!$result) {
-		return array('errors' => plog_tr('Could not post comment').mysql_error());
+		return array('errors' => plog_tr('Could not post comment').mysqli_error($GLOBALS["PLOGGER_DBH"]));
 	}
 
 	// XXX: admin email address should be validated
@@ -1589,7 +1601,7 @@ function plogger_list_categories($class) {
 	$output = "\n" . '<ul class="'.$class.'">';
 
 	// Loop through each collection, output child albums
-	while ($row = mysql_fetch_assoc($result)) {
+	while ($row = mysqli_fetch_assoc($result)) {
 		// Output collection name
 		$collection_link = '<a href="'.generate_url('collection', $row['id']).'">'.$row['name'].'</a>';
 		$output .= "\n\t" . '<li>'.$collection_link.'</li>';
@@ -1598,7 +1610,7 @@ function plogger_list_categories($class) {
 		$query = "SELECT * FROM ".PLOGGER_TABLE_PREFIX."albums WHERE parent_id = '$row[id]' ORDER BY name DESC";
 
 		$output .= "\n<ul>";
-		while ($albums = mysql_fetch_assoc($result)) {
+		while ($albums = mysqli_fetch_assoc($result)) {
 			$album_link = '<a href="'.generate_url('albums', $albums['id']).'">'.$albums['name'].'</a>';
 			$output .= "\n\t" . '<li>'.$album_link.'</li>';
 		}
@@ -1709,7 +1721,7 @@ function plogger_init_picture($arr) {
 
 	unset($_SESSION['require_captcha']);
 
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	if (!$row) {
 		return false;
@@ -1768,7 +1780,7 @@ function plogger_init_picture($arr) {
 
 	$result = run_query($sql);
 
-	while ($image = mysql_fetch_assoc($result)) {
+	while ($image = mysqli_fetch_assoc($result)) {
 		$image_list[] = $image['id'];
 	}
 
@@ -1782,7 +1794,7 @@ function plogger_init_picture($arr) {
 	WHERE `id`=$id";
 	$result = run_query($sql);
 
-	$GLOBALS['available_pictures'] = mysql_num_rows($result);
+	$GLOBALS['available_pictures'] = mysqli_num_rows($result);
 	$GLOBALS['picture_counter'] = 0;
 	$GLOBALS['picture_dbh'] = $result;
 
@@ -1818,7 +1830,7 @@ function plogger_init_picture($arr) {
 	}
 	$result = run_query($query);
 
-	$GLOBALS['available_comments'] = mysql_num_rows($result);
+	$GLOBALS['available_comments'] = mysqli_num_rows($result);
 	$GLOBALS['comment_counter'] = 0;
 	$GLOBALS['comment_dbh'] = $result;
 }
@@ -1860,7 +1872,7 @@ function plogger_init_pictures($arr) {
 	}
 
 	$result = run_query("SELECT COUNT(DISTINCT p.`id`) AS cnt ".$sql);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	$GLOBALS['total_pictures'] = $row['cnt'];
 
@@ -1929,7 +1941,7 @@ function plogger_init_pictures($arr) {
 	UNIX_TIMESTAMP(`date_submitted`) AS `unix_date_submitted`,
 	UNIX_TIMESTAMP(`EXIF_date_taken`) AS `unix_exif_date_taken` ".$sql);
 
-	$GLOBALS['available_pictures'] = mysql_num_rows($result);
+	$GLOBALS['available_pictures'] = mysqli_num_rows($result);
 	$GLOBALS['picture_counter'] = 0;
 	$GLOBALS['picture_dbh'] = $result;
 }
@@ -1961,7 +1973,7 @@ function plogger_init_search($arr) {
 	if ((count($terms) != 1) || ($terms[0] != '')) {
 		$query .= " WHERE ( ";
 		foreach ($terms as $term) {
-			$term = mysql_real_escape_string($term);
+			$term = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$term);
 			$multi_term = explode('+', $term);
 			if (count($multi_term)>1) {
 				$path = implode("%' AND `path` LIKE '%", $multi_term);
@@ -1998,7 +2010,7 @@ function plogger_init_search($arr) {
 	}
 
 	$result = run_query("SELECT COUNT(DISTINCT p.`id`) AS cnt ".$query);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	$GLOBALS['total_pictures'] = $row['cnt'];
 	// And I need sort order here as well
@@ -2007,7 +2019,7 @@ function plogger_init_search($arr) {
 	UNIX_TIMESTAMP(`date_submitted`) AS `unix_date_submitted` ".$query."
 	GROUP BY p.`id` ORDER BY `$sortby` $sortdir LIMIT $from, $limit");
 
-	$GLOBALS['available_pictures'] = mysql_num_rows($result);
+	$GLOBALS['available_pictures'] = mysqli_num_rows($result);
 	$GLOBALS['picture_counter'] = 0;
 	$GLOBALS['picture_dbh'] = $result;
 }
@@ -2016,7 +2028,7 @@ function plogger_init_collections($arr) {
 	$sql = "SELECT COUNT(DISTINCT `parent_collection`) AS `num_items`
 	FROM `".PLOGGER_TABLE_PREFIX."pictures`";
 	$result = run_query($sql);
-	$num_items = mysql_result($result, 0, 'num_items');
+	$num_items = mysqli_result($result, 0, 'num_items');
 	$GLOBALS['total_pictures'] = $num_items;
 
 	// Create a list of all non-empty collections. Could be done with subqueries, but
@@ -2031,7 +2043,7 @@ function plogger_init_collections($arr) {
 	$sql = "SELECT parent_collection, parent_album, COUNT(*) AS imagecount
 	FROM `".PLOGGER_TABLE_PREFIX."pictures` GROUP BY parent_collection, parent_album";
 	$result = run_query($sql);
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 		$image_collection_count[$row['parent_collection']] = $row['imagecount'];
 		$image_album_count[$row['parent_album']] = $row['imagecount'];
 	}
@@ -2050,7 +2062,7 @@ function plogger_init_collections($arr) {
 	GROUP BY parent_id";
 
 	$result = run_query($sql);
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 		$album_count[$row['parent_id']] = $row['albumcount'];
 	}
 
@@ -2082,7 +2094,7 @@ function plogger_init_collections($arr) {
 	$sql = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."collections`".$where.$order.$limit;
 	$result = run_query($sql);
 
-	$GLOBALS['available_collections'] = mysql_num_rows($result);
+	$GLOBALS['available_collections'] = mysqli_num_rows($result);
 	$GLOBALS['collection_counter'] = 0;
 	$GLOBALS['collection_dbh'] = $result;
 }
@@ -2100,7 +2112,7 @@ function plogger_init_albums($arr) {
 	FROM `".PLOGGER_TABLE_PREFIX."pictures` $where";
 
 	$result = run_query($sql);
-	$num_items = mysql_result($result, 0, 'num_items');
+	$num_items = mysqli_result($result, 0, 'num_items');
 
 	$GLOBALS['total_pictures'] = $num_items;
 
@@ -2113,7 +2125,7 @@ function plogger_init_albums($arr) {
 	// 1. create a list of all albums with at least one photo
 	$sql = "SELECT parent_album, COUNT(*) AS imagecount FROM `".PLOGGER_TABLE_PREFIX."pictures` GROUP BY parent_album";
 	$result = run_query($sql);
-	while($row = mysql_fetch_assoc($result)) {
+	while($row = mysqli_fetch_assoc($result)) {
 		$image_count[$row['parent_album']] = $row['imagecount'];
 	}
 
@@ -2153,7 +2165,7 @@ function plogger_init_albums($arr) {
 
 	$result = run_query($sql);
 
-	$GLOBALS['available_albums'] = mysql_num_rows($result);
+	$GLOBALS['available_albums'] = mysqli_num_rows($result);
 	$GLOBALS['album_counter'] = 0;
 	$GLOBALS['album_dbh'] = $result;
 
@@ -2377,7 +2389,7 @@ function plogger_picture_allows_comments() {
 }
 
 function plogger_load_picture() {
-	$rv = mysql_fetch_assoc($GLOBALS['picture_dbh']);
+	$rv = mysqli_fetch_assoc($GLOBALS['picture_dbh']);
 	$GLOBALS['picture_counter']++;
 	$GLOBALS['current_picture'] = $rv;
 	return $rv;
@@ -2388,7 +2400,7 @@ function plogger_picture_has_comments() {
 }
 
 function plogger_load_comment() {
-	$rv = mysql_fetch_assoc($GLOBALS['comment_dbh']);
+	$rv = mysqli_fetch_assoc($GLOBALS['comment_dbh']);
 	$GLOBALS['comment_counter']++;
 	$GLOBALS['current_comment'] = $rv;
 	return $rv;
@@ -2647,7 +2659,7 @@ function plogger_picture_comment_count() {
 	$comment_query = "SELECT COUNT(`id`) AS `num_comments` FROM `".PLOGGER_TABLE_PREFIX."comments`
 	WHERE approved = 1 AND `parent_id`='".$row['id']."'";
 	$comment_result = run_query($comment_query);
-	$num_comments = mysql_result($comment_result, 0, 'num_comments');
+	$num_comments = mysqli_result($comment_result, 0, 'num_comments');
 	return $num_comments;
 }
 
@@ -2802,7 +2814,7 @@ function plogger_get_prev_picture_url() {
 
 /*** The following functions can only be used inside the Collections loop ***/
 function plogger_load_collection() {
-	$rv = mysql_fetch_assoc($GLOBALS['collection_dbh']);
+	$rv = mysqli_fetch_assoc($GLOBALS['collection_dbh']);
 	$GLOBALS['collection_counter']++;
 	$GLOBALS['current_collection'] = $rv;
 	return $rv;
@@ -2830,7 +2842,7 @@ function plogger_get_collection_thumb() {
 		$thumb_query .= " `parent_collection`='".$rv['id']."' ORDER BY `id` DESC LIMIT 1";
 	}
 	$thumb_result = run_query($thumb_query);
-	$thumb_data = mysql_fetch_assoc($thumb_result);
+	$thumb_data = mysqli_fetch_assoc($thumb_result);
 	if ($thumb_data) {
 		$rv['thumbnail_id'] = $thumb_data['id'];
 		$rv['thumbnail_path'] = $thumb_data['path'];
@@ -2879,7 +2891,7 @@ function plogger_get_collection_id() {
 function plogger_count_collections() {
 	$numquery = "SELECT COUNT(DISTINCT `parent_collection`) AS `num_collections` FROM `".PLOGGER_TABLE_PREFIX."pictures`";
 	$numresult = run_query($numquery);
-	$num_albums = mysql_result($numresult, 0, 'num_collections');
+	$num_albums = mysqli_result($numresult, 0, 'num_collections');
 	return $num_albums;
 }
 
@@ -2887,7 +2899,7 @@ function plogger_count_collections() {
 
 /*** The following functions can only be used inside the Albums loop ***/
 function plogger_load_album() {
-	$rv = mysql_fetch_assoc($GLOBALS['album_dbh']);
+	$rv = mysqli_fetch_assoc($GLOBALS['album_dbh']);
 	$GLOBALS['album_counter']++;
 	$GLOBALS['current_album'] = $rv;
 	return $rv;
@@ -2914,7 +2926,7 @@ function plogger_get_album_thumb() {
 	else
 	$thumb_query .= " `parent_album`='".$rv['id']."' ORDER BY `date_submitted` DESC LIMIT 1";
 	$thumb_result = run_query($thumb_query);
-	$thumb_data = mysql_fetch_assoc($thumb_result);
+	$thumb_data = mysqli_fetch_assoc($thumb_result);
 	if ($thumb_data) {
 		$rv['thumbnail_id'] = $thumb_data['id'];
 		$rv['thumbnail_path'] = $thumb_data['path'];
@@ -2928,7 +2940,7 @@ function plogger_album_picture_count() {
 		// XXX: this may be faster?
 		$numquery = "SELECT COUNT(DISTINCT `id`) AS `num_pictures` FROM `".PLOGGER_TABLE_PREFIX."pictures` WHERE `parent_album`='".$row['id']."'";
 		$numresult = run_query($numquery);
-		return mysql_result($numresult, 0, 'num_pictures');
+		return mysqli_result($numresult, 0, 'num_pictures');
 	} else {
 		return 0;
 	}
@@ -3012,10 +3024,10 @@ function plogger_get_comments($picture_id) {
 	ORDER BY `date` DESC";
 	$result = run_query($query);
 	$comments = array();
-	while ($row = mysql_fetch_assoc($result)) {
+	while ($row = mysqli_fetch_assoc($result)) {
 		$comments[$row['id']] = $row;
 	}
 	return $comments;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/plog-includes/plog-tag-functions.php b/plog-includes/plog-tag-functions.php
index 168656a..7ca504b 100644
--- a/plog-includes/plog-tag-functions.php
+++ b/plog-includes/plog-tag-functions.php
@@ -36,8 +36,8 @@ function get_picture_tags($picture_id) {
 	// TODO: Evaluate whether this method should return the same format for the tags (so in this method it would return an array of arrays, each containing 'id', 'tag' and 'urlified').
 
 	$query = 'SELECT `t2p`.`tag_id`, `t`.`urlified`, `t`.`tag` FROM `'.$TABLE_PREFIX.'tag2picture` as `t2p`, `'.$TABLE_PREFIX.'tags` as `t` WHERE `picture_id` = '.$picture_id.' AND `t2p`.`tag_id` = `t`.`id`;';
-	$result = mysql_query($query);
-	while($tag_row = mysql_fetch_assoc($result)) {
+	$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$query);
+	while($tag_row = mysqli_fetch_assoc($result)) {
 		$picture_tags[$tag_row['urlified']] = $tag_row['tag_id'];
 	}
 	return $picture_tags;
@@ -47,7 +47,7 @@ function delete_picture_tags($picture_id) {
 	global $TABLE_PREFIX;
 	$picture_id = intval($picture_id);
 	$sql = 'DELETE FROM '.$TABLE_PREFIX.'tag2picture WHERE picture_id = '.$picture_id;
-	mysql_query($sql);
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 }
 
 function get_tag_by_name($tag) {
@@ -56,7 +56,7 @@ function get_tag_by_name($tag) {
 
 	$query = 'SELECT `id`, `tag`, `urlified` FROM `'.$TABLE_PREFIX.'tags` WHERE `tag`="'.$tag.'"';
 	$result = run_query($query);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	if (!is_array($row)) {
 		return NULL;
@@ -71,7 +71,7 @@ function get_tag_by_id($tag_id) {
 
 	$query = 'SELECT `id`, `tag`, `urlified` FROM `'.$TABLE_PREFIX.'tags` WHERE `id`='.$tag_id;
 	$result = run_query($query);
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	if (!is_array($row)) {
 		return NULL;
@@ -91,11 +91,11 @@ function get_popular_tags($limit=NULL) {
 
 function insert_tag($tag) {
 	global $TABLE_PREFIX;
-	$urlified = mysql_real_escape_string(urlify_tag($tag));
+	$urlified = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],urlify_tag($tag));
 	$sql = 'INSERT INTO '.$TABLE_PREFIX.'tags (`tag`,`tagdate`,`urlified`)
-	VALUES ("'.mysql_real_escape_string($tag).'", NOW(), "'.$urlified.'")';
-	if( mysql_query($sql) ) {
-		return mysql_insert_id();
+	VALUES ("'.mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$tag).'", NOW(), "'.$urlified.'")';
+	if( mysqli_query($GLOBALS["PLOGGER_DBH"],$sql) ) {
+		return mysqli_insert_id($GLOBALS["PLOGGER_DBH"]);
 	}
 }
 
@@ -109,14 +109,14 @@ function add_picture_tags($picture_id, $tags) {
 	if (sizeof($tags) > 0) {
 		$tagsql = join('", "', $tags);
 		$sql = 'SELECT * FROM '.$TABLE_PREFIX.'tags WHERE `tag` IN ("'.$tagsql.'")';
-		$result = mysql_query($sql);
-		while($tag_row = mysql_fetch_assoc($result)) {
+		$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
+		while($tag_row = mysqli_fetch_assoc($result)) {
 			$existing_tags[$tag_row['tag']] = $tag_row['id'];
 		}
 
 		$sql = 'SELECT * FROM '.$TABLE_PREFIX.'tag2picture WHERE `picture_id` ="'.$picture_id.'"';
-		$result = mysql_query($sql);
-		while($tag_row = mysql_fetch_assoc($result)) {
+		$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
+		while($tag_row = mysqli_fetch_assoc($result)) {
 			$existing_rels[$tag_row['tag_id']] = $tag_row['picture_id'];
 		}
 	}
@@ -133,7 +133,7 @@ function add_picture_tags($picture_id, $tags) {
 			// No connection between tag and picture? create if
 			$sql = 'INSERT INTO '.$TABLE_PREFIX.'tag2picture (`picture_id`,`tag_id`,`tagdate`)
 			VALUES ("'.$picture_id.'", "'.$existing_tags[$tag].'", NOW())';
-			mysql_query($sql);
+			mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		}
 	}
 
@@ -145,9 +145,9 @@ function delete_tags($tag_ids) {
 	global $TABLE_PREFIX;
 	$tagsql = join(', ', $tag_ids);
 	$sql = 'DELETE FROM '.$TABLE_PREFIX.'tag2picture WHERE tag_id IN ('.$tagsql.')';
-	mysql_query($sql);
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 	$sql = 'DELETE FROM '.$TABLE_PREFIX.'tags WHERE id IN ('.$tagsql.')';
-	mysql_query($sql);
+	mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 }
 
 function remove_picture_tags($picture_id, $tag_ids) {
@@ -173,14 +173,14 @@ function update_picture_tags($picture_id, $tags) {
 	if (sizeof($tags) > 0) {
 		$tagsql = join('", "', $tags);
 		$sql = 'SELECT * FROM '.$TABLE_PREFIX.'tags WHERE `tag` IN ("'.$tagsql.'")';
-		$result = mysql_query($sql);
-		while($tag_row = mysql_fetch_assoc($result)) {
+		$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
+		while($tag_row = mysqli_fetch_assoc($result)) {
 			$existing_tags[$tag_row['tag']] = $tag_row['id'];
 		}
 
 		$sql = 'SELECT * FROM '.$TABLE_PREFIX.'tag2picture WHERE `picture_id` ="'.$picture_id.'"';
-		$result = mysql_query($sql);
-		while($tag_row = mysql_fetch_assoc($result)) {
+		$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
+		while($tag_row = mysqli_fetch_assoc($result)) {
 			$existing_rels[$tag_row['tag_id']] = $tag_row['picture_id'];
 		}
 	}
@@ -188,19 +188,19 @@ function update_picture_tags($picture_id, $tags) {
 	foreach($tags as $tag) {
 		if (!isset($existing_tags[$tag])) {
 			// Must be a new tag, register it
-			$path = mysql_real_escape_string(preg_replace("/[^\w|\.|'|\-|\[|\]]/", "_", $tag));
+			$path = mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],preg_replace("/[^\w|\.|'|\-|\[|\]]/", "_", $tag));
 			$sql = 'INSERT INTO '.$TABLE_PREFIX.'tags (`tag`, `tagdate`, `path`)
-			VALUES ("'.mysql_real_escape_string($tag).'", "'.$path.'", NOW())';
+			VALUES ("'.mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$tag).'", "'.$path.'", NOW())';
 			print $sql;
-			$result = mysql_query($sql);
-			$existing_tags[$tag] = mysql_insert_id();
+			$result = mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
+			$existing_tags[$tag] = mysqli_insert_id($GLOBALS["PLOGGER_DBH"]);
 		}
 
 		if (!isset($existing_rels[$existing_tags[$tag]])) {
 			// No connection between tag and picture? create if
 			$sql = 'INSERT INTO '.$TABLE_PREFIX.'tag2picture (`picture_id`, `tag_id`, `tagdate`)
 			VALUES ("'.$picture_id.'", "'.$existing_tags[$tag].'", NOW())';
-			mysql_query($sql);
+			mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		}
 	}
 
@@ -209,7 +209,7 @@ function update_picture_tags($picture_id, $tags) {
 		if (!in_array($tag_id,$existing_tags)) {
 			$sql = "DELETE FROM `".$TABLE_PREFIX."tag2picture`
 			WHERE `picture_id` = '$picture_id' AND `tag_id` = '$tag_id'";
-			mysql_query($sql);
+			mysqli_query($GLOBALS["PLOGGER_DBH"],$sql);
 		}
 	}
 
diff --git a/plog-load-config.php b/plog-load-config.php
index bd6020a..1e015eb 100644
--- a/plog-load-config.php
+++ b/plog-load-config.php
@@ -48,16 +48,16 @@ if (!is_plogger_installed()) {
 	die($img."\n" . '<p style="font-family: tahoma, verdana, arial, sans-serif; font-size: 16px; letter-spacing: .25px; margin: 30px;">'.plog_tr('Please run <a href="'.$install_url.'">_install.php</a> to set up Plogger. If you are upgrading from a previous version, please run <a href="'.$upgrade_url.'">_upgrade.php</a>').'.</p>');
 }
 
-connect_db();
+//connect_db();
 
 $query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."config`";
 $result = run_query($query);
 
-if (mysql_num_rows($result) == 0) {
+if (mysqli_num_rows($result) == 0) {
 	die(plog_tr('No config information in the database.'));
 }
 
-$config = mysql_fetch_assoc($result);
+$config = mysqli_fetch_assoc($result);
 $config['gallery_name'] = SmartStripSlashes($config['gallery_name']);
 
 $config['basedir'] = PLOGGER_DIR;
@@ -96,7 +96,7 @@ if ($config['use_mod_rewrite'] == 1 && $config['embedded'] == 0) {
 	$config['baseurl'] = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/';
 // otherwise just use our cleaned up version of $_SERVER['PHP_SELF'] from plog-globals.php
 } else {
-	$config['baseurl'] = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];
+	$config['baseurl'] = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER["SCRIPT_NAME"];
 }
 
 // Remove plog-admin/ from the end, if present .. is there a better way to determine the full url?
@@ -123,13 +123,13 @@ if (!headers_sent()) {
 $query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."thumbnail_config`";
 $result = run_query($query);
 
-if (mysql_num_rows($result) == 0) {
+if (mysqli_num_rows($result) == 0) {
 	die(plog_tr('No thumbnail config information in the database.'));
 }
 
 $prefix_arr = array(1 => 'small', 2 => 'large', 3 => 'rss', 4 => 'thumbnav');
 
-while($row = mysql_fetch_assoc($result)) {
+while($row = mysqli_fetch_assoc($result)) {
 	$thumbnail_config[$row['id']] = array(
 	'type' => $prefix_arr[$row['id']],
 	'size' => $row['max_size'],
@@ -191,4 +191,4 @@ if (!isset($_SESSION['plogger_details'])) {
 	$_SESSION['plogger_details'] = 0;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/plog-remote.php b/plog-remote.php
index e6a6dcf..4f1a11f 100644
--- a/plog-remote.php
+++ b/plog-remote.php
@@ -47,9 +47,9 @@ class response {
 }
 
 function get_album_by_name($name) {
-	$sqlAlbum = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."albums` WHERE name = '".mysql_real_escape_string($name)."'";
+	$sqlAlbum = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."albums` WHERE name = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$name)."'";
 	$resultAlbum = run_query($sqlAlbum);
-	return mysql_fetch_assoc($resultAlbum);
+	return mysqli_fetch_assoc($resultAlbum);
 }
 
 function login($user, $password) {
@@ -87,7 +87,7 @@ function list_albums() {
 	);
 	$i = 2;
 
-	while($rowCollection = mysql_fetch_assoc($resultCollections)) {
+	while($rowCollection = mysqli_fetch_assoc($resultCollections)) {
 		$id = $rowCollection['id'];
 		$description = $rowCollection['description'];
 		$name = $rowCollection['name'];
@@ -122,7 +122,7 @@ function list_albums() {
 
 	$sqlAlbum = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."albums` ORDER BY `name` ASC";
 	$resultAlbum = run_query($sqlAlbum);
-	while ($rowAlbum = mysql_fetch_assoc($resultAlbum)) {
+	while ($rowAlbum = mysqli_fetch_assoc($resultAlbum)) {
 		$id = $rowAlbum['id'];
 		$parent_id = $parents[$rowAlbum['parent_id']];
 		$albums[$i] = array(
@@ -177,7 +177,7 @@ function list_images($albumname) {
 	if ($albuminfo) {
 		$sqlPictures = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."pictures` WHERE parent_album = ".intval($albuminfo['id']);
 		$resultAlbum = run_query($sqlPictures);
-		while ($rowAlbum = mysql_fetch_assoc($resultAlbum)) {
+		while ($rowAlbum = mysqli_fetch_assoc($resultAlbum)) {
 			$response->set_key("image.name.${i}", $rowAlbum['path']);
 			//print "image.raw_width.0=400\n";
 			//print "image.raw_height.0=400\n";
@@ -195,10 +195,10 @@ function list_images($albumname) {
 
 function gr_add_album($parent, $name, $description) {
 	// Parent is the name of the collection
-	$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."collections` WHERE name = '".mysql_real_escape_string($parent)."'";
+	$query = "SELECT * FROM `".PLOGGER_TABLE_PREFIX."collections` WHERE name = '".mysqli_real_escape_string($GLOBALS["PLOGGER_DBH"],$parent)."'";
 	$result = run_query($query);
 
-	$row = mysql_fetch_assoc($result);
+	$row = mysqli_fetch_assoc($result);
 
 	if (empty($name)) {
 		$name = 'no name';
diff --git a/plog-rss.php b/plog-rss.php
index d9fb723..b4eddca 100644
--- a/plog-rss.php
+++ b/plog-rss.php
@@ -101,7 +101,7 @@ function generate_RSS_feed ($level, $id, $search = '') {
 
 		$sql = "SELECT UNIX_TIMESTAMP(`date_modified`) AS `pubdate` FROM `".PLOGGER_TABLE_PREFIX."pictures` WHERE `parent_album` = '".plogger_get_album_id()."' ORDER BY `date_modified` DESC LIMIT 1";
 		$result = run_query($sql);
-		$row = mysql_fetch_assoc($result);
+		$row = mysqli_fetch_assoc($result);
 		$pubdate = date('D, d M Y H:i:s O', $row['pubdate']);
 
 		$title = plogger_get_album_name();
diff --git a/plog-thumb.php b/plog-thumb.php
index d015f5e..5fb1e3a 100644
--- a/plog-thumb.php
+++ b/plog-thumb.php
@@ -21,7 +21,7 @@ if (!isset($_REQUEST['type'])) $_REQUEST['type'] = 1;
 
 $query = "SELECT `path`, `id` FROM `plogger_pictures` WHERE `id`=".intval($_REQUEST['id']);
 $result = run_query($query);
-$thumb = mysql_fetch_assoc($result);
+$thumb = mysqli_fetch_assoc($result);
 
 $thumb['type'] = intval($_REQUEST['type']);
 
diff --git a/plog-xml.php b/plog-xml.php
index d457a9b..e81f9a0 100644
--- a/plog-xml.php
+++ b/plog-xml.php
@@ -325,7 +325,7 @@ function get_collection_ids($sort = 'alpha', $order = 'DESC') {
 
 	$collections = array();
 
-	while ($collection = mysql_fetch_assoc($resultCollection)) {
+	while ($collection = mysqli_fetch_assoc($resultCollection)) {
 		$collections[$collection['id']] = $collection;
 	}
 
@@ -369,7 +369,7 @@ function get_album_ids($collection_id = null, $sort = 'alpha', $order = 'DESC')
 
 	$result = run_query($query);
 
-	while ($album = mysql_fetch_assoc($result)) {
+	while ($album = mysqli_fetch_assoc($result)) {
 		$albums[$album['album_id']] = $album;
 	}
 
@@ -400,7 +400,7 @@ function get_picture_ids($album_id, $order = 'alpha', $sort = 'DESC') {
 
 	$pictures = array();
 
-	while ($row = mysql_fetch_assoc($result)) {
+	while ($row = mysqli_fetch_assoc($result)) {
 		$pictures[$row['id']] = $row;
 	}