From 5be7ec6214aa072d8b9ea746f123def445364c23 Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Mon, 5 Aug 2013 09:23:15 +0800 Subject: [PATCH] * code for task#1581. --- module/sso/lang/en.php | 32 ++++++++++++++++++++++++-------- module/sso/lang/zh-cn.php | 16 ++++++++-------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php index 4127d3846a..f00156a215 100644 --- a/module/sso/lang/en.php +++ b/module/sso/lang/en.php @@ -1,20 +1,20 @@ sso->common = 'SSO'; -$lang->sso->browse = 'Auth list'; -$lang->sso->create = 'Create auth'; -$lang->sso->edit = 'Edit auth'; -$lang->sso->delete = 'Delete auth'; +$lang->sso->browse = 'App list'; +$lang->sso->create = 'Create App'; +$lang->sso->edit = 'Edit App'; +$lang->sso->delete = 'Delete App'; $lang->sso->code = 'Code'; $lang->sso->title = 'Name'; $lang->sso->key = 'Key'; $lang->sso->ip = 'IP list'; -$lang->sso->createKey = 'Get new key'; +$lang->sso->createKey = 'New one'; -$lang->sso->confirmDelete = 'Are you sure to delete this auth?'; +$lang->sso->confirmDelete = 'Are you sure to delete this App?'; $lang->sso->note = new stdClass(); -$lang->sso->note->title = 'site name'; -$lang->sso->note->code = 'site code'; +$lang->sso->note->title = 'app name'; +$lang->sso->note->code = 'app code'; $lang->sso->note->ip = "Use comma between two IPs, and support IP segment, for example 192.168.1.*"; $lang->sso->error = new stdClass(); @@ -24,4 +24,20 @@ $lang->sso->error->key = 'Please input key'; $lang->sso->error->ip = 'Please input IP'; $lang->sso->instruction = <<Example：Name is 'Test'", Code is 'test', Key is '20c8eb0d522d2e1a09d4ea18e4df3a59',IP list is "192.168.11.*,127.0.0.1"。

+

1.User Auth

+

Application request API of user auth, check if the account and password is correct, to realize single sign-on (SSO).

+

The API is from sso module, auth method. POST data is account and encrypted string [md5(md5(password) + key)]. Return user info(json) if success, return fail if fail.

+

Example: url is 'http:://www.demo.com/sso-auth-test'，POST string is 'account=admin&authcode=c44c577432230ad8e67160d3f9f0b91c'.

+

    Note: 'test' is App code, 'c44c577432230ad8e67160d3f9f0b91' is md5(md5('123456') + '20c8eb0d522d2e1a09d4ea18e4df3a59')

+

2.Get User List

+

Application request API of user list, get all user info of zentao.

+

The API if from sso module, users method. POST data is key. Return user list (json) if success, return fail if fail.

+

Example:url is 'http:://www.demo.com/sso-users-test', POST string is 'key=20c8eb0d522d2e1a09d4ea18e4df3a59'.

+

    Note: 'test' is App code, '20c8eb0d522d2e1a09d4ea18e4df3a59' is App key.

+

3.Get Dept List

+

Application request API of dept list, get all dept info of zentao.

+

The API if from sso module, depts method. POST data is key. Return dept list (json) if success, return fail if fail.

+

Example:url is 'http:://www.demo.com/sso-depts-test', POST string is 'key=20c8eb0d522d2e1a09d4ea18e4df3a59'.

+

    Note: 'test' is App code, '20c8eb0d522d2e1a09d4ea18e4df3a59' is App key.

EOT; diff --git a/module/sso/lang/zh-cn.php b/module/sso/lang/zh-cn.php index 19f97c2df7..5520d0237d 100644 --- a/module/sso/lang/zh-cn.php +++ b/module/sso/lang/zh-cn.php @@ -1,21 +1,21 @@ sso->common = '单点登录'; -$lang->sso->browse = '授权列表'; -$lang->sso->create = '创建授权'; -$lang->sso->edit = '编辑授权'; -$lang->sso->delete = '删除授权'; +$lang->sso->browse = '应用列表'; +$lang->sso->create = '添加应用'; +$lang->sso->edit = '编辑应用'; +$lang->sso->delete = '删除应用'; $lang->sso->code = '代号'; $lang->sso->title = '名称'; $lang->sso->key = '密钥'; $lang->sso->ip = 'IP列表'; $lang->sso->createKey = '重新生成密钥'; -$lang->sso->confirmDelete = '您确定删除该授权吗？'; +$lang->sso->confirmDelete = '您确定删除该应用吗？'; $lang->sso->note = new stdClass(); -$lang->sso->note->title = '授权站点名称'; -$lang->sso->note->code = '授权站点代号'; -$lang->sso->note->ip = "允许该站点使用这些ip访问，多个ip使用逗号隔开。支持IP段，如192.168.1.*"; +$lang->sso->note->title = '授权应用名称'; +$lang->sso->note->code = '授权应用代号'; +$lang->sso->note->ip = "允许该应用使用这些ip访问，多个ip使用逗号隔开。支持IP段，如192.168.1.*"; $lang->sso->error = new stdClass(); $lang->sso->error->title = '名称不能为空';