Commit 7b08eb78048835687f09ed6b40e2abf5940a6335
1 parent
377b29c7
15.04.16 seo widget
Showing
22 changed files
with
511 additions
and
145 deletions
Show diff stats
1 | +<?php | |
2 | + | |
3 | +namespace common\components; | |
4 | +use PHPMailer\PHPMailer\PHPMailer; | |
5 | +use yii\base\Widget; | |
6 | + | |
7 | +class Mailer extends Widget{ | |
8 | + public $message; | |
9 | + public $email = 'dockdep@gmail.com'; | |
10 | + public $text; | |
11 | + public $subject; | |
12 | + | |
13 | + public function init(){ | |
14 | + | |
15 | + parent::init(); | |
16 | + | |
17 | + } | |
18 | + | |
19 | + public function run(){ | |
20 | + | |
21 | + $mail = new PHPMailer(); | |
22 | + | |
23 | + $mail->IsSMTP(); | |
24 | + | |
25 | + $mail->CharSet = 'UTF-8'; | |
26 | + $mail->Username = "dockdep@gmail.com"; | |
27 | + $mail->Password = "k0l0b04eg"; | |
28 | + $mail->SetFrom('dockdep@gmail.com'); | |
29 | + $mail->Subject = $this->subject; | |
30 | + $mail->MsgHTML($this->text); | |
31 | + $address = "dockdep@gmail.com"; | |
32 | + $mail->AddAddress($address); | |
33 | + if(!$mail->send()) { | |
34 | + \Yii::$app->getSession()->setFlash('error', 'Mailer Error: ' . $mail->ErrorInfo); | |
35 | + return 'Mailer Error: ' . $mail->ErrorInfo; | |
36 | + } else { | |
37 | + \Yii::$app->getSession()->setFlash('success', 'Мастер-приемщик свяжется с вами в ближайшее время'); | |
38 | + return 'Message has been sent'; | |
39 | + } | |
40 | + } | |
41 | + | |
42 | +} | |
43 | + | ... | ... |
common/models/Banner.php
... | ... | @@ -47,14 +47,14 @@ class Banner extends \yii\db\ActiveRecord |
47 | 47 | public function attributeLabels() |
48 | 48 | { |
49 | 49 | return [ |
50 | - 'banner_id' => Yii::t('app', 'Banner ID'), | |
51 | - 'image' => Yii::t('app', 'Image'), | |
52 | - 'alt' => Yii::t('app', 'Alt'), | |
53 | - 'title' => Yii::t('app', 'Title'), | |
54 | - 'url' => Yii::t('app', 'Url'), | |
55 | - 'status' => Yii::t('app', 'Status'), | |
56 | - 'width' => Yii::t('app', 'Width'), | |
57 | - 'height' => Yii::t('app', 'Height'), | |
50 | + 'banner_id' => Yii::t('app', 'status'), | |
51 | + 'image' => Yii::t('app', 'image'), | |
52 | + 'alt' => Yii::t('app', 'alt'), | |
53 | + 'title' => Yii::t('app', 'title'), | |
54 | + 'url' => Yii::t('app', 'url'), | |
55 | + 'status' => Yii::t('app', 'status'), | |
56 | + 'width' => Yii::t('app', 'width'), | |
57 | + 'height' => Yii::t('app', 'height'), | |
58 | 58 | ]; |
59 | 59 | } |
60 | 60 | } | ... | ... |
common/models/Blog.php
... | ... | @@ -93,15 +93,15 @@ |
93 | 93 | public function attributeLabels() |
94 | 94 | { |
95 | 95 | return [ |
96 | - 'blog_id' => Yii::t('app', 'Blog ID'), | |
97 | - 'user_id' => Yii::t('app', 'User ID'), | |
98 | - 'name' => Yii::t('app', 'Название'), | |
99 | - 'link' => Yii::t('app', 'URL'), | |
100 | - 'date_add' => Yii::t('app', 'Дата добавления'), | |
101 | - 'user_add_id' => Yii::t('app', 'User Add ID'), | |
102 | - 'view_count' => Yii::t('app', 'Количество просмотров'), | |
103 | - 'description' => Yii::t('app', 'Описание'), | |
104 | - 'cover' => Yii::t('app', 'Фото главное'), | |
96 | + 'blog_id' => Yii::t('app', 'blog_id'), | |
97 | + 'user_id' => Yii::t('app', 'user_id'), | |
98 | + 'name' => Yii::t('app', 'name'), | |
99 | + 'link' => Yii::t('app', 'link'), | |
100 | + 'date_add' => Yii::t('app', 'date_add'), | |
101 | + 'user_add_id' => Yii::t('app', 'user_add_id'), | |
102 | + 'view_count' => Yii::t('app', 'view_count'), | |
103 | + 'description' => Yii::t('app', 'description'), | |
104 | + 'cover' => Yii::t('app', 'cover'), | |
105 | 105 | ]; |
106 | 106 | } |
107 | 107 | } | ... | ... |
common/models/Customers.php
... | ... | @@ -79,16 +79,16 @@ class Customers extends User |
79 | 79 | { |
80 | 80 | return [ |
81 | 81 | 'id' => Yii::t('app', 'ID'), |
82 | - 'username' => Yii::t('app', 'Username'), | |
83 | - 'surname' => Yii::t('app', 'Surname'), | |
84 | - 'auth_key' => Yii::t('app', 'Auth Key'), | |
85 | - 'password_hash' => Yii::t('app', 'Password Hash'), | |
86 | - 'password_reset_token' => Yii::t('app', 'Password Reset Token'), | |
87 | - 'email' => Yii::t('app', 'Email'), | |
88 | - 'phone' => Yii::t('app', 'Phone'), | |
89 | - 'status' => Yii::t('app', 'Status'), | |
90 | - 'created_at' => Yii::t('app', 'Created At'), | |
91 | - 'updated_at' => Yii::t('app', 'Updated At'), | |
82 | + 'username' => Yii::t('app', 'username'), | |
83 | + 'surname' => Yii::t('app', 'surname'), | |
84 | + 'auth_key' => Yii::t('app', 'auth_key'), | |
85 | + 'password_hash' => Yii::t('app', 'password_hash'), | |
86 | + 'password_reset_token' => Yii::t('app', 'password_reset_token'), | |
87 | + 'email' => Yii::t('app', 'email'), | |
88 | + 'phone' => Yii::t('app', 'phone'), | |
89 | + 'status' => Yii::t('app', 'status'), | |
90 | + 'created_at' => Yii::t('app', 'created_at'), | |
91 | + 'updated_at' => Yii::t('app', 'updated_at'), | |
92 | 92 | ]; |
93 | 93 | } |
94 | 94 | } | ... | ... |
common/models/Event.php
... | ... | @@ -85,18 +85,18 @@ class Event extends \yii\db\ActiveRecord |
85 | 85 | public function attributeLabels() |
86 | 86 | { |
87 | 87 | return [ |
88 | - 'event_id' => Yii::t('app', 'Event ID'), | |
89 | - 'name' => Yii::t('app', 'Name'), | |
90 | - 'alias' => Yii::t('app', 'Alias'), | |
91 | - 'body' => Yii::t('app', 'Body'), | |
92 | - 'image' => Yii::t('app', 'Image'), | |
93 | - 'meta_title' => Yii::t('app', 'Meta Title'), | |
94 | - 'description' => Yii::t('app', 'Description'), | |
95 | - 'h1' => Yii::t('app', 'H1'), | |
96 | - 'seo_text' => Yii::t('app', 'Seo Text'), | |
97 | - 'created_at' => Yii::t('app', 'Created At'), | |
98 | - 'updated_at' => Yii::t('app', 'Updated At'), | |
99 | - 'end_at' => Yii::t('app', 'End At'), | |
88 | + 'event_id' => Yii::t('app', 'event_id'), | |
89 | + 'name' => Yii::t('app', 'name'), | |
90 | + 'alias' => Yii::t('app', 'alias'), | |
91 | + 'body' => Yii::t('app', 'body'), | |
92 | + 'image' => Yii::t('app', 'image'), | |
93 | + 'meta_title' => Yii::t('app', 'meta_title'), | |
94 | + 'description' => Yii::t('app', 'description'), | |
95 | + 'h1' => Yii::t('app', 'h1'), | |
96 | + 'seo_text' => Yii::t('app', 'seo_text'), | |
97 | + 'created_at' => Yii::t('app', 'created_at'), | |
98 | + 'updated_at' => Yii::t('app', 'updated_at'), | |
99 | + 'end_at' => Yii::t('app', 'end_at'), | |
100 | 100 | ]; |
101 | 101 | } |
102 | 102 | } | ... | ... |
common/models/OrderItems.php
... | ... | @@ -46,11 +46,11 @@ class OrderItems extends \yii\db\ActiveRecord |
46 | 46 | public function attributeLabels() |
47 | 47 | { |
48 | 48 | return [ |
49 | - 'order_items_id' => Yii::t('app', 'Order Items ID'), | |
50 | - 'order_id' => Yii::t('app', 'Order ID'), | |
51 | - 'item_id' => Yii::t('app', 'Item ID'), | |
52 | - 'item_count' => Yii::t('app', 'Item Count'), | |
53 | - 'price' => Yii::t('app', 'Price'), | |
49 | + 'order_items_id' => Yii::t('app', 'order_items_id'), | |
50 | + 'order_id' => Yii::t('app', 'order_id'), | |
51 | + 'item_id' => Yii::t('app', 'item_id'), | |
52 | + 'item_count' => Yii::t('app', 'item_count'), | |
53 | + 'price' => Yii::t('app', 'price'), | |
54 | 54 | ]; |
55 | 55 | } |
56 | 56 | ... | ... |
common/models/Orders.php
... | ... | @@ -82,17 +82,17 @@ class Orders extends \yii\db\ActiveRecord |
82 | 82 | public function attributeLabels() |
83 | 83 | { |
84 | 84 | return [ |
85 | - 'order_id' => Yii::t('app', 'Order ID'), | |
86 | - 'customer_id' => Yii::t('app', 'Customer ID'), | |
87 | - 'name' => Yii::t('app', 'Name'), | |
88 | - 'email' => Yii::t('app', 'Email'), | |
89 | - 'phone' => Yii::t('app', 'Phone'), | |
90 | - 'delivery' => Yii::t('app', 'Delivery'), | |
91 | - 'payment' => Yii::t('app', 'Payment'), | |
92 | - 'code' => Yii::t('app', 'Code'), | |
93 | - 'status' => Yii::t('app', 'Status'), | |
94 | - 'created_at' => Yii::t('app', 'Created At'), | |
95 | - 'updated_at' => Yii::t('app', 'Updated At'), | |
85 | + 'order_id' => Yii::t('app', 'order_id'), | |
86 | + 'customer_id' => Yii::t('app', 'customer_id'), | |
87 | + 'name' => Yii::t('app', 'name'), | |
88 | + 'email' => Yii::t('app', 'email'), | |
89 | + 'phone' => Yii::t('app', 'phone'), | |
90 | + 'delivery' => Yii::t('app', 'delivery'), | |
91 | + 'payment' => Yii::t('app', 'payment'), | |
92 | + 'code' => Yii::t('app', 'code'), | |
93 | + 'status' => Yii::t('app', 'status'), | |
94 | + 'created_at' => Yii::t('app', 'created_at'), | |
95 | + 'updated_at' => Yii::t('app', 'updated_at'), | |
96 | 96 | ]; |
97 | 97 | } |
98 | 98 | ... | ... |
common/models/Page.php
... | ... | @@ -46,15 +46,15 @@ class Page extends \yii\db\ActiveRecord |
46 | 46 | public function attributeLabels() |
47 | 47 | { |
48 | 48 | return [ |
49 | - 'id' => 'ID', | |
50 | - 'name' => 'Название', | |
51 | - 'alias' => 'alias', | |
52 | - 'title' => 'Title', | |
53 | - 'body' => 'Body', | |
54 | - 'meta_title' => 'Meta Title', | |
55 | - 'description' => 'Description', | |
56 | - 'h1' => 'H1', | |
57 | - 'seo_text' => 'Seo Text', | |
49 | + 'id' => Yii::t('app', 'id'), | |
50 | + 'name' => Yii::t('app', 'name'), | |
51 | + 'alias' => Yii::t('app', 'alias'), | |
52 | + 'title' => Yii::t('app', 'title'), | |
53 | + 'body' => Yii::t('app', 'body'), | |
54 | + 'meta_title' => Yii::t('app', 'meta_title'), | |
55 | + 'description' => Yii::t('app', 'description'), | |
56 | + 'h1' =>Yii::t('app', 'h1'), | |
57 | + 'seo_text' => Yii::t('app', 'seo_text'), | |
58 | 58 | ]; |
59 | 59 | } |
60 | 60 | ... | ... |
common/models/Seo.php
... | ... | @@ -42,12 +42,12 @@ class Seo extends \yii\db\ActiveRecord |
42 | 42 | public function attributeLabels() |
43 | 43 | { |
44 | 44 | return [ |
45 | - 'seo_id' => Yii::t('app', 'Seo ID'), | |
46 | - 'url' => Yii::t('app', 'Url'), | |
47 | - 'title' => Yii::t('app', 'Title'), | |
48 | - 'description' => Yii::t('app', 'Description'), | |
49 | - 'h1' => Yii::t('app', 'H1'), | |
50 | - 'seo_text' => Yii::t('app', 'Seo Text'), | |
45 | + 'seo_id' => Yii::t('app', 'seo_id'), | |
46 | + 'url' => Yii::t('app', 'url'), | |
47 | + 'title' => Yii::t('app', 'title'), | |
48 | + 'description' => Yii::t('app', 'description'), | |
49 | + 'h1' => Yii::t('app', 'h1'), | |
50 | + 'seo_text' => Yii::t('app', 'seo_text'), | |
51 | 51 | ]; |
52 | 52 | } |
53 | 53 | } | ... | ... |
common/models/SeoCategory.php
... | ... | @@ -42,10 +42,10 @@ class SeoCategory extends \yii\db\ActiveRecord |
42 | 42 | public function attributeLabels() |
43 | 43 | { |
44 | 44 | return [ |
45 | - 'seo_category_id' => Yii::t('app', 'Seo Category ID'), | |
46 | - 'name' => Yii::t('app', 'Name'), | |
47 | - 'controller' => Yii::t('app', 'Controller'), | |
48 | - 'status' => Yii::t('app', 'Status'), | |
45 | + 'seo_category_id' => Yii::t('app', 'seo_category_id'), | |
46 | + 'name' => Yii::t('app', 'name'), | |
47 | + 'controller' => Yii::t('app', 'controller'), | |
48 | + 'status' => Yii::t('app', 'status'), | |
49 | 49 | ]; |
50 | 50 | } |
51 | 51 | ... | ... |
common/models/SeoDynamic.php
... | ... | @@ -52,18 +52,18 @@ class SeoDynamic extends \yii\db\ActiveRecord |
52 | 52 | public function attributeLabels() |
53 | 53 | { |
54 | 54 | return [ |
55 | - 'seo_dynamic_id' => Yii::t('app', 'Seo Dynamic ID'), | |
56 | - 'seo_category_id' => Yii::t('app', 'Seo Category ID'), | |
57 | - 'name' => Yii::t('app', 'Name'), | |
58 | - 'action' => Yii::t('app', 'Action'), | |
59 | - 'fields' => Yii::t('app', 'Fields'), | |
60 | - 'title' => Yii::t('app', 'Title'), | |
61 | - 'h1' => Yii::t('app', 'H1'), | |
62 | - 'description' => Yii::t('app', 'Description'), | |
63 | - 'seo_text' => Yii::t('app', 'Seo Text'), | |
64 | - 'status' => Yii::t('app', 'Status'), | |
65 | - 'param' => Yii::t('app', 'Param'), | |
66 | - 'key' => Yii::t('app', 'Key'), | |
55 | + 'seo_dynamic_id' => Yii::t('app', 'seo_dynamic_id'), | |
56 | + 'seo_category_id' => Yii::t('app', 'seo_category_id'), | |
57 | + 'name' => Yii::t('app', 'name'), | |
58 | + 'action' => Yii::t('app', 'action'), | |
59 | + 'fields' => Yii::t('app', 'fields'), | |
60 | + 'title' => Yii::t('app', 'title'), | |
61 | + 'h1' => Yii::t('app', 'h1'), | |
62 | + 'description' => Yii::t('app', 'description'), | |
63 | + 'seo_text' => Yii::t('app', 'seo_text'), | |
64 | + 'status' => Yii::t('app', 'status'), | |
65 | + 'param' => Yii::t('app', 'param'), | |
66 | + 'key' => Yii::t('app', 'key'), | |
67 | 67 | ]; |
68 | 68 | } |
69 | 69 | ... | ... |
common/models/Service.php
... | ... | @@ -65,17 +65,17 @@ class Service extends \yii\db\ActiveRecord |
65 | 65 | public function attributeLabels() |
66 | 66 | { |
67 | 67 | return [ |
68 | - 'service_id' => Yii::t('app', 'Service ID'), | |
69 | - 'name' => Yii::t('app', 'Name'), | |
70 | - 'alias' => Yii::t('app', 'Alias'), | |
71 | - 'body' => Yii::t('app', 'Body'), | |
72 | - 'image' => Yii::t('app', 'Image'), | |
73 | - 'meta_title' => Yii::t('app', 'Meta Title'), | |
74 | - 'description' => Yii::t('app', 'Description'), | |
75 | - 'h1' => Yii::t('app', 'H1'), | |
76 | - 'seo_text' => Yii::t('app', 'Seo Text'), | |
77 | - 'created_at' => Yii::t('app', 'Created At'), | |
78 | - 'updated_at' => Yii::t('app', 'Updated At'), | |
68 | + 'service_id' => Yii::t('app', 'service_id'), | |
69 | + 'name' => Yii::t('app', 'name'), | |
70 | + 'alias' => Yii::t('app', 'alias'), | |
71 | + 'body' => Yii::t('app', 'body'), | |
72 | + 'image' => Yii::t('app', 'image'), | |
73 | + 'meta_title' => Yii::t('app', 'meta_title'), | |
74 | + 'description' => Yii::t('app', 'description'), | |
75 | + 'h1' => Yii::t('app', 'h1'), | |
76 | + 'seo_text' => Yii::t('app', 'seo_text'), | |
77 | + 'created_at' => Yii::t('app', 'created_at'), | |
78 | + 'updated_at' => Yii::t('app', 'updated_at'), | |
79 | 79 | ]; |
80 | 80 | } |
81 | 81 | } | ... | ... |
common/models/Slider.php
... | ... | @@ -48,13 +48,13 @@ class Slider extends \yii\db\ActiveRecord |
48 | 48 | public function attributeLabels() |
49 | 49 | { |
50 | 50 | return [ |
51 | - 'slider_id' => Yii::t('app', 'Slider ID'), | |
52 | - 'speed' => Yii::t('app', 'Speed'), | |
53 | - 'duration' => Yii::t('app', 'Duration'), | |
54 | - 'title' => Yii::t('app', 'Title'), | |
55 | - 'status' => Yii::t('app', 'Status'), | |
56 | - 'width' => Yii::t('app', 'Width'), | |
57 | - 'height' => Yii::t('app', 'Height'), | |
51 | + 'slider_id' => Yii::t('app', 'slider_id'), | |
52 | + 'speed' => Yii::t('app', 'speed'), | |
53 | + 'duration' => Yii::t('app', 'duration'), | |
54 | + 'title' => Yii::t('app', 'title'), | |
55 | + 'status' => Yii::t('app', 'status'), | |
56 | + 'width' => Yii::t('app', 'width'), | |
57 | + 'height' => Yii::t('app', 'height'), | |
58 | 58 | ]; |
59 | 59 | } |
60 | 60 | ... | ... |
common/models/SliderImage.php
... | ... | @@ -48,15 +48,15 @@ class SliderImage extends \yii\db\ActiveRecord |
48 | 48 | public function attributeLabels() |
49 | 49 | { |
50 | 50 | return [ |
51 | - 'slider_image_id' => Yii::t('app', 'Slider Image ID'), | |
52 | - 'slider_id' => Yii::t('app', 'Slider ID'), | |
53 | - 'image' => Yii::t('app', 'Image'), | |
54 | - 'alt' => Yii::t('app', 'Alt'), | |
55 | - 'title' => Yii::t('app', 'Title'), | |
56 | - 'url' => Yii::t('app', 'Url'), | |
57 | - 'status' => Yii::t('app', 'Status'), | |
58 | - 'sort' => Yii::t('app', 'Sort'), | |
59 | - 'price' => Yii::t('app', 'Price'), | |
51 | + 'slider_image_id' => Yii::t('app', 'slider_image_id'), | |
52 | + 'slider_id' => Yii::t('app', 'slider_id'), | |
53 | + 'image' => Yii::t('app', 'image'), | |
54 | + 'alt' => Yii::t('app', 'alt'), | |
55 | + 'title' => Yii::t('app', 'title'), | |
56 | + 'url' => Yii::t('app', 'url'), | |
57 | + 'status' => Yii::t('app', 'status'), | |
58 | + 'sort' => Yii::t('app', 'sort'), | |
59 | + 'price' => Yii::t('app', 'price'), | |
60 | 60 | ]; |
61 | 61 | } |
62 | 62 | ... | ... |
common/translation/ru/app.php
... | ... | @@ -8,7 +8,7 @@ return [ |
8 | 8 | 'password_reset_token' => 'Password Reset Token', |
9 | 9 | 'email' => 'Логин (e-mail)', |
10 | 10 | 'phone' => 'Телефон', |
11 | - 'status' => 'Status', | |
11 | + 'status' => 'Статус', | |
12 | 12 | 'created_at' => 'Created At', |
13 | 13 | 'updated_at' => 'Updated At', |
14 | 14 | 'verifyCode' => 'Код проверки', |
... | ... | @@ -32,4 +32,50 @@ return [ |
32 | 32 | 'my_orders' => 'Мои заказы', |
33 | 33 | 'bookmarks' => 'Закладки', |
34 | 34 | 'basket' => 'Корзина', |
35 | + 'banner_id' => 'Banner ID', | |
36 | + 'image' => 'Изображение', | |
37 | + 'alt' => 'Описание', | |
38 | + 'title' => 'Заголовок', | |
39 | + 'url' => 'Ссылка', | |
40 | + 'width' => 'Ширина', | |
41 | + 'height' => 'Высота', | |
42 | + 'blog_id' => 'Blog ID', | |
43 | + 'user_id' => 'User ID', | |
44 | + 'name' => 'Название', | |
45 | + 'link' => 'Ссылка', | |
46 | + 'date_add' => 'Дата добавления', | |
47 | + 'user_add_id' => 'User Add ID', | |
48 | + 'view_count' => 'Количество просмотров', | |
49 | + 'description' => 'Описание', | |
50 | + 'cover' => 'Фото главное', | |
51 | + 'event_id' => 'Event ID', | |
52 | + 'alias' => 'Ссылка', | |
53 | + 'body' => 'Тело', | |
54 | + 'meta_title' => 'Мета заголовок', | |
55 | + 'h1' => 'H1', | |
56 | + 'seo_text' => 'Сео Текст', | |
57 | + 'end_at' => 'Срок действия по', | |
58 | + 'order_items_id' => 'Order Items ID', | |
59 | + 'order_id' => 'Order ID', | |
60 | + 'item_id' => 'Item ID', | |
61 | + 'item_count' => 'Количество', | |
62 | + 'price' => 'Цена', | |
63 | + 'customer_id' => 'Customer ID', | |
64 | + 'delivery' => 'Доставка', | |
65 | + 'payment' => 'Оплата', | |
66 | + 'seo_id' => 'Seo ID', | |
67 | + 'controller' => 'Controller', | |
68 | + 'seo_category_id' => 'Seo Category ID', | |
69 | + 'seo_dynamic_id' => 'Seo Dynamic ID', | |
70 | + 'action' => 'Action', | |
71 | + 'fields' => 'Поля', | |
72 | + 'param' => 'Параметры', | |
73 | + 'key' => 'Ключ', | |
74 | + 'service_id' => 'Service ID', | |
75 | + 'slider_id' => 'Slider ID', | |
76 | + 'speed' => 'Скорость', | |
77 | + 'duration' => 'Продолжительность', | |
78 | + 'slider_image_id' => 'Slider Image ID', | |
79 | + 'sort' => 'Сортировка', | |
80 | + | |
35 | 81 | ]; |
36 | 82 | \ No newline at end of file | ... | ... |
composer.json
... | ... | @@ -33,7 +33,9 @@ |
33 | 33 | "FortAwesome/Font-Awesome": "*", |
34 | 34 | "kartik-v/yii2-widget-datepicker": "*", |
35 | 35 | "unclead/yii2-multiple-input": "~1.0", |
36 | - "codeception/codeception":"*" | |
36 | + "codeception/codeception":"*", | |
37 | + "phpmailer/phpmailer": "^5.2", | |
38 | + "league/oauth2-client": "^1.3" | |
37 | 39 | }, |
38 | 40 | "require-dev": { |
39 | 41 | "yiisoft/yii2-codeception": "*", | ... | ... |
composer.lock
... | ... | @@ -4,8 +4,8 @@ |
4 | 4 | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", |
5 | 5 | "This file is @generated automatically" |
6 | 6 | ], |
7 | - "hash": "a7d36c8cf4be5f624bef0426936b9594", | |
8 | - "content-hash": "1e53816a430c74ec792d83ade8eac412", | |
7 | + "hash": "d817e95d434dbdfff82796cc0b6e9c9e", | |
8 | + "content-hash": "a704572d721b5adc21f823d363fcd4de", | |
9 | 9 | "packages": [ |
10 | 10 | { |
11 | 11 | "name": "2amigos/yii2-transliterator-helper", |
... | ... | @@ -559,7 +559,7 @@ |
559 | 559 | }, |
560 | 560 | "dist": { |
561 | 561 | "type": "zip", |
562 | - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/a04ceaea52d2a050d8df19df1a85fb1b24456477", | |
562 | + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c3a92199d02598de6fb59fa57913a10909628e4f", | |
563 | 563 | "reference": "a04ceaea52d2a050d8df19df1a85fb1b24456477", |
564 | 564 | "shasum": "" |
565 | 565 | }, |
... | ... | @@ -739,7 +739,7 @@ |
739 | 739 | }, |
740 | 740 | "dist": { |
741 | 741 | "type": "zip", |
742 | - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", | |
742 | + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/416fb8ad1d095a87f1d21bc40711843cd122fd4a", | |
743 | 743 | "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", |
744 | 744 | "shasum": "" |
745 | 745 | }, |
... | ... | @@ -880,7 +880,7 @@ |
880 | 880 | }, |
881 | 881 | "dist": { |
882 | 882 | "type": "zip", |
883 | - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/f97ab41d187553e86abb8c7f6c057c9c0b88de58", | |
883 | + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/06b2efcda0d4612eccdaf8b79ae428fd079f2dfb", | |
884 | 884 | "reference": "f97ab41d187553e86abb8c7f6c057c9c0b88de58", |
885 | 885 | "shasum": "" |
886 | 886 | }, |
... | ... | @@ -928,7 +928,7 @@ |
928 | 928 | }, |
929 | 929 | "dist": { |
930 | 930 | "type": "zip", |
931 | - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", | |
931 | + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/85cb758d7367f3aaaa8ffc9269e777919c5f68bb", | |
932 | 932 | "reference": "d094e337976dff9d8e2424e8485872194e768662", |
933 | 933 | "shasum": "" |
934 | 934 | }, |
... | ... | @@ -1147,6 +1147,106 @@ |
1147 | 1147 | "time": "2014-06-13 10:54:04" |
1148 | 1148 | }, |
1149 | 1149 | { |
1150 | + "name": "ircmaxell/random-lib", | |
1151 | + "version": "dev-master", | |
1152 | + "source": { | |
1153 | + "type": "git", | |
1154 | + "url": "https://github.com/ircmaxell/RandomLib.git", | |
1155 | + "reference": "ad6a37d7bce67b0954be63feb1b4c47da77c527f" | |
1156 | + }, | |
1157 | + "dist": { | |
1158 | + "type": "zip", | |
1159 | + "url": "https://api.github.com/repos/ircmaxell/RandomLib/zipball/ad6a37d7bce67b0954be63feb1b4c47da77c527f", | |
1160 | + "reference": "ad6a37d7bce67b0954be63feb1b4c47da77c527f", | |
1161 | + "shasum": "" | |
1162 | + }, | |
1163 | + "require": { | |
1164 | + "ircmaxell/security-lib": "1.1.*@dev", | |
1165 | + "php": ">=5.3.2" | |
1166 | + }, | |
1167 | + "require-dev": { | |
1168 | + "mikey179/vfsstream": "1.1.*", | |
1169 | + "phpunit/phpunit": "3.7.*" | |
1170 | + }, | |
1171 | + "type": "library", | |
1172 | + "extra": { | |
1173 | + "branch-alias": { | |
1174 | + "dev-master": "1.1.x-dev" | |
1175 | + } | |
1176 | + }, | |
1177 | + "autoload": { | |
1178 | + "psr-0": { | |
1179 | + "RandomLib": "lib" | |
1180 | + } | |
1181 | + }, | |
1182 | + "notification-url": "https://packagist.org/downloads/", | |
1183 | + "license": [ | |
1184 | + "MIT" | |
1185 | + ], | |
1186 | + "authors": [ | |
1187 | + { | |
1188 | + "name": "Anthony Ferrara", | |
1189 | + "email": "ircmaxell@ircmaxell.com", | |
1190 | + "homepage": "http://blog.ircmaxell.com" | |
1191 | + } | |
1192 | + ], | |
1193 | + "description": "A Library For Generating Secure Random Numbers", | |
1194 | + "homepage": "https://github.com/ircmaxell/RandomLib", | |
1195 | + "keywords": [ | |
1196 | + "cryptography", | |
1197 | + "random", | |
1198 | + "random-numbers", | |
1199 | + "random-strings" | |
1200 | + ], | |
1201 | + "time": "2016-02-22 13:55:31" | |
1202 | + }, | |
1203 | + { | |
1204 | + "name": "ircmaxell/security-lib", | |
1205 | + "version": "v1.1.0", | |
1206 | + "source": { | |
1207 | + "type": "git", | |
1208 | + "url": "https://github.com/ircmaxell/SecurityLib.git", | |
1209 | + "reference": "f3db6de12c20c9bcd1aa3db4353a1bbe0e44e1b5" | |
1210 | + }, | |
1211 | + "dist": { | |
1212 | + "type": "zip", | |
1213 | + "url": "https://api.github.com/repos/ircmaxell/SecurityLib/zipball/f3db6de12c20c9bcd1aa3db4353a1bbe0e44e1b5", | |
1214 | + "reference": "f3db6de12c20c9bcd1aa3db4353a1bbe0e44e1b5", | |
1215 | + "shasum": "" | |
1216 | + }, | |
1217 | + "require": { | |
1218 | + "php": ">=5.3.2" | |
1219 | + }, | |
1220 | + "require-dev": { | |
1221 | + "mikey179/vfsstream": "1.1.*" | |
1222 | + }, | |
1223 | + "type": "library", | |
1224 | + "extra": { | |
1225 | + "branch-alias": { | |
1226 | + "dev-master": "1.0.x-dev" | |
1227 | + } | |
1228 | + }, | |
1229 | + "autoload": { | |
1230 | + "psr-0": { | |
1231 | + "SecurityLib": "lib" | |
1232 | + } | |
1233 | + }, | |
1234 | + "notification-url": "https://packagist.org/downloads/", | |
1235 | + "license": [ | |
1236 | + "MIT" | |
1237 | + ], | |
1238 | + "authors": [ | |
1239 | + { | |
1240 | + "name": "Anthony Ferrara", | |
1241 | + "email": "ircmaxell@ircmaxell.com", | |
1242 | + "homepage": "http://blog.ircmaxell.com" | |
1243 | + } | |
1244 | + ], | |
1245 | + "description": "A Base Security Library", | |
1246 | + "homepage": "https://github.com/ircmaxell/SecurityLib", | |
1247 | + "time": "2015-03-20 14:31:23" | |
1248 | + }, | |
1249 | + { | |
1150 | 1250 | "name": "kartik-v/yii2-krajee-base", |
1151 | 1251 | "version": "dev-master", |
1152 | 1252 | "source": { |
... | ... | @@ -1156,7 +1256,7 @@ |
1156 | 1256 | }, |
1157 | 1257 | "dist": { |
1158 | 1258 | "type": "zip", |
1159 | - "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/3e491e51ed742663b239cd6e0b7f76d403bed7e1", | |
1259 | + "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/3115b09aeb15a5e06f38dc16860baf153d9bf70e", | |
1160 | 1260 | "reference": "3e491e51ed742663b239cd6e0b7f76d403bed7e1", |
1161 | 1261 | "shasum": "" |
1162 | 1262 | }, |
... | ... | @@ -1207,7 +1307,7 @@ |
1207 | 1307 | }, |
1208 | 1308 | "dist": { |
1209 | 1309 | "type": "zip", |
1210 | - "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/18537fcdab0f5491d5eebff8e2464ef6a616ee4c", | |
1310 | + "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/1a10c5e9a528270e22dc8a5eba404c72f417665a", | |
1211 | 1311 | "reference": "18537fcdab0f5491d5eebff8e2464ef6a616ee4c", |
1212 | 1312 | "shasum": "" |
1213 | 1313 | }, |
... | ... | @@ -1261,7 +1361,7 @@ |
1261 | 1361 | }, |
1262 | 1362 | "dist": { |
1263 | 1363 | "type": "zip", |
1264 | - "url": "https://api.github.com/repos/kartik-v/yii2-widget-datepicker/zipball/3f7b38886e334a2c8c4262f155d98812461efd36", | |
1364 | + "url": "https://api.github.com/repos/kartik-v/yii2-widget-datepicker/zipball/52606c8764a174aa0d5e6483ed811f617c74ee4e", | |
1265 | 1365 | "reference": "3f7b38886e334a2c8c4262f155d98812461efd36", |
1266 | 1366 | "shasum": "" |
1267 | 1367 | }, |
... | ... | @@ -1359,6 +1459,69 @@ |
1359 | 1459 | "time": "2016-03-10 11:33:59" |
1360 | 1460 | }, |
1361 | 1461 | { |
1462 | + "name": "league/oauth2-client", | |
1463 | + "version": "1.3.0", | |
1464 | + "source": { | |
1465 | + "type": "git", | |
1466 | + "url": "https://github.com/thephpleague/oauth2-client.git", | |
1467 | + "reference": "5e5c0bc5bd219515c8d8db8bcb61f19753101b7c" | |
1468 | + }, | |
1469 | + "dist": { | |
1470 | + "type": "zip", | |
1471 | + "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/5e5c0bc5bd219515c8d8db8bcb61f19753101b7c", | |
1472 | + "reference": "5e5c0bc5bd219515c8d8db8bcb61f19753101b7c", | |
1473 | + "shasum": "" | |
1474 | + }, | |
1475 | + "require": { | |
1476 | + "ext-curl": "*", | |
1477 | + "guzzlehttp/guzzle": "~6.0", | |
1478 | + "ircmaxell/random-lib": "~1.1", | |
1479 | + "php": ">=5.5.0" | |
1480 | + }, | |
1481 | + "require-dev": { | |
1482 | + "jakub-onderka/php-parallel-lint": "0.8.*", | |
1483 | + "mockery/mockery": "~0.9", | |
1484 | + "phpunit/phpunit": "~4.0", | |
1485 | + "satooshi/php-coveralls": "0.6.*", | |
1486 | + "squizlabs/php_codesniffer": "~2.0" | |
1487 | + }, | |
1488 | + "type": "library", | |
1489 | + "extra": { | |
1490 | + "branch-alias": { | |
1491 | + "dev-master": "1.0.x-dev" | |
1492 | + } | |
1493 | + }, | |
1494 | + "autoload": { | |
1495 | + "psr-4": { | |
1496 | + "League\\OAuth2\\Client\\": "src/" | |
1497 | + } | |
1498 | + }, | |
1499 | + "notification-url": "https://packagist.org/downloads/", | |
1500 | + "license": [ | |
1501 | + "MIT" | |
1502 | + ], | |
1503 | + "authors": [ | |
1504 | + { | |
1505 | + "name": "Alex Bilbie", | |
1506 | + "email": "hello@alexbilbie.com", | |
1507 | + "homepage": "http://www.alexbilbie.com", | |
1508 | + "role": "Developer" | |
1509 | + } | |
1510 | + ], | |
1511 | + "description": "OAuth 2.0 Client Library", | |
1512 | + "keywords": [ | |
1513 | + "Authentication", | |
1514 | + "SSO", | |
1515 | + "authorization", | |
1516 | + "identity", | |
1517 | + "idp", | |
1518 | + "oauth", | |
1519 | + "oauth2", | |
1520 | + "single sign on" | |
1521 | + ], | |
1522 | + "time": "2016-02-13 20:18:03" | |
1523 | + }, | |
1524 | + { | |
1362 | 1525 | "name": "lusitanian/oauth", |
1363 | 1526 | "version": "v0.3.6", |
1364 | 1527 | "source": { |
... | ... | @@ -1670,6 +1833,60 @@ |
1670 | 1833 | "time": "2015-02-03 12:10:50" |
1671 | 1834 | }, |
1672 | 1835 | { |
1836 | + "name": "phpmailer/phpmailer", | |
1837 | + "version": "5.4.x-dev", | |
1838 | + "source": { | |
1839 | + "type": "git", | |
1840 | + "url": "https://github.com/PHPMailer/PHPMailer.git", | |
1841 | + "reference": "3d4e3b1a0da0a33889f8b0b2afda6ad4f6d011b5" | |
1842 | + }, | |
1843 | + "dist": { | |
1844 | + "type": "zip", | |
1845 | + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/3d4e3b1a0da0a33889f8b0b2afda6ad4f6d011b5", | |
1846 | + "reference": "3d4e3b1a0da0a33889f8b0b2afda6ad4f6d011b5", | |
1847 | + "shasum": "" | |
1848 | + }, | |
1849 | + "require": { | |
1850 | + "php": ">=5.5.0" | |
1851 | + }, | |
1852 | + "require-dev": { | |
1853 | + "phpdocumentor/phpdocumentor": "2.*", | |
1854 | + "phpunit/phpunit": "4.*" | |
1855 | + }, | |
1856 | + "suggest": { | |
1857 | + "league/oauth2-client": "Needed for XOAUTH2 authentication" | |
1858 | + }, | |
1859 | + "type": "library", | |
1860 | + "autoload": { | |
1861 | + "psr-4": { | |
1862 | + "PHPMailer\\PHPMailer\\": "src/" | |
1863 | + } | |
1864 | + }, | |
1865 | + "notification-url": "https://packagist.org/downloads/", | |
1866 | + "license": [ | |
1867 | + "LGPL-2.1" | |
1868 | + ], | |
1869 | + "authors": [ | |
1870 | + { | |
1871 | + "name": "Jim Jagielski", | |
1872 | + "email": "jimjag@gmail.com" | |
1873 | + }, | |
1874 | + { | |
1875 | + "name": "Marcus Bointon", | |
1876 | + "email": "phpmailer@synchromedia.co.uk" | |
1877 | + }, | |
1878 | + { | |
1879 | + "name": "Andy Prevost", | |
1880 | + "email": "codeworxtech@users.sourceforge.net" | |
1881 | + }, | |
1882 | + { | |
1883 | + "name": "Brent R. Matzelle" | |
1884 | + } | |
1885 | + ], | |
1886 | + "description": "PHPMailer is a full-featured email creation and transfer class for PHP", | |
1887 | + "time": "2016-04-07 09:04:03" | |
1888 | + }, | |
1889 | + { | |
1673 | 1890 | "name": "phpspec/prophecy", |
1674 | 1891 | "version": "dev-master", |
1675 | 1892 | "source": { |
... | ... | @@ -1981,7 +2198,7 @@ |
1981 | 2198 | }, |
1982 | 2199 | "dist": { |
1983 | 2200 | "type": "zip", |
1984 | - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a1b63266c046e1856fd03812a4e0ac2b51aa2d5", | |
2201 | + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/496745aeba741e63b7149da3e1f712d441751182", | |
1985 | 2202 | "reference": "1a1b63266c046e1856fd03812a4e0ac2b51aa2d5", |
1986 | 2203 | "shasum": "" |
1987 | 2204 | }, |
... | ... | @@ -2743,7 +2960,7 @@ |
2743 | 2960 | }, |
2744 | 2961 | "dist": { |
2745 | 2962 | "type": "zip", |
2746 | - "url": "https://api.github.com/repos/symfony/console/zipball/6b1175135bc2a74c08a28d89761272de8beed8cd", | |
2963 | + "url": "https://api.github.com/repos/symfony/console/zipball/7541c505d2b804cc65a4edf90a6f1cb496523fef", | |
2747 | 2964 | "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd", |
2748 | 2965 | "shasum": "" |
2749 | 2966 | }, |
... | ... | @@ -2856,7 +3073,7 @@ |
2856 | 3073 | }, |
2857 | 3074 | "dist": { |
2858 | 3075 | "type": "zip", |
2859 | - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/18a06d7a9af41718c20764a674a0ebba3bc40d1f", | |
3076 | + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/49b588841225b205700e5122fa01911cabada857", | |
2860 | 3077 | "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f", |
2861 | 3078 | "shasum": "" |
2862 | 3079 | }, |
... | ... | @@ -2912,7 +3129,7 @@ |
2912 | 3129 | }, |
2913 | 3130 | "dist": { |
2914 | 3131 | "type": "zip", |
2915 | - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9002dcf018d884d294b1ef20a6f968efc1128f39", | |
3132 | + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/17b04e6b1ede45b57d3ad5146abe50df6c3968b4", | |
2916 | 3133 | "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39", |
2917 | 3134 | "shasum": "" |
2918 | 3135 | }, |
... | ... | @@ -3174,7 +3391,7 @@ |
3174 | 3391 | }, |
3175 | 3392 | "dist": { |
3176 | 3393 | "type": "zip", |
3177 | - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/bcc317666439a8ec1dc28874e0577b860b6dd6b3", | |
3394 | + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/b7e62df2cfa1dfab4e70223770a99c3798d4a412", | |
3178 | 3395 | "reference": "bcc317666439a8ec1dc28874e0577b860b6dd6b3", |
3179 | 3396 | "shasum": "" |
3180 | 3397 | }, |
... | ... | @@ -3268,7 +3485,7 @@ |
3268 | 3485 | }, |
3269 | 3486 | "dist": { |
3270 | 3487 | "type": "zip", |
3271 | - "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/4dd9f52e2a376a875d998de6ab4c381291b0c69e", | |
3488 | + "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/772b610ea7940059584f9220f7b87e4b2b1a0e78", | |
3272 | 3489 | "reference": "4dd9f52e2a376a875d998de6ab4c381291b0c69e", |
3273 | 3490 | "shasum": "" |
3274 | 3491 | }, |
... | ... | @@ -3318,7 +3535,7 @@ |
3318 | 3535 | }, |
3319 | 3536 | "dist": { |
3320 | 3537 | "type": "zip", |
3321 | - "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/348122de0b2c2e343b579f93fcda1da78cab4912", | |
3538 | + "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/f5fe6ba58dbc92b37daed5d9bd94cda777852ee4", | |
3322 | 3539 | "reference": "348122de0b2c2e343b579f93fcda1da78cab4912", |
3323 | 3540 | "shasum": "" |
3324 | 3541 | }, |
... | ... | @@ -3365,7 +3582,7 @@ |
3365 | 3582 | }, |
3366 | 3583 | "dist": { |
3367 | 3584 | "type": "zip", |
3368 | - "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99", | |
3585 | + "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/3be1ecc324aa156a97f03e3fc59045c8d61be1f8", | |
3369 | 3586 | "reference": "a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99", |
3370 | 3587 | "shasum": "" |
3371 | 3588 | }, |
... | ... | @@ -3413,7 +3630,7 @@ |
3413 | 3630 | }, |
3414 | 3631 | "dist": { |
3415 | 3632 | "type": "zip", |
3416 | - "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/69cd9763b4807dbbce367d599dc615c5b8a8ef4f", | |
3633 | + "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/9ab9a2cb17cd7f13921339e11e5146295cf39083", | |
3417 | 3634 | "reference": "69cd9763b4807dbbce367d599dc615c5b8a8ef4f", |
3418 | 3635 | "shasum": "" |
3419 | 3636 | }, |
... | ... | @@ -3463,7 +3680,7 @@ |
3463 | 3680 | }, |
3464 | 3681 | "dist": { |
3465 | 3682 | "type": "zip", |
3466 | - "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/20775fef1047cd927908270a8d7983580304eb57", | |
3683 | + "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/163b9c6273e133c43a596aef46a9f5b1537731f9", | |
3467 | 3684 | "reference": "20775fef1047cd927908270a8d7983580304eb57", |
3468 | 3685 | "shasum": "" |
3469 | 3686 | }, |
... | ... | @@ -3542,7 +3759,7 @@ |
3542 | 3759 | }, |
3543 | 3760 | "dist": { |
3544 | 3761 | "type": "zip", |
3545 | - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", | |
3762 | + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/1c33e894fbbad6cf65bd42871719cd33227ed6a7", | |
3546 | 3763 | "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", |
3547 | 3764 | "shasum": "" |
3548 | 3765 | }, |
... | ... | @@ -3592,7 +3809,7 @@ |
3592 | 3809 | }, |
3593 | 3810 | "dist": { |
3594 | 3811 | "type": "zip", |
3595 | - "url": "https://api.github.com/repos/phpspec/php-diff/zipball/30e103d19519fe678ae64a60d77884ef3d71b28a", | |
3812 | + "url": "https://api.github.com/repos/phpspec/php-diff/zipball/0464787bfa7cd13576c5a1e318709768798bec6a", | |
3596 | 3813 | "reference": "30e103d19519fe678ae64a60d77884ef3d71b28a", |
3597 | 3814 | "shasum": "" |
3598 | 3815 | }, |
... | ... | @@ -3626,7 +3843,7 @@ |
3626 | 3843 | }, |
3627 | 3844 | "dist": { |
3628 | 3845 | "type": "zip", |
3629 | - "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/e01b3c46917b3f00c42f6a4aabf612cc36d792e6", | |
3846 | + "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/572a6d46d942cc5733c45931fdbd1d60228f3c89", | |
3630 | 3847 | "reference": "e01b3c46917b3f00c42f6a4aabf612cc36d792e6", |
3631 | 3848 | "shasum": "" |
3632 | 3849 | }, |
... | ... | @@ -3671,7 +3888,7 @@ |
3671 | 3888 | }, |
3672 | 3889 | "dist": { |
3673 | 3890 | "type": "zip", |
3674 | - "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/081795536b31d29106b0d1de0cb3aefa3e05e995", | |
3891 | + "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/e26905af4bc1ca5ecbababac112c7f7f722cabd2", | |
3675 | 3892 | "reference": "081795536b31d29106b0d1de0cb3aefa3e05e995", |
3676 | 3893 | "shasum": "" |
3677 | 3894 | }, |
... | ... | @@ -3718,7 +3935,7 @@ |
3718 | 3935 | }, |
3719 | 3936 | "dist": { |
3720 | 3937 | "type": "zip", |
3721 | - "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/a8daa97749e7154d91676405a1c59ed81e1ca999", | |
3938 | + "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/6e6eb430809e3f9c05e367303909a05a4912d4c0", | |
3722 | 3939 | "reference": "a8daa97749e7154d91676405a1c59ed81e1ca999", |
3723 | 3940 | "shasum": "" |
3724 | 3941 | }, |
... | ... | @@ -3765,7 +3982,7 @@ |
3765 | 3982 | }, |
3766 | 3983 | "dist": { |
3767 | 3984 | "type": "zip", |
3768 | - "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/989d6c52c92e51f0d562729c329ee1012191cba2", | |
3985 | + "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/70edab5a7938b5bf4b5dc3ad1e1c3ce673552f48", | |
3769 | 3986 | "reference": "989d6c52c92e51f0d562729c329ee1012191cba2", |
3770 | 3987 | "shasum": "" |
3771 | 3988 | }, | ... | ... |
frontend/controllers/SiteController.php
1 | 1 | <?php |
2 | 2 | namespace frontend\controllers; |
3 | 3 | |
4 | +use common\components\Mailer; | |
4 | 5 | use Yii; |
5 | 6 | use common\models\LoginForm; |
6 | 7 | use frontend\models\PasswordResetRequestForm; |
... | ... | @@ -91,6 +92,22 @@ class SiteController extends Controller |
91 | 92 | return $this->render('index'); |
92 | 93 | } |
93 | 94 | |
95 | + | |
96 | + public function actionMail(){ | |
97 | + $num = Yii::$app->request->post('num'); | |
98 | + $type = Yii::$app->request->post('type'); | |
99 | + | |
100 | + switch ($type) { | |
101 | + case 'call_me': | |
102 | + if(!empty($num)){ | |
103 | + return json_encode(Mailer::widget(['text' => $num, 'subject' => 'Обратный звонок'])); | |
104 | + } | |
105 | + | |
106 | + break; | |
107 | + | |
108 | + } | |
109 | + } | |
110 | + | |
94 | 111 | /** |
95 | 112 | * Logs in a user. |
96 | 113 | * | ... | ... |
frontend/views/event/view.php
1 | +<div class="call_me_modal_wrapper"> | |
2 | + <!-- <form name="forgot_pass_form" id="forgot_pass_form"> --> | |
3 | + <div class="modal_window"> | |
4 | + <form> | |
5 | + <div class="modal_close_btn"></div> | |
6 | + <div class="title">Перезвонить мне</div> | |
7 | + <label>Телефон:<input type="text" name="callme_head" id="phone_num_modal" placeholder="(0xx) xxx-xx-xx"></label> | |
8 | + <div class="for_btn_position"><button class="my_cust_btn" type="submit">перезвонить мне</button></div> | |
9 | + </form> | |
10 | + </div> | |
11 | + <!-- </form> --> | |
12 | +</div> | |
0 | 13 | \ No newline at end of file | ... | ... |
frontend/web/js/my_scripts.js
... | ... | @@ -181,8 +181,13 @@ $(document).ready(function(){ |
181 | 181 | $(".phone_me_head").find("input").addClass("error"); |
182 | 182 | } |
183 | 183 | else{ |
184 | - callback_wrap.fadeIn(200); | |
185 | - $(".phone_me_head").find("input").val(''); | |
184 | + var num = $(".phone_me_head").find("input").val(); | |
185 | + var type = 'call_me'; | |
186 | + send_call_me_back( num,type, function(data){ | |
187 | + callback_wrap.fadeIn(200); | |
188 | + $(".phone_me_head").find("input").val(''); | |
189 | + }); | |
190 | + | |
186 | 191 | } |
187 | 192 | }); |
188 | 193 | modal_busket_header_cont.click(function(){ // скрываем модальную корзину в хедере по ссылке |
... | ... | @@ -462,4 +467,28 @@ $(document).ready(function(){ |
462 | 467 | |
463 | 468 | //=============================================== BUSKET MODAL WINDOW FUNCTIONS |
464 | 469 | |
470 | + function send_call_me_back( num, type,callback ) | |
471 | + { | |
472 | + $.ajax({ | |
473 | + url: '/site/mail', | |
474 | + data : | |
475 | + { | |
476 | + 'num' : num, | |
477 | + 'type' : type | |
478 | + }, | |
479 | + type : 'POST', | |
480 | + dataType: 'json', | |
481 | + success: function (data) | |
482 | + { | |
483 | + if(callback) | |
484 | + callback(data); | |
485 | + }, | |
486 | + error: function() | |
487 | + { | |
488 | + console.info('error'); | |
489 | + } | |
490 | + }); | |
491 | + } | |
492 | + | |
493 | + | |
465 | 494 | }); |
466 | 495 | \ No newline at end of file | ... | ... |
frontend/widgets/Seo.php
... | ... | @@ -40,11 +40,11 @@ class Seo extends Widget |
40 | 40 | |
41 | 41 | switch ($this->row) { |
42 | 42 | case self::SEO_TEXT: |
43 | - $this->selectSeoData(self::SEO_TEXT); | |
43 | + return $this->selectSeoData(self::SEO_TEXT); | |
44 | 44 | |
45 | 45 | break; |
46 | 46 | case self::H1: |
47 | - $this->selectSeoData(self::H1); | |
47 | + return $this->selectSeoData(self::H1); | |
48 | 48 | break; |
49 | 49 | case self::TITLE: |
50 | 50 | ... | ... |