use new function cmpVersion() for checking extension dependencies

This commit is contained in:
Uwe Steinmann 2013-05-28 07:32:10 +02:00
parent b96e9f83f9
commit e1ce619f1f

View File

@ -51,7 +51,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
/* check dependency on specific seeddms version */ /* check dependency on specific seeddms version */
if(isset($extconf['constraints']['depends']['seeddms'])) { if(isset($extconf['constraints']['depends']['seeddms'])) {
$tmp = explode('-', $extconf['constraints']['depends']['seeddms'], 2); $tmp = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
if($tmp[0] > $version->version() || ($tmp[1] && $tmp[1] < $version->version())) if(cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && cmpVersion($tmp[1], $version->version()) < 0))
$errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']); $errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
} else { } else {
$errmsgs[] = "Missing dependency on SeedDMS"; $errmsgs[] = "Missing dependency on SeedDMS";
@ -60,7 +60,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
/* check dependency on specific php version */ /* check dependency on specific php version */
if(isset($extconf['constraints']['depends']['php'])) { if(isset($extconf['constraints']['depends']['php'])) {
$tmp = explode('-', $extconf['constraints']['depends']['php'], 2); $tmp = explode('-', $extconf['constraints']['depends']['php'], 2);
if($tmp[0] > phpversion() || ($tmp[1] && $tmp[1] < phpversion())) if(cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && cmpVersion($tmp[1], phpversion()) < 0))
$errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']); $errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
} else { } else {
$errmsgs[] = "Missing dependency on PHP"; $errmsgs[] = "Missing dependency on PHP";