diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php index cea53d858c..02c7a5861b 100644 --- a/framework/base/helper.class.php +++ b/framework/base/helper.class.php @@ -699,7 +699,7 @@ function isLocalIP() global $config; if(isset($config->islocalIP)) return $config->isLocalIP; $serverIP = $_SERVER['SERVER_ADDR']; - if($serverIP == '127.0.0.1') return true; + if($serverIP == '127.0.0.1' or $serverIP == '::1') return true; if(strpos($serverIP, '10.70') !== false) return false; return !filter_var($serverIP, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE); } diff --git a/framework/base/router.class.php b/framework/base/router.class.php index a0408cb1c5..1ee6b029c6 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -1199,8 +1199,8 @@ class baseRouter * Set the control file of the module to be called. * * @param bool $exitIfNone 没有找到该控制器文件的情况：如果该参数为true，则终止程序；如果为false，则打印错误日志 - * The controller file was not found: if the parameter is true, the program is terminated; - * if false, the error log is printed. + * The control file was not found: if the parameter is true, the program is terminated; + * if false, the error log is printed. * @access public * @return bool */ diff --git a/lib/base/filter/filter.class.php b/lib/base/filter/filter.class.php index 56b60939c4..66ec5b37e9 100644 --- a/lib/base/filter/filter.class.php +++ b/lib/base/filter/filter.class.php @@ -1027,8 +1027,8 @@ class baseFixer if(!defined('RUN_MODE') or RUN_MODE != 'admin') { /* - * purifier会把 替换空格，kindeditor在会吧行首的空格去掉。 - * purifier will change   to ' ', and edit it will no space in line head use kindeditor. + * purifier会把 替换空格，kindeditor再会把行首的空格去掉。 + * purifier will change   to ' ', and kindeditor will remove the header space again. **/ $this->data->$fieldName = preg_replace('/<[^>]+data->$fieldName); $this->data->$fieldName = preg_replace('/>[^<]+>/', '>', $this->data->$fieldName); diff --git a/lib/pager/pager.class.php b/lib/pager/pager.class.php index ce2a0cbe5b..f4074d4853 100644 --- a/lib/pager/pager.class.php +++ b/lib/pager/pager.class.php @@ -75,7 +75,7 @@ class pager extends basePager parent::setParams(); /* If the original module name and method name of the request are set, the module parameter is removed. */ - if(isset($this->app->rawModule) && isset($this->app->rawMethod)) unset($this->params['module']); + if($this->app->isFlow) unset($this->params['module']); } /** diff --git a/module/doc/model.php b/module/doc/model.php index 1d81d84a1d..a90e0162cf 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -273,8 +273,8 @@ class docModel extends model $libID = (int)$libID; $oldLib = $this->getLibById($libID); $lib = fixer::input('post') - ->setIF(!$this->post->users, 'users', '') - ->setIF(!$this->post->groups, 'groups', '') + ->setDefault('users', '') + ->setDefault('groups', '') ->join('groups', ',') ->join('users', ',') ->get(); @@ -663,8 +663,8 @@ class docModel extends model $now = helper::now(); $doc = fixer::input('post')->setDefault('module', 0) ->stripTags($this->config->doc->editor->edit['id'], $this->config->allowedTags) - ->setIF(!$this->post->users, 'users', '') - ->setIF(!$this->post->groups, 'groups', '') + ->setDefault('users', '') + ->setDefault('groups', '') ->add('editedBy', $this->app->user->account) ->add('editedDate', $now) ->cleanInt('module') diff --git a/module/install/lang/en.php b/module/install/lang/en.php index a22bf32f5c..79129dc1a9 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -201,7 +201,7 @@ $lang->install->ranzhi->desc = <<CRM: Customer Management and Order Tracking
  • OA: Approve, Announce, Trip, Leave and so on.
  • Project，Task and Document management
    • -
  • Money: Income, Expense, Transfer, Invest and Debt
    • +
  • Cash: Income, Expense, Transfer, Invest and Debt
    • EOD; @@ -240,8 +240,8 @@ $lang->install->ydisk->url = 'http://www.ydisk.cn'; $lang->install->ydisk->desc = <<
  • Self-Hosted: deploy on your own machine
    • -
  • Storage: depend on your hard drive size
    • -
  • Transmission: as fast as your bandwidth allows
    • +
  • Unlimited Storage: depend on your hard drive size
    • +
  • Fast Transmission: as fast as your bandwidth allows
  • Secure: 12 permissions for any strict settings
    • EOD; @@ -256,6 +256,6 @@ $lang->install->meshiot->desc = <<Performance: one gateway can monitor 65,536 equipments
  • Accessibility: unique radio communication protocol covers 2,500m radius
  • Dimming System: 200+ sensors and monitors
    • -
  • Battery Available: no requirements to any equipment on your site
    • +
  • Battery Available: no changes required to any equipment on your site
    • EOD; diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php index c751b11f68..4c33767b80 100644 --- a/module/install/view/index.html.php +++ b/module/install/view/index.html.php @@ -42,7 +42,6 @@
    install->promotion?>
    - install->product);?> install->product as $product):?>
    diff --git a/module/project/control.php b/module/project/control.php index 522c00ae2b..632d9ff409 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -900,10 +900,8 @@ class project extends control list($dateList, $interval) = $this->project->getDateList($projectInfo->begin, $projectInfo->end, $type, $interval, 'Y-m-d'); $chartData = $this->project->buildBurnData($projectID, $dateList, $type); - /* Set a space when assemble the string for english. */ - $space = common::checkNotCN() ? ' ' : ''; $dayList = array_fill(1, floor($project->days / $this->config->project->maxBurnDay) + 5, ''); - foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . $space . ($key + 1) . $space . $this->lang->day; + foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . ($key + 1) . $this->lang->day; /* Assign. */ $this->view->title = $title; @@ -914,7 +912,7 @@ class project extends control $this->view->type = $type; $this->view->interval = $interval; $this->view->chartData = $chartData; - $this->view->dayList = array('full' => $this->lang->project->interval . $space . 1 . $space . $this->lang->day) + $dayList; + $this->view->dayList = array('full' => $this->lang->project->interval . '1' . $this->lang->day) + $dayList; unset($this->lang->modulePageActions); $this->display(); diff --git a/module/project/css/view.css b/module/project/css/view.css index 25bd885c3e..30864b2f22 100644 --- a/module/project/css/view.css +++ b/module/project/css/view.css @@ -10,4 +10,3 @@ .block-dynamic .panel-body {height: 230px; overflow: auto; position: relative;} .block-team div.col-xs-6{white-space: nowrap; overflow: hidden;} -html[lang^='zh-'] .thWidth {width: 80px !important;} diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js index 5fbdd3bed1..7d28779596 100644 --- a/module/project/js/kanban.js +++ b/module/project/js/kanban.js @@ -38,8 +38,6 @@ $(function() $.cookie('selfClose', 0, {expires:config.cookieLife, path:config.webRoot}); var $kanban = $('#kanban'); - console.log(statusMap); - // Get scrollbar width var getScrollbarWidth = function () { diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 08ac9649cf..ffc2a8073a 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -58,7 +58,7 @@ $lang->project->viewBug = 'Bugs'; $lang->project->noProduct = "Kein {$lang->productCommon}"; $lang->project->createStory = "Story erstellen"; $lang->project->all = 'Alle'; -$lang->project->undone = 'Unabgeschlossen'; +$lang->project->undone = 'Unabgeschlossen '; $lang->project->unclosed = 'Geschlossen'; $lang->project->typeDesc = 'Keine Story, Bug, Build, Testaufgabe oder Burndown ist bei OPS erlaubt'; $lang->project->mine = 'Meine Zuständigkeit: '; @@ -269,7 +269,7 @@ $lang->project->createTask = 'Aufgaben erstellen'; $lang->project->goback = "Zurückkehren"; $lang->project->noweekend = 'Ohne Wochenende'; $lang->project->withweekend = 'Mit Wochenende'; -$lang->project->interval = 'Intervale'; +$lang->project->interval = 'Intervale '; $lang->project->fixFirstWithLeft = 'Modify the left'; $lang->project->action = new stdclass(); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 7ded04f922..df04152e15 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -58,7 +58,7 @@ $lang->project->viewBug = 'Bugs'; $lang->project->noProduct = "No {$lang->productCommon} yet."; $lang->project->createStory = "Create Story"; $lang->project->all = "All {$lang->projectCommon}s"; -$lang->project->undone = 'Unfinished'; +$lang->project->undone = 'Unfinished '; $lang->project->unclosed = 'Unclosed'; $lang->project->typeDesc = 'No story, bug, build, test, or burndown chart is allowed in OPS'; $lang->project->mine = 'My: '; @@ -269,7 +269,7 @@ $lang->project->createTask = 'Create Task'; $lang->project->goback = "Go Back"; $lang->project->noweekend = 'Exclude Weekend'; $lang->project->withweekend = 'Include Weekend'; -$lang->project->interval = 'Intervals'; +$lang->project->interval = 'Intervals '; $lang->project->fixFirstWithLeft = 'Update hours left too'; $lang->project->action = new stdclass(); diff --git a/module/release/lang/en.php b/module/release/lang/en.php index d784aff2fa..af5176bf24 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -64,7 +64,7 @@ $lang->release->exportTypeList['bug'] = 'Bug'; $lang->release->exportTypeList['leftbug'] = 'Active Bug'; $lang->release->statusList[''] = ''; -$lang->release->statusList['normal'] = 'Normal'; +$lang->release->statusList['normal'] = 'Active'; $lang->release->statusList['terminate'] = 'Terminated'; $lang->release->changeStatusList['normal'] = 'Active'; diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php index 2c134b8375..8fddb38e36 100644 --- a/module/release/view/create.html.php +++ b/module/release/view/create.html.php @@ -64,4 +64,10 @@
    + diff --git a/module/report/view/bugassign.html.php b/module/report/view/bugassign.html.php index 26f9a73bc9..e37bc2111f 100644 --- a/module/report/view/bugassign.html.php +++ b/module/report/view/bugassign.html.php @@ -4,7 +4,7 @@
    - PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion; ?>
    diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php index 123bc907fd..e676afd26b 100644 --- a/module/report/view/bugcreate.html.php +++ b/module/report/view/bugcreate.html.php @@ -5,7 +5,7 @@
    - PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion; ?>
    diff --git a/module/report/view/productsummary.html.php b/module/report/view/productsummary.html.php index a1d571d7d1..a6928cfddb 100644 --- a/module/report/view/productsummary.html.php +++ b/module/report/view/productsummary.html.php @@ -7,7 +7,7 @@
    - PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion;?>
    diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php index dcb6b4a90a..d285320435 100644 --- a/module/report/view/projectdeviation.html.php +++ b/module/report/view/projectdeviation.html.php @@ -6,7 +6,7 @@
    - PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion; ?>
    diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php index f627faf12f..6704a59106 100644 --- a/module/report/view/workload.html.php +++ b/module/report/view/workload.html.php @@ -5,7 +5,7 @@
    - PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion; ?>
    diff --git a/module/task/css/view.css b/module/task/css/view.css index f925220cde..477b3695b5 100644 --- a/module/task/css/view.css +++ b/module/task/css/view.css @@ -1,5 +1,3 @@ .side-col .cell{padding:0px;} .side-col #legendProjectAndTask .list-unstyled{padding:10px; border:1px solid #ddd; border-top:0px; margin:0px;} .tab-pane table {border: 1px solid #ddd; border-top: none;} - -html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/task/css/view.en.css b/module/task/css/view.en.css index c470aad1aa..337ee75011 100644 --- a/module/task/css/view.en.css +++ b/module/task/css/view.en.css @@ -1,2 +1,3 @@ +.thWidth{width:100px !important;} #legendLife .thWidth{width:100px !important;} .effortThWidth{width:90px !important;} diff --git a/module/task/css/view.zh-cn.css b/module/task/css/view.zh-cn.css index fdc11d4eec..1d7c97d1f5 100644 --- a/module/task/css/view.zh-cn.css +++ b/module/task/css/view.zh-cn.css @@ -1,2 +1,3 @@ +.thWidth{width:80px !important;} #legendLife .thWidth{width:70px !important;} .effortThWidth{width:70px !important;} diff --git a/module/task/css/view.zh-tw.css b/module/task/css/view.zh-tw.css index fdc11d4eec..1d7c97d1f5 100644 --- a/module/task/css/view.zh-tw.css +++ b/module/task/css/view.zh-tw.css @@ -1,2 +1,3 @@ +.thWidth{width:80px !important;} #legendLife .thWidth{width:70px !important;} .effortThWidth{width:70px !important;} diff --git a/module/translate/control.php b/module/translate/control.php index c07ec5632c..6a34f92896 100644 --- a/module/translate/control.php +++ b/module/translate/control.php @@ -29,7 +29,7 @@ class translate extends control if(!$this->active and $this->app->getMethodName() != 'index') { $this->app->loadLang('editor'); -// die($this->display('translate', 'deny')); + die($this->display('translate', 'deny')); } } diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php index 6675547e4f..b546981014 100644 --- a/module/tutorial/view/index.html.php +++ b/module/tutorial/view/index.html.php @@ -11,36 +11,36 @@ */ ?> - +
    - +
    -

    tutorial->congratulation ?>

    -       ' class='btn btn-success'> tutorial->exit ?> +

    tutorial->congratulation;?>

    +   ' class='btn btn-success'> tutorial->exit;?>
    -

    tutorial->congratulateTask ?>

    - +

    tutorial->congratulateTask;?>

    +
    @@ -104,13 +104,13 @@ $(function() }; var tasks = $.parseJSON(''); - var current = ''; - var setting = formatSetting(''); + var current = ''; + var setting = formatSetting(''); var lang = { - tagetPageTip: 'tutorial->targetPageTip ?>', - target : 'tutorial->target ?>', - requiredTip : 'tutorial->requiredTip ?>' + tagetPageTip: 'tutorial->targetPageTip;?>', + target : 'tutorial->target;?>', + requiredTip : 'tutorial->requiredTip;?>' }; var $tasks = $('#tasks'), @@ -168,7 +168,7 @@ $(function() var postData = []; $.each(setting, function(name, value) {if(value) postData.push(name);}); - $.post('', {finish: postData.join(',')}, function(e) + $.post('', {finish: postData.join(',')}, function(e) { if(e.result === 'success') { @@ -179,7 +179,7 @@ $(function() else { setting[current] = false; - alert('tutorial->serverErrorTip ?>'); + alert('tutorial->serverErrorTip;?>'); } }, 'json').error(function() {alert(lang.timeout)}); } @@ -187,7 +187,7 @@ $(function() var resetTasks = function() { - $.post('', {finish: ''}, function(e) + $.post('', {finish: ''}, function(e) { if(e.result === 'success') { @@ -196,7 +196,7 @@ $(function() } else { - alert('tutorial->serverErrorTip ?>'); + alert('tutorial->serverErrorTip;?>'); } }, 'json').error(function() {alert(lang.timeout)}); }; diff --git a/module/tutorial/view/start.html.php b/module/tutorial/view/start.html.php index 747f98e572..b1eb4bcfa5 100644 --- a/module/tutorial/view/start.html.php +++ b/module/tutorial/view/start.html.php @@ -13,8 +13,8 @@
    -

    tutorial->common ?>

    -

    tutorial->desc ?>

    +

    tutorial->common;?>

    +

    tutorial->desc;?>

    tutorial->start, '_top', "class='btn btn-primary btn-lg btn-wide btn-info'");;?>
    diff --git a/module/user/js/batchcreate.js b/module/user/js/batchcreate.js index bce0dc7c6b..919070450c 100644 --- a/module/user/js/batchcreate.js +++ b/module/user/js/batchcreate.js @@ -1,3 +1,11 @@ +/** + * Change group by role. + * + * @param string $role + * @param int $i + * @access public + * @return void + */ function changeGroup(role, i) { if(role && roleGroup[role]) @@ -11,6 +19,14 @@ function changeGroup(role, i) $('#group' + i).trigger('chosen:updated'); } +/** + * Toggle checkbox and check password strength. + * + * @param object $obj + * @param int $i + * @access public + * @return void + */ function toggleCheck(obj, i) { var $this = $(obj); diff --git a/module/user/lang/de.php b/module/user/lang/de.php index 1c74fccdad..a51e1e7074 100644 --- a/module/user/lang/de.php +++ b/module/user/lang/de.php @@ -166,14 +166,14 @@ $lang->user->placeholder->passwordStrength[1] = 'Buchstaben und Ziffern. Mindest $lang->user->placeholder->passwordStrength[2] = 'Buchstaben, Ziffern und Sonderzeichen. Mindestens 10 Zeichen'; $lang->user->error = new stdclass(); -$lang->user->error->account = "ID %s，Konto muss Buchstaben, Unterstriche oder Ziffern enthalten. Mindestens 3 Zeichen."; -$lang->user->error->accountDupl = "ID %s，Konto wurde genutzt."; -$lang->user->error->realname = "ID %s，muss der Realname sein"; -$lang->user->error->password = "ID %s，passwort muss mindestens 6 Zeichen lang sein."; -$lang->user->error->mail = "ID %s，bitte geben Sie eine gültige Emailadresse an."; -$lang->user->error->reserved = "ID %s，Konto ist reserviert."; -$lang->user->error->weakPassword = "ID %s，the password strength is less than the system setting."; -$lang->user->error->commonWeak = "ID %s，Passwords cannot be used with [%s] these commonly used if-passwords."; +$lang->user->error->account = "ID %s，Konto muss Buchstaben, Unterstriche oder Ziffern enthalten. Mindestens 3 Zeichen."; +$lang->user->error->accountDupl = "ID %s，Konto wurde genutzt."; +$lang->user->error->realname = "ID %s，muss der Realname sein"; +$lang->user->error->password = "ID %s，passwort muss mindestens 6 Zeichen lang sein."; +$lang->user->error->mail = "ID %s，bitte geben Sie eine gültige Emailadresse an."; +$lang->user->error->reserved = "ID %s，Konto ist reserviert."; +$lang->user->error->weakPassword = "ID %s，the password strength is less than the system setting."; +$lang->user->error->dangerPassword = "ID %s，Passwords cannot be used with [%s] these commonly used if-passwords."; $lang->user->error->verifyPassword = "Verifikation fehlgeschlagen. Bitte geben Sie ihr Loginpasswort ein."; $lang->user->error->originalPassword = "Altes Passwort ist falsch."; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 1bd290a4d7..ff9b90f02d 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -166,14 +166,14 @@ $lang->user->placeholder->passwordStrength[1] = '>= 6 letters and numbers'; $lang->user->placeholder->passwordStrength[2] = '>= 10 letters, numbers and special characters'; $lang->user->error = new stdclass(); -$lang->user->error->account = "ID %s，account must be >= 3 letters, underline, or numbers"; -$lang->user->error->accountDupl = "ID %s，account is used."; -$lang->user->error->realname = "ID %s，must be real name"; -$lang->user->error->password = "ID %s，password must be >= 6 characters."; -$lang->user->error->mail = "ID %s，please enter valid Email address"; -$lang->user->error->reserved = "ID %s，account is reserved."; -$lang->user->error->weakPassword = "ID %s，the password strength is less than the system setting."; -$lang->user->error->commonWeak = "ID %s，Passwords cannot be used with [%s] these commonly used if-passwords."; +$lang->user->error->account = "ID %s，account must be >= 3 letters, underline, or numbers"; +$lang->user->error->accountDupl = "ID %s，account is used."; +$lang->user->error->realname = "ID %s，must be real name"; +$lang->user->error->password = "ID %s，password must be >= 6 characters."; +$lang->user->error->mail = "ID %s，please enter valid Email address"; +$lang->user->error->reserved = "ID %s，account is reserved."; +$lang->user->error->weakPassword = "ID %s，the password strength is less than the system setting."; +$lang->user->error->dangerPassword = "ID %s，Passwords cannot be used with [%s] these commonly used if-passwords."; $lang->user->error->verifyPassword = "Verification failed. Please enter your Login Password."; $lang->user->error->originalPassword = "Old password is incorrect."; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 5b70b18831..de145c76ea 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -48,7 +48,7 @@ $lang->user->originalPassword = '原密码'; $lang->user->newPassword = '新密码'; $lang->user->verifyPassword = '您的密码'; $lang->user->resetPassword = '忘记密码'; -$lang->user->score = '分数'; +$lang->user->score = '积分'; $lang->user->legendBasic = '基本资料'; $lang->user->legendContribution = '个人贡献'; @@ -166,14 +166,14 @@ $lang->user->placeholder->passwordStrength[1] = '6位以上，包含大小写字 $lang->user->placeholder->passwordStrength[2] = '10位以上，包含大小写字母，数字，特殊字符。'; $lang->user->error = new stdclass(); -$lang->user->error->account = "【ID %s】的用户名应该为：三位以上的英文、数字或下划线的组合"; -$lang->user->error->accountDupl = "【ID %s】的用户名已经存在"; -$lang->user->error->realname = "【ID %s】的真实姓名必须填写"; -$lang->user->error->password = "【ID %s】的密码必须为六位以上"; -$lang->user->error->mail = "【ID %s】的邮箱地址不正确"; -$lang->user->error->reserved = "【ID %s】的用户名已被系统预留"; -$lang->user->error->weakPassword = "【ID %s】的密码强度小于系统设定。"; -$lang->user->error->commonWeak = "【ID %s】的密码不能使用【%s】这些常用若口令。"; +$lang->user->error->account = "【ID %s】的用户名应该为：三位以上的英文、数字或下划线的组合"; +$lang->user->error->accountDupl = "【ID %s】的用户名已经存在"; +$lang->user->error->realname = "【ID %s】的真实姓名必须填写"; +$lang->user->error->password = "【ID %s】的密码必须为六位以上"; +$lang->user->error->mail = "【ID %s】的邮箱地址不正确"; +$lang->user->error->reserved = "【ID %s】的用户名已被系统预留"; +$lang->user->error->weakPassword = "【ID %s】的密码强度小于系统设定。"; +$lang->user->error->dangerPassword = "【ID %s】的密码不能使用【%s】这些常用若口令。"; $lang->user->error->verifyPassword = "验证失败，请检查您的系统登录密码是否正确"; $lang->user->error->originalPassword = "原密码不正确"; diff --git a/module/user/view/deny.html.php b/module/user/view/deny.html.php index a2e6a035e9..9154c56a6b 100644 --- a/module/user/view/deny.html.php +++ b/module/user/view/deny.html.php @@ -32,25 +32,6 @@ include '../../common/view/header.lite.html.php'; $methodName = isset($tmpLang[$method]) ? $tmpLang[$method] : $method; } - /* set moduleName = caselib if method = caselibmethod. */ - $lowerMethod = strtolower($method); - if($module == 'testsuite') - { - $this->app->loadLang('group'); - $caselibMethods = array(); - foreach($lang->resource->caselib as $caselibMethod => $caselibMethodName) - { - $lowerCaselibMethod = strtolower($caselibMethod); - $caselibMethods[$lowerCaselibMethod] = $caselibMethodName; - } - - if(isset($caselibMethods[$lowerMethod]) && $lowerMethod != 'edit') - { - $this->app->loadLang('action'); - $moduleName = $lang->action->objectTypes['caselib']; - } - } - printf($lang->user->errorDeny, $moduleName, $methodName); ?>
    diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 90f566a791..c160b0519a 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -27,7 +27,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
    - +