diff --git a/common/config/main.php b/common/config/main.php index 7bc58c3..cd04470 100755 --- a/common/config/main.php +++ b/common/config/main.php @@ -29,7 +29,7 @@ 'reCaptcha' => [ 'name' => 'reCaptcha', - 'class' => 'sashsvamir\yii2\recaptcha\ReCaptcha', + 'class' => 'himiklab\yii2\recaptcha\ReCaptcha', 'siteKey' => '6LcZcmQUAAAAANF1TashIYAvYtTBCscpTlPe1q6T', 'secret' => '6LcZcmQUAAAAAFH4Ru4S6QnmB3An3PJWglmV', ], diff --git a/composer.json b/composer.json index 7713c33..6135fe3 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,9 @@ "minimum-stability": "RC", "require": { "php": ">=7.0", - "artweb/artbox-core": ">0.0.10", - "sashsvamir/yii2-recaptcha-widget": "dev-master" + "artweb/artbox-core" : ">0.0.10", + "himiklab/yii2-recaptcha-widget": "*" + }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", diff --git a/composer.lock b/composer.lock index 601c42f..4a60fc5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9a6e92d2cba1e4da99f27abd0a2ae4f3", - "content-hash": "f335aaff8ec5703aad48c3b2fd89b0c1", + "content-hash": "46c28e5733466f00f8bfe25c3564e1aa", "packages": [ { "name": "2amigos/yii2-tinymce-widget", @@ -65,7 +64,7 @@ "yii 2", "yii2" ], - "time": "2017-06-09 14:12:14" + "time": "2017-06-09T14:12:14+00:00" }, { "name": "artweb/artbox-core", @@ -126,7 +125,7 @@ "BSD-3-Clause" ], "description": "Artbox core extension", - "time": "2018-05-21 12:55:30" + "time": "2018-05-21T12:55:30+00:00" }, { "name": "bower-asset/amcharts", @@ -538,7 +537,7 @@ "markdown", "markdown-extra" ], - "time": "2017-07-16 21:13:23" + "time": "2017-07-16T21:13:23+00:00" }, { "name": "container-interop/container-interop", @@ -569,7 +568,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14 19:40:03" + "time": "2017-02-14T19:40:03+00:00" }, { "name": "doctrine/lexer", @@ -623,7 +622,7 @@ "lexer", "parser" ], - "time": "2014-09-09 13:34:57" + "time": "2014-09-09T13:34:57+00:00" }, { "name": "egulias/email-validator", @@ -680,7 +679,7 @@ "validation", "validator" ], - "time": "2018-04-10 10:11:19" + "time": "2018-04-10T10:11:19+00:00" }, { "name": "ezyang/htmlpurifier", @@ -727,7 +726,7 @@ "keywords": [ "html" ], - "time": "2018-02-23 01:58:20" + "time": "2018-02-23T01:58:20+00:00" }, { "name": "firebase/php-jwt", @@ -773,7 +772,7 @@ ], "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", "homepage": "https://github.com/firebase/php-jwt", - "time": "2017-06-27 22:17:23" + "time": "2017-06-27T22:17:23+00:00" }, { "name": "fortawesome/font-awesome", @@ -821,7 +820,7 @@ "font", "icon" ], - "time": "2016-10-24 15:52:54" + "time": "2016-10-24T15:52:54+00:00" }, { "name": "google/apiclient", @@ -880,7 +879,7 @@ "keywords": [ "google" ], - "time": "2017-11-03 01:19:53" + "time": "2017-11-03T01:19:53+00:00" }, { "name": "google/apiclient-services", @@ -917,7 +916,7 @@ "keywords": [ "google" ], - "time": "2018-05-19 00:23:51" + "time": "2018-05-19T00:23:51+00:00" }, { "name": "google/auth", @@ -964,7 +963,7 @@ "google", "oauth2" ], - "time": "2018-04-06 19:26:30" + "time": "2018-04-06T19:26:30+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1029,7 +1028,7 @@ "rest", "web service" ], - "time": "2018-04-22 15:46:56" + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", @@ -1080,7 +1079,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20 10:07:11" + "time": "2016-12-20T10:07:11+00:00" }, { "name": "guzzlehttp/psr7", @@ -1145,7 +1144,51 @@ "uri", "url" ], - "time": "2017-03-20 17:10:46" + "time": "2017-03-20T17:10:46+00:00" + }, + { + "name": "himiklab/yii2-recaptcha-widget", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/himiklab/yii2-recaptcha-widget.git", + "reference": "cc8a023bf51db3b40f1b8532cd94fc00c532edf5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/himiklab/yii2-recaptcha-widget/zipball/cc8a023bf51db3b40f1b8532cd94fc00c532edf5", + "reference": "cc8a023bf51db3b40f1b8532cd94fc00c532edf5", + "shasum": "" + }, + "require": { + "yiisoft/yii2": "~2.0.11", + "yiisoft/yii2-httpclient": "*" + }, + "type": "yii2-extension", + "autoload": { + "psr-4": { + "himiklab\\yii2\\recaptcha\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "HimikLab", + "homepage": "https://github.com/himiklab/" + } + ], + "description": "Yii2 Google reCAPTCHA widget", + "keywords": [ + "captcha", + "google", + "recaptcha", + "widget", + "yii2" + ], + "time": "2018-07-03T13:34:52+00:00" }, { "name": "hiqdev/yii2-asset-icheck", @@ -1217,7 +1260,7 @@ "iCheck", "yii2" ], - "time": "2016-03-30 10:59:26" + "time": "2016-03-30T10:59:26+00:00" }, { "name": "hiqdev/yii2-asset-pnotify", @@ -1279,7 +1322,7 @@ "pnotify", "yii2" ], - "time": "2015-09-09 15:16:38" + "time": "2015-09-09T15:16:38+00:00" }, { "name": "imagine/imagine", @@ -1337,7 +1380,7 @@ "image manipulation", "image processing" ], - "time": "2017-05-16 10:31:22" + "time": "2017-05-16T10:31:22+00:00" }, { "name": "intervention/httpauth", @@ -1390,7 +1433,7 @@ "http", "laravel" ], - "time": "2017-06-28 17:37:25" + "time": "2017-06-28T17:37:25+00:00" }, { "name": "kartik-v/bootstrap-fileinput", @@ -1443,7 +1486,7 @@ "progress", "upload" ], - "time": "2018-04-11 10:34:10" + "time": "2018-04-11T10:34:10+00:00" }, { "name": "kartik-v/yii2-krajee-base", @@ -1494,7 +1537,7 @@ "widget", "yii2" ], - "time": "2017-09-29 06:18:14" + "time": "2017-09-29T06:18:14+00:00" }, { "name": "kartik-v/yii2-widget-colorinput", @@ -1548,7 +1591,7 @@ "widget", "yii2" ], - "time": "2016-01-14 11:15:49" + "time": "2016-01-14T11:15:49+00:00" }, { "name": "kartik-v/yii2-widget-datepicker", @@ -1602,7 +1645,7 @@ "widget", "yii2" ], - "time": "2017-09-04 03:28:47" + "time": "2017-09-04T03:28:47+00:00" }, { "name": "kartik-v/yii2-widget-fileinput", @@ -1657,7 +1700,7 @@ "widget", "yii2" ], - "time": "2017-05-25 20:12:30" + "time": "2017-05-25T20:12:30+00:00" }, { "name": "kartik-v/yii2-widget-select2", @@ -1710,7 +1753,7 @@ "widget", "yii2" ], - "time": "2017-11-25 06:02:18" + "time": "2017-11-25T06:02:18+00:00" }, { "name": "monolog/monolog", @@ -1788,7 +1831,7 @@ "logging", "psr-3" ], - "time": "2017-06-19 01:22:40" + "time": "2017-06-19T01:22:40+00:00" }, { "name": "mrclay/jsmin-php", @@ -1840,7 +1883,7 @@ "jsmin", "minify" ], - "time": "2015-03-30 15:04:42" + "time": "2015-03-30T15:04:42+00:00" }, { "name": "mrclay/minify", @@ -1902,7 +1945,7 @@ ], "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers", "homepage": "https://github.com/mrclay/minify", - "time": "2017-11-03 21:00:15" + "time": "2017-11-03T21:00:15+00:00" }, { "name": "mrclay/props-dic", @@ -1954,7 +1997,7 @@ "di", "di container" ], - "time": "2016-02-10 18:59:20" + "time": "2016-02-10T18:59:20+00:00" }, { "name": "natxet/CssMin", @@ -2001,7 +2044,7 @@ "css", "minify" ], - "time": "2018-01-09 11:15:01" + "time": "2018-01-09T11:15:01+00:00" }, { "name": "noam148/yii2-image-manager", @@ -2050,7 +2093,7 @@ "widget", "yii2" ], - "time": "2018-02-18 20:13:22" + "time": "2018-02-18T20:13:22+00:00" }, { "name": "noam148/yii2-image-resize", @@ -2096,7 +2139,7 @@ "resize", "yii2" ], - "time": "2018-02-18 19:23:04" + "time": "2018-02-18T19:23:04+00:00" }, { "name": "phpseclib/phpseclib", @@ -2188,7 +2231,7 @@ "x.509", "x509" ], - "time": "2018-04-15 16:55:05" + "time": "2018-04-15T16:55:05+00:00" }, { "name": "pimple/pimple", @@ -2238,7 +2281,7 @@ "container", "dependency injection" ], - "time": "2018-01-21 07:42:36" + "time": "2018-01-21T07:42:36+00:00" }, { "name": "psr/cache", @@ -2284,7 +2327,7 @@ "psr", "psr-6" ], - "time": "2016-08-06 20:24:11" + "time": "2016-08-06T20:24:11+00:00" }, { "name": "psr/container", @@ -2333,7 +2376,7 @@ "container-interop", "psr" ], - "time": "2017-02-14 16:28:37" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/http-message", @@ -2383,7 +2426,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -2430,7 +2473,7 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "rmrevin/yii2-fontawesome", @@ -2482,51 +2525,7 @@ "font", "yii" ], - "time": "2017-01-11 14:05:47" - }, - { - "name": "sashsvamir/yii2-recaptcha-widget", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sashsvamir/yii2-recaptcha-widget.git", - "reference": "3daa1b48d99839807c0bf520bb2660d43ed83446" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sashsvamir/yii2-recaptcha-widget/zipball/3daa1b48d99839807c0bf520bb2660d43ed83446", - "reference": "3daa1b48d99839807c0bf520bb2660d43ed83446", - "shasum": "" - }, - "require": { - "himiklab/yii2-recaptcha-widget": "1.0.6", - "yiisoft/yii2": "*" - }, - "type": "yii2-extension", - "autoload": { - "psr-4": { - "sashsvamir\\yii2\\recaptcha\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "sashsvamir", - "homepage": "https://github.com/sashsvamir/" - } - ], - "description": "Yii2 Google reCAPTCHA widget", - "keywords": [ - "captcha", - "google", - "recaptcha", - "widget", - "yii2" - ], - "time": "2018-01-24 10:27:21" + "time": "2017-01-11T14:05:47+00:00" }, { "name": "skeeks/yii2-assets-auto-compress", @@ -2583,7 +2582,7 @@ "skeeks", "yii" ], - "time": "2018-04-04 08:44:24" + "time": "2018-04-04T08:44:24+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -2638,7 +2637,7 @@ "mail", "mailer" ], - "time": "2017-09-30 22:39:41" + "time": "2017-09-30T22:39:41+00:00" }, { "name": "tedivm/jshrink", @@ -2684,7 +2683,7 @@ "javascript", "minifier" ], - "time": "2017-12-08 00:59:56" + "time": "2017-12-08T00:59:56+00:00" }, { "name": "tinymce/tinymce", @@ -2730,7 +2729,7 @@ "tinymce", "wysiwyg" ], - "time": "2018-05-16 04:27:27" + "time": "2018-05-16T04:27:27+00:00" }, { "name": "tubalmartin/cssmin", @@ -2783,7 +2782,7 @@ "minify", "yui" ], - "time": "2018-01-15 15:26:51" + "time": "2018-01-15T15:26:51+00:00" }, { "name": "yii2tech/ar-linkmany", @@ -2834,7 +2833,7 @@ "relaton", "yii2" ], - "time": "2018-02-09 14:02:04" + "time": "2018-02-09T14:02:04+00:00" }, { "name": "yii2tech/ar-position", @@ -2883,7 +2882,7 @@ "sort", "yii2" ], - "time": "2017-11-01 10:56:01" + "time": "2017-11-01T10:56:01+00:00" }, { "name": "yii2tech/ar-variation", @@ -2937,7 +2936,7 @@ "variator", "yii2" ], - "time": "2018-04-09 08:43:38" + "time": "2018-04-09T08:43:38+00:00" }, { "name": "yii2tech/filedb", @@ -2985,7 +2984,7 @@ "static", "yii2" ], - "time": "2018-04-09 08:12:49" + "time": "2018-04-09T08:12:49+00:00" }, { "name": "yiisoft/yii2", @@ -3085,7 +3084,7 @@ "framework", "yii2" ], - "time": "2018-03-21 18:36:53" + "time": "2018-03-21T18:36:53+00:00" }, { "name": "yiisoft/yii2-bootstrap", @@ -3145,7 +3144,7 @@ "bootstrap", "yii2" ], - "time": "2018-02-16 10:41:52" + "time": "2018-02-16T10:41:52+00:00" }, { "name": "yiisoft/yii2-composer", @@ -3199,7 +3198,7 @@ "extension installer", "yii2" ], - "time": "2018-03-21 16:15:55" + "time": "2018-03-21T16:15:55+00:00" }, { "name": "yiisoft/yii2-httpclient", @@ -3246,7 +3245,7 @@ "httpclient", "yii2" ], - "time": "2018-02-13 15:11:30" + "time": "2018-02-13T15:11:30+00:00" }, { "name": "yiisoft/yii2-imagine", @@ -3294,7 +3293,7 @@ "imagine", "yii2" ], - "time": "2018-02-22 11:57:06" + "time": "2018-02-22T11:57:06+00:00" }, { "name": "yiisoft/yii2-jui", @@ -3340,7 +3339,7 @@ "jQuery UI", "yii2" ], - "time": "2017-11-25 15:32:29" + "time": "2017-11-25T15:32:29+00:00" }, { "name": "yiisoft/yii2-swiftmailer", @@ -3390,7 +3389,7 @@ "swiftmailer", "yii2" ], - "time": "2018-04-24 23:17:42" + "time": "2018-04-24T23:17:42+00:00" }, { "name": "yiister/yii2-gentelella", @@ -3448,7 +3447,7 @@ "theme", "yii2" ], - "time": "2017-11-12 16:49:22" + "time": "2017-11-12T16:49:22+00:00" } ], "packages-dev": [ @@ -3509,7 +3508,7 @@ "gherkin", "parser" ], - "time": "2017-08-30 11:04:43" + "time": "2017-08-30T11:04:43+00:00" }, { "name": "bower-asset/typeahead.js", @@ -3617,7 +3616,7 @@ "functional testing", "unit testing" ], - "time": "2018-03-31 22:36:34" + "time": "2018-03-31T22:36:34+00:00" }, { "name": "codeception/phpunit-wrapper", @@ -3660,7 +3659,7 @@ } ], "description": "PHPUnit classes used by Codeception", - "time": "2018-05-22 09:20:59" + "time": "2018-05-22T09:20:59+00:00" }, { "name": "codeception/stub", @@ -3693,7 +3692,7 @@ "MIT" ], "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", - "time": "2018-05-17 09:31:08" + "time": "2018-05-17T09:31:08+00:00" }, { "name": "codeception/verify", @@ -3729,7 +3728,7 @@ } ], "description": "BDD assertion library for PHPUnit", - "time": "2017-01-09 10:58:51" + "time": "2017-01-09T10:58:51+00:00" }, { "name": "doctrine/instantiator", @@ -3783,7 +3782,7 @@ "constructor", "instantiate" ], - "time": "2017-07-22 11:58:36" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "fzaninotto/faker", @@ -3833,7 +3832,7 @@ "faker", "fixtures" ], - "time": "2017-08-15 16:48:10" + "time": "2017-08-15T16:48:10+00:00" }, { "name": "myclabs/deep-copy", @@ -3878,7 +3877,7 @@ "object", "object graph" ], - "time": "2017-10-19 19:58:43" + "time": "2017-10-19T19:58:43+00:00" }, { "name": "phar-io/manifest", @@ -3933,7 +3932,7 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05 18:14:27" + "time": "2017-03-05T18:14:27+00:00" }, { "name": "phar-io/version", @@ -3980,7 +3979,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2017-03-05 17:38:23" + "time": "2017-03-05T17:38:23+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -4034,7 +4033,7 @@ "reflection", "static analysis" ], - "time": "2017-09-11 18:02:19" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -4085,7 +4084,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30 07:14:17" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -4132,7 +4131,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14 14:27:02" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/php-diff", @@ -4170,7 +4169,7 @@ } ], "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).", - "time": "2016-04-07 12:29:16" + "time": "2016-04-07T12:29:16+00:00" }, { "name": "phpspec/prophecy", @@ -4233,7 +4232,7 @@ "spy", "stub" ], - "time": "2018-04-18 13:57:24" + "time": "2018-04-18T13:57:24+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4296,7 +4295,7 @@ "testing", "xunit" ], - "time": "2018-04-29 14:59:09" + "time": "2018-04-29T14:59:09+00:00" }, { "name": "phpunit/php-file-iterator", @@ -4343,7 +4342,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27 13:52:08" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -4384,7 +4383,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -4433,7 +4432,7 @@ "keywords": [ "timer" ], - "time": "2018-02-01 13:07:23" + "time": "2018-02-01T13:07:23+00:00" }, { "name": "phpunit/php-token-stream", @@ -4482,7 +4481,7 @@ "keywords": [ "tokenizer" ], - "time": "2018-02-01 13:16:43" + "time": "2018-02-01T13:16:43+00:00" }, { "name": "phpunit/phpunit", @@ -4562,7 +4561,7 @@ "testing", "xunit" ], - "time": "2018-04-29 15:09:19" + "time": "2018-04-29T15:09:19+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -4618,7 +4617,7 @@ "mock", "xunit" ], - "time": "2018-04-11 04:50:36" + "time": "2018-04-11T04:50:36+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4663,7 +4662,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04 06:30:41" + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", @@ -4727,7 +4726,7 @@ "compare", "equality" ], - "time": "2018-04-18 13:33:00" + "time": "2018-04-18T13:33:00+00:00" }, { "name": "sebastian/diff", @@ -4783,7 +4782,7 @@ "unidiff", "unified diff" ], - "time": "2018-02-01 13:45:15" + "time": "2018-02-01T13:45:15+00:00" }, { "name": "sebastian/environment", @@ -4833,7 +4832,7 @@ "environment", "hhvm" ], - "time": "2017-07-01 08:51:00" + "time": "2017-07-01T08:51:00+00:00" }, { "name": "sebastian/exporter", @@ -4900,7 +4899,7 @@ "export", "exporter" ], - "time": "2017-04-03 13:19:02" + "time": "2017-04-03T13:19:02+00:00" }, { "name": "sebastian/global-state", @@ -4951,7 +4950,7 @@ "keywords": [ "global state" ], - "time": "2017-04-27 15:39:26" + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", @@ -4998,7 +4997,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03 12:35:26" + "time": "2017-08-03T12:35:26+00:00" }, { "name": "sebastian/object-reflector", @@ -5043,7 +5042,7 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29 09:07:27" + "time": "2017-03-29T09:07:27+00:00" }, { "name": "sebastian/recursion-context", @@ -5096,7 +5095,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03 06:23:57" + "time": "2017-03-03T06:23:57+00:00" }, { "name": "sebastian/resource-operations", @@ -5138,7 +5137,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -5181,7 +5180,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/browser-kit", @@ -5238,7 +5237,7 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2018-03-19 22:35:49" + "time": "2018-03-19T22:35:49+00:00" }, { "name": "symfony/console", @@ -5306,7 +5305,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-05-16 09:05:32" + "time": "2018-05-16T09:05:32+00:00" }, { "name": "symfony/css-selector", @@ -5359,7 +5358,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-05-11 15:58:37" + "time": "2018-05-11T15:58:37+00:00" }, { "name": "symfony/dom-crawler", @@ -5416,7 +5415,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-05-01 23:00:51" + "time": "2018-05-01T23:00:51+00:00" }, { "name": "symfony/event-dispatcher", @@ -5479,7 +5478,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-04-06 07:35:43" + "time": "2018-04-06T07:35:43+00:00" }, { "name": "symfony/finder", @@ -5528,7 +5527,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-05-16 09:05:32" + "time": "2018-05-16T09:05:32+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5583,7 +5582,7 @@ "polyfill", "portable" ], - "time": "2018-04-30 19:57:29" + "time": "2018-04-30T19:57:29+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -5642,7 +5641,7 @@ "portable", "shim" ], - "time": "2018-04-26 10:06:28" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/yaml", @@ -5701,7 +5700,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-05-07 07:12:24" + "time": "2018-05-07T07:12:24+00:00" }, { "name": "theseer/tokenizer", @@ -5741,7 +5740,7 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2017-04-07 12:08:54" + "time": "2017-04-07T12:08:54+00:00" }, { "name": "webmozart/assert", @@ -5791,7 +5790,7 @@ "check", "validate" ], - "time": "2018-01-29 19:49:41" + "time": "2018-01-29T19:49:41+00:00" }, { "name": "yiisoft/yii2-debug", @@ -5838,7 +5837,7 @@ "debugger", "yii2" ], - "time": "2017-12-05 07:36:23" + "time": "2017-12-05T07:36:23+00:00" }, { "name": "yiisoft/yii2-faker", @@ -5885,7 +5884,7 @@ "faker", "yii2" ], - "time": "2018-02-19 20:27:10" + "time": "2018-02-19T20:27:10+00:00" }, { "name": "yiisoft/yii2-gii", @@ -5938,14 +5937,12 @@ "gii", "yii2" ], - "time": "2018-05-02 22:05:25" + "time": "2018-05-02T22:05:25+00:00" } ], "aliases": [], "minimum-stability": "RC", - "stability-flags": { - "sashsvamir/yii2-recaptcha-widget": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/console/migrations/m180709_111256_create_partner_table.php b/console/migrations/m180709_111256_create_partner_table.php new file mode 100644 index 0000000..c5b42e1 --- /dev/null +++ b/console/migrations/m180709_111256_create_partner_table.php @@ -0,0 +1,31 @@ +createTable('partner', [ + 'id' => $this->primaryKey(), + 'image_id' => $this->integer(), + 'status' => $this->boolean(), + 'sort' => $this->integer(), + 'link' => $this->string() + ]); + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + $this->dropTable('partner'); + } +} diff --git a/frontend/models/Feedback.php b/frontend/models/Feedback.php index 5b62eae..733904c 100644 --- a/frontend/models/Feedback.php +++ b/frontend/models/Feedback.php @@ -7,7 +7,7 @@ namespace frontend\models; use artbox\core\models\Feedback as ArtboxCoreFeedback; -use sashsvamir\yii2\recaptcha\ReCaptchaValidator; + class Feedback extends ArtboxCoreFeedback { @@ -29,7 +29,7 @@ class Feedback extends ArtboxCoreFeedback 'on' => self::SCENARIO_DEFAULT, 'message' => \Yii::t('app', 'Empty field'), ], - ['reCaptcha', ReCaptchaValidator::className(), + ['reCaptcha', \himiklab\yii2\recaptcha\ReCaptchaValidator::className(), 'uncheckedMessage' => 'Please confirm that you are not a bot.', // add follow lines to prevent checking recaptcha when from has errors 'when' => function ($model) { diff --git a/frontend/modules/forms/Module.php b/frontend/modules/forms/Module.php index 271d483..6598390 100755 --- a/frontend/modules/forms/Module.php +++ b/frontend/modules/forms/Module.php @@ -155,7 +155,8 @@ class Module extends \yii\base\Module public $buttonTemplate = '{button}'; public $locale = 'app'; - + + /** * @inheritdoc * @throws \yii\base\InvalidConfigException @@ -241,7 +242,7 @@ JS; $content .= $formStr; } - $content .= $form->field($this->model, 'reCaptcha')->widget(\sashsvamir\yii2\recaptcha\ReCaptcha::className())->label(false); + $content .= $form->field($this->model, 'reCaptcha')->widget(\himiklab\yii2\recaptcha\ReCaptcha::className())->label(false); $content .= str_replace('{button}', Html::submitButton(\Yii::t($this->locale, $this->buttonContent), $this->buttonOptions), $this->buttonTemplate); diff --git a/frontend/widgets/ParthnersList.php b/frontend/widgets/ParthnersList.php index 7b480f3..5831f3e 100644 --- a/frontend/widgets/ParthnersList.php +++ b/frontend/widgets/ParthnersList.php @@ -1,31 +1,30 @@ filesList=preg_grep('$^customer-\d{1,3}\.(png|jpg|jpeg)$',scandir('../web/img',0)); - $this->filesList=Partner::find() - ->where(['status'=>true]) - ->all(); - - - } - - - public function run(){ - parent::run(); - return $this->render('_parthnerList',['data'=>$this->filesList]); - } -} + //====================================================================================================================== + //Виджет, который получает массив данных о партнёрах, и делает html код для карусели + + namespace frontend\widgets; + + use yii\base\Widget; + use common\models\Partner; + + class ParthnersList extends Widget + { + public $filesList = []; + public $parthnersLinkList = []; + public function init() + { + parent::init(); + #$this->filesList=preg_grep('$^customer-\d{1,3}\.(png|jpg|jpeg)$',scandir('../web/img',0)); + $this->filesList = Partner::find() + ->where([ 'status' => true ]) + ->all(); + + } + + public function run() + { + parent::run(); + return $this->render('_parthnerList', [ 'data' => $this->filesList ]); + } + } -- libgit2 0.21.4