diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php index be1f0ba93e..df9946f0cb 100644 --- a/framework/base/helper.class.php +++ b/framework/base/helper.class.php @@ -539,9 +539,7 @@ class baseHelper $domain = strtolower($domain); if(isset($config->siteCode[$domain])) return $config->siteCode[$domain]; - if($domain == 'localhost') return $domain; - if(!preg_match('/^([a-z0-9\-_]+\.)+[a-z0-9\-]+$/', $domain)) die('domain denied'); $domain = str_replace('-', '_', $domain); // Replace '-' by '_'. $items = explode('.', $domain); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 859f215b1f..b9cbda2f46 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -38,8 +38,8 @@ $lang->block->default['product']['1']['title'] = $lang->productCommon . ' list'; $lang->block->default['product']['1']['block'] = 'list'; $lang->block->default['product']['1']['grid'] = 8; -$lang->block->default['product']['1']['params']['num'] = 15; -$lang->block->default['product']['1']['params']['type'] = 'noclosed'; +$lang->block->default['product']['1']['params']['num'] = 15; +$lang->block->default['product']['1']['params']['type'] = 'noclosed'; $lang->block->default['product']['2']['title'] = 'Story of assigned to me'; $lang->block->default['product']['2']['block'] = 'story'; @@ -55,7 +55,7 @@ $lang->block->default['project']['1']['grid'] = 8; $lang->block->default['project']['1']['params']['num'] = 15; $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['1']['params']['type'] = 'undone'; +$lang->block->default['project']['1']['params']['type'] = 'undone'; $lang->block->default['project']['2']['title'] = 'Task of assigned to me'; $lang->block->default['project']['2']['block'] = 'task'; @@ -71,7 +71,7 @@ $lang->block->default['qa']['1']['grid'] = 4; $lang->block->default['qa']['1']['params']['num'] = 15; $lang->block->default['qa']['1']['params']['orderBy'] = 'id_desc'; -$lang->block->default['qa']['1']['params']['type'] = 'assignedTo'; +$lang->block->default['qa']['1']['params']['type'] = 'assignedTo'; $lang->block->default['qa']['2']['title'] = 'Case of assigned to me'; $lang->block->default['qa']['2']['block'] = 'case'; @@ -79,7 +79,7 @@ $lang->block->default['qa']['2']['grid'] = 4; $lang->block->default['qa']['2']['params']['num'] = 15; $lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc'; -$lang->block->default['qa']['2']['params']['type'] = 'assignedTo'; +$lang->block->default['qa']['2']['params']['type'] = 'assignedTo'; $lang->block->default['qa']['3']['title'] = 'Waiting test task'; $lang->block->default['qa']['3']['block'] = 'testtask'; @@ -89,23 +89,25 @@ $lang->block->default['qa']['3']['params']['num'] = 15; $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['3']['params']['type'] = 'wait'; -$lang->block->default['my']['1'] = $lang->block->default['project']['2']; +$lang->block->default['my']['1'] = $lang->block->default['project']['1']; $lang->block->default['my']['1']['source'] = 'project'; $lang->block->default['my']['2']['title'] = 'Dynamic'; $lang->block->default['my']['2']['block'] = 'dynamic'; $lang->block->default['my']['2']['grid'] = 4; $lang->block->default['my']['2']['source'] = ''; -$lang->block->default['my']['3'] = $lang->block->default['product']['2']; +$lang->block->default['my']['3'] = $lang->block->default['product']['1']; $lang->block->default['my']['3']['source'] = 'product'; $lang->block->default['my']['4']['title'] = 'My todo'; $lang->block->default['my']['4']['block'] = 'list'; $lang->block->default['my']['4']['grid'] = 4; $lang->block->default['my']['4']['source'] = 'todo'; $lang->block->default['my']['4']['params']['num'] = '20'; -$lang->block->default['my']['5'] = $lang->block->default['project']['1']; +$lang->block->default['my']['5'] = $lang->block->default['project']['2']; $lang->block->default['my']['5']['source'] = 'project'; $lang->block->default['my']['6'] = $lang->block->default['qa']['1']; $lang->block->default['my']['6']['source'] = 'qa'; +$lang->block->default['my']['7'] = $lang->block->default['product']['2']; +$lang->block->default['my']['7']['source'] = 'product'; $lang->block->num = 'Number'; $lang->block->type = 'Type'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index b28af17485..2f04e72505 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -38,8 +38,8 @@ $lang->block->default['product']['1']['title'] = $lang->productCommon . '列表' $lang->block->default['product']['1']['block'] = 'list'; $lang->block->default['product']['1']['grid'] = 8; -$lang->block->default['product']['1']['params']['num'] = 15; -$lang->block->default['product']['1']['params']['type'] = 'noclosed'; +$lang->block->default['product']['1']['params']['num'] = 15; +$lang->block->default['product']['1']['params']['type'] = 'noclosed'; $lang->block->default['product']['2']['title'] = '指派给我的需求'; $lang->block->default['product']['2']['block'] = 'story'; @@ -55,7 +55,7 @@ $lang->block->default['project']['1']['grid'] = 8; $lang->block->default['project']['1']['params']['num'] = 15; $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['1']['params']['type'] = 'undone'; +$lang->block->default['project']['1']['params']['type'] = 'undone'; $lang->block->default['project']['2']['title'] = '指派给我的任务'; $lang->block->default['project']['2']['block'] = 'task'; @@ -71,7 +71,7 @@ $lang->block->default['qa']['1']['grid'] = 4; $lang->block->default['qa']['1']['params']['num'] = 15; $lang->block->default['qa']['1']['params']['orderBy'] = 'id_desc'; -$lang->block->default['qa']['1']['params']['type'] = 'assignedTo'; +$lang->block->default['qa']['1']['params']['type'] = 'assignedTo'; $lang->block->default['qa']['2']['title'] = '指派给我的用例'; $lang->block->default['qa']['2']['block'] = 'case'; @@ -79,7 +79,7 @@ $lang->block->default['qa']['2']['grid'] = 4; $lang->block->default['qa']['2']['params']['num'] = 15; $lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc'; -$lang->block->default['qa']['2']['params']['type'] = 'assignedTo'; +$lang->block->default['qa']['2']['params']['type'] = 'assignedTo'; $lang->block->default['qa']['3']['title'] = '待测版本列表'; $lang->block->default['qa']['3']['block'] = 'testtask'; @@ -89,23 +89,25 @@ $lang->block->default['qa']['3']['params']['num'] = 15; $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['3']['params']['type'] = 'wait'; -$lang->block->default['my']['1'] = $lang->block->default['project']['2']; +$lang->block->default['my']['1'] = $lang->block->default['project']['1']; $lang->block->default['my']['1']['source'] = 'project'; $lang->block->default['my']['2']['title'] = '最新动态'; $lang->block->default['my']['2']['block'] = 'dynamic'; $lang->block->default['my']['2']['grid'] = 4; $lang->block->default['my']['2']['source'] = ''; -$lang->block->default['my']['3'] = $lang->block->default['product']['2']; +$lang->block->default['my']['3'] = $lang->block->default['product']['1']; $lang->block->default['my']['3']['source'] = 'product'; $lang->block->default['my']['4']['title'] = '我的待办'; $lang->block->default['my']['4']['block'] = 'list'; $lang->block->default['my']['4']['grid'] = 4; $lang->block->default['my']['4']['source'] = 'todo'; $lang->block->default['my']['4']['params']['num'] = '20'; -$lang->block->default['my']['5'] = $lang->block->default['project']['1']; +$lang->block->default['my']['5'] = $lang->block->default['project']['2']; $lang->block->default['my']['5']['source'] = 'project'; $lang->block->default['my']['6'] = $lang->block->default['qa']['1']; $lang->block->default['my']['6']['source'] = 'qa'; +$lang->block->default['my']['7'] = $lang->block->default['product']['2']; +$lang->block->default['my']['7']['source'] = 'product'; $lang->block->num = '数量'; $lang->block->type = '类型'; diff --git a/module/common/model.php b/module/common/model.php index 43259c83dd..d91afeaaae 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1295,7 +1295,7 @@ class commonModel extends model */ public static function isTutorialMode() { - return $_SESSION['tutorialMode']; + return (isset($_SESSION['tutorialMode']) and $_SESSION['tutorialMode']); } } diff --git a/module/custom/model.php b/module/custom/model.php index 75cdaa0b77..4fadb8cb8d 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -133,7 +133,7 @@ class customModel extends model public static function buildMenuConfig($allMenu, $menuConfig) { global $app, $lang, $config; - $isSetMenuConfig = isset($menuConfig); + $isSetMenuConfig = !empty($menuConfig); $menu = array(); $order = 1; $menuConfigMap = array(); @@ -186,18 +186,16 @@ class customModel extends model $float = ''; $fixed = ''; - $link = is_array($item) ? $item['link'] : $item; + $link = is_array($item) ? $item['link'] : $item; + $label = $link; + $hasPriv = true; if(strpos($link, '|') !== false) { $link = explode('|', $link); list($label, $module, $method) = $link; - } - else - { - $label = $link; + $hasPriv = commonModel::hasPriv($module, $method); } - $hasPriv = commonModel::hasPriv($module, $method); if($isTutorialMode || $hasPriv) { $itemLink = ''; @@ -232,7 +230,7 @@ class customModel extends model if($hidden) $menuItem->hidden = $hidden; if($isTutorialMode) $menuItem->tutorial = true; - while(isset($menu[$menuItem->order])) { $menuItem->order++; } + while(isset($menu[$menuItem->order])) $menuItem->order++; $menu[$menuItem->order] = $menuItem; } } diff --git a/module/my/control.php b/module/my/control.php index 9621c8e2eb..41e320cdc0 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -383,8 +383,10 @@ class my extends control } } - $mode = empty($mode) ? 'edit' : $mode; - $lists = $this->user->getContactLists($this->app->user->account); + $mode = empty($mode) ? 'edit' : $mode; + $lists = $this->user->getContactLists($this->app->user->account); + $listID = $listID ? $listID : key($lists); + if(!$listID) $mode = 'new'; /* Create or manage list according to mode. */ if($mode == 'new') @@ -394,9 +396,6 @@ class my extends control } else { - $listID = $listID ? $listID : key($lists); - if(!$listID) die(js::alert($this->lang->user->contacts->noListYet) . js::locate($this->createLink('my', 'managecontacts', "listID=0&mode=new"), 'parent')); - $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->user->contacts->manage; $this->view->position[] = $this->lang->user->contacts->manage; $this->view->list = $this->user->getContactListByID($listID);