Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #1566.

Browse Source
This commit is contained in:
wangyidong
2013-07-16 01:47:14 +00:00
parent a0dafb6d5a
commit 2baf6f43f5
2 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module/extension/control.php
View File

@@ -198,8 +198,7 @@ class extension extends control
if($conflicts)
{
$conflictsExt = '';
$limits = $this->extension->parseCondition($conflicts);
foreach($limits as $code => $limit)
foreach($conflicts as $code => $limit)
{
$hasConflicts = false;
if(isset($installedExts[$code]))
@@ -222,8 +221,7 @@ class extension extends control
if($depends)
{
$dependsExt = '';
$limits = $this->extension->parseCondition($depends);
foreach($limits as $code => $limit)
foreach($depends as $code => $limit)
{
$noDepends = false;
if(isset($installedExts[$code]))
@@ -236,9 +234,15 @@ class extension extends control
}
$extVersion = '';
if($limit['min'] == 'all') $extVersion = 'all';
if($limit['min'] and $limit['min']!= 'all') $extVersion .= '>=V' . $limit['min'];
if($limit['max']) $extVersion .= ' <=V' . $limit['max'];
if($limit == 'all')
{
$extVersion = 'all';
}
else
{
if(!empty($limit['min'])) $extVersion .= '>=V' . $limit['min'];
if(!empty($limit['max'])) $extVersion .= ' <=V' . $limit['max'];
}
if($noDepends)$dependsExt .= $code . "($extVersion) ";
}

49
module/extension/model.php
View File

@@ -229,6 +229,7 @@ class extensionModel extends model
foreach($info as $key => $value) if(isset($data->$key)) $data->$key = $value;
if(isset($info->zentaoversion)) $data->zentaoVersion = $info->zentaoversion;
if(isset($info->zentao['compatible'])) $data->zentaoVersion = $info->zentao['compatible'];
if(isset($info->depends)) $data->depends = json_encode($info->depends);
return $data;
}
@@ -355,37 +356,6 @@ class extensionModel extends model
return $condition;
}
/**
* Parse condition
*
* @param string $condition
* @access public
* @return array
*/
public function parseCondition($condition)
{
$limits = array();
$extensions = explode(') ', $condition);
foreach($extensions as $extension)
{
$code = substr($extension, 0, strpos($extension, '('));
$versions = trim(substr($extension, strpos($extension, '(') + 1), ')');
if($versions == 'all')
{
$limits[$code]['min'] = 'all';
$limits[$code]['max'] = '';
}
else
{
list($min, $max) = explode(',', $versions);
$limits[$code]['min'] = $min;
$limits[$code]['max'] = $max;
}
}
return $limits;
}
/**
* Process license. If is opensource return the full text of it.
*
@@ -836,7 +806,7 @@ class extensionModel extends model
{
foreach($dependsExts as $dependsExt)
{
$depends = $this->parseCondition($dependsExt->depends);
$depends = json_decode($dependsExt->depends, true);
if($this->compare4Limit($extensionInfo->version, $depends[$extension])) $result[] = $dependsExt->name;
}
}
@@ -855,11 +825,18 @@ class extensionModel extends model
public function compare4Limit($version, $limit, $type = 'between')
{
$result = false;
if(empty($limit)) return false;
if(empty($limit)) return true;
if($limit['min'] == 'all') $result = true;
if($limit['min'] != 'all' and $limit['min'] and $version >= $limit['min']) $result = true;
if($limit['max'] and $version <= $limit['max']) $result = true;
if($limit == 'all')
{
$result = true;
}
else
{
if(!empty($limit['min']) and $version >= $limit['min']) $result = true;
if(!empty($limit['max']) and $version <= $limit['max']) $result = true;
if(!empty($limit['max']) and $version > $limit['max'] and $result) $result = false;
}
if($type != 'between') return !$result;
return $result;