Skip to content

Commit

Permalink
change years copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
osben committed Jul 29, 2017
1 parent dc93cc5 commit b1691f5
Show file tree
Hide file tree
Showing 87 changed files with 101 additions and 101 deletions.
2 changes: 1 addition & 1 deletion api/Blog.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Brands.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Categories.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Coupons.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Delivery.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Design.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Features.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Feedbacks.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Managers.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Money.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Notify.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Orders.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Pages.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Products.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Simpla.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Users.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion api/Variants.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion password.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion simpla/BackupAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
14 changes: 7 additions & 7 deletions simpla/BlogAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down Expand Up @@ -45,28 +45,28 @@ public function fetch()
$filter = array();
$filter['page'] = max(1, $this->request->get('page', 'integer'));
$filter['limit'] = 20;

// Поиск
$keyword = $this->request->get('keyword', 'string');
if (!empty($keyword)) {
$filter['keyword'] = $keyword;
$this->design->assign('keyword', $keyword);
}

$posts_count = $this->blog->count_posts($filter);
// Показать все страницы сразу
if ($this->request->get('page') == 'all') {
$filter['limit'] = $posts_count;
}

$posts = $this->blog->get_posts($filter);
$this->design->assign('posts_count', $posts_count);

$this->design->assign('pages_count', ceil($posts_count/$filter['limit']));
$this->design->assign('current_page', $filter['page']);

$this->design->assign('posts', $posts);

return $this->design->fetch('blog.tpl');
}
}
2 changes: 1 addition & 1 deletion simpla/BrandAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
2 changes: 1 addition & 1 deletion simpla/BrandsAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
6 changes: 3 additions & 3 deletions simpla/CategoriesAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down Expand Up @@ -41,7 +41,7 @@ public function fetch()
}
}
}

// Сортировка
$positions = $this->request->post('positions');
$ids = array_keys($positions);
Expand All @@ -54,7 +54,7 @@ public function fetch()
$categories = $this->categories->get_categories_tree();

$this->design->assign('categories', $categories);

return $this->design->fetch('categories.tpl');
}
}
2 changes: 1 addition & 1 deletion simpla/CategoryAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand Down
14 changes: 7 additions & 7 deletions simpla/CommentsAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Simpla CMS
*
* @copyright 2016 Denis Pikusov
* @copyright 2017 Denis Pikusov
* @link http://simplacms.ru
* @author Denis Pikusov
*
Expand All @@ -19,7 +19,7 @@ public function fetch()
{
$filter = array();
$filter['page'] = max(1, $this->request->get('page', 'integer'));

$filter['limit'] = 40;

// Тип
Expand All @@ -39,7 +39,7 @@ public function fetch()

// Обработка действий
if ($this->request->method('post')) {

// Действия с выбранными
$ids = $this->request->post('check');
if (!empty($ids) && is_array($ids)) {
Expand Down Expand Up @@ -69,7 +69,7 @@ public function fetch()
$filter['limit'] = $comments_count;
}
$comments = $this->comments->get_comments($filter);

// Выбирает объекты, которые прокомментированы:
$products_ids = array();
$posts_ids = array();
Expand All @@ -90,7 +90,7 @@ public function fetch()
foreach ($this->blog->get_posts(array('id'=>$posts_ids)) as $p) {
$posts[$p->id] = $p;
}

foreach ($comments as &$comment) {
if ($comment->type == 'product' && isset($products[$comment->object_id])) {
$comment->product = $products[$comment->object_id];
Expand All @@ -99,8 +99,8 @@ public function fetch()
$comment->post = $posts[$comment->object_id];
}
}


$this->design->assign('pages_count', ceil($comments_count/$filter['limit']));
$this->design->assign('current_page', $filter['page']);

Expand Down
Loading

0 comments on commit b1691f5

Please sign in to comment.