+{% endblock %}
+
+{% block inline_js %}
+
+
+
{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/user/console/favorites.volt b/app/Http/Home/Views/user/console/favorites.volt
index 09db7f85..54c56715 100644
--- a/app/Http/Home/Views/user/console/favorites.volt
+++ b/app/Http/Home/Views/user/console/favorites.volt
@@ -2,7 +2,7 @@
{% block content %}
- {% set types = {'course':'课程','article':'文章','question':'问题'} %}
+ {% set types = {'course':'课程','article':'专栏','question':'问题'} %}
{% set type = request.get('type','trim','course') %}
diff --git a/app/Models/Article.php b/app/Models/Article.php
index 3ebfe3f7..4fac85c1 100644
--- a/app/Models/Article.php
+++ b/app/Models/Article.php
@@ -267,7 +267,7 @@ class Article extends Model
public function afterFetch()
{
- if (!empty($this->cover) && !Text::startsWith($this->cover, 'http')) {
+ if (!Text::startsWith($this->cover, 'http')) {
$this->cover = kg_cos_article_cover_url($this->cover);
}
diff --git a/app/Services/Logic/Article/ArticleList.php b/app/Services/Logic/Article/ArticleList.php
index d34377b9..53147885 100644
--- a/app/Services/Logic/Article/ArticleList.php
+++ b/app/Services/Logic/Article/ArticleList.php
@@ -78,20 +78,16 @@ class ArticleList extends LogicService
$items = [];
- $baseUrl = kg_cos_url();
+ $cosUrl = kg_cos_url();
foreach ($articles as $article) {
+ if (!empty($question['cover']) && !Text::startsWith($question['cover'], 'http')) {
+ $question['cover'] = $cosUrl . $question['cover'];
+ }
+
$article['tags'] = json_decode($article['tags'], true);
- if (empty($article['cover'])) {
- $article['cover'] = kg_default_article_cover_path();
- }
-
- if (!Text::startsWith($article['cover'], 'http')) {
- $article['cover'] = $baseUrl . $article['cover'];
- }
-
$category = $categories[$article['category_id']] ?? new \stdClass();
$owner = $users[$article['owner_id']] ?? new \stdClass();
diff --git a/app/Services/Logic/Course/RecommendedList.php b/app/Services/Logic/Course/RecommendedList.php
deleted file mode 100644
index f8aa1e70..00000000
--- a/app/Services/Logic/Course/RecommendedList.php
+++ /dev/null
@@ -1,30 +0,0 @@
-checkCourse($id);
-
- $cache = new CourseRecommendedListCache();
-
- $result = $cache->get($course->id);
-
- return $result ?: [];
- }
-
-}
diff --git a/app/Services/Logic/Deliver/CourseDeliver.php b/app/Services/Logic/Deliver/CourseDeliver.php
index dbd9153e..19eec15f 100644
--- a/app/Services/Logic/Deliver/CourseDeliver.php
+++ b/app/Services/Logic/Deliver/CourseDeliver.php
@@ -27,10 +27,10 @@ class CourseDeliver extends LogicService
protected function handleCourseUser(CourseModel $course, UserModel $user)
{
+ $expiryTime = strtotime("+{$course->study_expiry} months");
+
if ($course->model == CourseModel::MODEL_OFFLINE) {
$expiryTime = strtotime($course->attrs['end_date']);
- } else {
- $expiryTime = strtotime("+{$course->study_expiry} months");
}
$sourceType = CourseUserModel::SOURCE_CHARGE;
@@ -50,8 +50,7 @@ class CourseDeliver extends LogicService
foreach ($relations as $relation) {
if ($relation->deleted == 0) {
- $relation->deleted = 1;
- $relation->update();
+ $this->deleteCourseUser($relation);
}
}
}
diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php
index e555a588..38422bae 100644
--- a/app/Validators/Consult.php
+++ b/app/Validators/Consult.php
@@ -89,7 +89,7 @@ class Consult extends Validator
public function checkPublishStatus($status)
{
- if (!in_array($status, [0, 1])) {
+ if (!array_key_exists($status, ConsultModel::publishTypes())) {
throw new BadRequestException('consult.invalid_publish_status');
}
@@ -98,18 +98,11 @@ class Consult extends Validator
public function checkReplyPriv(ConsultModel $consult, UserModel $user)
{
- $repo = new CourseRepo();
+ $courseRepo = new CourseRepo();
- $teachers = $repo->findTeachers($consult->course_id);
+ $course = $courseRepo->findById($consult->course_id);
- $isTeacher = false;
-
- if ($teachers->count() > 0) {
- $teacherIds = kg_array_column($teachers->toArray(), 'id');
- $isTeacher = in_array($user->id, $teacherIds);
- }
-
- if (!$isTeacher) {
+ if ($course->teacher_id != $user->id) {
throw new ForbiddenException('sys.forbidden');
}
}
diff --git a/app/Validators/Question.php b/app/Validators/Question.php
index e2ccfe06..5f3d66b7 100644
--- a/app/Validators/Question.php
+++ b/app/Validators/Question.php
@@ -90,6 +90,19 @@ class Question extends Validator
return $value;
}
+ public function checkSummary($summary)
+ {
+ $value = $this->filter->sanitize($summary, ['trim', 'string']);
+
+ $length = kg_strlen($value);
+
+ if ($length > 255) {
+ throw new BadRequestException('question.summary_too_long');
+ }
+
+ return $value;
+ }
+
public function checkKeywords($keywords)
{
$keywords = $this->filter->sanitize($keywords, ['trim', 'string']);
diff --git a/config/errors.php b/config/errors.php
index d1c570cc..2c6283af 100644
--- a/config/errors.php
+++ b/config/errors.php
@@ -120,6 +120,7 @@ $error['article.not_found'] = '文章不存在';
$error['article.title_too_short'] = '标题太短（少于2个字符）';
$error['article.title_too_long'] = '标题太长（多于50个字符）';
$error['article.keyword_too_long'] = '关键字太长（多于100个字符）';
+$error['article.summary_too_long'] = '摘要太长（多于255个字符）';
$error['article.content_too_short'] = '内容太短（少于10个字符）';
$error['article.content_too_long'] = '内容太长（多于30000个字符）';
$error['article.invalid_source_type'] = '无效的来源类型';
@@ -138,6 +139,7 @@ $error['question.not_found'] = '问题不存在';
$error['question.title_too_short'] = '标题太短（少于5个字符）';
$error['question.title_too_long'] = '标题太长（多于50个字符）';
$error['question.keyword_too_long'] = '关键字太长（多于100个字符）';
+$error['question.summary_too_long'] = '摘要太长（多于255个字符）';
$error['question.content_too_short'] = '内容太短（少于10个字符）';
$error['question.content_too_long'] = '内容太长（多于30000个字符）';
$error['question.invalid_publish_status'] = '无效的发布状态';
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index 7012fd2e..231bcd9a 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -330,6 +330,10 @@
height: 100%;
}
+.query-input {
+ width: 720px;
+}
+
.search-tab {
margin: 0;
}
diff --git a/public/static/home/js/article.edit.js b/public/static/home/js/article.edit.js
index 23207122..65523688 100644
--- a/public/static/home/js/article.edit.js
+++ b/public/static/home/js/article.edit.js
@@ -1,23 +1,7 @@
-layui.use(['jquery', 'form', 'layer'], function () {
+layui.use(['jquery', 'form'], function () {
var $ = layui.jquery;
var form = layui.form;
- var layer = layui.layer;
-
- $('.publish').on('click', function () {
- var layerWidth = 360;
- var layerTop = $(this).offset().top + $(this).height() + 5 + 'px';
- var layerLeft = ($(this).offset().left + $(this).width() - layerWidth) + 'px';
- layer.open({
- type: 1,
- title: false,
- closeBtn: false,
- shadeClose: true,
- content: $('#layer-publish'),
- offset: [layerTop, layerLeft],
- area: layerWidth + 'px',
- });
- });
form.on('select(source_type)', function (data) {
var block = $('#source-url-block');
@@ -35,8 +19,6 @@ layui.use(['jquery', 'form', 'layer'], function () {
name: 'xm_tag_ids',
max: 3,
data: xmTags,
- layVerify: 'required',
- layVerType: 'msg',
autoRow: true,
filterable: true,
filterMethod: function (val, item, index, prop) {
diff --git a/public/static/home/js/common.js b/public/static/home/js/common.js
index a5df2cba..3d379ed9 100644
--- a/public/static/home/js/common.js
+++ b/public/static/home/js/common.js
@@ -102,7 +102,6 @@ layui.use(['jquery', 'form', 'element', 'layer', 'helper'], function () {
$('.nav-search').on('click', function () {
var content = '';
layer.open({
type: 1,
diff --git a/public/static/home/js/course.show.js b/public/static/home/js/course.show.js
index ae7ae753..9604de82 100644
--- a/public/static/home/js/course.show.js
+++ b/public/static/home/js/course.show.js
@@ -145,11 +145,6 @@ layui.use(['jquery', 'layer', 'helper'], function () {
helper.ajaxLoadHtml($sdTopics.data('url'), $sdTopics.attr('id'));
}
- if ($('#sidebar-recommended').length > 0) {
- var $sdRecommended = $('#sidebar-recommended');
- helper.ajaxLoadHtml($sdRecommended.data('url'), $sdRecommended.attr('id'));
- }
-
if ($('#sidebar-related').length > 0) {
var $sdRelated = $('#sidebar-related');
helper.ajaxLoadHtml($sdRelated.data('url'), $sdRelated.attr('id'));
diff --git a/public/static/home/js/question.edit.js b/public/static/home/js/question.edit.js
index 99bf6d10..b627ece8 100644
--- a/public/static/home/js/question.edit.js
+++ b/public/static/home/js/question.edit.js
@@ -1,22 +1,7 @@
-layui.use(['jquery', 'form', 'layer'], function () {
+layui.use(['jquery'], function () {
var $ = layui.jquery;
- $('.publish').on('click', function () {
- var layerWidth = 360;
- var layerTop = $(this).offset().top + $(this).height() + 5 + 'px';
- var layerLeft = ($(this).offset().left + $(this).width() - layerWidth) + 'px';
- layer.open({
- type: 1,
- title: false,
- closeBtn: false,
- shadeClose: true,
- content: $('#layer-publish'),
- offset: [layerTop, layerLeft],
- area: [layerWidth + 'px', '360px'],
- });
- });
-
var xmTags = JSON.parse($('input[name=xm_tags]').val());
xmSelect.render({
@@ -24,8 +9,6 @@ layui.use(['jquery', 'form', 'layer'], function () {
name: 'xm_tag_ids',
max: 3,
data: xmTags,
- layVerify: 'required',
- layVerType: 'msg',
autoRow: true,
filterable: true,
filterMethod: function (val, item, index, prop) {