Skip to content

Commit

Permalink
мелкие правки
Browse files Browse the repository at this point in the history
  • Loading branch information
@visavi
visavi committed Feb 19, 2018
1 parent dc5367d commit 021e40a
Show file tree
Hide file tree
Showing 21 changed files with 64 additions and 247 deletions.
32 changes: 17 additions & 15 deletions app/Controllers/Admin/RekUserController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ public function index()

$records = RekUser::query()
->where('deleted_at', '>', SITETIME)
->limit(setting('rekuserpost'))
->limit($page['limit'])
->offset($page['offset'])
->orderBy('deleted_at', 'desc')
->with('user')
->get();

return view('admin/rekuser/index', compact('records', 'page', 'total'));
Expand All @@ -51,31 +52,32 @@ public function edit($id)
$page = int(Request::input('page', 1));
$link = RekUser::query()->find($id);

if (!$link) {
abort('default', 'Ошибка! Данной ссылки не существует!');
if (! $link) {
abort('default', 'Данной ссылки не существует!');
}

if (Request::isMethod('post')) {
$token = check(Request::input('token'));
$site = check(Request::input('site'));
$name = check(Request::input('name'));
$site = check(Request::input('site'));
$name = check(Request::input('name'));
$color = check(Request::input('color'));
$bold = Request::has('bold') ? 1 : 0;
$bold = Request::has('bold') ? 1 : 0;

$validator = new Validator();
$validator->equal($token, $_SESSION['token'], 'Неверный идентификатор сессии, повторите действие!')
->regex($site, '|^https?://([а-яa-z0-9_\-\.])+(\.([а-яa-z0-9\/\-?_=#])+)+$|iu', ['site' => 'Недопустимый адрес сайта!. Разрешены символы [а-яa-z0-9_-.?=#/]!'])
->length($site, 5, 100, ['site' => 'Слишком длинный или короткий адрес ссылки!'])
->length($site, 5, 50, ['site' => 'Слишком длинный или короткий адрес ссылки!'])
->length($name, 5, 35, ['name' => 'Слишком длинное или короткое название ссылки!'])
->regex($color, '|^#+[A-f0-9]{6}$|', ['color' => 'Недопустимый формат цвета ссылки! (пример #ff0000)'], false);


if ($validator->isValid()) {
$link->site = $site;
$link->name = $name;
$link->color = $color;
$link->bold = $bold;
$link->save();

$link->update([
'site' => $site,
'name' => $name,
'color' => $color,
'bold' => $bold,
]);

saveAdvertUser();

Expand All @@ -95,9 +97,9 @@ public function edit($id)
*/
public function delete()
{
$page = int(Request::input('page', 1));
$page = int(Request::input('page', 1));
$token = check(Request::input('token'));
$del = intar(Request::input('del'));
$del = intar(Request::input('del'));

$validator = new Validator();
$validator->equal($token, $_SESSION['token'], 'Неверный идентификатор сессии, повторите действие!')
Expand Down
2 changes: 1 addition & 1 deletion app/Controllers/Admin/SpamController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function index()
->where('relate_type', $this->types[$type])
->orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('spamlist'))
->limit($page['limit'])
->with('relate.user', 'user')
->get();

Expand Down
10 changes: 5 additions & 5 deletions app/Controllers/BlogController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function blog($cid)
->where('category_id', $cid)
->orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('blogpost'))
->limit($page['limit'])
->with('user')
->get();

Expand Down Expand Up @@ -526,7 +526,7 @@ public function tags($tag = null)
->join('categories', 'blogs.category_id', '=', 'categories.id')
->orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('blogpost'))
->limit($page['limit'])
->with('user')
->get();

Expand Down Expand Up @@ -574,7 +574,7 @@ public function newArticles()
$blogs = Blog::query()
->orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('blogpost'))
->limit($page['limit'])
->with('user')
->get();

Expand Down Expand Up @@ -785,7 +785,7 @@ public function search()
->join('categories', 'blogs.category_id', '=', 'categories.id')
->orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('blogpost'))
->limit($page['limit'])
->with('user')
->get();

Expand Down Expand Up @@ -828,7 +828,7 @@ public function search()
->join('categories', 'blogs.category_id', '=', 'categories.id')
->orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('blogpost'))
->limit($page['limit'])
->with('user')
->get();

Expand Down
2 changes: 1 addition & 1 deletion app/Controllers/BookmarkController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function index()
->with('topic.user', 'topic.lastPost.user')
->orderBy('updated_at', 'desc')
->offset($page['offset'])
->limit(setting('forumtem'))
->limit($page['limit'])
->get();

return view('forum/bookmark', compact('topics', 'page'));
Expand Down
4 changes: 2 additions & 2 deletions app/Controllers/Forum/ActiveController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function themes()
$topics = Topic::query()
->where('user_id', $user->id)
->orderBy('updated_at', 'desc')
->limit(setting('forumtem'))
->limit($page['limit'])
->offset($page['offset'])
->with('forum', 'user', 'lastPost.user')
->get();
Expand All @@ -71,7 +71,7 @@ public function posts()
$posts = Post::query()
->where('user_id', $user->id)
->orderBy('created_at', 'desc')
->limit(setting('forumpost'))
->limit($page['limit'])
->offset($page['offset'])
->with('topic', 'user')
->get();
Expand Down
8 changes: 4 additions & 4 deletions app/Controllers/Forum/ForumController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public function search()
->with('lastPost.user')
->orderBy('updated_at', 'desc')
->offset($page['offset'])
->limit(setting('forumtem'))
->limit($page['limit'])
->get();

return view('forum/search_topics', compact('topics', 'page', 'find', 'type', 'where', 'section', 'period'));
Expand Down Expand Up @@ -322,7 +322,7 @@ public function search()
->with('user', 'topic')
->orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('forumpost'))
->limit($page['limit'])
->get();

return view('forum/search_posts', compact('posts', 'page', 'find', 'type', 'where', 'section', 'period'));
Expand Down Expand Up @@ -398,7 +398,7 @@ public function topThemes()
$topics = Topic::query()
->where('closed', 0)
->orderBy('posts', 'desc')
->limit(setting('forumtem'))
->limit($page['limit'])
->offset($page['offset'])
->with('forum', 'user', 'lastPost.user')
->get();
Expand All @@ -421,7 +421,7 @@ public function topPosts()

$posts = Post::query()
->orderBy('rating', 'desc')
->limit(setting('forumpost'))
->limit($page['limit'])
->offset($page['offset'])
->with('topic', 'user')
->get();
Expand Down
4 changes: 2 additions & 2 deletions app/Controllers/Forum/NewController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function themes()

$topics = Topic::query()
->orderBy('updated_at', 'desc')
->limit(setting('forumtem'))
->limit($page['limit'])
->offset($page['offset'])
->with('forum', 'user', 'lastPost.user')
->get();
Expand All @@ -54,7 +54,7 @@ public function posts()

$posts = Post::query()
->orderBy('created_at', 'desc')
->limit(setting('forumpost'))
->limit($page['limit'])
->offset($page['offset'])
->with('topic', 'user')
->get();
Expand Down
2 changes: 1 addition & 1 deletion app/Controllers/Forum/TopicController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function index($id)
})
->with('files', 'user', 'editUser')
->offset($page['offset'])
->limit(setting('forumpost'))
->limit($page['limit'])
->orderBy('created_at')
->get();

Expand Down
2 changes: 1 addition & 1 deletion app/Controllers/OnlineController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function index()
->with('user')
->orderBy('updated_at', 'desc')
->offset($page['offset'])
->limit(setting('onlinelist'))
->limit($page['limit'])
->get();

return view('pages/online', compact('online', 'page', 'all'));
Expand Down
4 changes: 2 additions & 2 deletions app/Controllers/PhotoController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function index()
$photos = Photo::query()
->orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('fotolist'))
->limit($page['limit'])
->with('user')
->get();

Expand Down Expand Up @@ -429,7 +429,7 @@ public function top()
$photos = Photo::query()
->orderBy($order, 'desc')
->offset($page['offset'])
->limit(setting('fotolist'))
->limit($page['limit'])
->with('user')
->get();

Expand Down
3 changes: 2 additions & 1 deletion app/Controllers/RekUserController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ public function index()

$adverts = RekUser::query()
->where('deleted_at', '>', SITETIME)
->limit(setting('rekuserpost'))
->limit($page['limit'])
->offset($page['offset'])
->orderBy('deleted_at', 'desc')
->with('user')
->get();

return view('reklama/index', compact('adverts', 'page'));
Expand Down
4 changes: 2 additions & 2 deletions app/modules/admin/forum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
->where('forum_id', $fid)
->orderBy('locked', 'desc')
->orderBy('updated_at', 'desc')
->limit(setting('forumtem'))
->limit($page['limit'])
->offset($page['offset'])
->with('lastPost.user')
->get();
Expand Down Expand Up @@ -751,7 +751,7 @@
})
->with('files', 'user', 'editUser')
->offset($page['offset'])
->limit(setting('forumpost'))
->limit($page['limit'])
->orderBy('created_at', 'asc')
->get();

Expand Down
2 changes: 1 addition & 1 deletion app/modules/admin/gallery.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
echo '<input type="hidden" name="token" value="'.$_SESSION['token'].'">';
$photos = Photo::orderBy('created_at', 'desc')
->offset($page['offset'])
->limit(setting('fotolist'))
->limit($page['limit'])
->with('user')
->get();

Expand Down

0 comments on commit 021e40a

Please sign in to comment.