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

* Finish task#8395.

Browse Source
This commit is contained in:
hufangzhou
2020-11-17 13:37:25 +08:00
parent ff69596dcd
commit 983927b6b9
8 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/extension/lang/de.php
View File

@@ -51,7 +51,7 @@ $lang->extension->downloads = 'Downloads';
$lang->extension->compatible = 'Kompatibilität';
$lang->extension->grade = 'Wertung';
$lang->extension->depends = 'Benötigt';
$lang->extension->expireDate = 'Verfällt';
$lang->extension->expiredDate = 'Verfällt';
$lang->extension->zentaoCompatible = 'Kompatible Version';
$lang->extension->installedTime = 'Installationszeit';
$lang->extension->life = 'lifetime';

2
module/extension/lang/en.php
View File

@@ -51,7 +51,7 @@ $lang->extension->downloads = 'Downloads';
$lang->extension->compatible = 'Compatibility';
$lang->extension->grade = 'Score';
$lang->extension->depends = 'Dependency';
$lang->extension->expireDate = 'Expire';
$lang->extension->expiredDate = 'Expire';
$lang->extension->zentaoCompatible = 'Compatible Version';
$lang->extension->installedTime = 'Installed Time';
$lang->extension->life = 'lifetime';

2
module/extension/lang/fr.php
View File

@@ -51,7 +51,7 @@ $lang->extension->downloads = 'Téléchargements';
$lang->extension->compatible = 'Compatibilité';
$lang->extension->grade = 'Score';
$lang->extension->depends = 'Dépendence';
$lang->extension->expireDate = 'Expire le';
$lang->extension->expiredDate = 'Expire le';
$lang->extension->zentaoCompatible = 'Version Compatible';
$lang->extension->installedTime = 'Date Installation';
$lang->extension->life = 'lifetime';

2
module/extension/lang/vi.php
View File

@@ -51,7 +51,7 @@ $lang->extension->downloads = 'Downloads';
$lang->extension->compatible = 'Compatibility';
$lang->extension->grade = 'Điểm';
$lang->extension->depends = 'Dependency';
$lang->extension->expireDate = 'Expire';
$lang->extension->expiredDate = 'Expire';
$lang->extension->zentaoCompatible = 'Compatible Version';
$lang->extension->installedTime = 'Installed Time';
$lang->extension->life = 'lifetime';

2
module/extension/lang/zh-cn.php
View File

@@ -51,7 +51,7 @@ $lang->extension->downloads = '下载量';
$lang->extension->compatible = '兼容性';
$lang->extension->grade = '评分';
$lang->extension->depends = '依赖';
$lang->extension->expireDate = '到期日期';
$lang->extension->expiredDate = '到期日期';
$lang->extension->zentaoCompatible = '适用版本';
$lang->extension->installedTime = '安装时间';
$lang->extension->life = '终身';

2
module/extension/lang/zh-tw.php
View File

@@ -51,7 +51,7 @@ $lang->extension->downloads = '下載量';
$lang->extension->compatible = '兼容性';
$lang->extension->grade = '評分';
$lang->extension->depends = '依賴';
$lang->extension->expireDate = '到期日期';
$lang->extension->expiredDate = '到期日期';
$lang->extension->zentaoCompatible = '適用版本';
$lang->extension->installedTime = '安裝時間';
$lang->extension->life = '終身';

10
module/extension/model.php
View File

@@ -889,13 +889,13 @@ class extensionModel extends model
*
* @param int $extension
* @access public
* @return void
* @return string
*/
public function getExpireDate($extension)
{
$licencePath = $this->app->getConfigRoot() . 'license/';
$today = date('Y-m-d');
$expireDate = '';
$expiredDate = '';
$licenceOrderFiles = glob($licencePath . 'order*' . $extension->code . $extension->version . '.txt');
foreach($licenceOrderFiles as $licenceOrderFile)
@@ -908,14 +908,14 @@ class extensionModel extends model
if($order->type == 'demo') $days = 31;
if($order->type == 'year') $days = 365;
$startDate = $order->paidDate != '0000-00-00 00:00:00' ? $order->paidDate : $order->createdDate;
if($days) $expireDate = date('Y-m-d', strtotime($startDate) + $days * 24 * 3600);
if($days) $expiredDate = date('Y-m-d', strtotime($startDate) + $days * 24 * 3600);
}
else
{
$expireDate = $order->type;
$expiredDate = $order->type;
}
}
return $expireDate;
return $expiredDate;
}
}

11
module/extension/view/browse.html.php
View File

@@ -54,14 +54,13 @@
<?php
echo "{$lang->extension->version}: <i>{$extension->version}</i> ";
echo "{$lang->extension->author}: <i>{$extension->author}</i> ";
$expireDate = $this->extension->getExpireDate($extension);
if(!empty($expireDate))
$expiredDate = $this->extension->getExpireDate($extension);
if(!empty($expiredDate))
{
echo $lang->extension->expireDate . ': ';
if($expireDate != 'life') echo "<i>{$expireDate}</i>";
else echo "<i>{$lang->extension->life}</i>";
echo $lang->extension->expiredDate . ': ';
$expiredDate != 'life' ? echo "<i>{$expiredDate}</i>" : echo "<i>{$lang->extension->life}</i>";
}
?>
</div>
</div>