From ec75af194b41fafe14ff492e7260b348f768fa2c Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 14 Jul 2011 21:31:02 -0400 Subject: [PATCH] CC-2279: Upgrade script for converting stor directory to new format -escape strings before inserting into database --- install/upgrades/airtime-1.9.0/airtime-upgrade.php | 6 +++--- .../media-monitor/airtimefilemonitor/mediamonitorcommon.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/upgrades/airtime-1.9.0/airtime-upgrade.php b/install/upgrades/airtime-1.9.0/airtime-upgrade.php index 2ba9d692d..b70db5090 100644 --- a/install/upgrades/airtime-1.9.0/airtime-upgrade.php +++ b/install/upgrades/airtime-1.9.0/airtime-upgrade.php @@ -430,9 +430,9 @@ $oldAndNewFileNames = json_decode($output[0]); print_r($oldAndNewFileNames); foreach ($oldAndNewFileNames as $pair){ - $relPathNew = substr($pair[1], strlen($stor_dir)); - $absPathOld = $pair[0]; - $sql = "UPDATE cc_files SET filepath = \"$relPathNew\", directory=1 WHERE filepath = \"$absPathOld\""; + $relPathNew = pg_escape_string(substr($pair[1], strlen($stor_dir))); + $absPathOld = pg_escape_string($pair[0]); + $sql = "UPDATE cc_files SET filepath = '$relPathNew', directory=1 WHERE filepath = '$absPathOld'"; echo $sql.PHP_EOL; execSqlQuery($sql); } diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py index bb267073f..9ddd779c7 100644 --- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py +++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py @@ -237,7 +237,7 @@ class MediaMonitorCommon: filepath = self.create_file_path(pathname, file_md) self.logger.debug(u"Moving from %s to %s", pathname, filepath) - #self.move_file(pathname, filepath) + self.move_file(pathname, filepath) else: filepath = None self.logger.warn("File %s, has invalid metadata", pathname)