Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
jinianlan
2019-08-21 10:27:32 +08:00
parent f1ef72dfbb c35167f38a
commit aa1609117e
32 changed files with 106 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/helper.class.php
+1 -1
View File
@@ -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);
}
framework/base/router.class.php
+2 -2
View File
@@ -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
*/
lib/base/filter/filter.class.php
+2 -2
View File
@@ -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('/<[^>]+</', '<', $this->data->$fieldName);
$this->data->$fieldName = preg_replace('/>[^<]+>/', '>', $this->data->$fieldName);
lib/pager/pager.class.php
+1 -1
View File
@@ -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']);
}
/**
module/doc/model.php
+4 -4
View File
@@ -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')
module/install/lang/en.php
+4 -4
View File
@@ -201,7 +201,7 @@ $lang->install->ranzhi->desc = <<<EOD
<li>CRM: Customer Management and Order Tracking</li>
<li>OA: Approve, Announce, Trip, Leave and so on. </li>
<li>Project，Task and Document management </li>
<li>Money: Income, Expense, Transfer, Invest and Debt</li>
<li>Cash: Income, Expense, Transfer, Invest and Debt</li>
</ul>
EOD;
@@ -240,8 +240,8 @@ $lang->install->ydisk->url = 'http://www.ydisk.cn';
$lang->install->ydisk->desc = <<<EOD
<ul>
<li>Self-Hosted: deploy on your own machine</li>
<li>Storage: depend on your hard drive size</li>
<li>Transmission: as fast as your bandwidth allows</li>
<li>Unlimited Storage: depend on your hard drive size</li>
<li>Fast Transmission: as fast as your bandwidth allows</li>
<li>Secure: 12 permissions for any strict settings</li>
</ul>
EOD;
@@ -256,6 +256,6 @@ $lang->install->meshiot->desc = <<<EOD
<li>Performance: one gateway can monitor 65,536 equipments</li>
<li>Accessibility: unique radio communication protocol covers 2,500m radius</li>
<li>Dimming System: 200+ sensors and monitors</li>
<li>Battery Available: no requirements to any equipment on your site</li>
<li>Battery Available: no changes required to any equipment on your site</li>
</ul>
EOD;
module/install/view/index.html.php
-1
View File
@@ -42,7 +42,6 @@
<td colspan='2'>
<h5><?php echo $lang->install->promotion?></h5>
<div class='row'>
<?php $count = count($lang->install->product);?>
<?php foreach($lang->install->product as $product):?>
<div class='<?php echo $lang->install->{$product}->width;?>'>
<a class="card ad" href="<?php echo $lang->install->{$product}->url;?>" target="_blank">
module/project/control.php
+2 -4
View File
@@ -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();
module/project/css/view.css
-1
View File
@@ -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;}
module/project/js/kanban.js
-2
View File
@@ -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 ()
{
module/project/lang/de.php
+2 -2
View File
@@ -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();
module/project/lang/en.php
+2 -2
View File
@@ -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();
module/release/lang/en.php
+1 -1
View File
@@ -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';
module/release/view/create.html.php
+6
View File
@@ -64,4 +64,10 @@
</form>
</div>
</div>
<script>
$(function()
{
$(".form-date").datetimepicker('setEndDate', '<?php echo date(DT_DATE1)?>');
});
</script>
<?php include '../../common/view/footer.html.php';?>
module/report/view/bugassign.html.php
+1 -1
View File
@@ -4,7 +4,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo (isset($config->isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/report/view/bugcreate.html.php
+1 -1
View File
@@ -5,7 +5,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo (isset($config->isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/report/view/productsummary.html.php
+1 -1
View File
@@ -7,7 +7,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo (isset($config->isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion;?></span>
</div>
</div>
</div>
module/report/view/projectdeviation.html.php
+1 -1
View File
@@ -6,7 +6,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo (isset($config->isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/report/view/workload.html.php
+1 -1
View File
@@ -5,7 +5,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo (isset($config->isINT) and $config->isINT) ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/task/css/view.css
-2
View File
@@ -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;}
module/task/css/view.en.css
+1
View File
@@ -1,2 +1,3 @@
.thWidth{width:100px !important;}
#legendLife .thWidth{width:100px !important;}
.effortThWidth{width:90px !important;}
module/task/css/view.zh-cn.css
+1
View File
@@ -1,2 +1,3 @@
.thWidth{width:80px !important;}
#legendLife .thWidth{width:70px !important;}
.effortThWidth{width:70px !important;}
module/task/css/view.zh-tw.css
+1
View File
@@ -1,2 +1,3 @@
.thWidth{width:80px !important;}
#legendLife .thWidth{width:70px !important;}
.effortThWidth{width:70px !important;}
module/translate/control.php
+1 -1
View File
@@ -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'));
}
}
module/tutorial/view/index.html.php
+26 -26
View File
@@ -11,36 +11,36 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<?php js::import($jsRoot . 'misc/base64.js'); ?>
<?php js::import($jsRoot . 'misc/base64.js');?>
<?php $referer = $referer ? $referer : helper::createLink('my', 'index', '', 'tutorial');?>
<div id='pageContainer'>
<div id='iframeWrapper'>
<iframe id='iframePage' name='iframePage' src='<?php echo $referer ?>' frameborder='no' allowtransparency='true' scrolling='auto' hidefocus='' style='width: 100%; height: 100%; left: 0; top: 0'></iframe>
<iframe id='iframePage' name='iframePage' src='<?php echo $referer;?>' frameborder='no' allowtransparency='true' scrolling='auto' hidefocus='' style='width: 100%; height: 100%; left: 0; top: 0'></iframe>
<div id='taskModalBack'></div>
<div id='taskModal'>
<button class='close'><i class="icon icon-close"></i></button>
<div class='finish-all'>
<div class='start-icon'><i class='icon icon-check-circle icon-front'></i></div>
<h3><?php echo $lang->tutorial->congratulation ?></h3>
<button type='button' class='btn btn-success btn-reset-tasks'><i class='icon icon-restart'></i> <?php echo $lang->tutorial->restart ?></button> &nbsp; <a href='<?php echo helper::createLink('tutorial', 'quit');?>' class='btn btn-success'><i class='icon icon-signout'></i> <?php echo $lang->tutorial->exit ?></a>
<h3><?php echo $lang->tutorial->congratulation;?></h3>
<button type='button' class='btn btn-success btn-reset-tasks'><i class='icon icon-restart'></i> <?php echo $lang->tutorial->restart;?></button> &nbsp; <a href='<?php echo helper::createLink('tutorial', 'quit');?>' class='btn btn-success'><i class='icon icon-signout'></i> <?php echo $lang->tutorial->exit;?></a>
</div>
<div class='finish'>
<div class='start-icon'><i class='icon icon-check-circle icon-front'></i></div>
<h3><?php echo $lang->tutorial->congratulateTask ?></h3>
<button type='button' class='btn btn-success btn-next-task btn-task'><?php echo $lang->tutorial->nextTask ?> <i class='icon icon-angle-right'></i></button>
<h3><?php echo $lang->tutorial->congratulateTask;?></h3>
<button type='button' class='btn btn-success btn-next-task btn-task'><?php echo $lang->tutorial->nextTask;?> <i class='icon icon-angle-right'></i></button>
</div>
</div>
</div>
<div id='sidebar'>
<header class='bg-primary'>
<div class='start-icon'><i class='icon icon-certificate icon-back'></i><i class='icon icon-flag icon-front text-secondary'></i></div>
<h2><?php echo $lang->tutorial->common ?></h2>
<h2><?php echo $lang->tutorial->common;?></h2>
<div class='actions'>
<a href='<?php echo helper::createLink('tutorial', 'quit') ?>' class='btn btn-danger btn-sm'><i class="icon icon-signout"></i> <?php echo $lang->tutorial->exit ?></a>
<a href='<?php echo helper::createLink('tutorial', 'quit');?>' class='btn btn-danger btn-sm'><i class="icon icon-signout"></i> <?php echo $lang->tutorial->exit;?></a>
</div>
</header>
<section id='current'>
<h4><?php echo $lang->tutorial->currentTask ?></h4>
<h4><?php echo $lang->tutorial->currentTask;?></h4>
<div class='panel' id='task'>
<div class='panel-heading bg-secondary'>
<strong><span class='task-id-current'>1</span>. <span class='task-name task-name-current'></span></strong>
@@ -49,20 +49,20 @@
<div class='panel-body'>
<div class='task-desc'></div>
<a href='javascript:;' id='openTaskPage' class='btn-open-target-page hl-primary'>
<div class='normal'><i class="icon icon-flag-alt"></i> <?php echo $lang->tutorial->openTargetPage ?></div>
<div class='opened'><i class="icon icon-flag"></i> <?php echo $lang->tutorial->atTargetPage ?></div>
<div class='reload'><i class="icon icon-restart"></i> <?php echo $lang->tutorial->reloadTargetPage ?></div>
<div class='normal'><i class="icon icon-flag-alt"></i> <?php echo $lang->tutorial->openTargetPage;?></div>
<div class='opened'><i class="icon icon-flag"></i> <?php echo $lang->tutorial->atTargetPage;?></div>
<div class='reload'><i class="icon icon-restart"></i> <?php echo $lang->tutorial->reloadTargetPage;?></div>
</a>
<div class='alert-warning' style='padding:5px 10px;margin-bottom:0px'><?php echo $lang->tutorial->dataNotSave?></div>
</div>
</div>
<div class='clearfix actions'>
<button type='button' class='btn btn-sm btn-circle btn-prev-task btn-task btn-icon-left'><span class="label label-badge label-icon"><i class="icon icon-arrow-left"></i></span><?php echo $lang->tutorial->previous ?></button>
<button type='button' class='btn btn-sm btn-circle btn-primary pull-right btn-task btn-next-task btn-icon-right'><?php echo $lang->tutorial->nextTask ?> <span class="label label-badge label-icon"><i class="icon icon-arrow-right"></i></span></button>
<button type='button' class='btn btn-sm btn-circle btn-prev-task btn-task btn-icon-left'><span class="label label-badge label-icon"><i class="icon icon-arrow-left"></i></span><?php echo $lang->tutorial->previous;?></button>
<button type='button' class='btn btn-sm btn-circle btn-primary pull-right btn-task btn-next-task btn-icon-right'><?php echo $lang->tutorial->nextTask;?> <span class="label label-badge label-icon"><i class="icon icon-arrow-right"></i></span></button>
</div>
</section>
<section id='all'>
<h4><?php echo $lang->tutorial->allTasks ?> (<span class='task-num-finish'>2</span>/<span class='tasks-count'><?php echo count($lang->tutorial->tasks) ?></span>)</h4>
<h4><?php echo $lang->tutorial->allTasks;?> (<span class='task-num-finish'>2</span>/<span class='tasks-count'><?php echo count($lang->tutorial->tasks);?></span>)</h4>
<div class='progress' id='tasksProgress'>
<div class='progress-text'></div>
<div class='progress-bar' style='width: 0%'>
@@ -81,8 +81,8 @@
$task['url'] = helper::createLink($nav['module'], $nav['method'], isset($nav['vars']) ? $nav['vars'] : '', 'tutorial');
$tasks[$name] = $task;
?>
<li data-name='<?php echo $name; ?>'><a class='btn-task' href='javascript:;' data-name='<?php echo $name; ?>'><span><?php echo $idx++; ?></span>. <span class='task-name'><?php echo $task['title'] ?></span><i class='icon icon-check pull-right'></i></a></li>
<?php endforeach; ?>
<li data-name='<?php echo $name;?>'><a class='btn-task' href='javascript:;' data-name='<?php echo $name;?>'><span><?php echo $idx++;?></span>. <span class='task-name'><?php echo $task['title'];?></span><i class='icon icon-check pull-right'></i></a></li>
<?php endforeach;?>
</ul>
</section>
</div>
@@ -104,13 +104,13 @@ $(function()
};
var tasks = $.parseJSON('<?php echo helper::jsonEncode4Parse($tasks, JSON_HEX_QUOT | JSON_HEX_APOS);?>');
var current = '<?php echo $current ?>';
var setting = formatSetting('<?php echo $setting ?>');
var current = '<?php echo $current;?>';
var setting = formatSetting('<?php echo $setting;?>');
var lang =
{
tagetPageTip: '<?php echo $lang->tutorial->targetPageTip ?>',
target : '<?php echo $lang->tutorial->target ?>',
requiredTip : '<?php echo $lang->tutorial->requiredTip ?>'
tagetPageTip: '<?php echo $lang->tutorial->targetPageTip;?>',
target : '<?php echo $lang->tutorial->target;?>',
requiredTip : '<?php echo $lang->tutorial->requiredTip;?>'
};
var $tasks = $('#tasks'),
@@ -168,7 +168,7 @@ $(function()
var postData = [];
$.each(setting, function(name, value) {if(value) postData.push(name);});
$.post('<?php echo inLink('ajaxSetTasks') ?>', {finish: postData.join(',')}, function(e)
$.post('<?php echo inlink('ajaxSetTasks');?>', {finish: postData.join(',')}, function(e)
{
if(e.result === 'success')
{
@@ -179,7 +179,7 @@ $(function()
else
{
setting[current] = false;
alert('<?php echo $lang->tutorial->serverErrorTip ?>');
alert('<?php echo $lang->tutorial->serverErrorTip;?>');
}
}, 'json').error(function() {alert(lang.timeout)});
}
@@ -187,7 +187,7 @@ $(function()
var resetTasks = function()
{
$.post('<?php echo inLink('ajaxSetTasks') ?>', {finish: ''}, function(e)
$.post('<?php echo inLink('ajaxSetTasks');?>', {finish: ''}, function(e)
{
if(e.result === 'success')
{
@@ -196,7 +196,7 @@ $(function()
}
else
{
alert('<?php echo $lang->tutorial->serverErrorTip ?>');
alert('<?php echo $lang->tutorial->serverErrorTip;?>');
}
}, 'json').error(function() {alert(lang.timeout)});
};
module/tutorial/view/start.html.php
+2 -2
View File
@@ -13,8 +13,8 @@
<?php include '../../common/view/header.lite.html.php';?>
<div id='start' class='bg-primary'>
<div class='start-icon'><i class='icon icon-certificate icon-spin icon-back text-primary'></i><i class='icon icon-flag icon-front text-primary'></i></div>
<h1><?php echo $lang->tutorial->common ?></h1>
<p><?php echo $lang->tutorial->desc ?></p>
<h1><?php echo $lang->tutorial->common;?></h1>
<p><?php echo $lang->tutorial->desc;?></p>
<?php echo html::a(inlink('index'), $lang->tutorial->start, '_top', "class='btn btn-primary btn-lg btn-wide btn-info'");;?>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
module/user/js/batchcreate.js
+16
View File
@@ -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);
module/user/lang/de.php
+8 -8
View File
@@ -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.";
module/user/lang/en.php
+8 -8
View File
@@ -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.";
module/user/lang/zh-cn.php
+9 -9
View File
@@ -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 = "原密码不正确";
module/user/view/deny.html.php
-19
View File
@@ -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);
?>
</div>
module/user/view/login.html.php
+1 -1
View File
@@ -27,7 +27,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
</header>
<div class="table-row">
<div class="col-4 text-center" id='logo-box'>
<img src="<?php echo $config->webRoot . 'theme/default/images/main/' . (common::checkNotCN() ? 'zt-logo.png' : 'zt-logo-en.png');?>" alt="">
<img src="<?php echo $config->webRoot . 'theme/default/images/main/' . $this->lang->logoImg;?>" />
</div>
<div class="col-8">
<form method='post' target='hiddenwin'>