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

Merge with 3.7

Browse Source
This commit is contained in:
Romain Neutron
2012-10-10 11:34:21 +02:00
parent fae88eefa7 a9efc37f70
commit e8b32d8e03
30 changed files with 586 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/classes/API/V1/adapter.class.php
View File

@@ -414,16 +414,17 @@ class API_V1_adapter extends API_V1_Abstract
),
),
'binary' => array(
'phpCli' => $app['phraseanet.registry']->get('GV_cli'),
'phpCli' => $app['phraseanet.registry']->get('php_binary'),
'phpIni' => $app['phraseanet.registry']->get('GV_PHP_INI'),
'imagick' => $app['phraseanet.registry']->get('GV_imagick'),
'swfExtract' => $app['phraseanet.registry']->get('GV_swf_extract'),
'pdf2swf' => $app['phraseanet.registry']->get('GV_pdf2swf'),
'swfRender' => $app['phraseanet.registry']->get('GV_swf_render'),
'unoconv' => $app['phraseanet.registry']->get('GV_unoconv'),
'ffmpeg' => $app['phraseanet.registry']->get('GV_ffmpeg'),
'mp4box' => $app['phraseanet.registry']->get('GV_mp4box'),
'pdftotext' => $app['phraseanet.registry']->get('GV_pdftotext'),
'imagick' => $app['phraseanet.registry']->get('convert_binary'),
'swfExtract' => $app['phraseanet.registry']->get('swf_extract_binary'),
'pdf2swf' => $app['phraseanet.registry']->get('pdf2swf_binary'),
'swfRender' => $app['phraseanet.registry']->get('swf_render_binary'),
'unoconv' => $app['phraseanet.registry']->get('unoconv_binary'),
'ffmpeg' => $app['phraseanet.registry']->get('ffmpeg_binary'),
'ffprobe' => $app['phraseanet.registry']->get('ffprobe_binary'),
'mp4box' => $app['phraseanet.registry']->get('mp4box_binary'),
'pdftotext' => $app['phraseanet.registry']->get('pdftotext_binary'),
'pdfmaxpages' => $app['phraseanet.registry']->get('GV_pdfmaxpages'),),
'mainConfiguration' => array(
'adminMail' => $app['phraseanet.registry']->get('GV_adminMail'),