修复：后台自动跳转到第一个有权限菜单异常问题

Author: modstart

artisan

@@ -19,6 +19,16 @@ require __DIR__.'/vendor/autoload.php';
 
 $app = require_once __DIR__.'/bootstrap/app.php';
 
+if (\ModStart\Core\Util\PlatformUtil::isLinux()) {
+    if (function_exists('posix_getuid')) {
+        $uid = posix_getuid();
+        if ($uid == 0) {
+            echo "You can't run this command as root ( uid = ${uid} ).\n";
+            exit(-1);
+        }
+    }
+}
+
 /*
 |--------------------------------------------------------------------------
 | Run The Artisan Application

module/Member/Api/Controller/AuthController.php

@@ -173,6 +173,18 @@ public function oauthTryLogin($oauthType = null)
             return Response::generateSuccessData($resultData);
         }
         if (modstart_config('Member_OauthBindAuto', false)) {
+            // 已登录直接绑定
+            if (MemberUser::isLogin()) {
+                $memberUserId = MemberUser::id();
+                $ret = $oauth->processBindToUser([
+                    'memberUserId' => $memberUserId,
+                    'userInfo' => $oauthUserInfo,
+                ]);
+                BizException::throwsIfResponseError($ret);
+                Session::forget('oauthUserInfo');
+                $resultData['memberUserId'] = $memberUserId;
+                return Response::generateSuccessData($resultData);
+            }
             // 快速注册
             /** 为了兼容统一登录，禁止使用手机号格式和邮箱格式  */
             $username = null;

module/Member/Docs/release.md

@@ -2,6 +2,7 @@
 
 - 优化：手机快速注册登录密码设置控件不是password修复
 - 优化：VIP设置赠送积分但积分设置为0时异常问题
+- 修复：已登录绑定授权信息，开启自动绑定账户时，绑定账户异常问题
 
 ---
 

module/Vendor/View/mail/frame.blade.php

@@ -32,7 +32,8 @@
             @show
         </div>
         <div id="foot">
-            {{modstart_config('siteName')}} &copy; {{modstart_config('siteDomain')}}
+            {{modstart_config('siteName')}}
+            {!! modstart_config('siteDomain','')?'&copy;'.modstart_config('siteDomain',''):'' !!}
         </div>
     @show
 </div>

vendor/modstart/modstart/lang/zh/base.php

@@ -30,6 +30,7 @@
     'Security Warning' => '安全警告',
     'System in debug mode ( APP_DEBUG=true ), error messages may expose sensitive data.' => '系统为调试模式 ( APP_DEBUG=true )，错误信息可能暴露敏感信息。',
     'install.php script not deleted, may expose sensitive data' => 'install.php 安装向导文件未删除，可能暴露敏感信息',
+    'Your password is weak, please change your password.' => '您的正在使用弱密码，请及时修改密码。',
     'Visit Home' => '访问首页',
     'Home' => '首页',
     'Admin Login' => '管理登录',

vendor/modstart/modstart/src/Admin/Middleware/AuthMiddleware.php

@@ -147,7 +147,12 @@ public function handle($request, Closure $next)
                         // 如果是首页，尝试跳转到第一个有权限的页面
                         foreach ($rules as $_ => $ruleInfo) {
                             if (!empty($ruleInfo['auth'])) {
-                                return Response::redirect(action($ruleInfo['url']));
+                                // 如果是 URL，直接跳转，如果是 Controller@method，尝试调用
+                                $url = $ruleInfo['url'];
+                                if (AdminPermission::isUrlAction($ruleInfo['url'])) {
+                                    $url = action($ruleInfo['url']);
+                                }
+                                return Response::redirect($url);
                             }
                         }
                     }

vendor/modstart/modstart/src/Core/Util/ShellUtil.php

@@ -66,6 +66,30 @@ public static function runInNewProcess($command, $log = true)
         return $ret;
     }
 
+    public static function runWithTimeout($command, $timeout = 60, $log = true)
+    {
+        if ($log) {
+            Log::info("ShellUtil.Run -> " . $command);
+        }
+        $process = new Process($command);
+        $process->setTimeout($timeout);
+        try {
+            $process->start();
+            $process->wait();
+            $ret = $process->getOutput();
+            $ret = @trim($ret);
+            if ($log) {
+                Log::info("ShellUtil.Result -> " . $ret);
+            }
+            return $ret;
+        } catch (\Exception $e) {
+            if ($log) {
+                Log::error("ShellUtil.Error -> " . $e->getMessage());
+            }
+            return "ERROR:" . $e->getMessage();
+        }
+    }
+
     /**
      * @param $commandFilter
      * @return array|string|null

vendor/modstart/modstart/src/Widget/Nav.php

@@ -23,6 +23,11 @@ class Nav extends AbstractWidget
      */
     protected $classList = '';
 
+    /**
+     * @var string
+     */
+    protected $attributes = '';
+
     /**
      * Box constructor.
      *
@@ -35,7 +40,7 @@ public function __construct($navs, $classList = '')
         $this->classList = $classList;
     }
 
-    public static function make($navs, $classList = '')
+    public static function make($navs = [], $classList = '')
     {
         return new static($navs, $classList);
     }
@@ -52,6 +57,36 @@ public function classList($classList)
         return $this;
     }
 
+    public function attributes($attributes)
+    {
+        $this->attributes = $attributes;
+        return $this;
+    }
+
+    public function append($title, $url, $active = false)
+    {
+        $this->navs[] = [
+            'title' => $title,
+            'url' => $url,
+            'active' => $active,
+        ];
+        return $this;
+    }
+
+    public function appendDialog($title, $url, $active = false, $width = null, $height = null)
+    {
+        $this->navs[] = [
+            'title' => $title,
+            'dialog' => [
+                'url' => $url,
+                'width' => $width,
+                'height' => $height,
+            ],
+            'active' => $active,
+        ];
+        return $this;
+    }
+
     /**
      * Variables in view.
      *

vendor/modstart/modstart/views/admin/widget/securityTooltipBox.blade.php

@@ -38,7 +38,7 @@
         <div class="ub-alert warning">
             <i class="iconfont icon-warning"></i>
             {{L('Security Warning')}}: {{L('Your password is weak, please change your password.')}}
-            <a href="{{action('\ModStart\Admin\Controller\AdminUserController@changePassword')}}">{{L('Process Now')}}</a>
+            <a href="{{action('\ModStart\Admin\Controller\ProfileController@changePassword')}}">{{L('Process Now')}}</a>
         </div>
     @endif
     @if(config('env.APP_KEY')=='AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')

vendor/modstart/modstart/views/core/field/tags.blade.php

@@ -40,6 +40,7 @@ class="form"
         var $field = $('#{{$id}}');
         var $tag = $('#{{$id}}Tags').tagify({
             whitelist : {!! \ModStart\Core\Util\SerializeUtil::jsonEncode(array_values($tags)) !!},
+            enforceWhitelist: false,
             dropdown: {
                 maxItems: 20,
                 classname: "tagify-dropdown-list",