diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e48ec1..16d76a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ Changelog ========= +## 1.1.0 (2023-06-29) + * Update copyrights, fix nav menu + ## 1.0.12 (2020-06-28) * Update dependencies, README.md diff --git a/LICENSE b/LICENSE index 4ff35d5..92279d7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 - 2020 W.D.M.Group, Ukraine +Copyright (c) 2019 - 2023 W.D.M.Group, Ukraine Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Module.php b/Module.php index 1899e6e..9de34a1 100644 --- a/Module.php +++ b/Module.php @@ -6,14 +6,15 @@ * Yii2 Redirects * * @category Module - * @version 1.0.12 + * @version 1.1.0 * @author Alexsander Vyshnyvetskyy * @link https://github.com/wdmg/yii2-redirects - * @copyright Copyright (c) 2019 - 2021 W.D.M.Group, Ukraine + * @copyright Copyright (c) 2019 - 2023 W.D.M.Group, Ukraine * @license https://opensource.org/licenses/MIT Massachusetts Institute of Technology (MIT) License * */ +use wdmg\helpers\ArrayHelper; use Yii; use wdmg\base\BaseModule; @@ -57,7 +58,7 @@ class Module extends BaseModule /** * @var string the module version */ - private $version = "1.0.12"; + private $version = "1.1.0"; /** * @var integer, priority of initialization @@ -82,7 +83,7 @@ public function init() /** * {@inheritdoc} */ - public function dashboardNavItems($options = false) + public function dashboardNavItems($options = null) { $items = [ 'label' => $this->name, @@ -90,7 +91,20 @@ public function dashboardNavItems($options = false) 'icon' => 'fa fa-fw fa-exchange-alt', 'active' => in_array(\Yii::$app->controller->module->id, [$this->id]) ]; - return $items; + + if (!is_null($options)) { + + if (isset($options['count'])) { + $items['label'] .= '' . $options['count'] . ''; + unset($options['count']); + } + + if (is_array($options)) + $items = ArrayHelper::merge($items, $options); + + } + + return $items; } /** diff --git a/README.md b/README.md index cdd8bfc..22f1419 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.40-blue.svg)](https://packagist.org/packages/yiisoft/yii2) +[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.35-blue.svg)](https://packagist.org/packages/yiisoft/yii2) [![Downloads](https://img.shields.io/packagist/dt/wdmg/yii2-redirects.svg)](https://packagist.org/packages/wdmg/yii2-redirects) [![Packagist Version](https://img.shields.io/packagist/v/wdmg/yii2-redirects.svg)](https://packagist.org/packages/wdmg/yii2-redirects) ![Progress](https://img.shields.io/badge/progress-ready_to_use-green.svg) @@ -11,11 +11,11 @@ Redirects module for Yii2. This module is an integral part of the [Butterfly.СMS](https://butterflycms.com/) content management system, but can also be used as an standalone extension. -Copyrights (c) 2019-2021 [W.D.M.Group, Ukraine](https://wdmg.com.ua/) +Copyrights (c) 2019-2023 [W.D.M.Group, Ukraine](https://wdmg.com.ua/) # Requirements * PHP 5.6 or higher -* Yii2 v.2.0.40 and newest +* Yii2 v.2.0.35 and newest * [Yii2 Base](https://github.com/wdmg/yii2-base) module (required) * [Yii2 SelectInput](https://github.com/wdmg/yii2-selectinput) widget @@ -76,11 +76,7 @@ Use the `Module::dashboardNavItems()` method of the module to generate a navigat ?> # Status and version [ready to use] +* v.1.1.0 - Update copyrights, fix nav menu * v.1.0.12 - Update dependencies, README.md * v.1.0.11 - Added log activity, fixed check for redirection -* v.1.0.10 - Update dependencies, fixed migrations -* v.1.0.9 - Added pagination, up to date dependencies -* v.1.0.8 - Migrations bugfix -* v.1.0.7 - Added allowExternal option for add absolute URL -* v.1.0.6 - Fixed deprecated class declaration -* v.1.0.5 - Fixing redirects model rules and redirect component \ No newline at end of file +* v.1.0.10 - Update dependencies, fixed migrations \ No newline at end of file diff --git a/commands/InitController.php b/commands/InitController.php index 81542f8..d23f06b 100644 --- a/commands/InitController.php +++ b/commands/InitController.php @@ -34,7 +34,7 @@ public function actionIndex($params = null) '║ ║'. "\n" . '║ REDIRECTS MODULE, v.'.$version.' ║'. "\n" . '║ by Alexsander Vyshnyvetskyy ║'. "\n" . - '║ (c) 2019-2021 W.D.M.Group, Ukraine ║'. "\n" . + '║ (c) 2019-2023 W.D.M.Group, Ukraine ║'. "\n" . '║ ║'. "\n" . '╚════════════════════════════════════════════════╝'; echo $name = $this->ansiFormat($welcome . "\n\n", Console::FG_GREEN); diff --git a/components/Redirects.php b/components/Redirects.php index 1985ee7..8e668e4 100644 --- a/components/Redirects.php +++ b/components/Redirects.php @@ -53,7 +53,7 @@ public function check($url, $setRedirect = true) $this->request_url = $url; if ($this->model && $this->request_url) { - $redirect = $this->model::findOne(['request_url' => $this->request_url, 'is_active' => true]); + $redirect = $this->model->findOne(['request_url' => $this->request_url, 'is_active' => true]); if ($redirect !== null) { if ($setRedirect) return Yii::$app->response->redirect(\yii\helpers\Url::to($redirect->redirect_url), $redirect->code); diff --git a/composer.json b/composer.json index f478140..6ea55de 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "keywords": ["yii2", "yii2-redirects", "redirects", "redirect", "wdmg"], "type": "yii2-extension", "license": "MIT", - "version": "1.0.12", + "version": "1.1.0", "homepage": "https://github.com/wdmg/yii2-redirects", "support": { "source": "https://github.com/wdmg/yii2-redirects",