From 1c72171a5e628b11b792d640671bb8430c1cbe05 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 8 Apr 2019 16:07:42 +0800
Subject: [PATCH] Extract copyright as view

---
 app/Http/Controllers/AdminController.php   |  4 ++--
 app/helpers.php                            | 17 -----------------
 resources/views/admin/master.blade.php     |  2 +-
 resources/views/auth/master.blade.php      |  2 +-
 resources/views/common/copyright.blade.php | 12 ++++++++++++
 resources/views/index.blade.php            |  2 +-
 resources/views/skinlib/master.blade.php   |  2 +-
 resources/views/user/master.blade.php      |  2 +-
 8 files changed, 19 insertions(+), 24 deletions(-)
 create mode 100644 resources/views/common/copyright.blade.php

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 718ca2d5..45d30385 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -89,8 +89,8 @@ class AdminController extends Controller
                     ->option('0', 'Powered with ❤ by Blessing Skin Server.')
                     ->option('1', 'Powered by Blessing Skin Server.')
                     ->option('2', 'Proudly powered by Blessing Skin Server.')
-                    ->option('3', '由 Blessing Skin Server 强力驱动.')
-                    ->option('4', '自豪地采用 Blessing Skin Server.')
+                    ->option('3', '由 Blessing Skin Server 强力驱动。')
+                    ->option('4', '自豪地采用 Blessing Skin Server。')
                 ->description();
 
             $form->textarea('copyright_text')->rows(6)->description();
diff --git a/app/helpers.php b/app/helpers.php
index 902cffc1..193e1577 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -171,23 +171,6 @@ if (! function_exists('bs_menu')) {
     }
 }
 
-if (! function_exists('bs_copyright')) {
-    function bs_copyright($prefer = null)
-    {
-        $prefer = is_null($prefer) ? option_localized('copyright_prefer', 0) : $prefer;
-
-        $base64CopyrightText = [
-            'UG93ZXJlZCB3aXRoIOKdpCBieSA8YSBocmVmPSJodHRwczovL2dpdGh1Yi5jb20vcHJpbnRlbXB3L2JsZXNzaW5nLXNraW4tc2VydmVyIj5CbGVzc2luZyBTa2luIFNlcnZlcjwvYT4u',
-            'UG93ZXJlZCBieSA8YSBocmVmPSJodHRwczovL2dpdGh1Yi5jb20vcHJpbnRlbXB3L2JsZXNzaW5nLXNraW4tc2VydmVyIj5CbGVzc2luZyBTa2luIFNlcnZlcjwvYT4u',
-            'UHJvdWRseSBwb3dlcmVkIGJ5IDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS9wcmludGVtcHcvYmxlc3Npbmctc2tpbi1zZXJ2ZXIiPkJsZXNzaW5nIFNraW4gU2VydmVyPC9hPi4=',
-            '55SxIDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS9wcmludGVtcHcvYmxlc3Npbmctc2tpbi1zZXJ2ZXIiPkJsZXNzaW5nIFNraW4gU2VydmVyPC9hPiDlvLrlipvpqbHliqgu',
-            '6Ieq6LGq5Zyw6YeH55SoIDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS9wcmludGVtcHcvYmxlc3Npbmctc2tpbi1zZXJ2ZXIiPkJsZXNzaW5nIFNraW4gU2VydmVyPC9hPi4=',
-        ];
-
-        return base64_decode(Arr::get($base64CopyrightText, $prefer, $base64CopyrightText[0]));
-    }
-}
-
 if (! function_exists('option')) {
     /**
      * Get / set the specified option value.
diff --git a/resources/views/admin/master.blade.php b/resources/views/admin/master.blade.php
index 38d6b104..01be2f00 100644
--- a/resources/views/admin/master.blade.php
+++ b/resources/views/admin/master.blade.php
@@ -73,7 +73,7 @@
         <footer class="main-footer">
             <!-- YOU CAN NOT MODIFIY THE COPYRIGHT TEXT W/O PERMISSION -->
             <div id="copyright-text" class="pull-right hidden-xs">
-                {!! bs_copyright() !!}
+                @include('common.copyright')
             </div>
             <!-- Default to the left -->
             @include('common.custom-copyright')
diff --git a/resources/views/auth/master.blade.php b/resources/views/auth/master.blade.php
index 152a41a7..cee2bd3f 100644
--- a/resources/views/auth/master.blade.php
+++ b/resources/views/auth/master.blade.php
@@ -20,7 +20,7 @@
 
     <!-- YOU CAN NOT MODIFIY THE COPYRIGHT TEXT W/O PERMISSION -->
     <div id="copyright-text" class="hide">
-        {!! bs_copyright() !!}
+        @include('common.copyright')
     </div>
 
     <!-- App Scripts -->
diff --git a/resources/views/common/copyright.blade.php b/resources/views/common/copyright.blade.php
new file mode 100644
index 00000000..8f01b1bd
--- /dev/null
+++ b/resources/views/common/copyright.blade.php
@@ -0,0 +1,12 @@
+{!!
+Arr::get(
+    [
+        'Powered with ❤ by <a href="https://github.com/bs-community/blessing-skin-server">Blessing Skin Server</a>.',
+        'Powered by <a href="https://github.com/bs-community/blessing-skin-server">Blessing Skin Server</a>.',
+        'Proudly powered by <a href="https://github.com/bs-community/blessing-skin-server">Blessing Skin Server</a>.',
+        '由 <a href="https://github.com/bs-community/blessing-skin-server">Blessing Skin Server</a> 强力驱动。',
+        '自豪地采用 <a href="https://github.com/bs-community/blessing-skin-server">Blessing Skin Server</a>。'
+    ],
+    option_localized('copyright_prefer', 0)
+)
+!!}
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 07c17a70..b4942513 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -118,7 +118,7 @@
         <div class="container">
             <!-- YOU CAN NOT MODIFIY THE COPYRIGHT TEXT W/O PERMISSION -->
             <div id="copyright-text" class="pull-right hidden-xs">
-                {!! bs_copyright() !!}
+                @include('common.copyright')
             </div>
             <!-- Default to the left -->
             @include('common.custom-copyright')
diff --git a/resources/views/skinlib/master.blade.php b/resources/views/skinlib/master.blade.php
index 26cb46d6..f8079708 100644
--- a/resources/views/skinlib/master.blade.php
+++ b/resources/views/skinlib/master.blade.php
@@ -74,7 +74,7 @@
             <div class="container">
                 <!-- YOU CAN NOT MODIFIY THE COPYRIGHT TEXT W/O PERMISSION -->
                 <div id="copyright-text" class="pull-right hidden-xs">
-                    {!! bs_copyright() !!}
+                    @include('common.copyright')
                 </div>
                 <!-- Default to the left -->
                 @include('common.custom-copyright')
diff --git a/resources/views/user/master.blade.php b/resources/views/user/master.blade.php
index 8788324d..22622c82 100644
--- a/resources/views/user/master.blade.php
+++ b/resources/views/user/master.blade.php
@@ -78,7 +78,7 @@
         <footer class="main-footer">
             <!-- YOU CAN NOT MODIFIY THE COPYRIGHT TEXT W/O PERMISSION -->
             <div id="copyright-text" class="pull-right hidden-xs">
-                {!! bs_copyright() !!}
+                @include('common.copyright')
             </div>
             <!-- Default to the left -->
             @include('common.custom-copyright')