diff --git a/framework/helper.class.php b/framework/helper.class.php index 38b42bf5b6..b368adf933 100644 --- a/framework/helper.class.php +++ b/framework/helper.class.php @@ -305,6 +305,43 @@ class helper extends baseHelper { throw EndResponseException::create($content); } + + /** + * Get date interval. + * + * @param string|int $begin + * @param string|int $end + * @param string $format %Y-%m-%d %H:%i:%s + * @static + * @access public + * @return object|string + */ + public static function getDateInterval($begin, $end = '', $format = '') + { + if(empty($end)) $end = time(); + if(is_int($begin)) $begin = date('Y-m-d H:i:s', $begin); + if(is_int($end)) $end = date('Y-m-d H:i:s', $end); + + $begin = date_create($begin); + $end = date_create($end); + $interval = date_diff($begin, $end); + + if($format) + { + $dateInterval = $interval->format($format); + } + else + { + $dateInterval = new stdClass(); + $dateInterval->year = $interval->format('%Y'); + $dateInterval->month = $interval->format('%m'); + $dateInterval->day = $interval->format('%d'); + $dateInterval->hour = $interval->format('%H'); + $dateInterval->minute = $interval->format('%i'); + $dateInterval->secound = $interval->format('%s'); + } + return $dateInterval; + } } /** diff --git a/module/admin/control.php b/module/admin/control.php index c49cd97b5e..df9b8efada 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -37,11 +37,13 @@ class admin extends control $hasInternet = $this->admin->checkInternet(); $clientLang = $this->app->getClientLang(); $langNotCN = common::checkNotCN(); + $dateUsed = $this->admin->genDateUsed(); $this->view->title = $this->lang->admin->common; $this->view->position[] = $this->lang->admin->index; $this->view->plugins = $this->admin->getExtensionsByAPI('plugin', $langNotCN ? 5 : 6, $hasInternet); $this->view->patches = $this->admin->getExtensionsByAPI('patch', 3, $hasInternet); + $this->view->dateUsed = $dateUsed; $this->view->hasInternet = $hasInternet; $this->view->publicClass = ($hasInternet and !$langNotCN) ? $this->admin->getPublicClassByAPI(3) : array(); $this->view->langNotCN = $langNotCN; diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index 67e77b6ae4..7d4d570f4a 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -25,6 +25,13 @@ $lang->admin->resetPWDSetting = 'Reset password Setting'; $lang->admin->tableEngine = 'Table Engine'; $lang->admin->setModuleIndex = 'Set Module'; +$lang->admin->mon = 'month'; +$lang->admin->day = 'day'; +$lang->admin->updateDynamics = 'updateDynamics'; +$lang->admin->updatePatch = 'updatePatch'; +$lang->admin->upgradeRecommend = 'upgradeRecommend'; +$lang->admin->zentaoUsed = ''; + $lang->admin->api = 'API'; $lang->admin->log = 'Log'; $lang->admin->setting = 'Einstellungen'; @@ -170,10 +177,4 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm $lang->admin->menuSetting['convert']['name'] = 'Data Import'; $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.'; -$lang->admin->mon = 'month'; -$lang->admin->day = 'day'; -$lang->admin->updateDynamics = 'updateDynamics'; -$lang->admin->updatePatch = 'updatePatch'; -$lang->admin->upgradeRecommend = 'upgradeRecommend'; - include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 2314b2dd83..51a566be61 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -25,6 +25,13 @@ $lang->admin->resetPWDSetting = 'Reset password Setting'; $lang->admin->tableEngine = 'Table Engine'; $lang->admin->setModuleIndex = 'Set Module'; +$lang->admin->mon = 'month'; +$lang->admin->day = 'day'; +$lang->admin->updateDynamics = 'updateDynamics'; +$lang->admin->updatePatch = 'updatePatch'; +$lang->admin->upgradeRecommend = 'upgradeRecommend'; +$lang->admin->zentaoUsed = ''; + $lang->admin->api = 'API'; $lang->admin->log = 'Log'; $lang->admin->setting = 'Setting'; @@ -170,10 +177,4 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm $lang->admin->menuSetting['convert']['name'] = 'Data Import'; $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.'; -$lang->admin->mon = 'month'; -$lang->admin->day = 'day'; -$lang->admin->updateDynamics = 'updateDynamics'; -$lang->admin->updatePatch = 'updatePatch'; -$lang->admin->upgradeRecommend = 'upgradeRecommend'; - include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 2bda8e62e3..2760ba8873 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -25,6 +25,13 @@ $lang->admin->resetPWDSetting = 'Reset password Setting'; $lang->admin->tableEngine = 'Table Engine'; $lang->admin->setModuleIndex = 'Set Module'; +$lang->admin->mon = 'month'; +$lang->admin->day = 'day'; +$lang->admin->updateDynamics = 'updateDynamics'; +$lang->admin->updatePatch = 'updatePatch'; +$lang->admin->upgradeRecommend = 'upgradeRecommend'; +$lang->admin->zentaoUsed = ''; + $lang->admin->api = 'API'; $lang->admin->log = 'Log'; $lang->admin->setting = 'Paramétrage'; @@ -170,10 +177,4 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm $lang->admin->menuSetting['convert']['name'] = 'Data Import'; $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.'; -$lang->admin->mon = 'month'; -$lang->admin->day = 'day'; -$lang->admin->updateDynamics = 'updateDynamics'; -$lang->admin->updatePatch = 'updatePatch'; -$lang->admin->upgradeRecommend = 'upgradeRecommend'; - include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 64939cc0db..ff3b87a8a8 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -25,6 +25,13 @@ $lang->admin->resetPWDSetting = '重置密码设置'; $lang->admin->tableEngine = '表引擎'; $lang->admin->setModuleIndex = '系统功能配置'; +$lang->admin->mon = '月'; +$lang->admin->day = '天'; +$lang->admin->updateDynamics = '更新动态'; +$lang->admin->updatePatch = '补丁更新'; +$lang->admin->upgradeRecommend = '推荐升级'; +$lang->admin->zentaoUsed = '您已使用禅道'; + $lang->admin->api = '接口'; $lang->admin->log = '日志'; $lang->admin->setting = '设置'; @@ -170,10 +177,4 @@ $lang->admin->menuSetting['dev']['desc'] = '支持对系统进行二次开 $lang->admin->menuSetting['convert']['name'] = '数据导入'; $lang->admin->menuSetting['convert']['desc'] = '第三方系统的数据导入。'; -$lang->admin->mon = '月'; -$lang->admin->day = '天'; -$lang->admin->updateDynamics = '更新动态'; -$lang->admin->updatePatch = '补丁更新'; -$lang->admin->upgradeRecommend = '推荐升级'; - include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/model.php b/module/admin/model.php index 5a14dcb131..a24aa192b3 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -593,4 +593,21 @@ class adminModel extends model return (bool)$connected; } + + /** + * Get date used object. + * + * @access public + * @return object + */ + public function genDateUsed() + { + $firstUseDate = $this->dao->select('date')->from(TABLE_ACTION) + ->where('date')->gt('0000-00-00') + ->andWhere('actor')->eq($this->app->user->account) + ->orderBy('date_asc') + ->fetch('date'); + + return helper::getDateInterval($firstUseDate); + } } diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index 79060aee20..9f32729dc1 100755 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -90,7 +90,16 @@