add update tips

prinsss · Sep 28, 2016 · e119ba0 · e119ba0
1 parent 6a8cbc9
commit e119ba0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/resources/views/setup/updates/success.tpl b/resources/views/setup/updates/success.tpl
@@ -5,6 +5,16 @@
 
 <p>数据库升级成功，欢迎使用 Blessing Skin Server {{ config('app.version') }}！</p>
 
+{{-- if any tip is given --}}
+@if (isset($tips))
+<p><b>升级提示：</b></p>
+<ul>
+    @foreach ($tips as $tip)
+    <li><p>{{ $tip }}</p></li>
+    @endforeach
+</ul>
+@endif
+
 <p class="step">
     <a href="../" class="button button-large">首页</a>
 </p>

diff --git a/setup/update.php b/setup/update.php
@@ -21,6 +21,9 @@
     case '2':
         $resource = opendir(BASE_DIR."/setup/update_scripts/");
         $update_script_exist = false;
+
+        $tips = [];
+
         while($filename = @readdir($resource)) {
             if ($filename != "." && $filename != "..") {
                 preg_match('/update-(.*)-to-(.*).php/', $filename, $matches);
@@ -31,7 +34,14 @@
                     continue;
                 }
 
-                include BASE_DIR."/setup/update_scripts/$filename";
+                $result = require BASE_DIR."/setup/update_scripts/$filename";
+
+                if (is_array($result)) {
+                    // push tip to array
+                    foreach ($result as $tip) {
+                        $tips[] = $tip;
+                    }
+                }
             }
         }
         closedir($resource);
@@ -46,7 +56,7 @@
             Option::set('version', config('app.version'));
         }
 
-        View::show('setup.updates.success');
+        View::show('setup.updates.success', ['tips' => $tips]);
 
         break;