From f226876ba4e3b02daa73873f28b0a8a5bfdd8ea0 Mon Sep 17 00:00:00 2001 From: Jos Elstgeest Date: Sat, 6 Feb 2016 19:03:47 +0100 Subject: [PATCH 1/3] add support for php7 --- .travis.yml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe94787..fcd3e6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ matrix: - php: 5.6 - php: 5.3 - php: 5.6 + - php: 7.0 - php: nightly - php: hhvm allow_failures: diff --git a/composer.json b/composer.json index e3a546f..0fd3388 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ } ], "require": { - "php": "~5.3" + "php": ">=5.3" }, "suggest": { "ext-rar": "RAR extension is required for RAR archive module.", From 3d84c3e71e02fecc3819e3ee759c667fee8fd8aa Mon Sep 17 00:00:00 2001 From: Jos Elstgeest Date: Sat, 6 Feb 2016 22:51:21 +0100 Subject: [PATCH 2/3] eliminate mysql functions by replacing them with mysqli equivalents --- Extension/Cache/Mysql.php | 32 +- Resources/demos/demo.mysql.php | 572 +++++++++++++++++---------------- 2 files changed, 304 insertions(+), 300 deletions(-) diff --git a/Extension/Cache/Mysql.php b/Extension/Cache/Mysql.php index bc95f9e..8784a94 100644 --- a/Extension/Cache/Mysql.php +++ b/Extension/Cache/Mysql.php @@ -108,18 +108,18 @@ class Mysql extends GetId3 public function __construct($host, $database, $username, $password, $table = 'getid3_cache') { // Check for mysql support - if (!function_exists('mysql_pconnect')) { - throw new DefaultException('PHP not compiled with mysql support.'); + if (!function_exists('mysqli_connect')) { + throw new DefaultException('PHP not compiled with mysqli support.'); } // Connect to database - $this->connection = mysql_pconnect($host, $username, $password); + $this->connection = mysqli_connect('p:' . $host, $username, $password); if (!$this->connection) { - throw new DefaultException('mysql_pconnect() failed - check permissions and spelling.'); + throw new DefaultException('mysqli_connect() failed - check permissions and spelling.'); } // Select database - if (!mysql_select_db($database, $this->connection)) { + if (!mysqli_select_db($this->connection, $database)) { throw new DefaultException('Cannot use database '.$database); } @@ -131,8 +131,8 @@ public function __construct($host, $database, $username, $password, $table = 'ge // Check version number and clear cache if changed $version = ''; - if ($this->cursor = mysql_query('SELECT `value` FROM `'.mysql_real_escape_string($this->table)."` WHERE (`filename` = '".mysql_real_escape_string(GetId3Core::VERSION)."') AND (`filesize` = '-1') AND (`filetime` = '-1') AND (`analyzetime` = '-1')", $this->connection)) { - list($version) = mysql_fetch_array($this->cursor); + if ($this->cursor = mysqli_query($this->connection, 'SELECT `value` FROM `'.mysqli_real_escape_string($this->connection, $this->table)."` WHERE (`filename` = '".mysqli_real_escape_string($this->connection, GetId3Core::VERSION)."') AND (`filesize` = '-1') AND (`filetime` = '-1') AND (`analyzetime` = '-1')")) { + list($version) = mysqli_fetch_array($this->cursor); } if ($version != GetId3Core::VERSION) { $this->clear_cache(); @@ -146,8 +146,8 @@ public function __construct($host, $database, $username, $password, $table = 'ge */ public function clear_cache() { - $this->cursor = mysql_query('DELETE FROM `'.mysql_real_escape_string($this->table).'`', $this->connection); - $this->cursor = mysql_query('INSERT INTO `'.mysql_real_escape_string($this->table)."` VALUES ('".GetId3Core::VERSION."', -1, -1, -1, '".GetId3Core::VERSION."')", $this->connection); + $this->cursor = mysqli_query($this->connection, 'DELETE FROM `'.mysqli_real_escape_string($this->connection, $this->table).'`'); + $this->cursor = mysqli_query($this->connection, 'INSERT INTO `'.mysqli_real_escape_string($this->connection, $this->table)."` VALUES ('".GetId3Core::VERSION."', -1, -1, -1, '".GetId3Core::VERSION."')"); } /** @@ -166,10 +166,10 @@ public function analyze($filename) $filesize = filesize($filename); // Lookup file - $this->cursor = mysql_query('SELECT `value` FROM `'.mysql_real_escape_string($this->table)."` WHERE (`filename` = '".mysql_real_escape_string($filename)."') AND (`filesize` = '".mysql_real_escape_string($filesize)."') AND (`filetime` = '".mysql_real_escape_string($filetime)."')", $this->connection); - if (mysql_num_rows($this->cursor) > 0) { + $this->cursor = mysqli_query($this->connection, 'SELECT `value` FROM `'.mysqli_real_escape_string($this->connection, $this->table)."` WHERE (`filename` = '".mysqli_real_escape_string($this->connection, $filename)."') AND (`filesize` = '".mysqli_real_escape_string($this->connection, $filesize)."') AND (`filetime` = '".mysqli_real_escape_string($this->connection, $filetime)."')"); + if (mysqli_num_rows($this->cursor) > 0) { // Hit - list($result) = mysql_fetch_array($this->cursor); + list($result) = mysqli_fetch_array($this->cursor); return unserialize(base64_decode($result)); } @@ -180,7 +180,7 @@ public function analyze($filename) // Save result if (file_exists($filename)) { - $this->cursor = mysql_query('INSERT INTO `'.mysql_real_escape_string($this->table)."` (`filename`, `filesize`, `filetime`, `analyzetime`, `value`) VALUES ('".mysql_real_escape_string($filename)."', '".mysql_real_escape_string($filesize)."', '".mysql_real_escape_string($filetime)."', '".mysql_real_escape_string(time())."', '".mysql_real_escape_string(base64_encode(serialize($analysis)))."')", $this->connection); + $this->cursor = mysqli_query($this->connection, 'INSERT INTO `'.mysqli_real_escape_string($this->connection, $this->table)."` (`filename`, `filesize`, `filetime`, `analyzetime`, `value`) VALUES ('".mysqli_real_escape_string($this->connection, $filename)."', '".mysqli_real_escape_string($this->connection, $filesize)."', '".mysqli_real_escape_string($connection, $filetime)."', '".mysqli_real_escape_string($this->connection, time())."', '".mysqli_real_escape_string($this->connection, base64_encode(serialize($analysis)))."')"); } return $analysis; @@ -193,13 +193,13 @@ public function analyze($filename) */ private function create_table($drop = false) { - $this->cursor = mysql_query('CREATE TABLE IF NOT EXISTS `'.mysql_real_escape_string($this->table)."` ( + $this->cursor = mysqli_query($this->connection, 'CREATE TABLE IF NOT EXISTS `'.mysqli_real_escape_string($this->connection, $this->table)."` ( `filename` VARCHAR(255) NOT NULL DEFAULT '', `filesize` INT(11) NOT NULL DEFAULT '0', `filetime` INT(11) NOT NULL DEFAULT '0', `analyzetime` INT(11) NOT NULL DEFAULT '0', `value` TEXT NOT NULL, - PRIMARY KEY (`filename`,`filesize`,`filetime`)) ENGINE=MyISAM", $this->connection); - echo mysql_error($this->connection); + PRIMARY KEY (`filename`,`filesize`,`filetime`)) ENGINE=MyISAM"); + echo mysqli_error($this->connection); } } diff --git a/Resources/demos/demo.mysql.php b/Resources/demos/demo.mysql.php index 4f0a4f0..d71faed 100644 --- a/Resources/demos/demo.mysql.php +++ b/Resources/demos/demo.mysql.php @@ -12,6 +12,8 @@ // /// ///////////////////////////////////////////////////////////////// +use GetId3\Lib\Helper; + die('Due to a security issue, this demo has been disabled. It can be enabled by removing line 16 in demos/demo.mysql.php'); // OPTIONS: @@ -28,15 +30,15 @@ // CREATE DATABASE `getid3`; ob_start(); -if (!mysql_connect(GETID3_DB_HOST, GETID3_DB_USER, GETID3_DB_PASS)) { +if (!$connection = mysqli_connect(GETID3_DB_HOST, GETID3_DB_USER, GETID3_DB_PASS)) { $errormessage = ob_get_contents(); ob_end_clean(); - die('Could not connect to MySQL host:
'.mysql_error().'
'); + die('Could not connect to MySQL host:
'.mysqli_error($connection).'
'); } -if (!mysql_select_db(GETID3_DB_DB)) { +if (!mysqli_select_db($connection, GETID3_DB_DB)) { $errormessage = ob_get_contents(); ob_end_clean(); - die('Could not select database:
'.mysql_error().'
'); + die('Could not select database:
'.mysqli_error($connection).'
'); } ob_end_clean(); @@ -102,6 +104,7 @@ function fileextension($filename, $numextensions = 1) function RenameFileFromTo($from, $to, &$results) { + global $connection; $success = true; if ($from === $to) { $results = 'Source and Destination filenames identical
FAILED to rename'; @@ -113,9 +116,9 @@ function RenameFileFromTo($from, $to, &$results) ob_start(); if (rename($from, $to)) { ob_end_clean(); - $SQLquery = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($from).'")'; - mysql_query_safe($SQLquery); + $SQLquery = 'DELETE FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`filename` = "'.mysqli_real_escape_string($connection, $from).'")'; + mysql_query_safe($connection, $SQLquery); $results = 'Successfully renamed'; } else { $errormessage = ob_get_contents(); @@ -153,25 +156,25 @@ function WindowsShareSlashTranslate($filename) return $filename; } -function mysql_query_safe($SQLquery) +function mysql_query_safe($connection, $SQLquery) { static $TimeSpentQuerying = 0; if ($SQLquery === null) { return $TimeSpentQuerying; } $starttime = microtime(true); - $result = mysql_query($SQLquery); + $result = mysqli_query($connection, $SQLquery); $TimeSpentQuerying += (microtime(true) - $starttime); - if (mysql_error()) { - die('
SQL error:
'.htmlentities(mysql_error()).'
'.htmlentities($SQLquery).'
'); + if (mysqli_error($connection)) { + die('
SQL error:
'.htmlentities(mysqli_error($connection)).'
'.htmlentities($SQLquery).'
'); } return $result; } -function mysql_table_exists($tablename) +function mysql_table_exists($connection, $tablename) { - return (bool) mysql_query_safe('DESCRIBE '.$tablename); + return (bool) mysql_query_safe($connection, 'DESCRIBE '.$tablename); } function AcceptableExtensions($fileformat, $audio_dataformat = '', $video_dataformat = '') @@ -206,13 +209,13 @@ function AcceptableExtensions($fileformat, $audio_dataformat = '', $video_datafo } if (!empty($_REQUEST['scan'])) { - if (mysql_table_exists(GETID3_DB_TABLE)) { - $SQLquery = 'DROP TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - mysql_query_safe($SQLquery); + if (mysql_table_exists($connection, GETID3_DB_TABLE)) { + $SQLquery = 'DROP TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + mysql_query_safe($connection, $SQLquery); } } -if (!mysql_table_exists(GETID3_DB_TABLE)) { - $SQLquery = 'CREATE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ('; +if (!mysql_table_exists($connection, GETID3_DB_TABLE)) { + $SQLquery = 'CREATE TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` ('; $SQLquery .= ' `ID` int(11) unsigned NOT NULL auto_increment,'; $SQLquery .= ' `filename` text NOT NULL,'; $SQLquery .= " `last_modified` int(11) NOT NULL default '0',"; @@ -246,51 +249,52 @@ function AcceptableExtensions($fileformat, $audio_dataformat = '', $video_datafo $SQLquery .= " `vbr_method` varchar(255) NOT NULL default '',"; $SQLquery .= ' PRIMARY KEY (`ID`)'; $SQLquery .= ')'; - mysql_query_safe($SQLquery); + mysql_query_safe($connection, $SQLquery); } $ExistingTableFields = array(); -$result = mysql_query_safe('DESCRIBE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'); -while ($row = mysql_fetch_array($result)) { +$result = mysql_query_safe($connection, 'DESCRIBE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'); +while ($row = mysqli_fetch_array($result)) { $ExistingTableFields[$row['Field']] = $row; } if (!isset($ExistingTableFields['encoder_options'])) { // Added in 1.7.0b2 echo 'adding field `encoder_options`
'; - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `encoder_options` VARCHAR(255) default "" NOT NULL AFTER `error`'); - mysql_query_safe('OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` ADD `encoder_options` VARCHAR(255) default "" NOT NULL AFTER `error`'); + mysql_query_safe($connection, 'OPTIMIZE TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'); } if (isset($ExistingTableFields['track']) && ($ExistingTableFields['track']['Type'] != 'varchar(7)')) { // Changed in 1.7.0b2 echo 'changing field `track` to VARCHAR(7)
'; - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `track` `track` VARCHAR(7) default "" NOT NULL'); - mysql_query_safe('OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` CHANGE `track` `track` VARCHAR(7) default "" NOT NULL'); + mysql_query_safe($connection, 'OPTIMIZE TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'); } if (!isset($ExistingTableFields['track_volume'])) { // Added in 1.7.0b5 echo '

WARNING! You should erase your database and rescan everything because the comment storing has been changed since the last version

'; echo 'adding field `track_volume`
'; - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `track_volume` FLOAT NOT NULL AFTER `error`'); - mysql_query_safe('OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` ADD `track_volume` FLOAT NOT NULL AFTER `error`'); + mysql_query_safe($connection, 'OPTIMIZE TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'); } if (!isset($ExistingTableFields['remix'])) { // Added in 1.7.3b1 echo 'adding field `encoder_options`, `alternate_name`, `parody`
'; - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `remix` VARCHAR(255) default "" NOT NULL AFTER `title`'); - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `alternate_name` VARCHAR(255) default "" NOT NULL AFTER `track`'); - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `parody` VARCHAR(255) default "" NOT NULL AFTER `alternate_name`'); - mysql_query_safe('OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` ADD `remix` VARCHAR(255) default "" NOT NULL AFTER `title`'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` ADD `alternate_name` VARCHAR(255) default "" NOT NULL AFTER `track`'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` ADD `parody` VARCHAR(255) default "" NOT NULL AFTER `alternate_name`'); + mysql_query_safe($connection, 'OPTIMIZE TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'); } if (isset($ExistingTableFields['comments_all']) && ($ExistingTableFields['comments_all']['Type'] != 'longtext')) { // Changed in 1.9.0 echo 'changing comments fields from text to longtext
'; // no need to change id3v1 - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `comments_all` `comments_all` LONGTEXT NOT NULL'); - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `comments_id3v2` `comments_id3v2` LONGTEXT NOT NULL'); - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `comments_ape` `comments_ape` LONGTEXT NOT NULL'); - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `comments_lyrics3` `comments_lyrics3` LONGTEXT NOT NULL'); - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `warning` `warning` LONGTEXT NOT NULL'); - mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `error` `error` LONGTEXT NOT NULL'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` CHANGE `comments_all` `comments_all` LONGTEXT NOT NULL'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` CHANGE `comments_id3v2` `comments_id3v2` LONGTEXT NOT NULL'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` CHANGE `comments_ape` `comments_ape` LONGTEXT NOT NULL'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` CHANGE `comments_lyrics3` `comments_lyrics3` LONGTEXT NOT NULL'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` CHANGE `warning` `warning` LONGTEXT NOT NULL'); + mysql_query_safe($connection, 'ALTER TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` CHANGE `error` `error` LONGTEXT NOT NULL'); } function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto = 'A12', &$errors) { global $getID3; + global $connection; set_time_limit(30); @@ -305,9 +309,9 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto die('ERROR: $ThisFileInfo[tags]['.$synchronizefrom.'] does not exist'); } - $SQLquery = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($filename).'")'; - mysql_query_safe($SQLquery); + $SQLquery = 'DELETE FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`filename` = "'.mysqli_real_escape_string($connection, $filename).'")'; + mysql_query_safe($connection, $SQLquery); $TagFormatsToWrite = array(); if ((strpos($synchronizeto, '2') !== false) && ($synchronizefrom != 'id3v2')) { @@ -344,9 +348,9 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $IgnoreNoTagFormats = array('', 'png', 'jpg', 'gif', 'bmp', 'swf', 'pdf', 'zip', 'rar', 'mid', 'mod', 'xm', 'it', 's3m'); if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUEST['rescanerrors'])) { - $SQLquery = 'DELETE from `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery = 'DELETE from `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`fileformat` = "")'; - mysql_query_safe($SQLquery); + mysql_query_safe($connection, $SQLquery); $FilesInDir = array(); @@ -356,17 +360,17 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo 'Re-scanning all media files already in database that had errors and/or warnings in last scan
'; $SQLquery = 'SELECT `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`error` <> "")'; $SQLquery .= ' OR (`warning` <> "")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); - while ($row = mysql_fetch_array($result)) { + $result = mysql_query_safe($connection, $SQLquery); + while ($row = mysqli_fetch_array($result)) { if (!file_exists($row['filename'])) { echo 'File missing: '.$row['filename'].'
'; - $SQLquery = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($row['filename']).'")'; - mysql_query_safe($SQLquery); + $SQLquery = 'DELETE FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`filename` = "'.mysqli_real_escape_string($connection, $row['filename']).'")'; + mysql_query_safe($connection, $SQLquery); } else { $FilesInDir[] = $row['filename']; } @@ -377,17 +381,17 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo 'Scanning all media files in '.str_replace('\\', '/', realpath(!empty($_REQUEST['scan']) ? $_REQUEST['scan'] : $_REQUEST['newscan'])).' (and subdirectories)
'; $SQLquery = 'SELECT COUNT(*) AS `num`, `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' GROUP BY `filename`'; $SQLquery .= ' HAVING (`num` > 1)'; $SQLquery .= ' ORDER BY `num` DESC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); $DupesDeleted = 0; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); - $SQLquery = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE `filename` LIKE "'.mysql_real_escape_string($row['filename']).'"'; - mysql_query_safe($SQLquery); + $SQLquery = 'DELETE FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE `filename` LIKE "'.mysqli_real_escape_string($connection, $row['filename']).'"'; + mysql_query_safe($connection, $SQLquery); ++$DupesDeleted; } if ($DupesDeleted > 0) { @@ -398,10 +402,10 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $AlreadyInDatabase = array(); set_time_limit(60); $SQLquery = 'SELECT `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); - while ($row = mysql_fetch_array($result)) { + $result = mysql_query_safe($connection, $SQLquery); + while ($row = mysqli_fetch_array($result)) { //$AlreadyInDatabase[] = strtolower($row['filename']); $AlreadyInDatabase[] = $row['filename']; } @@ -508,80 +512,80 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } if (!empty($_REQUEST['rescanerrors'])) { - $SQLquery = 'UPDATE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` SET '; - $SQLquery .= ' `last_modified` = "'.mysql_real_escape_string(!empty($ThisFileInfo['file_modified_time']) ? $ThisFileInfo['file_modified_time'] : '').'"'; - $SQLquery .= ', `md5_file` = "'.mysql_real_escape_string(!empty($ThisFileInfo['md5_file']) ? $ThisFileInfo['md5_file'] : '').'"'; - $SQLquery .= ', `md5_data` = "'.mysql_real_escape_string(!empty($ThisFileInfo['md5_data']) ? $ThisFileInfo['md5_data'] : '').'"'; - $SQLquery .= ', `md5_data_source` = "'.mysql_real_escape_string(!empty($ThisFileInfo['md5_data_source']) ? $ThisFileInfo['md5_data_source'] : '').'"'; - $SQLquery .= ', `filesize` = "'.mysql_real_escape_string(!empty($ThisFileInfo['filesize']) ? $ThisFileInfo['filesize'] : 0).'"'; - $SQLquery .= ', `fileformat` = "'.mysql_real_escape_string(!empty($ThisFileInfo['fileformat']) ? $ThisFileInfo['fileformat'] : '').'"'; - $SQLquery .= ', `audio_dataformat` = "'.mysql_real_escape_string(!empty($ThisFileInfo['audio']['dataformat']) ? $ThisFileInfo['audio']['dataformat'] : '').'"'; - $SQLquery .= ', `video_dataformat` = "'.mysql_real_escape_string(!empty($ThisFileInfo['video']['dataformat']) ? $ThisFileInfo['video']['dataformat'] : '').'"'; - $SQLquery .= ', `vbr_method` = "'.mysql_real_escape_string(!empty($ThisFileInfo['mpeg']['audio']['VBR_method']) ? $ThisFileInfo['mpeg']['audio']['VBR_method'] : '').'"'; - $SQLquery .= ', `audio_bitrate` = "'.mysql_real_escape_string(!empty($ThisFileInfo['audio']['bitrate']) ? floatval($ThisFileInfo['audio']['bitrate']) : 0).'"'; - $SQLquery .= ', `video_bitrate` = "'.mysql_real_escape_string(!empty($ThisFileInfo['video']['bitrate']) ? floatval($ThisFileInfo['video']['bitrate']) : 0).'"'; - $SQLquery .= ', `playtime_seconds` = "'.mysql_real_escape_string(!empty($ThisFileInfo['playtime_seconds']) ? floatval($ThisFileInfo['playtime_seconds']) : 0).'"'; - $SQLquery .= ', `track_volume` = "'.mysql_real_escape_string(!empty($ThisFileInfo['replay_gain']['track']['volume']) ? floatval($ThisFileInfo['replay_gain']['track']['volume']) : 0).'"'; - $SQLquery .= ', `comments_all` = "'.mysql_real_escape_string(!empty($ThisFileInfo['comments']) ? serialize($ThisFileInfo['comments']) : '').'"'; - $SQLquery .= ', `comments_id3v2` = "'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['id3v2']) ? serialize($ThisFileInfo['tags']['id3v2']) : '').'"'; - $SQLquery .= ', `comments_ape` = "'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['ape']) ? serialize($ThisFileInfo['tags']['ape']) : '').'"'; - $SQLquery .= ', `comments_lyrics3` = "'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['lyrics3']) ? serialize($ThisFileInfo['tags']['lyrics3']) : '').'"'; - $SQLquery .= ', `comments_id3v1` = "'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['id3v1']) ? serialize($ThisFileInfo['tags']['id3v1']) : '').'"'; - $SQLquery .= ', `warning` = "'.mysql_real_escape_string(!empty($ThisFileInfo['warning']) ? implode("\t", $ThisFileInfo['warning']) : '').'"'; - $SQLquery .= ', `error` = "'.mysql_real_escape_string(!empty($ThisFileInfo['error']) ? implode("\t", $ThisFileInfo['error']) : '').'"'; - $SQLquery .= ', `album` = "'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['album']) ? implode("\t", $ThisFileInfo['comments']['album']) : '').'"'; - $SQLquery .= ', `genre` = "'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['genre']) ? implode("\t", $ThisFileInfo['comments']['genre']) : '').'"'; - $SQLquery .= ', `comment` = "'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['comment']) ? implode("\t", $ThisFileInfo['comments']['comment']) : '').'"'; - $SQLquery .= ', `artist` = "'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['artist']) ? implode("\t", $ThisFileInfo['comments']['artist']) : '').'"'; - $SQLquery .= ', `tags` = "'.mysql_real_escape_string(!empty($ThisFileInfo['tags']) ? implode("\t", array_keys($ThisFileInfo['tags'])) : '').'"'; - $SQLquery .= ', `encoder_options` = "'.mysql_real_escape_string(trim((!empty($ThisFileInfo['audio']['encoder']) ? $ThisFileInfo['audio']['encoder'] : '').' '.(!empty($ThisFileInfo['audio']['encoder_options']) ? $ThisFileInfo['audio']['encoder_options'] : ''))).'"'; - $SQLquery .= ', `title` = "'.mysql_real_escape_string($this_track_title).'"'; - $SQLquery .= ', `remix` = "'.mysql_real_escape_string($this_track_remix).'"'; - $SQLquery .= ', `track` = "'.mysql_real_escape_string($this_track_track).'"'; - $SQLquery .= 'WHERE (`filename` = "'.mysql_real_escape_string(isset($ThisFileInfo['filenamepath']) ? $ThisFileInfo['filenamepath'] : '').'")'; + $SQLquery = 'UPDATE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` SET '; + $SQLquery .= ' `last_modified` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['file_modified_time']) ? $ThisFileInfo['file_modified_time'] : '').'"'; + $SQLquery .= ', `md5_file` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['md5_file']) ? $ThisFileInfo['md5_file'] : '').'"'; + $SQLquery .= ', `md5_data` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['md5_data']) ? $ThisFileInfo['md5_data'] : '').'"'; + $SQLquery .= ', `md5_data_source` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['md5_data_source']) ? $ThisFileInfo['md5_data_source'] : '').'"'; + $SQLquery .= ', `filesize` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['filesize']) ? $ThisFileInfo['filesize'] : 0).'"'; + $SQLquery .= ', `fileformat` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['fileformat']) ? $ThisFileInfo['fileformat'] : '').'"'; + $SQLquery .= ', `audio_dataformat` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['audio']['dataformat']) ? $ThisFileInfo['audio']['dataformat'] : '').'"'; + $SQLquery .= ', `video_dataformat` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['video']['dataformat']) ? $ThisFileInfo['video']['dataformat'] : '').'"'; + $SQLquery .= ', `vbr_method` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['mpeg']['audio']['VBR_method']) ? $ThisFileInfo['mpeg']['audio']['VBR_method'] : '').'"'; + $SQLquery .= ', `audio_bitrate` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['audio']['bitrate']) ? floatval($ThisFileInfo['audio']['bitrate']) : 0).'"'; + $SQLquery .= ', `video_bitrate` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['video']['bitrate']) ? floatval($ThisFileInfo['video']['bitrate']) : 0).'"'; + $SQLquery .= ', `playtime_seconds` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['playtime_seconds']) ? floatval($ThisFileInfo['playtime_seconds']) : 0).'"'; + $SQLquery .= ', `track_volume` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['replay_gain']['track']['volume']) ? floatval($ThisFileInfo['replay_gain']['track']['volume']) : 0).'"'; + $SQLquery .= ', `comments_all` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']) ? serialize($ThisFileInfo['comments']) : '').'"'; + $SQLquery .= ', `comments_id3v2` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']['id3v2']) ? serialize($ThisFileInfo['tags']['id3v2']) : '').'"'; + $SQLquery .= ', `comments_ape` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']['ape']) ? serialize($ThisFileInfo['tags']['ape']) : '').'"'; + $SQLquery .= ', `comments_lyrics3` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']['lyrics3']) ? serialize($ThisFileInfo['tags']['lyrics3']) : '').'"'; + $SQLquery .= ', `comments_id3v1` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']['id3v1']) ? serialize($ThisFileInfo['tags']['id3v1']) : '').'"'; + $SQLquery .= ', `warning` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['warning']) ? implode("\t", $ThisFileInfo['warning']) : '').'"'; + $SQLquery .= ', `error` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['error']) ? implode("\t", $ThisFileInfo['error']) : '').'"'; + $SQLquery .= ', `album` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']['album']) ? implode("\t", $ThisFileInfo['comments']['album']) : '').'"'; + $SQLquery .= ', `genre` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']['genre']) ? implode("\t", $ThisFileInfo['comments']['genre']) : '').'"'; + $SQLquery .= ', `comment` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']['comment']) ? implode("\t", $ThisFileInfo['comments']['comment']) : '').'"'; + $SQLquery .= ', `artist` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']['artist']) ? implode("\t", $ThisFileInfo['comments']['artist']) : '').'"'; + $SQLquery .= ', `tags` = "'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']) ? implode("\t", array_keys($ThisFileInfo['tags'])) : '').'"'; + $SQLquery .= ', `encoder_options` = "'.mysqli_real_escape_string($connection, trim((!empty($ThisFileInfo['audio']['encoder']) ? $ThisFileInfo['audio']['encoder'] : '').' '.(!empty($ThisFileInfo['audio']['encoder_options']) ? $ThisFileInfo['audio']['encoder_options'] : ''))).'"'; + $SQLquery .= ', `title` = "'.mysqli_real_escape_string($connection, $this_track_title).'"'; + $SQLquery .= ', `remix` = "'.mysqli_real_escape_string($connection, $this_track_remix).'"'; + $SQLquery .= ', `track` = "'.mysqli_real_escape_string($connection, $this_track_track).'"'; + $SQLquery .= 'WHERE (`filename` = "'.mysqli_real_escape_string($connection, isset($ThisFileInfo['filenamepath']) ? $ThisFileInfo['filenamepath'] : '').'")'; } elseif (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan'])) { - //$SQLquery = 'INSERT INTO `'.mysql_real_escape_string(GETID3_DB_TABLE).'` (`filename`, `last_modified`, `md5_file`, `md5_data`, `md5_data_source`, `filesize`, `fileformat`, `audio_dataformat`, `video_dataformat`, `audio_bitrate`, `video_bitrate`, `playtime_seconds`, `artist`, `title`, `remix`, `album`, `genre`, `comment`, `track`, `comments_all`, `comments_id3v2`, `comments_ape`, `comments_lyrics3`, `comments_id3v1`, `warning`, `error`, `encoder_options`, `vbr_method`, `track_volume`) VALUES ('; - $SQLquery = 'INSERT INTO `'.mysql_real_escape_string(GETID3_DB_TABLE).'` (`filename`, `last_modified`, `md5_file`, `md5_data`, `md5_data_source`, `filesize`, `fileformat`, `audio_dataformat`, `video_dataformat`, `audio_bitrate`, `video_bitrate`, `playtime_seconds`, `tags`, `artist`, `title`, `remix`, `album`, `genre`, `comment`, `track`, `comments_all`, `comments_id3v2`, `comments_ape`, `comments_lyrics3`, `comments_id3v1`, `warning`, `error`, `encoder_options`, `vbr_method`, `track_volume`) VALUES ('; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['filenamepath']) ? $ThisFileInfo['filenamepath'] : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['file_modified_time']) ? $ThisFileInfo['file_modified_time'] : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['md5_file']) ? $ThisFileInfo['md5_file'] : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['md5_data']) ? $ThisFileInfo['md5_data'] : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['md5_data_source']) ? $ThisFileInfo['md5_data_source'] : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['filesize']) ? $ThisFileInfo['filesize'] : 0).'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['fileformat']) ? $ThisFileInfo['fileformat'] : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['audio']['dataformat']) ? $ThisFileInfo['audio']['dataformat'] : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['video']['dataformat']) ? $ThisFileInfo['video']['dataformat'] : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['audio']['bitrate']) ? floatval($ThisFileInfo['audio']['bitrate']) : 0).'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['video']['bitrate']) ? floatval($ThisFileInfo['video']['bitrate']) : 0).'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['playtime_seconds']) ? floatval($ThisFileInfo['playtime_seconds']) : 0).'", '; - //$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags'] ) ? implode("\t", $ThisFileInfo['tags']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']) ? implode("\t", array_keys($ThisFileInfo['tags'])) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['artist']) ? implode("\t", $ThisFileInfo['comments']['artist']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string($this_track_title).'", '; - $SQLquery .= '"'.mysql_real_escape_string($this_track_remix).'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['album']) ? implode("\t", $ThisFileInfo['comments']['album']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['genre']) ? implode("\t", $ThisFileInfo['comments']['genre']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['comment']) ? implode("\t", $ThisFileInfo['comments']['comment']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string($this_track_track).'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']) ? serialize($ThisFileInfo['comments']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['id3v2']) ? serialize($ThisFileInfo['tags']['id3v2']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['ape']) ? serialize($ThisFileInfo['tags']['ape']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['lyrics3']) ? serialize($ThisFileInfo['tags']['lyrics3']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['id3v1']) ? serialize($ThisFileInfo['tags']['id3v1']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['warning']) ? implode("\t", $ThisFileInfo['warning']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['error']) ? implode("\t", $ThisFileInfo['error']) : '').'", '; - $SQLquery .= '"'.mysql_real_escape_string(trim((!empty($ThisFileInfo['audio']['encoder']) ? $ThisFileInfo['audio']['encoder'] : '').' '.(!empty($ThisFileInfo['audio']['encoder_options']) ? $ThisFileInfo['audio']['encoder_options'] : ''))).'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['mpeg']['audio']['LAME']) ? 'LAME' : (!empty($ThisFileInfo['mpeg']['audio']['VBR_method']) ? $ThisFileInfo['mpeg']['audio']['VBR_method'] : '')).'", '; - $SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['replay_gain']['track']['volume']) ? floatval($ThisFileInfo['replay_gain']['track']['volume']) : 0).'")'; + //$SQLquery = 'INSERT INTO `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` (`filename`, `last_modified`, `md5_file`, `md5_data`, `md5_data_source`, `filesize`, `fileformat`, `audio_dataformat`, `video_dataformat`, `audio_bitrate`, `video_bitrate`, `playtime_seconds`, `artist`, `title`, `remix`, `album`, `genre`, `comment`, `track`, `comments_all`, `comments_id3v2`, `comments_ape`, `comments_lyrics3`, `comments_id3v1`, `warning`, `error`, `encoder_options`, `vbr_method`, `track_volume`) VALUES ('; + $SQLquery = 'INSERT INTO `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'` (`filename`, `last_modified`, `md5_file`, `md5_data`, `md5_data_source`, `filesize`, `fileformat`, `audio_dataformat`, `video_dataformat`, `audio_bitrate`, `video_bitrate`, `playtime_seconds`, `tags`, `artist`, `title`, `remix`, `album`, `genre`, `comment`, `track`, `comments_all`, `comments_id3v2`, `comments_ape`, `comments_lyrics3`, `comments_id3v1`, `warning`, `error`, `encoder_options`, `vbr_method`, `track_volume`) VALUES ('; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['filenamepath']) ? $ThisFileInfo['filenamepath'] : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['file_modified_time']) ? $ThisFileInfo['file_modified_time'] : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['md5_file']) ? $ThisFileInfo['md5_file'] : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['md5_data']) ? $ThisFileInfo['md5_data'] : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['md5_data_source']) ? $ThisFileInfo['md5_data_source'] : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['filesize']) ? $ThisFileInfo['filesize'] : 0).'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['fileformat']) ? $ThisFileInfo['fileformat'] : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['audio']['dataformat']) ? $ThisFileInfo['audio']['dataformat'] : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['video']['dataformat']) ? $ThisFileInfo['video']['dataformat'] : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['audio']['bitrate']) ? floatval($ThisFileInfo['audio']['bitrate']) : 0).'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['video']['bitrate']) ? floatval($ThisFileInfo['video']['bitrate']) : 0).'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['playtime_seconds']) ? floatval($ThisFileInfo['playtime_seconds']) : 0).'", '; + //$SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags'] ) ? implode("\t", $ThisFileInfo['tags']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']) ? implode("\t", array_keys($ThisFileInfo['tags'])) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']['artist']) ? implode("\t", $ThisFileInfo['comments']['artist']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, $this_track_title).'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, $this_track_remix).'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']['album']) ? implode("\t", $ThisFileInfo['comments']['album']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']['genre']) ? implode("\t", $ThisFileInfo['comments']['genre']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']['comment']) ? implode("\t", $ThisFileInfo['comments']['comment']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, $this_track_track).'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['comments']) ? serialize($ThisFileInfo['comments']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']['id3v2']) ? serialize($ThisFileInfo['tags']['id3v2']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']['ape']) ? serialize($ThisFileInfo['tags']['ape']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']['lyrics3']) ? serialize($ThisFileInfo['tags']['lyrics3']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['tags']['id3v1']) ? serialize($ThisFileInfo['tags']['id3v1']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['warning']) ? implode("\t", $ThisFileInfo['warning']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['error']) ? implode("\t", $ThisFileInfo['error']) : '').'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, trim((!empty($ThisFileInfo['audio']['encoder']) ? $ThisFileInfo['audio']['encoder'] : '').' '.(!empty($ThisFileInfo['audio']['encoder_options']) ? $ThisFileInfo['audio']['encoder_options'] : ''))).'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['mpeg']['audio']['LAME']) ? 'LAME' : (!empty($ThisFileInfo['mpeg']['audio']['VBR_method']) ? $ThisFileInfo['mpeg']['audio']['VBR_method'] : '')).'", '; + $SQLquery .= '"'.mysqli_real_escape_string($connection, !empty($ThisFileInfo['replay_gain']['track']['volume']) ? floatval($ThisFileInfo['replay_gain']['track']['volume']) : 0).'")'; } flush(); - mysql_query_safe($SQLquery); + mysql_query_safe($connection, $SQLquery); } } - $SQLquery = 'OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - mysql_query_safe($SQLquery); + $SQLquery = 'OPTIMIZE TABLE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + mysql_query_safe($connection, $SQLquery); echo '
Done scanning!
'; } elseif (!empty($_REQUEST['missingtrackvolume'])) { @@ -589,12 +593,12 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $MissingTrackVolumeFilesAdjusted = 0; $MissingTrackVolumeFilesDeleted = 0; $SQLquery = 'SELECT `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`track_volume` = 0)'; $SQLquery .= ' AND (`audio_bitrate` > 0)'; - $result = mysql_query_safe($SQLquery); - echo 'Scanning 0 / '.number_format(mysql_num_rows($result)).' files for track volume information:
'; - while ($row = mysql_fetch_array($result)) { + $result = mysql_query_safe($connection, $SQLquery); + echo 'Scanning 0 / '.number_format(mysqli_num_rows($result)).' files for track volume information:
'; + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); echo '. '; flush(); @@ -602,36 +606,36 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $ThisFileInfo = $getID3->analyze($row['filename']); if (!empty($ThisFileInfo['replay_gain']['track']['volume'])) { ++$MissingTrackVolumeFilesAdjusted; - $SQLquery = 'UPDATE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery = 'UPDATE `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' SET `track_volume` = "'.$ThisFileInfo['replay_gain']['track']['volume'].'"'; - $SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($row['filename']).'")'; - mysql_query_safe($SQLquery); + $SQLquery .= ' WHERE (`filename` = "'.mysqli_real_escape_string($connection, $row['filename']).'")'; + mysql_query_safe($connection, $SQLquery); } } else { ++$MissingTrackVolumeFilesDeleted; - $SQLquery = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($row['filename']).'")'; - mysql_query_safe($SQLquery); + $SQLquery = 'DELETE FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`filename` = "'.mysqli_real_escape_string($connection, $row['filename']).'")'; + mysql_query_safe($connection, $SQLquery); } } echo '
Scanned '.number_format($MissingTrackVolumeFilesScanned).' files with no track volume information.
'; echo 'Found track volume information for '.number_format($MissingTrackVolumeFilesAdjusted).' of them (could not find info for '.number_format($MissingTrackVolumeFilesScanned - $MissingTrackVolumeFilesAdjusted).' files; deleted '.number_format($MissingTrackVolumeFilesDeleted).' records of missing files)
'; } elseif (!empty($_REQUEST['deadfilescheck'])) { $SQLquery = 'SELECT COUNT(*) AS `num`, `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' GROUP BY `filename`'; $SQLquery .= ' ORDER BY `num` DESC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); $DupesDeleted = 0; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); if ($row['num'] <= 1) { break; } echo '
'.htmlentities($row['filename']).' (duplicate)'; - $SQLquery = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE `filename` LIKE "'.mysql_real_escape_string($row['filename']).'"'; - mysql_query_safe($SQLquery); + $SQLquery = 'DELETE FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE `filename` LIKE "'.mysqli_real_escape_string($connection, $row['filename']).'"'; + mysql_query_safe($connection, $SQLquery); ++$DupesDeleted; } if ($DupesDeleted > 0) { @@ -639,13 +643,13 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } $SQLquery = 'SELECT `filename`, `filesize`, `last_modified`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); $totalchecked = 0; $totalremoved = 0; $previousdir = ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { ++$totalchecked; set_time_limit(30); $reason = ''; @@ -665,9 +669,9 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto ++$totalremoved; echo '
'.htmlentities($row['filename']).' ('.$reason.')'; flush(); - $SQLquery = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($row['filename']).'")'; - mysql_query_safe($SQLquery); + $SQLquery = 'DELETE FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`filename` = "'.mysqli_real_escape_string($connection, $row['filename']).'")'; + mysql_query_safe($connection, $SQLquery); } elseif ($thisdir != $previousdir) { echo '. '; flush(); @@ -682,12 +686,12 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '#EXTM3U'."\n"; $SQLquery = 'SELECT `filename`, `comments_id3v2`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`encoder_options` = "'.mysql_real_escape_string($_REQUEST['encodedbydistribution']).'")'; - $result = mysql_query_safe($SQLquery); + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`encoder_options` = "'.mysqli_real_escape_string($connection, $_REQUEST['encodedbydistribution']).'")'; + $result = mysql_query_safe($connection, $SQLquery); $NonBlankEncodedBy = ''; $BlankEncodedBy = ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); $CommentArray = unserialize($row['comments_id3v2']); if (isset($CommentArray['encoded_by'][0])) { @@ -704,9 +708,9 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo ''; $SQLquery = 'SELECT `filename`, `comments_id3v2`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $result = mysql_query_safe($SQLquery); - while ($row = mysql_fetch_array($result)) { + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $result = mysql_query_safe($connection, $SQLquery); + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); $CommentArray = unserialize($row['comments_id3v2']); if (($_REQUEST['encodedbydistribution'] == '%') || (!empty($CommentArray['encoded_by'][0]) && ($_REQUEST['encodedbydistribution'] == $CommentArray['encoded_by'][0]))) { @@ -717,11 +721,11 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '
'; } else { $SQLquery = 'SELECT `encoder_options`, `comments_id3v2`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' ORDER BY (`encoder_options` LIKE "LAME%") DESC, (`encoder_options` LIKE "CBR%") DESC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); $EncodedBy = array(); - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); $CommentArray = unserialize($row['comments_id3v2']); if (isset($CommentArray['encoded_by'][0])) { @@ -751,11 +755,11 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true); $BitrateDistribution = array(); $SQLquery = 'SELECT ROUND(audio_bitrate / 1000) AS `RoundBitrate`, COUNT(*) AS `num`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`audio_bitrate` > 0)'; $SQLquery .= ' GROUP BY `RoundBitrate`'; - $result = mysql_query_safe($SQLquery); - while ($row = mysql_fetch_array($result)) { + $result = mysql_query_safe($connection, $SQLquery); + while ($row = mysqli_fetch_array($result)) { $this_bitrate = getid3_mp3::ClosestStandardMP3Bitrate($row['RoundBitrate'] * 1000); if (isset($BitrateDistribution[$this_bitrate])) { $BitrateDistribution[$this_bitrate] += $row['num']; @@ -775,17 +779,17 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo ''; } elseif (!empty($_REQUEST['emptygenres'])) { $SQLquery = 'SELECT `fileformat`, `filename`, `genre`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`genre` = "")'; $SQLquery .= ' OR (`genre` = "Unknown")'; $SQLquery .= ' OR (`genre` = "Other")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { if (!in_array($row['fileformat'], $IgnoreNoTagFormats)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } @@ -796,7 +800,7 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $EmptyGenreCounter = 0; echo ''; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { if (!in_array($row['fileformat'], $IgnoreNoTagFormats)) { ++$EmptyGenreCounter; echo ''; @@ -810,15 +814,15 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } } elseif (!empty($_REQUEST['nonemptycomments'])) { $SQLquery = 'SELECT `filename`, `comment`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`comment` <> "")'; $SQLquery .= ' ORDER BY `comment` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; @@ -827,7 +831,7 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '.m3u version
'; echo '
m3ufilename
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { ++$NonEmptyCommentsCounter; echo ''; echo ''; @@ -844,17 +848,17 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } } elseif (!empty($_REQUEST['trackzero'])) { $SQLquery = 'SELECT `filename`, `track`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`track` <> "")'; $SQLquery .= ' AND ((`track` < "1")'; $SQLquery .= ' OR (`track` > "99"))'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { if ((strlen($row['track']) > 0) && ($row['track'] < 1) || ($row['track'] > 99)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } @@ -865,7 +869,7 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $TrackZeroCounter = 0; echo '
m3ufilenamecomments
m3u
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { if ((strlen($row['track']) > 0) && ($row['track'] < 1) || ($row['track'] > 99)) { ++$TrackZeroCounter; echo ''; @@ -880,24 +884,24 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } } elseif (!empty($_REQUEST['titlefeat'])) { $SQLquery = 'SELECT `filename`, `title`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`title` LIKE "%feat.%")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; } else { - echo ''.number_format(mysql_num_rows($result)).' files with "feat." in the title (instead of the artist)

'; + echo ''.number_format(mysqli_num_rows($result)).' files with "feat." in the title (instead of the artist)

'; echo '.m3u version
'; echo '
m3ufilenametrack
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -908,25 +912,25 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } } elseif (!empty($_REQUEST['tracknoalbum'])) { $SQLquery = 'SELECT `filename`, `track`, `album`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`track` <> "")'; $SQLquery .= ' AND (`album` = "")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; } else { - echo ''.number_format(mysql_num_rows($result)).' files with a track number, but no album

'; + echo ''.number_format(mysqli_num_rows($result)).' files with a track number, but no album

'; echo '.m3u version
'; echo '
m3ufilenametitle
m3u'.htmlentities($row['filename']).'
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -986,13 +990,13 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo ''; $SQLquery = 'SELECT `filename`, `comments_all`, `comments_id3v2`, `comments_ape`, `comments_lyrics3`, `comments_id3v1`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`fileformat` = "mp3")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); $lastdir = ''; $serializedCommentsFields = array('all', 'id3v2', 'ape', 'lyrics3', 'id3v1'); - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); if ($lastdir != dirname($row['filename'])) { echo ''; @@ -1238,17 +1242,17 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } $SQLquery = 'SELECT `filename`, `fileformat`, '.implode(', ', $FieldNames); - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); echo 'Files that do not match naming pattern: (auto-fix)
'; echo '
m3ufilenametrackalbum
m3u'.htmlentities($row['filename']).'
'; echo ''; $nonmatchingfilenames = 0; $Pattern = $_REQUEST['filenamepattern']; $PatternLength = strlen($Pattern); - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(10); $PatternFilename = ''; for ($i = 0; $i < $PatternLength; ++$i) { @@ -1354,16 +1358,16 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo 'Found '.number_format($nonmatchingfilenames).' files that do not match naming pattern
'; } elseif (!empty($_REQUEST['encoderoptionsdistribution'])) { if (isset($_REQUEST['showtagfiles'])) { - $SQLquery = 'SELECT `filename`, `encoder_options` FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`encoder_options` LIKE "'.mysql_real_escape_string($_REQUEST['showtagfiles']).'")'; + $SQLquery = 'SELECT `filename`, `encoder_options` FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`encoder_options` LIKE "'.mysqli_real_escape_string($connection, $_REQUEST['showtagfiles']).'")'; $SQLquery .= ' AND (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; @@ -1371,7 +1375,7 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo 'Show all Encoder Options
'; echo 'Files with Encoder Options '.$_REQUEST['showtagfiles'].':
'; echo '
viewWhyActual filename
(click to play/edit file)		Correct filename (based on tags)'.(empty($_REQUEST['autofix']) ? '
(click to rename file to this)' : '').'
'; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1380,15 +1384,15 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '
'.htmlentities($row['filename']).''.$row['encoder_options'].'
'; } } elseif (!isset($_REQUEST['m3u'])) { - $SQLquery = 'SELECT `encoder_options`, COUNT(*) AS `num` FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery = 'SELECT `encoder_options`, COUNT(*) AS `num` FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")'; $SQLquery .= ' GROUP BY `encoder_options`'; $SQLquery .= ' ORDER BY (`encoder_options` LIKE "LAME%") DESC, (`encoder_options` LIKE "CBR%") DESC, `num` DESC, `encoder_options` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); echo 'Files with Encoder Options:
'; echo ''; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1399,15 +1403,15 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } } elseif (!empty($_REQUEST['tagtypes'])) { if (!isset($_REQUEST['m3u'])) { - $SQLquery = 'SELECT `tags`, COUNT(*) AS `num` FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery = 'SELECT `tags`, COUNT(*) AS `num` FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")'; $SQLquery .= ' GROUP BY `tags`'; $SQLquery .= ' ORDER BY `num` DESC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); echo 'Files with tags:
'; echo '
Encoder OptionsCountM3U
'.$row['encoder_options'].''.number_format($row['num']).'
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1418,22 +1422,22 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } if (isset($_REQUEST['showtagfiles'])) { - $SQLquery = 'SELECT `filename`, `tags` FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`tags` LIKE "'.mysql_real_escape_string($_REQUEST['showtagfiles']).'")'; + $SQLquery = 'SELECT `filename`, `tags` FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`tags` LIKE "'.mysqli_real_escape_string($connection, $_REQUEST['showtagfiles']).'")'; $SQLquery .= ' AND (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; } else { echo '
TagsCountM3U
'.$row['tags'].''.number_format($row['num']).'
'; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1447,23 +1451,23 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $AVFormats = ''; $SQLquery = 'SELECT `md5_data`, `filename`, COUNT(*) AS `num`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`md5_data` <> "")'; $SQLquery .= ' GROUP BY `md5_data`'; $SQLquery .= ' ORDER BY `num` DESC'; - $result = mysql_query_safe($SQLquery); - while (($row = mysql_fetch_array($result)) && ($row['num'] > 1)) { + $result = mysql_query_safe($connection, $SQLquery); + while (($row = mysqli_fetch_array($result)) && ($row['num'] > 1)) { set_time_limit(30); $filenames = array(); $tags = array(); $md5_data = array(); $SQLquery = 'SELECT `fileformat`, `filename`, `tags`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`md5_data` = "'.mysql_real_escape_string($row['md5_data']).'")'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`md5_data` = "'.mysqli_real_escape_string($connection, $row['md5_data']).'")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result2 = mysql_query_safe($SQLquery); - while ($row2 = mysql_fetch_array($result2)) { + $result2 = mysql_query_safe($connection, $SQLquery); + while ($row2 = mysqli_fetch_array($result2)) { $thisfileformat = $row2['fileformat']; $filenames[] = $row2['filename']; $tags[] = $row2['tags']; @@ -1491,41 +1495,41 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; $SQLquery = 'SELECT `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`artist` = "'.mysql_real_escape_string($_REQUEST['m3uartist']).'")'; - $SQLquery .= ' AND (`title` = "'.mysql_real_escape_string($_REQUEST['m3utitle']).'")'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`artist` = "'.mysqli_real_escape_string($connection, $_REQUEST['m3uartist']).'")'; + $SQLquery .= ' AND (`title` = "'.mysqli_real_escape_string($connection, $_REQUEST['m3utitle']).'")'; $SQLquery .= ' ORDER BY `playtime_seconds` ASC, `remix` ASC, `filename` ASC'; - $result = mysql_query_safe($SQLquery); - while ($row = mysql_fetch_array($result)) { + $result = mysql_query_safe($connection, $SQLquery); + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; } $SQLquery = 'SELECT `artist`, `title`, `filename`, COUNT(*) AS `num`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`artist` <> "")'; $SQLquery .= ' AND (`title` <> "")'; $SQLquery .= ' GROUP BY `artist`, `title`'.(!empty($_REQUEST['samemix']) ? ', `remix`' : ''); $SQLquery .= ' ORDER BY `num` DESC, `artist` ASC, `title` ASC, `playtime_seconds` ASC, `remix` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); $uniquetitles = 0; $uniquefiles = 0; if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while (($row = mysql_fetch_array($result)) && ($row['num'] > 1)) { + while (($row = mysqli_fetch_array($result)) && ($row['num'] > 1)) { $SQLquery = 'SELECT `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`artist` = "'.mysql_real_escape_string($row['artist']).'")'; - $SQLquery .= ' AND (`title` = "'.mysql_real_escape_string($row['title']).'")'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`artist` = "'.mysqli_real_escape_string($connection, $row['artist']).'")'; + $SQLquery .= ' AND (`title` = "'.mysqli_real_escape_string($connection, $row['title']).'")'; if (!empty($_REQUEST['samemix'])) { - $SQLquery .= ' AND (`remix` = "'.mysql_real_escape_string($row['remix']).'")'; + $SQLquery .= ' AND (`remix` = "'.mysqli_real_escape_string($connection, $row['remix']).'")'; } $SQLquery .= ' ORDER BY `playtime_seconds` ASC, `remix` ASC, `filename` ASC'; - $result2 = mysql_query_safe($SQLquery); - while ($row2 = mysql_fetch_array($result2)) { + $result2 = mysql_query_safe($connection, $SQLquery); + while ($row2 = mysqli_fetch_array($result2)) { echo WindowsShareSlashTranslate($row2['filename'])."\n"; } } @@ -1536,7 +1540,7 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '
'.htmlentities($row['filename']).''.$row['tags'].'
'; echo ''; - while (($row = mysql_fetch_array($result)) && ($row['num'] > 1)) { + while (($row = mysqli_fetch_array($result)) && ($row['num'] > 1)) { ++$uniquetitles; set_time_limit(30); @@ -1547,12 +1551,12 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $bitrates = array(); $playtimes = array(); $SQLquery = 'SELECT `filename`, `artist`, `title`, `remix`, `audio_bitrate`, `vbr_method`, `playtime_seconds`, `encoder_options`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`artist` = "'.mysql_real_escape_string($row['artist']).'")'; - $SQLquery .= ' AND (`title` = "'.mysql_real_escape_string($row['title']).'")'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`artist` = "'.mysqli_real_escape_string($connection, $row['artist']).'")'; + $SQLquery .= ' AND (`title` = "'.mysqli_real_escape_string($connection, $row['title']).'")'; $SQLquery .= ' ORDER BY `playtime_seconds` ASC, `remix` ASC, `filename` ASC'; - $result2 = mysql_query_safe($SQLquery); - while ($row2 = mysql_fetch_array($result2)) { + $result2 = mysql_query_safe($connection, $SQLquery); + while ($row2 = mysqli_fetch_array($result2)) { ++$uniquefiles; $filenames[] = $row2['filename']; $artists[] = $row2['artist']; @@ -1563,7 +1567,7 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } else { $bitrates[] = BitrateText($row2['audio_bitrate'] / 1000); } - $playtimes[] = getid3_lib::PlaytimeString($row2['playtime_seconds']); + $playtimes[] = \GetId3\Lib\Helper::PlaytimeString($row2['playtime_seconds']); } echo ''; @@ -1599,14 +1603,14 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } elseif (!empty($_REQUEST['filetypelist'])) { list($fileformat, $audioformat) = explode('|', $_REQUEST['filetypelist']); $SQLquery = 'SELECT `filename`, `fileformat`, `audio_dataformat`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`fileformat` = "'.mysql_real_escape_string($fileformat).'")'; - $SQLquery .= ' AND (`audio_dataformat` = "'.mysql_real_escape_string($audioformat).'")'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`fileformat` = "'.mysqli_real_escape_string($connection, $fileformat).'")'; + $SQLquery .= ' AND (`audio_dataformat` = "'.mysqli_real_escape_string($connection, $audioformat).'")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); echo 'Files of format '.$fileformat.'.'.$audioformat.':
 ArtistTitleVersion  Filename
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1616,14 +1620,14 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '
fileaudiofilename
'.$row['fileformat'].''.$row['audio_dataformat'].'
'; } elseif (!empty($_REQUEST['trackinalbum'])) { $SQLquery = 'SELECT `filename`, `album`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`album` LIKE "% [%")'; $SQLquery .= ' ORDER BY `album` ASC, `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; @@ -1631,7 +1635,7 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true); getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true); - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); $ThisFileInfo = $getID3->analyze($filename); getid3_lib::CopyTagsToComments($ThisFileInfo); @@ -1661,12 +1665,12 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto flush(); } } else { - echo ''.number_format(mysql_num_rows($result)).' files with [??]-format track numbers in album field:
'; - if (mysql_num_rows($result) > 0) { + echo ''.number_format(mysqli_num_rows($result)).' files with [??]-format track numbers in album field:
'; + if (mysqli_num_rows($result) > 0) { echo '(.m3u version)
'; echo 'Try to auto-fix
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1678,13 +1682,13 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } } elseif (!empty($_REQUEST['fileextensions'])) { $SQLquery = 'SELECT `filename`, `fileformat`, `audio_dataformat`, `video_dataformat`, `tags`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); $invalidextensionfiles = 0; $invalidextensionline = '
'.$row['album'].''.htmlentities($row['filename']).'
'; $invalidextensionline .= ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); $acceptableextensions = AcceptableExtensions($row['fileformat'], $row['audio_dataformat'], $row['video_dataformat']); @@ -1711,27 +1715,27 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; $SQLquery = 'SELECT `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (BINARY `genre` = "'.$_REQUEST['genredistribution'].'")'; $SQLquery .= ' AND (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); - while ($row = mysql_fetch_array($result)) { + $result = mysql_query_safe($connection, $SQLquery); + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; } else { if ($_REQUEST['genredistribution'] == '%') { $SQLquery = 'SELECT COUNT(*) AS `num`, `genre`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")'; $SQLquery .= ' GROUP BY `genre`'; $SQLquery .= ' ORDER BY `num` DESC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true); echo '
fileaudiovideotagsactualcorrectfilename
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { $GenreID = getid3_id3v1::LookupGenreID($row['genre']); if (is_numeric($GenreID)) { echo ''; @@ -1746,14 +1750,14 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '
CountGenrem3u
'; } else { $SQLquery = 'SELECT `filename`, `genre`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`genre` LIKE "'.mysql_real_escape_string($_REQUEST['genredistribution']).'")'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`genre` LIKE "'.mysqli_real_escape_string($connection, $_REQUEST['genredistribution']).'")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); echo 'All Genres
'; echo ''; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1765,13 +1769,13 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } } elseif (!empty($_REQUEST['formatdistribution'])) { $SQLquery = 'SELECT `fileformat`, `audio_dataformat`, COUNT(*) AS `num`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' GROUP BY `fileformat`, `audio_dataformat`'; $SQLquery .= ' ORDER BY `num` DESC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); echo 'File format distribution:
Genrem3uFilename
'.str_replace("\t", '
', $row['genre']).'		m3u
'; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1780,25 +1784,25 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '
NumberFormat
'.number_format($row['num']).''.($row['fileformat'] ? $row['fileformat'] : 'unknown').(($row['audio_dataformat'] && ($row['audio_dataformat'] != $row['fileformat'])) ? '.'.$row['audio_dataformat'] : '').'
'; } elseif (!empty($_REQUEST['errorswarnings'])) { $SQLquery = 'SELECT `filename`, `error`, `warning`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`error` <> "")'; $SQLquery .= ' OR (`warning` <> "")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); if (!empty($_REQUEST['m3u'])) { header('Content-type: audio/x-mpegurl'); echo '#EXTM3U'."\n"; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo WindowsShareSlashTranslate($row['filename'])."\n"; } exit; } else { - echo number_format(mysql_num_rows($result)).' files with errors or warnings:
'; + echo number_format(mysqli_num_rows($result)).' files with errors or warnings:
'; echo '(.m3u version)
'; echo ''; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; echo ''; @@ -1812,14 +1816,14 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto $id3v1_writer = new getid3_write_id3v1(); $SQLquery = 'SELECT `filename`, `error`, `warning`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`fileformat` = "mp3")'; $SQLquery .= ' AND (`warning` <> "")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); - $totaltofix = mysql_num_rows($result); + $result = mysql_query_safe($connection, $SQLquery); + $totaltofix = mysqli_num_rows($result); $rowcounter = 0; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { set_time_limit(30); if (strpos($row['warning'], 'Some ID3v1 fields do not use NULL characters for padding') !== false) { set_time_limit(30); @@ -1835,13 +1839,13 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto } elseif (!empty($_REQUEST['vbrmethod'])) { if ($_REQUEST['vbrmethod'] == '1') { $SQLquery = 'SELECT COUNT(*) AS `num`, `vbr_method`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' GROUP BY `vbr_method`'; $SQLquery .= ' ORDER BY `vbr_method`'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); echo 'VBR methods:
FilenameErrorWarning
'.htmlentities($row['filename']).''.(!empty($row['error']) ? '
  • '.str_replace("\t", '
  • ', htmlentities($row['error'])).'
    • ' : ' ').'
    '; echo ''; - while ($row = mysql_fetch_array($result)) { + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; if ($row['vbr_method']) { @@ -1854,11 +1858,11 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '
    CountVBR Method
    '.htmlentities(number_format($row['num'])).'
    '; } else { $SQLquery = 'SELECT `filename`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; - $SQLquery .= ' WHERE (`vbr_method` = "'.mysql_real_escape_string($_REQUEST['vbrmethod']).'")'; - $result = mysql_query_safe($SQLquery); - echo number_format(mysql_num_rows($result)).' files with VBR_method of "'.$_REQUEST['vbrmethod'].'":'; - while ($row = mysql_fetch_array($result)) { + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; + $SQLquery .= ' WHERE (`vbr_method` = "'.mysqli_real_escape_string($connection, $_REQUEST['vbrmethod']).'")'; + $result = mysql_query_safe($connection, $SQLquery); + echo number_format(mysqli_num_rows($result)).' files with VBR_method of "'.$_REQUEST['vbrmethod'].'":
    '; + while ($row = mysqli_fetch_array($result)) { echo ''; echo ''; } @@ -1867,14 +1871,14 @@ function SynchronizeAllTags($filename, $synchronizefrom = 'all', $synchronizeto echo '
    '; } elseif (!empty($_REQUEST['correctcase'])) { $SQLquery = 'SELECT `filename`, `fileformat`'; - $SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`'; + $SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`'; $SQLquery .= ' WHERE (`fileformat` <> "")'; $SQLquery .= ' ORDER BY `filename` ASC'; - $result = mysql_query_safe($SQLquery); + $result = mysql_query_safe($connection, $SQLquery); echo 'Copy and paste the following into a DOS batch file. You may have to run this script more than once to catch all the changes (remember to scan for deleted/changed files and rescan directory between scans)
    '; echo '
    ';
     $lastdir = '';
-    while ($row = mysql_fetch_array($result)) {
+    while ($row = mysqli_fetch_array($result)) {
         set_time_limit(30);
         $CleanedFilename = CleanUpFileName($row['filename']);
         if ($row['filename'] != $CleanedFilename) {
@@ -1998,19 +2002,19 @@ function BetterUCwords($string)
 echo '';
 
 $SQLquery = 'SELECT COUNT(*) AS `TotalFiles`, SUM(`playtime_seconds`) AS `TotalPlaytime`, SUM(`filesize`) AS `TotalFilesize`, AVG(`playtime_seconds`) AS `AvgPlaytime`, AVG(`filesize`) AS `AvgFilesize`, AVG(`audio_bitrate` + `video_bitrate`) AS `AvgBitrate`';
-$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-$result = mysql_query_safe($SQLquery);
-if ($row = mysql_fetch_array($result)) {
+$SQLquery .= ' FROM `'.mysqli_real_escape_string($connection, GETID3_DB_TABLE).'`';
+$result = mysql_query_safe($connection, $SQLquery);
+if ($row = mysqli_fetch_array($result)) {
     echo '
    ';
     echo '
    ';
-    echo 'Spent '.number_format(mysql_query_safe(null), 3).' seconds querying the database
    ';
+    echo 'Spent '.number_format(mysql_query_safe($connection, null), 3).' seconds querying the database
    ';
     echo '
    ';
     echo 'Currently in the database:
    m3u'.htmlentities($row['filename']).'
    '; echo ''; echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; echo '
    Total Files'.number_format($row['TotalFiles']).'
    Total Filesize'.number_format($row['TotalFilesize'] / 1048576).' MB
    Total Playtime'.number_format($row['TotalPlaytime'] / 3600, 1).' hours
    Average Filesize'.number_format($row['AvgFilesize'] / 1048576, 1).' MB
    Average Playtime'.getid3_lib::PlaytimeString($row['AvgPlaytime']).'
    Average Playtime'.\GetId3\Lib\Helper::PlaytimeString($row['AvgPlaytime']).'
    Average Bitrate'.BitrateText($row['AvgBitrate'] / 1000, 1).'
    '; echo '
    '; From abf8089ddc54b06f2105b8a886e956da35b35d9c Mon Sep 17 00:00:00 2001 From: Jos Elstgeest Date: Sat, 6 Feb 2016 22:51:37 +0100 Subject: [PATCH 3/3] correct namespace --- Resources/demos/demo.audioinfo.class.php | 4 ++-- Resources/demos/demo.browse.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/demos/demo.audioinfo.class.php b/Resources/demos/demo.audioinfo.class.php index 186c209..0c12251 100644 --- a/Resources/demos/demo.audioinfo.class.php +++ b/Resources/demos/demo.audioinfo.class.php @@ -24,7 +24,7 @@ // | $au = new AudioInfo(); | // | print_r($au->Info('file.flac'); | // +----------------------------------------------------------------------+ -// | Authors: Allan Hansen | +// | Authors: Allan Hansen | // +----------------------------------------------------------------------+ // @@ -47,7 +47,7 @@ class AudioInfo /** * Constructor */ - public function AudioInfo() + public function __construct() { // Initialize getID3 engine $this->getID3 = new getID3(); diff --git a/Resources/demos/demo.browse.php b/Resources/demos/demo.browse.php index cc9b35b..c16411c 100644 --- a/Resources/demos/demo.browse.php +++ b/Resources/demos/demo.browse.php @@ -347,7 +347,7 @@ echo 'Average:'; echo ''.number_format($TotalScannedFilesize / max($TotalScannedKnownFiles, 1)).''; echo ' '; - echo ''.getid3_lib::PlaytimeString($TotalScannedPlaytime / max($TotalScannedPlaytimeFiles, 1)).''; + echo ''.\GetId3\Lib\Helper::PlaytimeString($TotalScannedPlaytime / max($TotalScannedPlaytimeFiles, 1)).''; echo ''.BitrateText(round(($TotalScannedBitrate / 1000) / max($TotalScannedBitrateFiles, 1))).''; echo '
    Identified Files:'.number_format($TotalScannedKnownFiles).'   Errors:'.number_format($FilesWithErrors).'
    Unknown Files:'.number_format($TotalScannedUnknownFiles).'   Warnings:'.number_format($FilesWithWarnings).'
    '; echo ''; @@ -355,7 +355,7 @@ echo 'Total:'; echo ''.number_format($TotalScannedFilesize).''; echo ' '; - echo ''.getid3_lib::PlaytimeString($TotalScannedPlaytime).''; + echo ''.\GetId3\Lib\Helper::PlaytimeString($TotalScannedPlaytime).''; echo ' '; echo ''; }