mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-54948-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-06-21 11:48:10 +02:00
commit 878835db7f
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/filestorage/file_storage.php
View File

@ -241,14 +241,20 @@ class file_storage {
$unoconvbin = \escapeshellarg($CFG->pathtounoconv);
$command = "$unoconvbin --version";
exec($command, $output);
preg_match('/([0-9]+\.[0-9]+)/', $output[0], $matches);
$currentversion = (float)$matches[0];
$supportedversion = 0.7;
if ($currentversion < $supportedversion) {
return false;
}
if ($output) {
$currentversion = 0;
foreach ($output as $response) {
if (preg_match('/unoconv (\\d+\\.\\d+)/', $response, $matches)) {
$currentversion = (float)$matches[1];
}
}
$supportedversion = 0.7;
if ($currentversion < $supportedversion) {
return false;
}
return true;
return true;
}
}
/**

20
lib/upgradelib.php
View File

@ -2297,13 +2297,19 @@ function check_unoconv_version(environment_results $result) {
$unoconvbin = \escapeshellarg($CFG->pathtounoconv);
$command = "$unoconvbin --version";
exec($command, $output);
preg_match('/([0-9]+\.[0-9]+)/', $output[0], $matches);
$currentversion = (float)$matches[0];
$supportedversion = 0.7;
if ($currentversion < $supportedversion) {
$result->setInfo('unoconv version not supported');
$result->setStatus(false);
return $result;
if ($output) {
$currentversion = 0;
foreach ($output as $response) {
if (preg_match('/unoconv (\\d+\\.\\d+)/', $response, $matches)) {
$currentversion = (float)$matches[1];
}
}
$supportedversion = 0.7;
if ($currentversion < $supportedversion) {
$result->setInfo('unoconv version not supported');
$result->setStatus(false);
return $result;
}
}
}
return null;