diff --git a/module/admin/control.php b/module/admin/control.php index e2c5fc52d6..494e9d2510 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -32,52 +32,52 @@ class admin extends control $this->view->ignore = false; } - $this->app->loadLang('misc'); + $this->app->loadLang('misc'); $this->view->title = $this->lang->admin->common; $this->view->position[] = $this->lang->admin->index; - $this->display(); + $this->display(); } - /** - * Ignore notice of register and bind. - * - * @access public - * @return void - */ - public function ignore() - { - $this->loadModel('setting'); - $this->setting->deleteItems('owner=system&module=common§ion=global&key=community'); - $this->setting->deleteItems('owner=system&module=common§ion=global&key=ztPrivateKey'); - $this->setting->setItem('system.common.global.community', 'na'); - die(js::locate(inlink('index'), 'parent')); - } + /** + * Ignore notice of register and bind. + * + * @access public + * @return void + */ + public function ignore() + { + $this->loadModel('setting'); + $this->setting->deleteItems('owner=system&module=common§ion=global&key=community'); + $this->setting->deleteItems('owner=system&module=common§ion=global&key=ztPrivateKey'); + $this->setting->setItem('system.common.global.community', 'na'); + die(js::locate(inlink('index'), 'parent')); + } - /** - * Register zentao. - * - * @access public - * @return void - */ - public function register($from = 'admin') - { - if($_POST) - { - $response = $this->admin->registerByAPI(); + /** + * Register zentao. + * + * @access public + * @return void + */ + public function register($from = 'admin') + { + if($_POST) + { + $response = $this->admin->registerByAPI(); $response = json_decode($response); if($response->result == 'success') - { + { $user = $response->data; $data['community'] = $user->account; $data['ztPrivateKey'] = $user->private; - $this->loadModel('setting'); + $this->loadModel('setting'); $this->setting->deleteItems('owner=system&module=common§ion=global&key=community'); $this->setting->deleteItems('owner=system&module=common§ion=global&key=ztPrivateKey'); - $this->setting->setItems('system.common.global', $data); + $this->setting->setItems('system.common.global', $data); - echo js::alert($this->lang->admin->register->success); + echo js::alert($this->lang->admin->register->success); if($from == 'admin') die(js::locate(inlink('index'), 'parent')); if($from == 'mail') die(js::locate($this->createLink('mail', 'ztcloud'), 'parent')); } @@ -97,20 +97,20 @@ class admin extends control $this->view->title = $this->lang->admin->register->caption; $this->view->position[] = $this->lang->admin->register->caption; - $this->view->register = $this->admin->getRegisterInfo(); - $this->view->sn = $this->config->global->sn; - $this->view->from = $from; - $this->display(); - } + $this->view->register = $this->admin->getRegisterInfo(); + $this->view->sn = $this->config->global->sn; + $this->view->from = $from; + $this->display(); + } - /** - * Bind zentao. - * - * @access public - * @return void - */ - public function bind($from = 'admin') - { + /** + * Bind zentao. + * + * @access public + * @return void + */ + public function bind($from = 'admin') + { if($_POST) { $response = $this->admin->bindByAPI(); @@ -121,10 +121,10 @@ class admin extends control $data['community'] = $user->account; $data['ztPrivateKey'] = $user->private; - $this->loadModel('setting'); + $this->loadModel('setting'); $this->setting->deleteItems('owner=system&module=common§ion=global&key=community'); $this->setting->deleteItems('owner=system&module=common§ion=global&key=ztPrivateKey'); - $this->setting->setItems('system.common.global', $data); + $this->setting->setItems('system.common.global', $data); echo js::alert($this->lang->admin->bind->success); if($from == 'admin') die(js::locate(inlink('index'), 'parent')); diff --git a/module/bug/js/create.js b/module/bug/js/create.js index 8201f74d59..f44d38b6df 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -75,11 +75,11 @@ function setTemplate(templateID) function deleteTemplate(templateID) { if(!templateID) return; - if(confirm(confirmDeleteTemplate)) + if(confirm(confirmDeleteTemplate)) { - hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID); - $('#tplBox' + templateID).addClass('hidden'); - } + hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID); + $('#tplBox' + templateID).addClass('hidden'); + } } /* Display template x icon. */ diff --git a/module/install/view/step3.html.php b/module/install/view/step3.html.php index 82b3291c92..d475a1ed9f 100644 --- a/module/install/view/step3.html.php +++ b/module/install/view/step3.html.php @@ -4,9 +4,9 @@ * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) - * @author Chunsheng Wang - * @package ZenTaoPMS - * @version $Id: step3.html.php 4297 2013-01-27 07:51:45Z wwccss $ + * @author Chunsheng Wang + * @package ZenTaoPMS + * @version $Id: step3.html.php 4297 2013-01-27 07:51:45Z wwccss $ */ ?> diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php index 59a19882cb..89f735a372 100644 --- a/module/install/view/step4.html.php +++ b/module/install/view/step4.html.php @@ -4,9 +4,9 @@ * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) - * @author Chunsheng Wang - * @package ZenTaoPMS - * @version $Id: step4.html.php 4129 2013-01-18 01:58:14Z wwccss $ + * @author Chunsheng Wang + * @package ZenTaoPMS + * @version $Id: step4.html.php 4129 2013-01-18 01:58:14Z wwccss $ */ ?> diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 83f77ffa9a..563b50f988 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -20,7 +20,7 @@ $lang->product->create = "Create {$lang->productCommon}"; $lang->product->delete = "Delete {$lang->productCommon}"; $lang->product->deleted = "Deleted"; $lang->product->close = "Close"; -$lang->product->select = " Select {$lang->productCommon}"; +$lang->product->select = " Select {$lang->productCommon}"; $lang->product->mine = 'My responsibility:'; $lang->product->other = 'Other:'; $lang->product->closed = 'Closed'; diff --git a/module/task/model.php b/module/task/model.php index 3fa08f0133..8e2b667348 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1231,9 +1231,9 @@ class taskModel extends model { $delay = helper::diffDate($today, $task->deadline); if($delay > 0) $task->delay = $delay; - } - } - + } + } + /* Story changed or not. */ $task->needConfirm = false; if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion) $task->needConfirm = true; diff --git a/module/upgrade/control.php b/module/upgrade/control.php index dbdbbde10a..5ead4966e6 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -205,8 +205,8 @@ class upgrade extends control if($result['type'] == 'finish') { $response['result'] = 'finished'; - $response['type'] = $type; - $response['count'] = $result['count']; + $response['type'] = $type; + $response['count'] = $result['count']; $response['message'] = 'Finished'; } else diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 9fd4c1bb75..b7ed4638e3 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -1329,7 +1329,7 @@ class upgradeModel extends model { $result['type'] = 'doc'; $result['count'] = count($comments); - $result['lastID'] = 0; + $result['lastID'] = 0; } else { @@ -1397,7 +1397,7 @@ class upgradeModel extends model } } $result['type'] = empty($nextType) ? 'finish' : $nextType; - $result['count'] = count($objects); + $result['count'] = count($objects); $result['lastID'] = 0; } else @@ -1742,10 +1742,10 @@ class upgradeModel extends model */ public function checkProcess() { - $fromVersion = $this->config->installedVersion; - $needProcess = array(); + $fromVersion = $this->config->installedVersion; + $needProcess = array(); if(strpos($fromVersion, 'pro') === false ? $fromVersion < '8.3' : $fromVersion < 'pro5.4') $needProcess['updateFile'] = true; - return $needProcess; + return $needProcess; } /**