hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +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

47
lib/classes/setup.class.php
View File

@@ -97,13 +97,15 @@ class setup
}
}
$type = 'string';
$type = $variable['type'];
switch ($variable['type']) {
case 'string':
case 'password':
case \registry::TYPE_STRING:
case \registry::TYPE_BINARY:
case \registry::TYPE_TEXT:
case \registry::TYPE_TIMEZONE:
$datas[$variable['name']] = (string) trim($datas[$variable['name']]);
break;
case 'enum':
case \registry::TYPE_ENUM:
if (!isset($variable['available'])) {
$variable['error'] = 'avalaibility';
} elseif (!is_array($variable['available'])) {
@@ -112,25 +114,16 @@ class setup
$variable['error'] = 'avalaibility';
}
break;
case 'enum_multi':
case \registry::TYPE_ENUM_MULTI:
if (!isset($datas[$variable['name']]))
$datas[$variable['name']] = null;
$datas[$variable['name']] = ($datas[$variable['name']]);
$type = 'array';
break;
case 'boolean':
case \registry::TYPE_BOOLEAN:
$datas[$variable['name']] = strtolower($datas[$variable['name']]) === 'true' ? '1' : '0';
$type = 'boolean';
break;
case 'integer':
case \registry::TYPE_INTEGER:
$datas[$variable['name']] = (int) trim($datas[$variable['name']]);
$type = 'integer';
break;
case 'text':
$datas[$variable['name']] = trim($datas[$variable['name']]);
break;
case 'timezone':
$datas[$variable['name']] = trim($datas[$variable['name']]);
break;
default:
$error = true;
@@ -180,17 +173,17 @@ class setup
$finder = new \Symfony\Component\Process\ExecutableFinder();
$binaries = array(
'PHP CLI' => $registry->get('GV_cli', $finder->find('php')),
'ImageMagick (convert)' => $registry->get('GV_imagick', $finder->find('convert')),
'PDF 2 SWF' => $registry->get('GV_pdf2swf', $finder->find('pdf2swf')),
'Unoconv' => $registry->get('GV_unoconv', $finder->find('unoconv')),
'SWFextract' => $registry->get('GV_swf_extract', $finder->find('swfextract')),
'SWFrender' => $registry->get('GV_swf_render', $finder->find('swfrender')),
'MP4Box' => $registry->get('GV_mp4box', $finder->find('MP4Box')),
'xpdf (pdf2text)' => $registry->get('GV_pdftotext', $finder->find('pdftotext')),
'ImageMagick (composite)' => $registry->get('GV_pathcomposite', $finder->find('composite')),
'FFmpeg' => $registry->get('GV_ffmpeg', $finder->find('ffmpeg')),
'FFprobe' => $registry->get('GV_ffprobe', $finder->find('ffprobe')),
'PHP CLI' => $registry->get('php_binary', $finder->find('php')),
'ImageMagick (convert)' => $registry->get('convert_binary', $finder->find('convert')),
'PDF 2 SWF' => $registry->get('pdf2swf_binary', $finder->find('pdf2swf')),
'Unoconv' => $registry->get('unoconv_binary', $finder->find('unoconv')),
'SWFextract' => $registry->get('swf_extract_binary', $finder->find('swfextract')),
'SWFrender' => $registry->get('swf_render_binary', $finder->find('swfrender')),
'MP4Box' => $registry->get('mp4box_binary', $finder->find('MP4Box')),
'xpdf (pdf2text)' => $registry->get('pdftotext_binary', $finder->find('pdftotext')),
'ImageMagick (composite)' => $registry->get('composite_binary', $finder->find('composite')),
'FFmpeg' => $registry->get('ffmpeg_binary', $finder->find('ffmpeg')),
'FFprobe' => $registry->get('ffprobe_binary', $finder->find('ffprobe')),
'phraseanet_indexer' => $finder->find('phraseanet_indexer'),
);