Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
be66c8fb
Commit
be66c8fb
authored
Nov 01, 2016
by
杨培
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改标题或内容后内容进入待审核状态
增加多个模型数据的XSS过滤等安全性 课程富文本编辑工具栏调整 其它BUG修复
parent
d6caec43
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
59 additions
and
10 deletions
+59
-10
Classes.php
src/common/models/Classes.php
+15
-0
Teacher.php
src/common/models/Teacher.php
+15
-0
MyCourseController.php
src/frontend/controllers/MyCourseController.php
+9
-9
CoursePublishForm.php
src/frontend/models/CoursePublishForm.php
+14
-1
common-part.js
src/frontend/web/js/my-course/common-part.js
+4
-0
rich-text.js
src/frontend/web/js/my-course/rich-text.js
+2
-0
No files found.
src/common/models/Classes.php
View file @
be66c8fb
...
...
@@ -71,6 +71,21 @@ class Classes extends ActiveRecord
];
}
/**
* @inheritdoc
*/
public
function
beforeSave
(
$insert
)
{
if
(
!
parent
::
beforeSave
(
$insert
))
{
return
FALSE
;
}
$this
->
name
=
strip_tags
(
$this
->
name
);
$this
->
intro
=
\yii\helpers\HtmlPurifier
::
process
(
$this
->
intro
);
return
TRUE
;
}
/**
* @inheritdoc
*/
...
...
src/common/models/Teacher.php
View file @
be66c8fb
...
...
@@ -69,6 +69,21 @@ class Teacher extends ActiveRecord
];
}
/**
* @inheritdoc
*/
public
function
beforeSave
(
$insert
)
{
if
(
!
parent
::
beforeSave
(
$insert
))
{
return
FALSE
;
}
$this
->
name
=
strip_tags
(
$this
->
name
);
$this
->
intro
=
\yii\helpers\HtmlPurifier
::
process
(
$this
->
intro
);
return
TRUE
;
}
/**
* @inheritdoc
*/
...
...
src/frontend/controllers/MyCourseController.php
View file @
be66c8fb
...
...
@@ -232,8 +232,11 @@ class MyCourseController extends \yii\web\Controller
throw
new
ForbiddenHttpException
();
}
//是否提交重新审核,仅待审核和已拒绝状态允许重新进入审核
$isRecheck
=
in_array
(
$course
->
status
,
[
Course
::
STATUS_UNCHECK
,
Course
::
STATUS_FAILED
]);
//内容是否还没完成,代表某些重新资料(视频,试看时间)可以更改
$unready
=
in_array
(
$course
->
status
,
[
Course
::
STATUS_UNCHECK
,
Course
::
STATUS_FAILED
]);
//是否重新审核,如标题和简介发生变更
$recheck
=
(
$unready
||
$form
->
isMustRecheck
(
$course
));
$courseware
=
Courseware
::
findOne
([
'course_id'
=>
$course
->
id
]);
$coursewareUpdate
=
false
;
...
...
@@ -246,14 +249,11 @@ class MyCourseController extends \yii\web\Controller
$course
->
intro
=
$form
->
intro
;
$course
->
recommend
=
$form
->
recommend
;
$form
->
preview
&&
$course
->
preview_pic
=
$form
->
preview
[
'key'
];
if
(
$isRecheck
)
{
$course
->
free_time
=
$form
->
free_time
;
$course
->
status
=
Course
::
STATUS_UNCHECK
;
}
$unready
&&
$course
->
free_time
=
$form
->
free_time
;
$recheck
&&
$course
->
status
=
Course
::
STATUS_UNCHECK
;
//仅重审核时可以更换视频
if
(
$form
->
vuid
&&
!
$
isRecheck
)
{
if
(
$form
->
vuid
&&
!
$
unready
)
{
Utils
::
ajaxResponse
(
false
,
'当前课程状态不允许更换视频!'
);
}
...
...
@@ -289,7 +289,7 @@ class MyCourseController extends \yii\web\Controller
$coursewareUpdate
=
true
;
}
if
(
$
isR
echeck
&&
$courseware
->
status
!=
Course
::
STATUS_UNCHECK
)
{
if
(
$
r
echeck
&&
$courseware
->
status
!=
Course
::
STATUS_UNCHECK
)
{
$courseware
->
status
=
Course
::
STATUS_UNCHECK
;
$coursewareUpdate
=
true
;
}
...
...
src/frontend/models/CoursePublishForm.php
View file @
be66c8fb
...
...
@@ -89,9 +89,10 @@ class CoursePublishForm extends Model
//}
$rules
=
[
[[
'tmp'
,
'name'
,
'price'
,
'preview'
,
'vuid'
],
'required'
],
[[
'tmp'
,
'name'
,
'
intro'
,
'
price'
,
'preview'
,
'vuid'
],
'required'
],
[[
'id'
,
'free_time'
],
'integer'
],
[[
'tmp'
,
'name'
,
'preview'
,
'intro'
],
'string'
],
[[
'name'
,
'intro'
],
'trim'
],
[
'recommend'
,
'boolean'
],
[
'free_time'
,
'default'
,
'value'
=>
0
],
[
'free_time'
,
'integer'
,
'min'
=>
0
,
'max'
=>
15
],
...
...
@@ -105,6 +106,18 @@ class CoursePublishForm extends Model
return
$rules
;
}
/**
* 检查内容是否必须重新审核
*
* @param \common\models\Course $course
* @return bool
*/
public
function
isMustRecheck
(
$course
)
{
$removeStr
=
[
' '
,
"
\t
"
,
"
\r
"
,
"
\n
"
];
//移除空格,制表符和换行
return
md5
(
str_replace
(
$removeStr
,
''
,
$course
->
name
.
$course
->
intro
))
!=
md5
(
str_replace
(
$removeStr
,
''
,
$this
->
name
.
$this
->
intro
));
}
/**
* 检查上传七牛云文件是否可领取是否可领取
*
...
...
src/frontend/web/js/my-course/common-part.js
View file @
be66c8fb
...
...
@@ -65,6 +65,10 @@ module.exports = {
to
=
org
;
}
if
(
!
to
)
{
return
;
}
//绑定提示到元素上
if
(
text
)
{
if
(
to
.
tipIndex
)
{
...
...
src/frontend/web/js/my-course/rich-text.js
View file @
be66c8fb
...
...
@@ -10,6 +10,8 @@ module.exports = {
toolbarFloat
:
true
,
toolbarFloatOffset
:
60
,
defaultImage
:
"/assets/img/placeholder.jpg"
,
toolbar
:
[
'bold'
,
'italic'
,
'underline'
,
'fontScale'
,
'color'
,
'|'
,
'alignment'
,
'indent'
,
'outdent'
,
'|'
,
'ol'
,
'ul'
,
'blockquote'
,
'code'
,
'link'
,
'image'
,
'table'
],
upload
:
{
url
:
'/my-course/upload'
,
//文件上传的接口地址
params
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment