fix: nav
This commit is contained in:
@@ -11,6 +11,7 @@ namespace app\api\controller;
|
||||
use core\basic\Controller;
|
||||
use app\api\model\CmsModel;
|
||||
use core\basic\Url;
|
||||
use app\home\controller\ParserController;
|
||||
|
||||
class AboutController extends Controller
|
||||
{
|
||||
@@ -40,15 +41,8 @@ class AboutController extends Controller
|
||||
$data->likeslink = url('/home/Do/likes/id/' . $data->id, false);
|
||||
$data->opposelink = url('/home/Do/oppose/id/' . $data->id, false);
|
||||
|
||||
$urlname = $data->urlname ?: 'about';
|
||||
$url_break_char = $this->config('url_break_char') ?: '_';
|
||||
|
||||
if ($data->sortfilename) {
|
||||
$data->contentlink = Url::home($data->sortfilename);
|
||||
} else {
|
||||
$data->contentlink = Url::home($urlname . $url_break_char . $data->scode);
|
||||
}
|
||||
|
||||
$Parser = new ParserController();
|
||||
$data->contentlink = $Parser->parserLink(1, $data->urlname, 'about', $data->scode, $data->sortfilename);
|
||||
$data->content = str_replace(STATIC_DIR . '/upload/', get_http_url() . STATIC_DIR . '/upload/', $data->content);
|
||||
json(1, $data);
|
||||
} else {
|
||||
|
||||
@@ -11,6 +11,7 @@ namespace app\api\controller;
|
||||
use core\basic\Controller;
|
||||
use app\api\model\CmsModel;
|
||||
use core\basic\Url;
|
||||
use app\home\controller\ParserController;
|
||||
|
||||
class CmsController extends Controller
|
||||
{
|
||||
@@ -170,7 +171,7 @@ class CmsController extends Controller
|
||||
|
||||
// 获取主要参数
|
||||
$field = request('field');
|
||||
if (! preg_match('/^[\w\|\s]+$/', $field)) {
|
||||
if (! preg_match('/^[\w\|]+$/', $field)) {
|
||||
$field = '';
|
||||
}
|
||||
$keyword = request('keyword', 'vars');
|
||||
@@ -329,7 +330,7 @@ class CmsController extends Controller
|
||||
|
||||
// 读取数据
|
||||
$data = $this->model->getLists($acode, $scode, $num, $order, $where1, $where2, $where3, $fuzzy);
|
||||
$url_break_char = $this->config('url_break_char') ?: '_';
|
||||
$Parser = new ParserController();
|
||||
|
||||
foreach ($data as $key => $value) {
|
||||
if ($value->outlink) {
|
||||
@@ -342,16 +343,7 @@ class CmsController extends Controller
|
||||
$data[$key]->content = str_replace(STATIC_DIR . '/upload/', get_http_url() . STATIC_DIR . '/upload/', $value->content);
|
||||
|
||||
// 返回网页链接地址,便于AJAX调用内容
|
||||
$urlname = $value->urlname ?: 'list';
|
||||
if ($value->sortfilename && $value->filename) {
|
||||
$data[$key]->contentlink = Url::home($value->sortfilename . '/' . $value->filename, true);
|
||||
} elseif ($value->sortfilename) {
|
||||
$data[$key]->contentlink = Url::home($value->sortfilename . '/' . $value->id, true);
|
||||
} elseif ($value->filename) {
|
||||
$data[$key]->contentlink = Url::home($urlname . $url_break_char . $value->scode . '/' . $value->filename, true);
|
||||
} else {
|
||||
$data[$key]->contentlink = Url::home($urlname . $url_break_char . $value->scode . '/' . $value->id, true);
|
||||
}
|
||||
$data[$key]->contentlink = $Parser->parserLink(2, $value->urlname, 'content', $value->scode, $value->sortfilename, $value->id, $value->filename);
|
||||
}
|
||||
|
||||
// 输出数据
|
||||
@@ -427,7 +419,7 @@ class CmsController extends Controller
|
||||
if ($this->model->addMessage($value->table_name, $data)) {
|
||||
$this->log('API提交留言数据成功!');
|
||||
if ($this->config('message_send_mail') && $this->config('message_send_to')) {
|
||||
$mail_subject = "【PbootCMS】您有新的" . $value->form_name . "信息,请注意查收!";
|
||||
$mail_subject = "【" . CMSNAME . "】您有新的" . $value->form_name . "信息,请注意查收!";
|
||||
$mail_body .= '<br>来自网站' . get_http_url() . '(' . date('Y-m-d H:i:s') . ')';
|
||||
sendmail($this->config(), $this->config('message_send_to'), $mail_subject, $mail_body);
|
||||
}
|
||||
@@ -509,7 +501,7 @@ class CmsController extends Controller
|
||||
if ($this->model->addForm($value->table_name, $data)) {
|
||||
$this->log('API提交表单数据成功!');
|
||||
if ($this->config('form_send_mail') && $this->config('message_send_to')) {
|
||||
$mail_subject = "【PbootCMS】您有新的" . $value->form_name . "信息,请注意查收!";
|
||||
$mail_subject = "【" . CMSNAME . "】您有新的" . $value->form_name . "信息,请注意查收!";
|
||||
$mail_body .= '<br>来自网站' . get_http_url() . '(' . date('Y-m-d H:i:s') . ')';
|
||||
sendmail($this->config(), $this->config('message_send_to'), $mail_subject, $mail_body);
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ namespace app\api\controller;
|
||||
use core\basic\Controller;
|
||||
use app\api\model\CmsModel;
|
||||
use core\basic\Url;
|
||||
use app\home\controller\ParserController;
|
||||
|
||||
class ContentController extends Controller
|
||||
{
|
||||
@@ -38,21 +39,9 @@ class ContentController extends Controller
|
||||
$data->likeslink = url('/home/Do/likes/id/' . $data->id, false);
|
||||
$data->opposelink = url('/home/Do/oppose/id/' . $data->id, false);
|
||||
|
||||
$url_break_char = $this->config('url_break_char') ?: '_';
|
||||
$url_rule_sort_suffix = $this->config('url_rule_sort_suffix') ? true : null;
|
||||
$urlname = $data->urlname ?: 'list';
|
||||
|
||||
// 返回网页链接地址
|
||||
if ($data->sortfilename && $data->filename) {
|
||||
$data->contentlink = Url::home($data->sortfilename . '/' . $data->filename, true);
|
||||
} elseif ($data->sortfilename) {
|
||||
$data->contentlink = Url::home($data->sortfilename . '/' . $data->id, true);
|
||||
} elseif ($data->filename) {
|
||||
$data->contentlink = Url::home($urlname . $url_break_char . $data->scode . '/' . $data->filename, true);
|
||||
} else {
|
||||
$data->contentlink = Url::home($urlname . $url_break_char . $data->scode . '/' . $data->id, true);
|
||||
}
|
||||
|
||||
$Parser = new ParserController();
|
||||
$data->contentlink = $Parser->parserLink(2, $data->urlname, 'content', $data->scode, $data->sortfilename, $data->id, $data->filename);
|
||||
$data->content = str_replace(STATIC_DIR . '/upload/', get_http_url() . STATIC_DIR . '/upload/', $data->content);
|
||||
json(1, $data);
|
||||
} else {
|
||||
|
||||
@@ -11,6 +11,7 @@ namespace app\api\controller;
|
||||
use core\basic\Controller;
|
||||
use app\api\model\CmsModel;
|
||||
use core\basic\Url;
|
||||
use app\home\controller\ParserController;
|
||||
|
||||
class ListController extends Controller
|
||||
{
|
||||
@@ -82,7 +83,7 @@ class ListController extends Controller
|
||||
|
||||
// 读取数据
|
||||
$data = $this->model->getLists($acode, $scode, $num, $order);
|
||||
$url_break_char = $this->config('url_break_char') ?: '_';
|
||||
$Parser = new ParserController();
|
||||
|
||||
foreach ($data as $key => $value) {
|
||||
if ($value->outlink) {
|
||||
@@ -95,16 +96,7 @@ class ListController extends Controller
|
||||
$data[$key]->content = str_replace(STATIC_DIR . '/upload/', get_http_url() . STATIC_DIR . '/upload/', $value->content);
|
||||
|
||||
// 返回网页链接地址,便于AJAX调用内容
|
||||
$urlname = $value->urlname ?: 'list';
|
||||
if ($value->sortfilename && $value->filename) {
|
||||
$data[$key]->contentlink = Url::home($value->sortfilename . '/' . $value->filename, true);
|
||||
} elseif ($value->sortfilename) {
|
||||
$data[$key]->contentlink = Url::home($value->sortfilename . '/' . $value->id, true);
|
||||
} elseif ($value->filename) {
|
||||
$data[$key]->contentlink = Url::home($urlname . $url_break_char . $value->scode . '/' . $value->filename, true);
|
||||
} else {
|
||||
$data[$key]->contentlink = Url::home($urlname . $url_break_char . $value->scode . '/' . $value->id, true);
|
||||
}
|
||||
$data[$key]->contentlink = $Parser->parserLink(2, $value->urlname, 'content', $value->scode, $value->sortfilename, $value->id, $value->filename);
|
||||
}
|
||||
|
||||
// 输出数据
|
||||
|
||||
Reference in New Issue
Block a user