Merge pull request #1682 from voltan/develop

Work on user section
pi-engine · Jan 27, 2021 · c644d55 · c644d55
2 parents d1e7691 + fbfec1a
commit c644d55
Show file tree

Hide file tree

Showing 30 changed files with 1,141 additions and 781 deletions.
diff --git a/usr/module/system/config/block.php b/usr/module/system/config/block.php
@@ -109,6 +109,13 @@
                 'filter'      => 'number_int',
                 'value'       => 1,
             ],
+            'show_video'   => [
+                'title'       => _a('Display video'),
+                'description' => '',
+                'edit'        => 'checkbox',
+                'filter'      => 'number_int',
+                'value'       => 1,
+            ],
         ],
     ],
 

diff --git a/usr/module/system/config/module.php b/usr/module/system/config/module.php
@@ -21,7 +21,7 @@
         'description' =>
             _a('For administration of core functions of the site.'),
         // Version number, required
-        'version'       => '3.6.10',
+        'version'       => '3.6.11',
         // Distribution license, required
         'license'     => 'New BSD',
         // Logo image, for admin, optional

diff --git a/usr/module/system/src/Block/Block.php b/usr/module/system/src/Block/Block.php
@@ -108,6 +108,7 @@ public static function userbar($options = [])
             'show_credit'    => $options['show_credit'],
             'show_support'   => $options['show_support'],
             'show_favourite' => $options['show_favourite'],
+            'show_video'     => $options['show_video'],
             'count'          => 0,
         ];
 
@@ -341,6 +342,20 @@ public static function userbar($options = [])
             }
         }
 
+        // Set videos
+        if ($options['show_video'] && Pi::service('module')->isActive('video')) {
+            $user['video_url'] = Pi::url(
+                Pi::service('url')->assemble(
+                    'video',
+                    [
+                        'module'     => 'video',
+                        'controller' => 'dashboard',
+                        'action'     => 'purchased',
+                    ]
+                )
+            );
+        }
+
         // Set user information to result
         $result['user'] = $user;
 

diff --git a/usr/module/system/src/Controller/Front/LoginController.php b/usr/module/system/src/Controller/Front/LoginController.php
@@ -213,8 +213,7 @@ public function processAction()
         if (empty($values['redirect'])) {
             $redirect = ['route' => 'home'];
         } else {
-            //$redirect = urldecode($values['redirect']);
-            $redirect = ['route' => 'home'];
+            $redirect = urldecode($values['redirect']);
         }
 
         // Trigger login event

diff --git a/usr/module/system/template/block/user-bar.phtml b/usr/module/system/template/block/user-bar.phtml
@@ -131,6 +131,12 @@ EOT;
                                     </a>
                                 <?php } ?>
                             <?php } ?>
+                            <?php if (isset($block['user']['video_url'])) { ?>
+                                <a class="dropdown-item" href="<?php echo $block['user']['video_url']; ?>" title="<?php echo _b('Purchased Videos'); ?>">
+                                    <i class="fas fa-video"></i>
+                                    <?php echo _b('Purchased Videos'); ?>
+                                </a>
+                            <?php } ?>
                             <?php if (isset($block['user']['support_url'])) { ?>
                                 <a class="dropdown-item <?php echo $module == 'support' ? 'active' : '' ?>" href="<?php echo $block['user']['support_url']; ?>"
                                    title="<?php echo _b('Support'); ?>">

diff --git a/usr/module/user/config/config.php b/usr/module/user/config/config.php
@@ -715,7 +715,7 @@
         'title'       => _a('Login by google'),
         'description' => sprintf(
             __('Callback urls is : %s'),
-            Pi::url('user/oauth/callback/provider-google')
+            Pi::url('user/oauth/callback/provider/google')
         ),
         'edit'        => 'checkbox',
         'filter'      => 'number_int',
@@ -743,7 +743,7 @@
         'title'       => _a('Login by twitter'),
         'description' => sprintf(
             __('Callback urls is : %s'),
-            Pi::url('user/oauth/callback/provider-twitter')
+            Pi::url('user/oauth/callback/provider/twitter')
         ),
         'edit'        => 'checkbox',
         'filter'      => 'number_int',
@@ -771,7 +771,7 @@
         'title'       => _a('Login by facebook'),
         'description' => sprintf(
             __('Callback urls is : %s'),
-            Pi::url('user/oauth/callback/provider-facebook')
+            Pi::url('user/oauth/callback/provider/facebook')
         ),
         'edit'        => 'checkbox',
         'filter'      => 'number_int',
@@ -799,7 +799,7 @@
         'title'       => _a('Login by github'),
         'description' => sprintf(
             __('Callback urls is : %s'),
-            Pi::url('user/oauth/callback/provider-github')
+            Pi::url('user/oauth/callback/provider/github')
         ),
         'edit'        => 'checkbox',
         'filter'      => 'number_int',

diff --git a/usr/module/user/config/module.php b/usr/module/user/config/module.php
@@ -16,7 +16,7 @@
     'meta'     => [
         'title'       => _a('User'),
         'description' => _a('User profile and services.'),
-        'version'     => '1.8.1',
+        'version'     => '1.8.2',
         'license'     => 'New BSD',
         'demo'        => 'http://demo.piengine.org',
         'icon'        => 'fa-user',

diff --git a/usr/module/user/config/user.php b/usr/module/user/config/user.php
@@ -291,13 +291,13 @@
             'edit'  => 'locale',
         ],
 
-        // Profile: mobile phone number
+        // Profile: mobile number
         'mobile'          => [
             'name'  => 'mobile',
             'title' => _a('Mobile phone'),
         ],
 
-        // Profile: phone
+        // Profile: phone number
         'phone'           => [
             'name'  => 'phone',
             'title' => _a('Telephone'),

diff --git a/usr/module/user/locale/en/admin.mo b/usr/module/user/locale/en/admin.mo