diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index af7d6fad96..895ecd3bd8 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -46,6 +46,7 @@ $lang->extension->downloads = 'Downloads';
$lang->extension->compatible = 'Compatibility';
$lang->extension->grade = 'Score';
$lang->extension->depends = 'Dependent';
+$lang->extension->expireDate = 'Expire';
$lang->extension->zentaoCompatible = 'Compatible Version';
$lang->extension->installedTime = 'Installed Time';
diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php
index b182beefb5..42d0cec101 100644
--- a/module/extension/lang/zh-cn.php
+++ b/module/extension/lang/zh-cn.php
@@ -46,6 +46,7 @@ $lang->extension->downloads = '下载量';
$lang->extension->compatible = '兼容性';
$lang->extension->grade = '评分';
$lang->extension->depends = '依赖';
+$lang->extension->expireDate = '到期日期';
$lang->extension->zentaoCompatible = '适用版本';
$lang->extension->installedTime = '安装时间';
diff --git a/module/extension/model.php b/module/extension/model.php
index cc70c170ea..e1917e8b6e 100644
--- a/module/extension/model.php
+++ b/module/extension/model.php
@@ -886,4 +886,35 @@ class extensionModel extends model
if($type != 'between') return !$result;
return $result;
}
+
+ /**
+ * Get extension expire date.
+ *
+ * @param int $extension
+ * @access public
+ * @return void
+ */
+ public function getExpireDate($extension)
+ {
+ $licencePath = $this->app->getConfigRoot() . 'license/';
+ $today = date('Y-m-d');
+ $expireDate = '';
+
+ $licenceOrderFile = $licencePath . 'order' . $extension->code . $extension->version . '.txt';
+ if(file_exists($licenceOrderFile))
+ {
+ $order = file_get_contents($licenceOrderFile);
+ $order = unserialize($order);
+ if($order->type != 'life')
+ {
+ $days = isset($order->days) ? $order->days : 0;
+ 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);
+ }
+ }
+
+ return $expireDate;
+ }
}
diff --git a/module/extension/view/browse.html.php b/module/extension/view/browse.html.php
index 33c0f4d316..2120e7145e 100644
--- a/module/extension/view/browse.html.php
+++ b/module/extension/view/browse.html.php
@@ -53,6 +53,8 @@
extension->version}: {$extension->version} ";
echo "{$lang->extension->author}: {$extension->author} ";
+ $expireDate = $this->extension->getExpireDate($extension);
+ if(!empty($expireDate)) echo "{$lang->extension->expireDate}: {$expireDate}";
?>