DEV: Незначительные изменения (namespace)
This commit is contained in:
parent
d3bd749350
commit
a76f768072
|
@ -4,8 +4,7 @@ namespace App\Controllers;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\ActionModel;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Config, Base};
|
||||
|
||||
class ActionController extends \MainController
|
||||
{
|
||||
|
@ -13,7 +12,7 @@ class ActionController extends \MainController
|
|||
public function deletingAndRestoring()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$info = \Request::getPost('info');
|
||||
$info = Request::getPost('info');
|
||||
$status = preg_split('/(@)/', $info);
|
||||
$type_id = (int)$status[0]; // id конткнта
|
||||
$type = $status[1]; // тип контента
|
||||
|
@ -60,7 +59,7 @@ class ActionController extends \MainController
|
|||
// Журнал логирования удалений / восстановлений контента
|
||||
public function moderation()
|
||||
{
|
||||
$moderations_log = ActionModel::getModerations();
|
||||
$moderations_log = ActionModel::getModerations();
|
||||
|
||||
$result = array();
|
||||
foreach ($moderations_log as $ind => $row) {
|
||||
|
@ -83,8 +82,8 @@ class ActionController extends \MainController
|
|||
// Связанные посты и выбор автора
|
||||
public function select()
|
||||
{
|
||||
$type = \Request::get('type');
|
||||
$search = \Request::getPost('searchTerm');
|
||||
$type = Request::get('type');
|
||||
$search = Request::getPost('searchTerm');
|
||||
$search = preg_replace('/[^a-zA-ZА-Яа-я0-9 ]/ui', '', $search);
|
||||
|
||||
return ActionModel::getSearch($search, $type);
|
||||
|
|
|
@ -3,24 +3,19 @@
|
|||
namespace App\Controllers\Answer;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\NotificationsModel;
|
||||
use App\Models\ActionModel;
|
||||
use App\Models\AnswerModel;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Content;
|
||||
use Lori\Base;
|
||||
use App\Models\{NotificationsModel, ActionModel, AnswerModel, PostModel, UserModel};
|
||||
use Lori\{Content, Base};
|
||||
|
||||
class AddAnswerController extends \MainController
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
$post = PostModel::getPostId($post_id);
|
||||
Base::PageError404($post);
|
||||
|
||||
$answer_content = $_POST['answer']; // не фильтруем (для Markdown)
|
||||
$ip = \Request::getRemoteAddress();
|
||||
$ip = Request::getRemoteAddress();
|
||||
$uid = Base::getUid();
|
||||
|
||||
// Если пользователь забанен / заморожен
|
||||
|
@ -86,7 +81,7 @@ class AddAnswerController extends \MainController
|
|||
NotificationsModel::send($uid['user_id'], $user_id, $type, $last_id, $url_answer, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Кто подписан на данный вопрос / пост
|
||||
if ($focus_all = NotificationsModel::getFocusUsersPost($post['post_id'])) {
|
||||
|
||||
|
|
|
@ -3,11 +3,8 @@
|
|||
namespace App\Controllers\Answer;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\UserModel;
|
||||
use App\Models\AnswerModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{UserModel, AnswerModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class AnswerController extends \MainController
|
||||
{
|
||||
|
@ -15,7 +12,7 @@ class AnswerController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 25;
|
||||
|
@ -50,7 +47,7 @@ class AnswerController extends \MainController
|
|||
// Ответы участника
|
||||
public function userAnswers()
|
||||
{
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
$user = UserModel::getUser($login, 'slug');
|
||||
|
||||
Base::PageError404($user);
|
||||
|
@ -80,7 +77,7 @@ class AnswerController extends \MainController
|
|||
public function addAnswerFavorite()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$answer_id = \Request::getPostInt('answer_id');
|
||||
$answer_id = Request::getPostInt('answer_id');
|
||||
$answer = AnswerModel::getAnswerId($answer_id);
|
||||
|
||||
Base::PageRedirection($answer);
|
||||
|
|
|
@ -3,20 +3,16 @@
|
|||
namespace App\Controllers\Answer;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\AnswerModel;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{AnswerModel, PostModel, UserModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class EditAnswerController extends \MainController
|
||||
{
|
||||
// Редактируем ответ
|
||||
public function index()
|
||||
{
|
||||
$answer_id = \Request::getPostInt('answer_id');
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$answer_id = Request::getPostInt('answer_id');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
$answer_content = $_POST['answer']; // не фильтруем
|
||||
|
||||
$post = PostModel::getPostId($post_id);
|
||||
|
@ -24,12 +20,9 @@ class EditAnswerController extends \MainController
|
|||
// Получим относительный url поста для возрата
|
||||
$url = '/post/' . $post['post_id'] . '/' . $post['post_slug'];
|
||||
|
||||
// id того, кто редактирует
|
||||
$uid = Base::getUid();
|
||||
$user_id = $uid['user_id'];
|
||||
|
||||
// Если пользователь забанен / заморожен
|
||||
$user = UserModel::getUser($uid['user_id'], 'id');
|
||||
// Если кто редактирует забанен / заморожен
|
||||
$uid = Base::getUid();
|
||||
$user = UserModel::getUser($uid['user_id'], 'id');
|
||||
Base::accountBan($user);
|
||||
Content::stopContentQuietМode($user);
|
||||
|
||||
|
@ -53,8 +46,8 @@ class EditAnswerController extends \MainController
|
|||
// Покажем форму
|
||||
public function edit()
|
||||
{
|
||||
$answer_id = \Request::getInt('id');
|
||||
$post_id = \Request::getInt('post_id');
|
||||
$answer_id = Request::getInt('id');
|
||||
$post_id = Request::getInt('post_id');
|
||||
$uid = Base::getUid();
|
||||
|
||||
$answer = AnswerModel::getAnswerId($answer_id);
|
||||
|
|
|
@ -3,19 +3,18 @@
|
|||
namespace App\Controllers\Auth;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\UserModel;
|
||||
use App\Models\AuthModel;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{UserModel, AuthModel};
|
||||
use Lori\{Config, Base};
|
||||
|
||||
|
||||
class LoginController extends \MainController
|
||||
{
|
||||
// Отправка запроса авторизации
|
||||
public function index()
|
||||
{
|
||||
$email = \Request::getPost('email');
|
||||
$password = \Request::getPost('password');
|
||||
$rememberMe = \Request::getPostInt('rememberme');
|
||||
$email = Request::getPost('email');
|
||||
$password = Request::getPost('password');
|
||||
$rememberMe = Request::getPostInt('rememberme');
|
||||
|
||||
$url = '/login';
|
||||
|
||||
|
@ -96,7 +95,7 @@ class LoginController extends \MainController
|
|||
'expires' => date('Y-m-d H:i:s', $expires),
|
||||
];
|
||||
|
||||
// ПРОВЕРИМ, ЕСТЬ ЛИ У ИДЕНТИФИКАТОРА ПОЛЬЗОВАТЕЛЯ УЖЕ НАБОР ТОКЕНОВ
|
||||
// Проверим, есть ли у пользователя уже набор токенов
|
||||
$result = AuthModel::getAuthTokenByUserId($user_id);
|
||||
|
||||
// Записываем
|
||||
|
|
|
@ -4,12 +4,10 @@ namespace App\Controllers\Auth;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Config, Base};
|
||||
|
||||
class RecoverController extends \MainController
|
||||
{
|
||||
|
||||
public function showPasswordForm()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
|
@ -24,7 +22,7 @@ class RecoverController extends \MainController
|
|||
|
||||
public function index()
|
||||
{
|
||||
$email = \Request::getPost('email');
|
||||
$email = Request::getPost('email');
|
||||
|
||||
if (Config::get(Config::PARAM_CAPTCHA)) {
|
||||
if (!Base::checkCaptchaCode()) {
|
||||
|
@ -68,7 +66,7 @@ class RecoverController extends \MainController
|
|||
public function showRemindForm()
|
||||
{
|
||||
// Код активации
|
||||
$code = \Request::get('code');
|
||||
$code = Request::get('code');
|
||||
|
||||
// Проверяем код
|
||||
$user_id = UserModel::getPasswordActivate($code);
|
||||
|
@ -94,9 +92,9 @@ class RecoverController extends \MainController
|
|||
|
||||
public function remindNew()
|
||||
{
|
||||
$password = \Request::getPost('password');
|
||||
$code = \Request::getPost('code');
|
||||
$user_id = \Request::getPost('user_id');
|
||||
$password = Request::getPost('password');
|
||||
$code = Request::getPost('code');
|
||||
$user_id = Request::getPost('user_id');
|
||||
|
||||
if (!$user_id) {
|
||||
return false;
|
||||
|
@ -121,7 +119,7 @@ class RecoverController extends \MainController
|
|||
public function AvtivateEmail()
|
||||
{
|
||||
// Код активации
|
||||
$code = \Request::get('code');
|
||||
$code = Request::get('code');
|
||||
|
||||
// Проверяем код
|
||||
$avtivate_email = UserModel::getEmailActivate($code);
|
||||
|
|
|
@ -3,10 +3,8 @@
|
|||
namespace App\Controllers\Auth;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\UserModel;
|
||||
use App\Models\AuthModel;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{UserModel, AuthModel};
|
||||
use Lori\{Config, Base};
|
||||
|
||||
class RegisterController extends \MainController
|
||||
{
|
||||
|
@ -33,12 +31,12 @@ class RegisterController extends \MainController
|
|||
// Отправка запроса для регистрации
|
||||
public function index()
|
||||
{
|
||||
$email = \Request::getPost('email');
|
||||
$login = \Request::getPost('login');
|
||||
$inv_code = \Request::getPost('invitation_code');
|
||||
$inv_uid = \Request::getPostInt('invitation_id');
|
||||
$password = \Request::getPost('password');
|
||||
$reg_ip = \Request::getRemoteAddress();
|
||||
$email = Request::getPost('email');
|
||||
$login = Request::getPost('login');
|
||||
$inv_code = Request::getPost('invitation_code');
|
||||
$inv_uid = Request::getPostInt('invitation_id');
|
||||
$password = Request::getPost('password');
|
||||
$reg_ip = Request::getRemoteAddress();
|
||||
|
||||
$url = $inv_code ? '/register/invite/' . $inv_code : '/register';
|
||||
|
||||
|
@ -129,7 +127,7 @@ class RegisterController extends \MainController
|
|||
public function showInviteForm()
|
||||
{
|
||||
// Код активации
|
||||
$code = \Request::get('code');
|
||||
$code = Request::get('code');
|
||||
|
||||
// Проверяем код
|
||||
$invate = UserModel::InvitationAvailable($code);
|
||||
|
|
|
@ -3,15 +3,8 @@
|
|||
namespace App\Controllers\Comment;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\NotificationsModel;
|
||||
use App\Models\ActionModel;
|
||||
use App\Models\AnswerModel;
|
||||
use App\Models\CommentModel;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{NotificationsModel, ActionModel, AnswerModel, CommentModel, PostModel, UserModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class AddCommentController extends \MainController
|
||||
{
|
||||
|
@ -19,13 +12,13 @@ class AddCommentController extends \MainController
|
|||
// Добавление комментария
|
||||
public function index()
|
||||
{
|
||||
$comment_content = \Request::getPost('comment');
|
||||
$post_id = \Request::getPostInt('post_id'); // в каком посту ответ
|
||||
$answer_id = \Request::getPostInt('answer_id'); // на какой ответ
|
||||
$comment_id = \Request::getPostInt('comment_id'); // на какой комментарий
|
||||
$comment_content = Request::getPost('comment');
|
||||
$post_id = Request::getPostInt('post_id'); // в каком посту ответ
|
||||
$answer_id = Request::getPostInt('answer_id'); // на какой ответ
|
||||
$comment_id = Request::getPostInt('comment_id'); // на какой комментарий
|
||||
|
||||
$uid = Base::getUid();
|
||||
$ip = \Request::getRemoteAddress();
|
||||
$ip = Request::getRemoteAddress();
|
||||
$post = PostModel::getPostId($post_id);
|
||||
Base::PageError404($post);
|
||||
|
||||
|
@ -80,8 +73,8 @@ class AddCommentController extends \MainController
|
|||
if ($comment_published == 0) {
|
||||
ActionModel::addAudit('comment', $uid['user_id'], $last_comment_id);
|
||||
// Оповещение админу
|
||||
$type = 15; // Упоминания в посте
|
||||
$user_id = 1; // админу
|
||||
$type = 15; // Упоминания в посте
|
||||
$user_id = 1; // админу
|
||||
NotificationsModel::send($uid['user_id'], $user_id, $type, $last_comment_id, $url_comment, 1);
|
||||
}
|
||||
|
||||
|
@ -116,15 +109,11 @@ class AddCommentController extends \MainController
|
|||
// Покажем форму
|
||||
public function add()
|
||||
{
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$answer_id = \Request::getPostInt('answer_id');
|
||||
$comment_id = \Request::getPostInt('comment_id');
|
||||
|
||||
$uid = Base::getUid();
|
||||
$data = [
|
||||
'answer_id' => $answer_id,
|
||||
'post_id' => $post_id,
|
||||
'comment_id' => $comment_id,
|
||||
'answer_id' => Request::getPostInt('answer_id'),
|
||||
'post_id' => Request::getPostInt('post_id'),
|
||||
'comment_id' => Request::getPostInt('comment_id'),
|
||||
];
|
||||
|
||||
return view(PR_VIEW_DIR . '/comment/add-form-answer-comment', ['data' => $data, 'uid' => $uid]);
|
||||
|
|
|
@ -3,11 +3,8 @@
|
|||
namespace App\Controllers\Comment;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\CommentModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{CommentModel, UserModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class CommentController extends \MainController
|
||||
{
|
||||
|
@ -15,7 +12,7 @@ class CommentController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 25;
|
||||
|
@ -50,9 +47,7 @@ class CommentController extends \MainController
|
|||
// Комментарии участника
|
||||
public function userComments()
|
||||
{
|
||||
$login = \Request::get('login');
|
||||
|
||||
// Если нет такого пользователя
|
||||
$login = Request::get('login');
|
||||
$user = UserModel::getUser($login, 'slug');
|
||||
Base::PageError404($user);
|
||||
|
||||
|
|
|
@ -3,11 +3,8 @@
|
|||
namespace App\Controllers\Comment;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\CommentModel;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Content;
|
||||
use Lori\Base;
|
||||
use App\Models\{CommentModel, PostModel, UserModel};
|
||||
use Lori\{Content, Base};
|
||||
|
||||
class EditCommentController extends \MainController
|
||||
{
|
||||
|
@ -15,9 +12,9 @@ class EditCommentController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$comment_id = \Request::getPostInt('comment_id');
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$comment_content = \Request::getPost('comment');
|
||||
$comment_id = Request::getPostInt('comment_id');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
$comment_content = Request::getPost('comment');
|
||||
|
||||
// Получим относительный url поста для возрата
|
||||
$post = PostModel::getPostId($post_id);
|
||||
|
@ -47,8 +44,8 @@ class EditCommentController extends \MainController
|
|||
// Покажем форму
|
||||
public function edit()
|
||||
{
|
||||
$comment_id = \Request::getPostInt('comment_id');
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$comment_id = Request::getPostInt('comment_id');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
$uid = Base::getUid();
|
||||
|
||||
$comment = CommentModel::getCommentsId($comment_id);
|
||||
|
|
|
@ -3,9 +3,7 @@
|
|||
namespace App\Controllers;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\FavoriteModel;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\AnswerModel;
|
||||
use App\Models\{FavoriteModel, PostModel, AnswerModel};
|
||||
use Lori\Base;
|
||||
|
||||
class FavoriteController extends \MainController
|
||||
|
@ -13,7 +11,7 @@ class FavoriteController extends \MainController
|
|||
public function index($type)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$content_id = \Request::getPostInt('content_id');
|
||||
$content_id = Request::getPostInt('content_id');
|
||||
|
||||
if ($type == 'post') {
|
||||
$content = PostModel::getPostId($content_id);
|
||||
|
|
|
@ -4,9 +4,7 @@ namespace App\Controllers;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\HomeModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class HomeController extends \MainController
|
||||
{
|
||||
|
@ -14,7 +12,7 @@ class HomeController extends \MainController
|
|||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 25;
|
||||
|
|
|
@ -2,10 +2,7 @@
|
|||
|
||||
namespace App\Controllers;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class InfoController extends \MainController
|
||||
{
|
||||
|
|
|
@ -3,17 +3,14 @@
|
|||
namespace App\Controllers;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\MessagesModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{MessagesModel, UserModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class MessagesController extends \MainController
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
$uid = Base::getUid();
|
||||
|
||||
// Ошибочный Slug в Url
|
||||
|
@ -45,7 +42,7 @@ class MessagesController extends \MainController
|
|||
$row['unread'] = $row['dialog_recipient_unread'];
|
||||
$row['count'] = $row['dialog_recipient_count'];
|
||||
|
||||
// Отправляющий AND $row['dialog_sender_count']
|
||||
// Отправляющий AND $row['dialog_sender_count']
|
||||
} else if ($row['dialog_sender_id'] == $uid['user_id']) {
|
||||
$row['unread'] = $row['dialog_sender_unread'];
|
||||
$row['count'] = $row['dialog_sender_count'];
|
||||
|
|
|
@ -3,18 +3,15 @@
|
|||
namespace App\Controllers;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\NotificationsModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{NotificationsModel, UserModel};
|
||||
use Lori\{Config, Base};
|
||||
|
||||
class NotificationsController extends \MainController
|
||||
{
|
||||
// Страница уведомлений участника
|
||||
public function index()
|
||||
{
|
||||
$login = \Request::get('login');
|
||||
|
||||
$login = Request::get('login');
|
||||
$uid = Base::getUid();
|
||||
$user = UserModel::getUser($uid['user_login'], 'slug');
|
||||
|
||||
|
@ -46,9 +43,9 @@ class NotificationsController extends \MainController
|
|||
public function read()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$notif_id = \Request::getInt('id');
|
||||
$notif_id = Request::getInt('id');
|
||||
$info = NotificationsModel::getNotification($notif_id);
|
||||
|
||||
|
||||
if ($uid['user_id'] != $info['notification_recipient_id']) {
|
||||
return false;
|
||||
}
|
||||
|
@ -59,7 +56,7 @@ class NotificationsController extends \MainController
|
|||
}
|
||||
|
||||
NotificationsModel::updateMessagesUnread($uid['user_id'], $notif_id);
|
||||
|
||||
|
||||
redirect('/' . $info['notification_url']);
|
||||
}
|
||||
|
||||
|
|
|
@ -11,10 +11,7 @@ use App\Models\WebModel;
|
|||
use App\Models\PostModel;
|
||||
use App\Models\TopicModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\UploadImage;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Content, Config, Base, UploadImage};
|
||||
use UrlRecord;
|
||||
use URLScraper;
|
||||
|
||||
|
@ -24,16 +21,16 @@ class AddPostController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
// Получаем title и содержание
|
||||
$post_title = \Request::getPost('post_title');
|
||||
$post_title = Request::getPost('post_title');
|
||||
$post_content = $_POST['post_content']; // не фильтруем
|
||||
$post_url = \Request::getPost('post_url');
|
||||
$post_closed = \Request::getPostInt('closed');
|
||||
$post_draft = \Request::getPostInt('post_draft');
|
||||
$post_top = \Request::getPostInt('top');
|
||||
$post_type = \Request::getPostInt('post_type');
|
||||
$post_translation = \Request::getPostInt('translation');
|
||||
$post_merged_id = \Request::getPostInt('post_merged_id');
|
||||
$post_tl = \Request::getPostInt('post_tl');
|
||||
$post_url = Request::getPost('post_url');
|
||||
$post_closed = Request::getPostInt('closed');
|
||||
$post_draft = Request::getPostInt('post_draft');
|
||||
$post_top = Request::getPostInt('top');
|
||||
$post_type = Request::getPostInt('post_type');
|
||||
$post_translation = Request::getPostInt('translation');
|
||||
$post_merged_id = Request::getPostInt('post_merged_id');
|
||||
$post_tl = Request::getPostInt('post_tl');
|
||||
|
||||
$related = empty($_POST['post_related']) ? '' : $_POST['post_related'];
|
||||
$post_related = empty($related) ? '' : implode(',', $related);
|
||||
|
@ -44,7 +41,7 @@ class AddPostController extends \MainController
|
|||
|
||||
// Данные кто добавляет
|
||||
$uid = Base::getUid();
|
||||
$post_ip = \Request::getRemoteAddress();
|
||||
$post_ip = Request::getRemoteAddress();
|
||||
|
||||
// Если пользователь забанен / заморожен
|
||||
$user = UserModel::getUser($uid['user_id'], 'id');
|
||||
|
@ -52,7 +49,7 @@ class AddPostController extends \MainController
|
|||
Content::stopContentQuietМode($user);
|
||||
|
||||
// Получаем информацию по пространству
|
||||
$space_id = \Request::getPostInt('space_id');
|
||||
$space_id = Request::getPostInt('space_id');
|
||||
$space = SpaceModel::getSpace($space_id, 'id');
|
||||
if (!$space) {
|
||||
Base::addMsg(lang('Select space'), 'error');
|
||||
|
@ -213,8 +210,7 @@ class AddPostController extends \MainController
|
|||
{
|
||||
$uid = Base::getUid();
|
||||
$spaces = SpaceModel::getSpaceSelect($uid['user_id'], $uid['user_trust_level']);
|
||||
|
||||
$space_id = \Request::getInt('space_id');
|
||||
$space_id = Request::getInt('space_id');
|
||||
|
||||
$data = [
|
||||
'sheet' => 'add-post',
|
||||
|
@ -241,7 +237,7 @@ class AddPostController extends \MainController
|
|||
// Парсинг
|
||||
public function grabMeta()
|
||||
{
|
||||
$url = \Request::getPost('uri');
|
||||
$url = Request::getPost('uri');
|
||||
$result = URLScraper::get($url);
|
||||
|
||||
return json_encode($result);
|
||||
|
@ -271,7 +267,7 @@ class AddPostController extends \MainController
|
|||
public function deletingAndRestoring()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$info = \Request::getPost('info');
|
||||
$info = Request::getPost('info');
|
||||
$status = preg_split('/(@)/', $info);
|
||||
$type_id = (int)$status[0]; // id конткнта
|
||||
$type = $status[1]; // тип контента
|
||||
|
|
|
@ -3,33 +3,27 @@
|
|||
namespace App\Controllers\Post;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\UserModel;
|
||||
use App\Models\SpaceModel;
|
||||
use App\Models\TopicModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\UploadImage;
|
||||
use App\Models\{PostModel, UserModel, SpaceModel, TopicModel};
|
||||
use Lori\{Content, Config, Base, UploadImage};
|
||||
|
||||
class EditPostController extends \MainController
|
||||
{
|
||||
// Изменяем пост
|
||||
public function index()
|
||||
{
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$post_title = \Request::getPost('post_title');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
$post_title = Request::getPost('post_title');
|
||||
$post_content = $_POST['post_content']; // не фильтруем
|
||||
$post_type = \Request::getPostInt('post_type');
|
||||
$post_translation = \Request::getPostInt('translation');
|
||||
$post_draft = \Request::getPostInt('post_draft');
|
||||
$post_closed = \Request::getPostInt('closed');
|
||||
$post_top = \Request::getPostInt('top');
|
||||
$post_space_id = \Request::getPostInt('space_id');
|
||||
$draft = \Request::getPost('draft');
|
||||
$post_user_new = \Request::getPost('post_user_new');
|
||||
$post_merged_id = \Request::getPostInt('post_merged_id');
|
||||
$post_tl = \Request::getPostInt('post_tl');
|
||||
$post_type = Request::getPostInt('post_type');
|
||||
$post_translation = Request::getPostInt('translation');
|
||||
$post_draft = Request::getPostInt('post_draft');
|
||||
$post_closed = Request::getPostInt('closed');
|
||||
$post_top = Request::getPostInt('top');
|
||||
$post_space_id = Request::getPostInt('space_id');
|
||||
$draft = Request::getPost('draft');
|
||||
$post_user_new = Request::getPost('post_user_new');
|
||||
$post_merged_id = Request::getPostInt('post_merged_id');
|
||||
$post_tl = Request::getPostInt('post_tl');
|
||||
|
||||
// Связанные посты и темы
|
||||
$related = empty($_POST['post_related']) ? '' : $_POST['post_related'];
|
||||
|
@ -183,7 +177,7 @@ class EditPostController extends \MainController
|
|||
// Удаление обложки
|
||||
function imgPostRemove()
|
||||
{
|
||||
$post_id = \Request::getInt('id');
|
||||
$post_id = Request::getInt('id');
|
||||
$uid = Base::getUid();
|
||||
|
||||
$post = PostModel::getPostId($post_id);
|
||||
|
|
|
@ -10,9 +10,7 @@ use App\Models\FeedModel;
|
|||
use App\Models\AnswerModel;
|
||||
use App\Models\CommentModel;
|
||||
use App\Models\FavoriteModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class PostController extends \MainController
|
||||
{
|
||||
|
@ -20,8 +18,8 @@ class PostController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$slug = \Request::get('slug');
|
||||
$post_id = \Request::getInt('id');
|
||||
$slug = Request::get('slug');
|
||||
$post_id = Request::getInt('id');
|
||||
|
||||
$post_new = PostModel::getPostId($post_id);
|
||||
|
||||
|
@ -111,7 +109,7 @@ class PostController extends \MainController
|
|||
$meta_title = strip_tags($post['post_title']) . ' — ' . strip_tags($post['space_name']) . ' | ' . Config::get(Config::PARAM_NAME);
|
||||
|
||||
if ($post['post_is_deleted'] == 1) {
|
||||
\Request::getHead()->addMeta('robots', 'noindex');
|
||||
Request::getHead()->addMeta('robots', 'noindex');
|
||||
}
|
||||
|
||||
Request::getResources()->addBottomScript('/assets/js/shares.js');
|
||||
|
@ -148,8 +146,8 @@ class PostController extends \MainController
|
|||
public function posts($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$login = \Request::get('login');
|
||||
$page = \Request::getInt('page');
|
||||
$login = Request::get('login');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
// Если нет такого пользователя
|
||||
|
@ -188,7 +186,7 @@ class PostController extends \MainController
|
|||
public function addPostProfile()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
|
||||
$post = PostModel::getPostId($post_id);
|
||||
|
||||
|
@ -211,7 +209,7 @@ class PostController extends \MainController
|
|||
public function addPostFavorite()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
$post = PostModel::getPostId($post_id);
|
||||
|
||||
Base::PageRedirection($post);
|
||||
|
@ -224,7 +222,7 @@ class PostController extends \MainController
|
|||
// Просмотр поста с титульной страницы
|
||||
public function shownPost()
|
||||
{
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
$post = PostModel::getPostId($post_id);
|
||||
|
||||
if (!$post) {
|
||||
|
|
|
@ -3,9 +3,7 @@
|
|||
namespace App\Controllers;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\NotificationsModel;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\ReportModel;
|
||||
use App\Models\{NotificationsModel, PostModel, ReportModel};
|
||||
use Lori\Base;
|
||||
|
||||
class ReportController extends \MainController
|
||||
|
@ -13,9 +11,9 @@ class ReportController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$content_type = \Request::getPost('type');
|
||||
$post_id = \Request::getPostInt('post_id');
|
||||
$content_id = \Request::getPostInt('content_id');
|
||||
$content_type = Request::getPost('type');
|
||||
$post_id = Request::getPostInt('post_id');
|
||||
$content_id = Request::getPostInt('content_id');
|
||||
|
||||
if ($uid['user_trust_level'] < 1) {
|
||||
return false;
|
||||
|
|
|
@ -3,9 +3,7 @@
|
|||
namespace App\Controllers;
|
||||
|
||||
use App\Models\RssModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class RssController extends \MainController
|
||||
{
|
||||
|
@ -25,7 +23,7 @@ class RssController extends \MainController
|
|||
|
||||
public function turboFeed()
|
||||
{
|
||||
$space_id = \Request::getInt('id');
|
||||
$space_id = Request::getInt('id');
|
||||
$space = RssModel::getSpaceId($space_id);
|
||||
Base::PageError404($space);
|
||||
|
||||
|
|
|
@ -4,9 +4,7 @@ namespace App\Controllers;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\SearchModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class SearchController extends \MainController
|
||||
{
|
||||
|
@ -14,7 +12,7 @@ class SearchController extends \MainController
|
|||
{
|
||||
if (Request::getPost()) {
|
||||
|
||||
$qa = \Request::getPost('q');
|
||||
$qa = Request::getPost('q');
|
||||
|
||||
$query = preg_replace('/[^a-zA-Zа-яА-Я0-9]/ui', '', $qa);
|
||||
|
||||
|
|
|
@ -4,8 +4,7 @@ namespace App\Controllers\Space;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\SpaceModel;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Config, Base};
|
||||
|
||||
class AddSpaceController extends \MainController
|
||||
{
|
||||
|
@ -21,13 +20,13 @@ class AddSpaceController extends \MainController
|
|||
// redirect('/');
|
||||
}
|
||||
|
||||
$space_slug = \Request::getPost('space_slug');
|
||||
$space_name = \Request::getPost('space_name');
|
||||
$space_permit = \Request::getPostInt('permit');
|
||||
$space_feed = \Request::getPostInt('feed');
|
||||
$space_tl = \Request::getPostInt('space_tl');
|
||||
$space_slug = Request::getPost('space_slug');
|
||||
$space_name = Request::getPost('space_name');
|
||||
$space_permit = Request::getPostInt('permit');
|
||||
$space_feed = Request::getPostInt('feed');
|
||||
$space_tl = Request::getPostInt('space_tl');
|
||||
|
||||
$redirect = '/space/add';
|
||||
$redirect = '/space/add';
|
||||
|
||||
Base::charset_slug($space_slug, 'URL', $redirect);
|
||||
|
||||
|
|
|
@ -2,10 +2,9 @@
|
|||
|
||||
namespace App\Controllers\Space;
|
||||
|
||||
use App\Models\SpaceModel;
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use Lori\UploadImage;
|
||||
use Lori\Base;
|
||||
use App\Models\SpaceModel;
|
||||
use Lori\{UploadImage, Base};
|
||||
|
||||
class EditSpaceController extends \MainController
|
||||
{
|
||||
|
@ -13,11 +12,11 @@ class EditSpaceController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$space_slug = \Request::getPost('space_slug');
|
||||
$space_id = \Request::getPostInt('space_id');
|
||||
$space_permit = \Request::getPostInt('permit');
|
||||
$space_feed = \Request::getPostInt('feed');
|
||||
$space_tl = \Request::getPostInt('space_tl');
|
||||
$space_slug = Request::getPost('space_slug');
|
||||
$space_id = Request::getPostInt('space_id');
|
||||
$space_permit = Request::getPostInt('permit');
|
||||
$space_feed = Request::getPostInt('feed');
|
||||
$space_tl = Request::getPostInt('space_tl');
|
||||
|
||||
$space = SpaceModel::getSpace($space_id, 'id');
|
||||
|
||||
|
@ -26,10 +25,10 @@ class EditSpaceController extends \MainController
|
|||
redirect('/');
|
||||
}
|
||||
|
||||
$space_name = \Request::getPost('space_name');
|
||||
$space_description = \Request::getPost('space_description');
|
||||
$space_text = \Request::getPost('space_text');
|
||||
$space_short_text = \Request::getPost('space_short_text');
|
||||
$space_name = Request::getPost('space_name');
|
||||
$space_description = Request::getPost('space_description');
|
||||
$space_text = Request::getPost('space_text');
|
||||
$space_short_text = Request::getPost('space_short_text');
|
||||
|
||||
$redirect = '/space/edit/' . $space['space_id'];
|
||||
|
||||
|
@ -40,7 +39,7 @@ class EditSpaceController extends \MainController
|
|||
Base::Limits($space_slug, 'URL', '3', '12', $redirect);
|
||||
Base::Limits($space_short_text, 'TEXT', '10', '250', $redirect);
|
||||
|
||||
$space_color = \Request::getPost('color');
|
||||
$space_color = Request::getPost('color');
|
||||
$space_color = empty($space_color) ? $space['space_color'] : $space_color;
|
||||
|
||||
$space_text = empty($space_text) ? '' : $space_text;
|
||||
|
@ -81,7 +80,7 @@ class EditSpaceController extends \MainController
|
|||
public function edit()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$space_id = \Request::getInt('id');
|
||||
$space_id = Request::getInt('id');
|
||||
|
||||
$space = SpaceModel::getSpace($space_id, 'id');
|
||||
|
||||
|
@ -106,7 +105,7 @@ class EditSpaceController extends \MainController
|
|||
public function logo()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$slug = \Request::get('slug');
|
||||
$slug = Request::get('slug');
|
||||
|
||||
$space = SpaceModel::getSpace($slug, 'slug');
|
||||
|
||||
|
@ -131,8 +130,8 @@ class EditSpaceController extends \MainController
|
|||
public function logoEdit()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$space_slug = \Request::getPost('space_slug');
|
||||
$space_id = \Request::getPost('space_id');
|
||||
$space_slug = Request::getPost('space_slug');
|
||||
$space_id = Request::getPost('space_id');
|
||||
|
||||
$space = SpaceModel::getSpace($space_id, 'id');
|
||||
|
||||
|
@ -165,7 +164,7 @@ class EditSpaceController extends \MainController
|
|||
public function coverRemove()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$slug = \Request::get('slug');
|
||||
$slug = Request::get('slug');
|
||||
|
||||
$space = SpaceModel::getSpace($slug, 'slug');
|
||||
|
||||
|
|
|
@ -3,12 +3,8 @@
|
|||
namespace App\Controllers\Space;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\SubscriptionModel;
|
||||
use App\Models\SpaceModel;
|
||||
use App\Models\FeedModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{SubscriptionModel, SpaceModel, FeedModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class SpaceController extends \MainController
|
||||
{
|
||||
|
@ -16,7 +12,7 @@ class SpaceController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 25;
|
||||
|
@ -28,7 +24,7 @@ class SpaceController extends \MainController
|
|||
// Введем ограничение на количество создаваемых пространств (кроме tl5)
|
||||
$sp = SpaceModel::getUserCreatedSpaces($uid['user_id']);
|
||||
$count_space = count($sp);
|
||||
$total_allowed = $uid['user_trust_level'] == 5 ? 999 : 3;
|
||||
$total_allowed = $uid['user_trust_level'] == 5 ? 999 : 3;
|
||||
$add_space_button = validTl($uid['user_trust_level'], Config::get(Config::PARAM_TL_ADD_SPACE), $count_space, $total_allowed);
|
||||
|
||||
$result = array();
|
||||
|
@ -56,7 +52,7 @@ class SpaceController extends \MainController
|
|||
public function spaseUser()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
$limit = 25;
|
||||
|
||||
|
@ -93,8 +89,8 @@ class SpaceController extends \MainController
|
|||
public function posts($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$slug = \Request::get('slug');
|
||||
$page = \Request::getInt('page');
|
||||
$slug = Request::get('slug');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$space = SpaceModel::getSpace($slug, 'slug');
|
||||
|
|
|
@ -3,16 +3,15 @@
|
|||
namespace App\Controllers;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\SubscriptionModel;
|
||||
use App\Models\SpaceModel;
|
||||
use App\Models\{SubscriptionModel, SpaceModel};
|
||||
|
||||
class SubscriptionController extends \MainController
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$account = \Request::getSession('account');
|
||||
$content_id = \Request::getPostInt('content_id');
|
||||
$type = \Request::get('type');
|
||||
$account = Request::getSession('account');
|
||||
$content_id = Request::getPostInt('content_id');
|
||||
$type = Request::get('type');
|
||||
|
||||
$user_id = $account['user_id'];
|
||||
|
||||
|
|
|
@ -3,12 +3,8 @@
|
|||
namespace App\Controllers\Topic;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\TopicModel;
|
||||
use App\Models\FeedModel;
|
||||
use App\Models\SubscriptionModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{TopicModel, FeedModel, SubscriptionModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class TopicController extends \MainController
|
||||
{
|
||||
|
@ -16,7 +12,7 @@ class TopicController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 30;
|
||||
|
@ -55,10 +51,10 @@ class TopicController extends \MainController
|
|||
public function posts($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$slug = \Request::get('slug');
|
||||
$slug = Request::get('slug');
|
||||
|
||||
$topic = TopicModel::getTopic($slug, 'slug');
|
||||
Base::PageError404($topic);
|
||||
|
@ -115,7 +111,7 @@ class TopicController extends \MainController
|
|||
// Информация по теме
|
||||
public function info()
|
||||
{
|
||||
$slug = \Request::get('slug');
|
||||
$slug = Request::get('slug');
|
||||
$uid = Base::getUid();
|
||||
|
||||
$topic = TopicModel::getTopic($slug, 'slug');
|
||||
|
|
|
@ -4,8 +4,7 @@ namespace App\Controllers\User;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\{Config, Base};
|
||||
|
||||
class InvitationsUserController extends \MainController
|
||||
{
|
||||
|
@ -27,7 +26,7 @@ class InvitationsUserController extends \MainController
|
|||
{
|
||||
// Страница участника и данные
|
||||
$uid = Base::getUid();
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
|
||||
if ($login != $uid['user_login']) {
|
||||
redirect('/u/' . $uid['user_login'] . '/invitation');
|
||||
|
@ -56,7 +55,7 @@ class InvitationsUserController extends \MainController
|
|||
// Данные участника
|
||||
$uid = Base::getUid();
|
||||
|
||||
$invitation_email = \Request::getPost('email');
|
||||
$invitation_email = Request::getPost('email');
|
||||
|
||||
$redirect = '/u/' . $uid['user_login'] . '/invitation';
|
||||
|
||||
|
|
|
@ -4,9 +4,7 @@ namespace App\Controllers\User;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use Lori\UploadImage;
|
||||
use Lori\{Config, Base, UploadImage};
|
||||
|
||||
class SettingController extends \MainController
|
||||
{
|
||||
|
@ -14,7 +12,7 @@ class SettingController extends \MainController
|
|||
function settingForm()
|
||||
{
|
||||
// Данные участника
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
$uid = Base::getUid();
|
||||
$user = UserModel::getUser($uid['user_login'], 'slug');
|
||||
|
||||
|
@ -39,13 +37,13 @@ class SettingController extends \MainController
|
|||
// Изменение профиля
|
||||
function edit()
|
||||
{
|
||||
$name = \Request::getPost('name');
|
||||
$about = \Request::getPost('about');
|
||||
$public_email = \Request::getPost('public_email');
|
||||
$name = Request::getPost('name');
|
||||
$about = Request::getPost('about');
|
||||
$public_email = Request::getPost('public_email');
|
||||
|
||||
$uid = Base::getUid();
|
||||
$redirect = '/u/' . $uid['user_login'] . '/setting';
|
||||
|
||||
|
||||
Base::Limits($name, lang('Name'), '3', '11', $redirect);
|
||||
Base::Limits($about, lang('About me'), '0', '255', $redirect);
|
||||
|
||||
|
@ -56,15 +54,15 @@ class SettingController extends \MainController
|
|||
$data = [
|
||||
'user_id' => $uid['user_id'],
|
||||
'user_name' => $name,
|
||||
'user_color' => \Request::getPostString('color', '#339900'),
|
||||
'user_color' => Request::getPostString('color', '#339900'),
|
||||
'user_about' => $about,
|
||||
'user_website' => \Request::getPostString('website', ''),
|
||||
'user_location' => \Request::getPostString('location', ''),
|
||||
'user_website' => Request::getPostString('website', ''),
|
||||
'user_location' => Request::getPostString('location', ''),
|
||||
'user_public_email' => $public_email,
|
||||
'user_skype' => \Request::getPostString('skype', ''),
|
||||
'user_twitter' => \Request::getPostString('twitter', ''),
|
||||
'user_telegram' => \Request::getPostString('telegram', ''),
|
||||
'user_vk' => \Request::getPostString('vk', ''),
|
||||
'user_skype' => Request::getPostString('skype', ''),
|
||||
'user_twitter' => Request::getPostString('twitter', ''),
|
||||
'user_telegram' => Request::getPostString('telegram', ''),
|
||||
'user_vk' => Request::getPostString('vk', ''),
|
||||
];
|
||||
|
||||
UserModel::editProfile($data);
|
||||
|
@ -77,7 +75,7 @@ class SettingController extends \MainController
|
|||
function avatarForm()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
|
||||
// Ошибочный Slug в Url
|
||||
if ($login != $uid['user_login']) {
|
||||
|
@ -101,8 +99,8 @@ class SettingController extends \MainController
|
|||
// Форма изменение пароля
|
||||
function securityForm()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$login = \Request::get('login');
|
||||
$uid = Base::getUid();
|
||||
$login = Request::get('login');
|
||||
|
||||
if ($login != $uid['user_login']) {
|
||||
redirect('/u/' . $uid['user_login'] . '/setting/security');
|
||||
|
@ -149,9 +147,9 @@ class SettingController extends \MainController
|
|||
function securityEdit()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$password = \Request::getPost('password');
|
||||
$password2 = \Request::getPost('password2');
|
||||
$password3 = \Request::getPost('password3');
|
||||
$password = Request::getPost('password');
|
||||
$password2 = Request::getPost('password2');
|
||||
$password3 = Request::getPost('password3');
|
||||
|
||||
$redirect = '/u/' . $uid['user_login'] . '/setting/security';
|
||||
if ($password2 != $password3) {
|
||||
|
@ -170,8 +168,8 @@ class SettingController extends \MainController
|
|||
}
|
||||
|
||||
// Данные участника
|
||||
$account = \Request::getSession('account');
|
||||
$userInfo = UserModel::userInfo($account['email']);
|
||||
$account = Request::getSession('account');
|
||||
$userInfo = UserModel::userInfo($account['email']);
|
||||
|
||||
if (!password_verify($password, $userInfo['password'])) {
|
||||
Base::addMsg(lang('old-password-err'), 'error');
|
||||
|
@ -188,7 +186,7 @@ class SettingController extends \MainController
|
|||
// Удаление обложки
|
||||
function userCoverRemove()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$uid = Base::getUid();
|
||||
|
||||
if ($login != $uid['user_login']) {
|
||||
redirect('/u/' . $uid['user_login'] . '/setting/avatar');
|
||||
|
|
|
@ -3,13 +3,8 @@
|
|||
namespace App\Controllers\User;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\NotificationsModel;
|
||||
use App\Models\UserModel;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\SpaceModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{NotificationsModel, UserModel, SpaceModel, PostModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class UserController extends \MainController
|
||||
{
|
||||
|
@ -17,10 +12,10 @@ class UserController extends \MainController
|
|||
function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 40;
|
||||
$limit = 42;
|
||||
$usersCount = UserModel::getUsersAllCount();
|
||||
$users = UserModel::getUsersAll($page, $limit, $uid['user_id']);
|
||||
|
||||
|
@ -44,7 +39,7 @@ class UserController extends \MainController
|
|||
// Страница участника
|
||||
function profile()
|
||||
{
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
$user = UserModel::getUser($login, 'slug');
|
||||
|
||||
// Покажем 404
|
||||
|
@ -60,10 +55,10 @@ class UserController extends \MainController
|
|||
$meta_title = sprintf(lang('title-profile'), $user['user_login'], $user['user_name'], $site_name);
|
||||
$meta_desc = sprintf(lang('desc-profile'), $user['user_login'], $user['user_about'], $site_name);
|
||||
|
||||
\Request::getHead()->addStyles('/assets/css/users.css');
|
||||
Request::getHead()->addStyles('/assets/css/users.css');
|
||||
|
||||
if ($user['user_ban_list'] == 1) {
|
||||
\Request::getHead()->addMeta('robots', 'noindex');
|
||||
Request::getHead()->addMeta('robots', 'noindex');
|
||||
}
|
||||
|
||||
// Просмотры профиля
|
||||
|
@ -106,7 +101,7 @@ class UserController extends \MainController
|
|||
function userFavorites()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
|
||||
if ($login != $uid['user_login']) {
|
||||
redirect('/u/' . $uid['user_login'] . '/favorite');
|
||||
|
@ -136,7 +131,7 @@ class UserController extends \MainController
|
|||
function userDrafts()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
|
||||
if ($login != $uid['user_login']) {
|
||||
redirect('/u/' . $uid['user_login'] . '/drafts');
|
||||
|
@ -157,7 +152,7 @@ class UserController extends \MainController
|
|||
public function preferencesPage()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$login = \Request::get('login');
|
||||
$login = Request::get('login');
|
||||
|
||||
if ($login != $uid['user_login']) {
|
||||
redirect('/u/' . $uid['user_login'] . '/preferences');
|
||||
|
@ -175,7 +170,7 @@ class UserController extends \MainController
|
|||
}
|
||||
|
||||
$data = [
|
||||
'h1' => lang('Preferences'),
|
||||
'h1' => lang('Preferences'),
|
||||
'sheet' => 'preferences',
|
||||
'meta_title' => lang('Preferences') . ' | ' . Config::get(Config::PARAM_NAME)
|
||||
];
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
namespace App\Controllers;
|
||||
|
||||
use App\Models\VotesModel;
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\VotesModel;
|
||||
|
||||
class VotesController extends \MainController
|
||||
{
|
||||
|
@ -13,8 +13,8 @@ class VotesController extends \MainController
|
|||
$account = Request::getSession('account');
|
||||
$user_id = $account['user_id'];
|
||||
|
||||
$up_id = \Request::getPostInt('up_id');
|
||||
$type = \Request::get('type');
|
||||
$up_id = Request::getPostInt('up_id');
|
||||
$type = Request::get('type');
|
||||
|
||||
$allowed = ['post', 'comment', 'answer', 'link'];
|
||||
if (!in_array($type, $allowed)) {
|
||||
|
|
|
@ -3,18 +3,15 @@
|
|||
namespace App\Controllers\Web;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use App\Models\WebModel;
|
||||
use App\Models\FeedModel;
|
||||
use Lori\Content;
|
||||
use Lori\Config;
|
||||
use Lori\Base;
|
||||
use App\Models\{WebModel, FeedModel};
|
||||
use Lori\{Content, Config, Base};
|
||||
|
||||
class WebController extends \MainController
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 25;
|
||||
|
@ -42,9 +39,9 @@ class WebController extends \MainController
|
|||
// Посты по домену
|
||||
public function posts($sheet)
|
||||
{
|
||||
$domain = \Request::get('domain');
|
||||
$domain = Request::get('domain');
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$link = WebModel::getLinkOne($domain, $uid['user_id']);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
return [
|
||||
'Home' => 'Главная',
|
||||
'To the website' => 'На сайт',
|
||||
'To the website' => 'На сайт',
|
||||
'TOP' => 'TOP',
|
||||
'Space' => 'Пространство',
|
||||
'Spaces' => 'Пространства',
|
||||
|
@ -23,7 +23,7 @@ return [
|
|||
'Post deleted' => 'Пост удален',
|
||||
'Answer deleted' => 'Ответ удален',
|
||||
'Deleted' => 'Удалено',
|
||||
'Email activated' => 'Активирован e-mail',
|
||||
'Email activated' => 'Активирован e-mail',
|
||||
'Not activated' => 'Не активирован',
|
||||
'Like' => 'Нравится',
|
||||
'Like' => 'Нравится',
|
||||
|
@ -46,7 +46,7 @@ return [
|
|||
'Edit topic' => 'Изменим тему',
|
||||
'All topics' => 'Все темы',
|
||||
'Sign in' => 'Войти',
|
||||
'Sign out' => 'Выйти',
|
||||
'Sign out' => 'Выйти',
|
||||
'Sign up' => 'Регистрация',
|
||||
'Private messages' => 'Личные сообщения',
|
||||
'It was read' => 'Было прочитано',
|
||||
|
@ -56,12 +56,12 @@ return [
|
|||
'Send' => 'Отправить',
|
||||
'To share' => 'Поделиться',
|
||||
'Information' => 'Данные',
|
||||
'Review' => 'Обзор',
|
||||
'Review' => 'Обзор',
|
||||
'Contacts' => 'Контакты',
|
||||
'City' => 'Город',
|
||||
'Remember me' => 'Запомнить меня',
|
||||
'Banned' => 'Забаненные',
|
||||
'Ban it' => 'Забанить',
|
||||
'Ban it' => 'Забанить',
|
||||
'Unban' => 'Разбанить',
|
||||
'Dumb mode' => 'Немой режим',
|
||||
'Reset' => 'Сбросить',
|
||||
|
@ -99,7 +99,7 @@ return [
|
|||
'Statistics' => 'Статистика',
|
||||
'Privacy' => 'Конфиденциальность',
|
||||
'About' => 'О нас',
|
||||
'About me' => 'О себе',
|
||||
'About me' => 'О себе',
|
||||
'Riddle' => 'Загадка',
|
||||
'Info' => 'Информация',
|
||||
'More' => 'Далее',
|
||||
|
@ -120,7 +120,7 @@ return [
|
|||
'Read more' => 'Читайте больше',
|
||||
'Signed' => 'Читаю',
|
||||
'I read space' => 'Читаю пространства',
|
||||
'To approve' => 'Одобрить',
|
||||
'To approve' => 'Одобрить',
|
||||
'Remove' => 'Удалить',
|
||||
'Recover' => 'Восстановить',
|
||||
'Download' => 'Загрузить',
|
||||
|
@ -161,7 +161,7 @@ return [
|
|||
'by default' => 'по умолчанию',
|
||||
'Just me' => 'Только я',
|
||||
'Publications' => 'Публикации',
|
||||
'Selected Post' => 'Избранный пост',
|
||||
'Selected Post' => 'Избранный пост',
|
||||
'Edit post' => 'Изменить пост',
|
||||
'Participant posts' => 'Посты участника',
|
||||
'Color' => 'Цвет',
|
||||
|
@ -191,7 +191,7 @@ return [
|
|||
'remove-favorites' => 'Убрать из закладок',
|
||||
'no-cover' => 'Нет обложки. Загрузите',
|
||||
'Add post' => 'Добавить пост',
|
||||
'Change' => 'Изменить',
|
||||
'Change' => 'Изменить',
|
||||
'Change saved' => 'Изменение сохранено',
|
||||
'Add topic' => 'Добавить тему',
|
||||
'Add tag' => 'Добавить метку',
|
||||
|
@ -202,20 +202,20 @@ return [
|
|||
'Stop word' => 'Стоп-слово',
|
||||
'Stop words no' => 'Стоп-слов нет',
|
||||
'Add a stop word' => 'Добавить стоп-слово',
|
||||
|
||||
|
||||
'Repeat the password' => 'Повторите пароль',
|
||||
'The post is closed' => 'Пост закрыт',
|
||||
'The post is closed' => 'Пост закрыт',
|
||||
'There are no posts' => 'К сожалению постов нет',
|
||||
'Forgot your password' => 'Забыли пароль',
|
||||
'There are no comments' => 'К сожалению комментариев нет',
|
||||
'Rules' => 'Правила сайта',
|
||||
'Rules' => 'Правила сайта',
|
||||
'Privacy Policy' => 'Политика конфиденциальности',
|
||||
'Restriction' => 'Ограничения',
|
||||
'privacy-desc' => 'Политика конфиденциальности сайта. Правила сайта.',
|
||||
'privacy-desc' => 'Политика конфиденциальности сайта. Правила сайта.',
|
||||
'info-desc' => 'Информация, справка. Правила, политика конфиденциальности, архив сайта и технологии.',
|
||||
'no-invate-txt' => 'Еще не пользователь? Регистрация осуществляется только по приглашению для борьбы со спамом и повышения ответственности. Если вы знаете <a href="/users">текущего пользователя</a> сайта, попросите у него приглашение.',
|
||||
|
||||
/* Дата и время + события*/
|
||||
|
||||
/* Дата и время + события*/
|
||||
'january' => 'января',
|
||||
'february' => 'февраля',
|
||||
'martha' => 'марта',
|
||||
|
@ -259,19 +259,19 @@ return [
|
|||
'restored-comment' => 'Восстановил комментарий',
|
||||
'deleted-answer' => 'Удалил ответ',
|
||||
'restored-answer' => 'Восстановил ответ',
|
||||
|
||||
|
||||
/* Настройки */
|
||||
'Setting profile' => 'Настройка профиля',
|
||||
'Setting profile' => 'Настройка профиля',
|
||||
'Setting profile page' => 'Страница настройки профиля',
|
||||
'Change avatar' => 'Изменение аватарки',
|
||||
'Change avatar' => 'Изменение аватарки',
|
||||
'Avatar' => 'Аватарка',
|
||||
'Cover art' => 'Обложка',
|
||||
'Type' => 'Тип',
|
||||
'Logo' => 'Логотип',
|
||||
'Last' => 'Последнее',
|
||||
'Logo' => 'Логотип',
|
||||
'Last' => 'Последнее',
|
||||
'Cover removed' => 'Обложка удалена',
|
||||
'Change avatar page' => 'Страница изменение аватарки',
|
||||
'Change password' => 'Изменение пароля',
|
||||
'Change avatar page' => 'Страница изменение аватарки',
|
||||
'Change password' => 'Изменение пароля',
|
||||
'Change password page' => 'Страница изменение пароля',
|
||||
'Recommended size' => 'Рекомендуемый размер',
|
||||
|
||||
|
@ -279,7 +279,7 @@ return [
|
|||
'No notifications yet' => 'Уведомлений пока нет',
|
||||
'I read' => 'Я прочитал',
|
||||
'I read' => 'Я прочитал',
|
||||
'Wrote' => 'Написал',
|
||||
'Wrote' => 'Написал',
|
||||
'Wrote a post' => 'Написал пост',
|
||||
'Wrote to you' => 'написал вам',
|
||||
'Replied to post' => 'Ответил на пост',
|
||||
|
@ -287,15 +287,15 @@ return [
|
|||
'appealed to you' => 'обратился к вам',
|
||||
'in post' => 'в посте',
|
||||
'in answer' => 'в ответе',
|
||||
'in the comment' => 'в комментарии',
|
||||
'in the comment' => 'в комментарии',
|
||||
'to your answer' => 'на ваш ответ',
|
||||
|
||||
|
||||
/* MSG */
|
||||
'text-string-length' => 'Длина %1$s должна быть от %2$s до %3$s символов',
|
||||
'text-charset-slug' => '%1$s должен содержать только латиницу, цифры',
|
||||
'titles' => 'названия',
|
||||
'descriptions' => 'описания',
|
||||
'url-already-exists' => 'Такой URL пространства уже есть',
|
||||
'url-already-exists' => 'Такой URL пространства уже есть',
|
||||
'url-gaps' => 'В URL не допускаются пробелы',
|
||||
'Select space' => 'Выберите пространство',
|
||||
'you-question-no' => 'Вы уже ответили на этот вопрос',
|
||||
|
@ -303,7 +303,7 @@ return [
|
|||
'You dont have access' => 'У вас нет доступа',
|
||||
'Access restricted' => 'Доступ ограничен',
|
||||
'Member does not exist' => 'Участника не существует',
|
||||
|
||||
|
||||
'Changes saved' => 'Изменения сохранены',
|
||||
'Invite created' => 'Инвайт создан',
|
||||
'Invalid' => 'Недопустимый',
|
||||
|
@ -317,8 +317,8 @@ return [
|
|||
'user-already' => 'Пользователь уже есть на сайте',
|
||||
'invate-to-replay' => 'Вы уже отсылали приглашение этому пользователю',
|
||||
'limit-post-day' => 'Вы исчерпали лимит постов на сегодня',
|
||||
'Registration by invite'=> 'Регистрация по инвайту',
|
||||
|
||||
'Registration by invite' => 'Регистрация по инвайту',
|
||||
|
||||
'Breaking the rules' => 'Нарушение правил',
|
||||
|
||||
/* Meta - desc */
|
||||
|
@ -337,21 +337,21 @@ return [
|
|||
'All space' => 'Все пространства',
|
||||
'all-space-desc' => 'Все пространства сообщества. Подписаться, официальные пространства, количество участников',
|
||||
'Too short' => 'Слишком короткий / длинный поисковый запрос',
|
||||
'Empty request' => 'Пустой поисковый запрос',
|
||||
'Enter' => 'Введите',
|
||||
'Empty request' => 'Пустой поисковый запрос',
|
||||
'Enter' => 'Введите',
|
||||
'Enter your password' => 'Введите пароль',
|
||||
'Enter content' => 'Введите содержание',
|
||||
'topic-desc' => 'Страница тем, расположенных в порядке популярности. Все, новые темы, популярные темы',
|
||||
|
||||
|
||||
'space-subscription' => '<a class="gray" href="/spaces">Подпишитесь на пространства и читайте их в ленте</a>',
|
||||
|
||||
|
||||
'No account available' => 'Нет учетной записи',
|
||||
'Description is formed' => 'Описание формируется',
|
||||
'Under development' => 'В стадии разработки',
|
||||
'Activity' => 'Активность',
|
||||
'The question is closed'=> 'Вопрос закрыт',
|
||||
'The question is closed' => 'Вопрос закрыт',
|
||||
'This is a draft' => 'Это черновик',
|
||||
'There are no favorites'=> 'Закладок нет',
|
||||
'There are no favorites' => 'Закладок нет',
|
||||
/* Setting */
|
||||
'info_setting' => 'Заполните ваше имя, это поможет участникам обращаться к вам по имени. <br><br> Расскажи что-нибудь о себе. У вас отличная возможность раскрыться, чтобы понравиться окружающим и показаться интересной личностью.',
|
||||
'info_avatar' => 'Загрузите аватар и обложку для своего профиля. <br><br> Когда каждый пользователь имеет уникальный аватар, следить за обсуждениями становится значительно легче!',
|
||||
|
@ -365,7 +365,7 @@ return [
|
|||
'info_space_logo' => 'От логотипа многое зависит. Он должен наиболее точно отображать тему пространства.',
|
||||
'info_login' => 'Авторизация дает вам возможность публиковать посты, отвечать, комментировать.<br><br>Вы можете голосовать за другие публикации, заполнять и редактировать профиль.',
|
||||
'info_recover' => 'После того, как нажмете кнопку «Сбросить», проверьте свой e-mail...',
|
||||
|
||||
|
||||
'info_favorite' => 'Посты, комментарии и вопросы за которыми вы следите',
|
||||
'info_preferences' => 'Посты, на которые вы подписаны. Вы будете получать уведомления о всех новых ответах',
|
||||
|
||||
|
@ -378,16 +378,16 @@ return [
|
|||
'info-url-edit' => 'Изменения в данных становятся видимыми мгновенно. Будьте внимательны!',
|
||||
'code-incorrect' => 'Код неверен, или он уже использовался. Пройдите процедуру восстановления заново.',
|
||||
'yes-email-pass' => 'Теперь вы можете использовать свой e-mail и пароль.',
|
||||
'code-used' => 'Код неверен, или он уже использовался.',
|
||||
'topic_info' => 'Страница тем, расположенных в порядке популярности.',
|
||||
|
||||
'code-used' => 'Код неверен, или он уже использовался.',
|
||||
'topic_info' => 'Страница тем, расположенных в порядке популярности.',
|
||||
|
||||
'Audit' => 'Аудит',
|
||||
'post_audit' => 'Ваш пост отправлен на модерацию.',
|
||||
'answer_audit' => 'Ваш ответ отправлен на модерацию.',
|
||||
'comment_audit' => 'Ваш комментарий отправлен на модерацию.',
|
||||
'limit_answer_day' => 'Вы исчерпали лимит ответов (10) на сегодня.',
|
||||
'limit_comment_day' => 'Вы исчерпали лимит комментариев (10) на сегодня.',
|
||||
|
||||
|
||||
'No invitations' => 'Пока нет приглашений',
|
||||
'limit_tl_invitation' => 'Ваш уровень доверия пока не позволяет использовать инвайты',
|
||||
'can send this link' => 'можно отправить эту ссылку',
|
||||
|
@ -396,17 +396,17 @@ return [
|
|||
'registered' => 'зарегистрировался',
|
||||
'Invitations left' => 'Осталось приглашений',
|
||||
'no-space-to-add' => 'У вас нет пространств для добавления поста. <a href="/spaces">Подпишитесь</a> на пространста',
|
||||
|
||||
|
||||
'limiting_mode_1' => 'Вы не можете публиковать материалы, ваш аккаунт проверяется',
|
||||
'The dialog does not exist' => 'Указанного диалога не существует',
|
||||
'The topic does not exist' => 'Указанной темы не существует',
|
||||
|
||||
|
||||
'The site is already there' => 'Такой сайт уже есть в системе',
|
||||
'Joined in the early days' => 'Присоединился в первые дни запуска сообщества',
|
||||
'The owner restricted the publication' => 'Владелец пространства ограничил публикацию',
|
||||
'The profile is being checked' => 'Ваш профиль находится на рассмотрении',
|
||||
'Ban-space-info-posts' => 'Бан пространства повлечет за собой недоступность всех постов',
|
||||
|
||||
|
||||
'nickname-replay' => 'Такой никнейм уже есть на сайте',
|
||||
'e-mail-replay' => 'Такой e-mail уже есть на сайте',
|
||||
'multiple-accounts' => 'Не регистрируйте множественные аккаунты',
|
||||
|
@ -416,14 +416,14 @@ return [
|
|||
'The code is incorrect' => 'Код неверен, или он уже использовался',
|
||||
'interesting spaces' => 'пространства, которые вам интересны',
|
||||
'format-cover-post' => 'Ширина, больше 500px. Ориентация горизонтальная',
|
||||
|
||||
|
||||
'E-mail or password is not correct' => 'E-mail или пароль не верен',
|
||||
'Your account is not activated' => 'Ваш аккаунт не активирован',
|
||||
'Your account is under review' => 'Ваш аккаунт находится на рассмотрении',
|
||||
'Invalid email address' => 'Недопустимый e-mail',
|
||||
'There is no such e-mail on the site' => 'Такого e-mail нет на сайте',
|
||||
|
||||
'New password has been sent to e-mail' => 'Новый пароль отправлен на e-mail',
|
||||
|
||||
'New password has been sent to e-mail' => 'Новый пароль отправлен на e-mail',
|
||||
'Check your e-mail to activate your account' => 'Проверьте e-mail почту для активации аккаунта',
|
||||
'tl-limitation' => 'Ваш уровень доверия (TL) не позволяет совершить это действие',
|
||||
'Who will be able to post posts' => 'Кто сможет размещать посты',
|
||||
|
|
|
@ -253,16 +253,16 @@ function pagination($pNum, $pagesCount, $sheet, $other)
|
|||
|
||||
if ($pNum != 1) {
|
||||
if (($pNum - 1) == 1) {
|
||||
$html .= '<a class="pr5 mr5" href="' . $first . '"><< '. ($pNum - 1) . '</a>';
|
||||
$html .= '<a class="pr5 mr5" href="' . $first . '"><< ' . ($pNum - 1) . '</a>';
|
||||
} else {
|
||||
$html .= '<a class="pr5 mr5" href="' . $page . '/page/'. ($pNum - 1) .'"><< '. ($pNum - 1) . '</a>';
|
||||
$html .= '<a class="pr5 mr5" href="' . $page . '/page/' . ($pNum - 1) . '"><< ' . ($pNum - 1) . '</a>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($pagesCount > $pNum) {
|
||||
$html .= '<span class="pagination-active ml5 mr5 size-15">' . ($pNum) . '</span>';
|
||||
}
|
||||
|
||||
|
||||
if ($pagesCount > $pNum) {
|
||||
if ($pagesCount > $pNum + 1) {
|
||||
$html .= '<a class="p5" href="' . $page . '/page/' . ($pNum + 1) . '"> ' . ($pNum + 1) . ' </a>';
|
||||
|
@ -345,8 +345,8 @@ function no_content($lang)
|
|||
{
|
||||
$html = '<div class="mt10 mb10 pt10 pr15 pb10 pl15 bg-lightyellow gray">
|
||||
<i class="icon-info green middle"></i>
|
||||
<span class="middle">'. lang($lang). '...</span>
|
||||
<span class="middle">' . lang($lang) . '...</span>
|
||||
</div>';
|
||||
|
||||
return $html;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,9 +2,7 @@
|
|||
|
||||
namespace Lori;
|
||||
|
||||
use App\Models\UserModel;
|
||||
use App\Models\TopicModel;
|
||||
use App\Models\SpaceModel;
|
||||
use App\Models\{UserModel, TopicModel, SpaceModel};
|
||||
use SimpleImage;
|
||||
use Lori\Base;
|
||||
|
||||
|
@ -57,7 +55,7 @@ class UploadImage
|
|||
} elseif ($type == 'space') {
|
||||
$images = SpaceModel::getSpace($content_id, 'id');
|
||||
$foto = $images['space_img'];
|
||||
} else {
|
||||
} else {
|
||||
$images = UserModel::getUser($content_id, 'id');
|
||||
$foto = $images['user_avatar'];
|
||||
}
|
||||
|
|
|
@ -114,9 +114,9 @@ class NotificationsModel extends \MainModel
|
|||
{
|
||||
$sql = "SELECT
|
||||
signed_post_id,
|
||||
signed_user_id
|
||||
signed_user_id
|
||||
FROM posts_signed
|
||||
WHERE signed_user_id' = :user_id";
|
||||
WHERE signed_user_id = :user_id";
|
||||
|
||||
return DB::run($sql, ['user_id' => $user_id])->fetchAll(PDO::FETCH_ASSOC);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Models\NotificationsModel;
|
||||
use DB;
|
||||
|
||||
class ReportModel extends \MainModel
|
||||
|
|
|
@ -80,7 +80,7 @@ class WebModel extends \MainModel
|
|||
|
||||
return DB::run($sql, ['domain' => $domain, 'user_id' => $user_id])->fetch(PDO::FETCH_ASSOC);
|
||||
}
|
||||
|
||||
|
||||
// Добавим домен
|
||||
public static function addLink($data)
|
||||
{
|
||||
|
@ -118,10 +118,10 @@ class WebModel extends \MainModel
|
|||
|
||||
return DB::run($sql, $params);
|
||||
}
|
||||
|
||||
|
||||
public static function addLinkCount($domain)
|
||||
{
|
||||
$sql = "UPDATE links SET link_count = (link_count + 1) WHERE link_url_domain = :domain";
|
||||
DB::run($sql, ['domain' => $domain]);
|
||||
DB::run($sql, ['domain' => $domain]);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ class AnswersController extends \MainController
|
|||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 100;
|
||||
|
|
|
@ -4,9 +4,7 @@ namespace Modules\Admin\Controllers;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use Modules\Admin\Models\AuditModel;
|
||||
use App\Models\PostModel;
|
||||
use App\Models\AnswerModel;
|
||||
use App\Models\CommentModel;
|
||||
use App\Models\{PostModel, AnswerModel, CommentModel};
|
||||
use Lori\Base;
|
||||
|
||||
class AuditsController extends \MainController
|
||||
|
@ -14,7 +12,7 @@ class AuditsController extends \MainController
|
|||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 55;
|
||||
|
@ -50,7 +48,7 @@ class AuditsController extends \MainController
|
|||
// Восстановление после аудита
|
||||
public function status()
|
||||
{
|
||||
$st = \Request::getPost('status');
|
||||
$st = Request::getPost('status');
|
||||
$status = preg_split('/(@)/', $st);
|
||||
// id, type
|
||||
AuditModel::recoveryAudit($status[0], $status[1]);
|
||||
|
|
|
@ -4,18 +4,17 @@ namespace Modules\Admin\Controllers;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use Modules\Admin\Models\CommentModel;
|
||||
use Lori\Content;
|
||||
use Lori\Base;
|
||||
use Lori\{Content, Base};
|
||||
|
||||
class CommentsController extends \MainController
|
||||
{
|
||||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 100;
|
||||
$limit = 100;
|
||||
$pagesCount = CommentModel::getCommentsAllCount($sheet);
|
||||
$comments = CommentModel::getCommentsAll($page, $limit, $sheet);
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace Modules\Admin\Controllers;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use Modules\Admin\Models\InvitationModel;
|
||||
use App\Models\UserModel;
|
||||
use Lori\Base;
|
||||
|
|
|
@ -4,15 +4,14 @@ namespace Modules\Admin\Controllers;
|
|||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use Modules\Admin\Models\PostModel;
|
||||
use Lori\Content;
|
||||
use Lori\Base;
|
||||
use Lori\{Content, Base};
|
||||
|
||||
class PostsController extends \MainController
|
||||
{
|
||||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 100;
|
||||
|
|
|
@ -12,7 +12,7 @@ class ReportsController extends \MainController
|
|||
public function index()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 50;
|
||||
|
@ -21,9 +21,9 @@ class ReportsController extends \MainController
|
|||
|
||||
$result = array();
|
||||
foreach ($reports as $ind => $row) {
|
||||
$row['user'] = UserModel::getUser($row['report_user_id'], 'id');
|
||||
$row['date'] = lang_date($row['report_date']);
|
||||
$result[$ind] = $row;
|
||||
$row['user'] = UserModel::getUser($row['report_user_id'], 'id');
|
||||
$row['date'] = lang_date($row['report_date']);
|
||||
$result[$ind] = $row;
|
||||
}
|
||||
|
||||
$data = [
|
||||
|
@ -39,7 +39,7 @@ class ReportsController extends \MainController
|
|||
// Ознакомился
|
||||
public function status()
|
||||
{
|
||||
$report_id = \Request::getPostInt('id');
|
||||
$report_id = Request::getPostInt('id');
|
||||
|
||||
ReportModel::setStatus($report_id);
|
||||
|
||||
|
|
|
@ -11,10 +11,10 @@ class SpacesController extends \MainController
|
|||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 25;
|
||||
$limit = 25;
|
||||
$pagesCount = SpaceModel::getSpacesCount($sheet);
|
||||
$spaces = SpaceModel::getSpaces($page, $limit, $sheet);
|
||||
|
||||
|
@ -31,7 +31,7 @@ class SpacesController extends \MainController
|
|||
// Удаление / восстановление пространства
|
||||
public function delSpace()
|
||||
{
|
||||
$space_id = \Request::getPostInt('id');
|
||||
$space_id = Request::getPostInt('id');
|
||||
|
||||
SpaceModel::SpaceDelete($space_id);
|
||||
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
namespace Modules\Admin\Controllers;
|
||||
|
||||
use Hleb\Constructor\Handlers\Request;
|
||||
use Modules\Admin\Models\UserModel;
|
||||
use Modules\Admin\Models\BadgeModel;
|
||||
use Modules\Admin\Models\{UserModel, BadgeModel};
|
||||
use App\Models\SpaceModel;
|
||||
use Lori\Base;
|
||||
|
||||
|
@ -13,7 +12,7 @@ class UsersController extends \MainController
|
|||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 50;
|
||||
|
@ -44,7 +43,7 @@ class UsersController extends \MainController
|
|||
public function logsIp()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$user_ip = \Request::get('ip');
|
||||
$user_ip = Request::get('ip');
|
||||
$user_all = UserModel::getUserLogsId($user_ip);
|
||||
|
||||
$results = array();
|
||||
|
@ -66,7 +65,7 @@ class UsersController extends \MainController
|
|||
// Бан участнику
|
||||
public function banUser()
|
||||
{
|
||||
$user_id = \Request::getPostInt('id');
|
||||
$user_id = Request::getPostInt('id');
|
||||
|
||||
UserModel::setBanUser($user_id);
|
||||
|
||||
|
@ -77,7 +76,7 @@ class UsersController extends \MainController
|
|||
public function userEditPage()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$user_id = \Request::getInt('id');
|
||||
$user_id = Request::getInt('id');
|
||||
|
||||
if (!$user = UserModel::getUser($user_id, 'id')) {
|
||||
redirect('/admin');
|
||||
|
@ -105,27 +104,27 @@ class UsersController extends \MainController
|
|||
// Редактировать участника
|
||||
public function userEdit()
|
||||
{
|
||||
$user_id = \Request::getInt('id');
|
||||
$user_id = Request::getInt('id');
|
||||
|
||||
$redirect = '/admin/users';
|
||||
if (!UserModel::getUser($user_id, 'id')) {
|
||||
redirect($redirect);
|
||||
}
|
||||
|
||||
$email = \Request::getPost('email');
|
||||
$login = \Request::getPost('login');
|
||||
$name = \Request::getPost('name');
|
||||
$about = \Request::getPost('about');
|
||||
$activated = \Request::getPostInt('activated');
|
||||
$limiting_mode = \Request::getPostInt('limiting_mode');
|
||||
$trust_level = \Request::getPostInt('trust_level');
|
||||
$website = \Request::getPost('website');
|
||||
$location = \Request::getPost('location');
|
||||
$public_email = \Request::getPost('public_email');
|
||||
$skype = \Request::getPost('skype');
|
||||
$twitter = \Request::getPost('twitter');
|
||||
$telegram = \Request::getPost('telegram');
|
||||
$vk = \Request::getPost('vk');
|
||||
$email = Request::getPost('email');
|
||||
$login = Request::getPost('login');
|
||||
$name = Request::getPost('name');
|
||||
$about = Request::getPost('about');
|
||||
$activated = Request::getPostInt('activated');
|
||||
$limiting_mode = Request::getPostInt('limiting_mode');
|
||||
$trust_level = Request::getPostInt('trust_level');
|
||||
$website = Request::getPost('website');
|
||||
$location = Request::getPost('location');
|
||||
$public_email = Request::getPost('public_email');
|
||||
$skype = Request::getPost('skype');
|
||||
$twitter = Request::getPost('twitter');
|
||||
$telegram = Request::getPost('telegram');
|
||||
$vk = Request::getPost('vk');
|
||||
|
||||
Base::Limits($login, lang('Login'), '4', '11', $redirect);
|
||||
|
||||
|
|
|
@ -11,10 +11,10 @@ class WebsController extends \MainController
|
|||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$page = \Request::getInt('page');
|
||||
$page = Request::getInt('page');
|
||||
$page = $page == 0 ? 1 : $page;
|
||||
|
||||
$limit = 25;
|
||||
$limit = 25;
|
||||
$pagesCount = WebModel::getLinksAllCount();
|
||||
$domains = WebModel::getLinksAll($page, $limit, $uid['user_id']);
|
||||
|
||||
|
@ -32,7 +32,6 @@ class WebsController extends \MainController
|
|||
public function addPage()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
|
||||
$data = [
|
||||
'meta_title' => lang('Add a website'),
|
||||
'sheet' => 'domains-add',
|
||||
|
@ -46,9 +45,9 @@ class WebsController extends \MainController
|
|||
{
|
||||
$uid = Base::getUid();
|
||||
|
||||
$link_url = \Request::getPost('link_url');
|
||||
$link_title = \Request::getPost('link_title');
|
||||
$link_content = \Request::getPost('link_content');
|
||||
$link_url = Request::getPost('link_url');
|
||||
$link_title = Request::getPost('link_title');
|
||||
$link_content = Request::getPost('link_content');
|
||||
|
||||
$parse = parse_url($link_url);
|
||||
$link_url_domain = $parse['host'];
|
||||
|
@ -83,14 +82,9 @@ class WebsController extends \MainController
|
|||
// Форма редактирование домена
|
||||
public function editPage()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
|
||||
$domain_id = \Request::getInt('id');
|
||||
|
||||
$pg = \Request::getInt('page');
|
||||
$page = (!$pg) ? 1 : $pg;
|
||||
|
||||
$domain = WebModel::getLinkId($domain_id);
|
||||
$uid = Base::getUid();
|
||||
$domain_id = Request::getInt('id');
|
||||
$domain = WebModel::getLinkId($domain_id);
|
||||
|
||||
$data = [
|
||||
'meta_title' => lang('Change the site') . ' | ' . $domain['link_url_domain'],
|
||||
|
@ -104,19 +98,18 @@ class WebsController extends \MainController
|
|||
public function edit()
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
|
||||
$link_id = \Request::getPostInt('link_id');
|
||||
$link_id = Request::getPostInt('link_id');
|
||||
|
||||
$redirect = '/web';
|
||||
if (!$link = WebModel::getLinkId($link_id)) {
|
||||
redirect($redirect);
|
||||
}
|
||||
|
||||
$link_url = \Request::getPost('link_url');
|
||||
$link_title = \Request::getPost('link_title');
|
||||
$link_content = \Request::getPost('link_content');
|
||||
$url_domain = \Request::getPost('link_domain');
|
||||
$link_status = \Request::getPostInt('link_status');
|
||||
$link_url = Request::getPost('link_url');
|
||||
$link_title = Request::getPost('link_title');
|
||||
$link_content = Request::getPost('link_content');
|
||||
$url_domain = Request::getPost('link_domain');
|
||||
$link_status = Request::getPostInt('link_status');
|
||||
|
||||
Base::Limits($link_title, lang('Title'), '24', '250', $redirect);
|
||||
Base::Limits($link_content, lang('Description'), '24', '1500', $redirect);
|
||||
|
|
|
@ -11,7 +11,7 @@ class WordsController extends \MainController
|
|||
public function index($sheet)
|
||||
{
|
||||
$uid = Base::getUid();
|
||||
$pg = \Request::getInt('page');
|
||||
$pg = Request::getInt('page');
|
||||
$page = (!$pg) ? 1 : $pg;
|
||||
|
||||
$words = WordsModel::getStopWords();
|
||||
|
@ -39,7 +39,7 @@ class WordsController extends \MainController
|
|||
// Добавление стоп-слова
|
||||
public function add()
|
||||
{
|
||||
$word = \Request::getPost('word');
|
||||
$word = Request::getPost('word');
|
||||
$data = [
|
||||
'stop_word' => $word,
|
||||
'stop_add_uid' => 1,
|
||||
|
@ -54,7 +54,7 @@ class WordsController extends \MainController
|
|||
// Удаление стоп-слова
|
||||
public function deletes()
|
||||
{
|
||||
$word_id = \Request::getPostInt('id');
|
||||
$word_id = Request::getPostInt('id');
|
||||
|
||||
WordsModel::deleteStopWord($word_id);
|
||||
|
||||
|
|
|
@ -832,25 +832,6 @@ a.tags.avtive {
|
|||
color: #fff;
|
||||
}
|
||||
|
||||
/* Info space and recommended in the post */
|
||||
.l-rec {
|
||||
font-size: 26px;
|
||||
color: rgba(48, 41, 41, 0.51);
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.l-rec-telo {
|
||||
margin-left: 42px;
|
||||
padding-top: 5px;
|
||||
line-height: 1.2;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.l-rec-telo a {
|
||||
color: #333;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
h3.recommend {
|
||||
border-bottom: 1px solid #ddd;
|
||||
padding: 12px 0 10px 0;
|
||||
|
@ -981,6 +962,22 @@ footer a.footer:hover {
|
|||
grid-template-columns: repeat(auto-fit, minmax(99%, 1fr));
|
||||
}
|
||||
|
||||
.up-box-post {
|
||||
padding: 3px 0;
|
||||
white-space: nowrap;
|
||||
width: 38px;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.green-box {
|
||||
background: #5cb379;
|
||||
}
|
||||
|
||||
.gray-box {
|
||||
background: #f1f1f1;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
/* dark */
|
||||
.dark {
|
||||
background-color: #222;
|
||||
|
@ -1040,8 +1037,7 @@ footer a.footer:hover {
|
|||
color: #919191;
|
||||
}
|
||||
|
||||
.dark a:hover,
|
||||
.dark .l-rec {
|
||||
.dark a:hover {
|
||||
color: #eee;
|
||||
}
|
||||
|
||||
|
|
|
@ -271,19 +271,20 @@
|
|||
<div class="white-box sticky recommend">
|
||||
<div class="pt5 pr15 pb5 pl15">
|
||||
<h3 class="recommend size-13"><?= lang('Recommended'); ?></h3>
|
||||
<?php $n = 0;
|
||||
foreach ($recommend as $rec_post) {
|
||||
$n++; ?>
|
||||
<div class="mb10 hidden">
|
||||
<div class="l-rec left">0<?= $n; ?></div>
|
||||
<div class="l-rec-telo">
|
||||
<a class="edit-bl" href="/post/<?= $rec_post['post_id']; ?>/<?= $rec_post['post_slug']; ?>">
|
||||
<?= $rec_post['post_title']; ?>
|
||||
</a>
|
||||
<?php if ($rec_post['post_answers_count'] != 0) { ?>
|
||||
<span class="green">+<?= $rec_post['post_answers_count'] ?></span>
|
||||
<?php foreach ($recommend as $rec_post) { ?>
|
||||
<div class="mb15 hidden flex">
|
||||
<a class="gray size-15" href="/post/<?= $rec_post['post_id']; ?>/<?= $rec_post['post_slug']; ?>">
|
||||
<?php if ($rec_post['post_answers_count'] > 0) { ?>
|
||||
<div class="up-box-post green-box size-13 center mr15">
|
||||
<?= $rec_post['post_answers_count'] ?>
|
||||
</div>
|
||||
<?php } else { ?>
|
||||
<div class="up-box-post gray-box size-13 center mr15">0</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</a>
|
||||
<a class="gray size-13" href="/post/<?= $rec_post['post_id']; ?>/<?= $rec_post['post_slug']; ?>">
|
||||
<?= $rec_post['post_title']; ?>
|
||||
</a>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue