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

* finish task #1567

Browse Source
This commit is contained in:
wangyidong
2013-07-16 04:07:21 +00:00
parent b0056f8e82
commit 443dabf7ed
4 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/extension/model.php
+14 -14
View File
@@ -214,22 +214,22 @@ class extensionModel extends model
{
/* Init the data. */
$data = new stdclass();
$data->name = $extension;
$data->code = $extension;
$data->version = 'unknown';
$data->author = 'unknown';
$data->desc = $extension;
$data->site = 'unknown';
$data->license = 'unknown';
$data->zentaoVersion = '';
$data->type = '';
$data->depends = '';
$data->name = $extension;
$data->code = $extension;
$data->version = 'unknown';
$data->author = 'unknown';
$data->desc = $extension;
$data->site = 'unknown';
$data->license = 'unknown';
$data->zentaoCompatible = '';
$data->type = '';
$data->depends = '';
$info = $this->parseExtensionCFG($extension);
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);
if(isset($info->zentaoversion)) $data->zentaoCompatible = $info->zentaoversion;
if(isset($info->zentao['compatible'])) $data->zentaoCompatible = $info->zentao['compatible'];
if(isset($info->depends)) $data->depends = json_encode($info->depends);
return $data;
}
@@ -801,7 +801,7 @@ class extensionModel extends model
{
$result = array();
$extensionInfo = $this->dao->select('*')->from(TABLE_EXTENSION)->where('code')->eq($extension)->fetch();
$dependsExts = $this->dao->select('*')->from(TABLE_EXTENSION)->where('depends')->like("%$extension%")->fetchAll();
$dependsExts = $this->dao->select('*')->from(TABLE_EXTENSION)->where('depends')->like("%$extension%")->andWhere('status')->ne('available')->fetchAll();
if($dependsExts)
{
foreach($dependsExts as $dependsExt)