hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove exiftool gitmodule dependency

Browse Source
This commit is contained in:
Romain Neutron
2012-05-04 01:26:21 +02:00
parent 7fb78bf281
commit fcd3e42737
11 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/exiftool.class.php
View File

@@ -11,10 +11,12 @@ class exiftool
$ret = array();
if (in_array($system, array('DARWIN', 'LINUX'))) {
$cmd = $registry->get('GV_exiftool') . ' ' . escapeshellarg($filename) . '';
$cmd = __DIR__ . '/../../vendor/phpexiftool/exiftool/exiftool '
. escapeshellarg($filename) ;
} else {
if (chdir($registry->get('GV_RootPath') . 'tmp/')) {
$cmd = 'start /B /LOW ' . $registry->get('GV_exiftool') . ' ' . escapeshellarg($filename) . '';
$cmd = 'start /B /LOW ' . __DIR__ . '/../../vendor/phpexiftool/exiftool/exiftool.exe '
. escapeshellarg($filename) . '';
}
}
if ($cmd) {
@@ -73,10 +75,12 @@ class exiftool
if (in_array($system, array('DARWIN', 'LINUX'))) {
$cmd = $registry->get('GV_exiftool') . $options . escapeshellarg($file->getPathname()) . '';
$cmd = __DIR__ . '/../../vendor/phpexiftool/exiftool/exiftool '
. $options . escapeshellarg($file->getPathname()) . '';
} else {
if (chdir($registry->get('GV_RootPath') . 'tmp/')) {
$cmd = 'start /B /LOW ' . $registry->get('GV_exiftool') . $options . escapeshellarg($file->getPathname()) . '';
$cmd = 'start /B /LOW ' . __DIR__ . '/../../vendor/phpexiftool/exiftool/exiftool.exe'
. ' ' . $options . escapeshellarg($file->getPathname()) . '';
}
}