diff --git a/module/admin/control.php b/module/admin/control.php index c24f70ed60..a861724435 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -37,12 +37,19 @@ class admin extends control $hasInternet = $this->admin->checkInternet(); $clientLang = $this->app->getClientLang(); $langNotCN = common::checkNotCN(); + $usedTime = $this->admin->genDateUsed(); + + $dateUsed = new stdclass(); + $dateUsed->year = $usedTime->format('%y'); + $dateUsed->month = $usedTime->format('%m'); + $dateUsed->day = $usedTime->format('%d'); + $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 = $this->admin->genDateUsed(); + $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 d83080b9c0..f00bc06b7f 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -603,14 +603,15 @@ class adminModel extends model public function genDateUsed() { $firstUseDate = $this->dao->select('date')->from(TABLE_ACTION) - ->where('date')->gt('0000-00-00') + ->where('date')->gt('0000-00-00') ->andWhere('actor')->eq($this->app->user->account) - ->orderBy('date_asc') - ->fetch('date'); - $firstUseDate = date_create($firstUseDate); - $dateNow = date("Y-m-d H:i", time()); - $dateNow = date_create($dateNow); - $interval = date_diff($dateNow, $firstUseDate); - return $interval; + ->orderBy('date_asc') + ->fetch('date'); + + $firstUseDate = date_create($firstUseDate); + $dateNow = date("Y-m-d H:i"); + $dateNow = date_create($dateNow); + $interval = date_diff($dateNow, $firstUseDate); + return $interval; } } diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index fae7e11f3e..9f32729dc1 100755 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -90,14 +90,15 @@