X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/3f81eba13b1bb23de2c135d6fc404fd76f7b6ce7..refs/pull/234/head:/app/helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index d28b1956f..b5be0fd11 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -7,26 +7,34 @@ use BookStack\Ownable;
  *
  * @param  string $file
  * @return string
- *
- * @throws \InvalidArgumentException
+ * @throws Exception
  */
-function versioned_asset($file)
+function versioned_asset($file = '')
 {
-    static $manifest = null;
+    static $version = null;
 
-    if (is_null($manifest)) {
-        $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
+    if (is_null($version)) {
+        $versionFile = base_path('version');
+        $version = trim(file_get_contents($versionFile));
     }
 
-    if (isset($manifest[$file])) {
-        return baseUrl($manifest[$file]);
+    $additional = '';
+    if (config('app.env') === 'development') {
+        $additional = sha1_file(public_path($file));
     }
 
-    if (file_exists(public_path($file))) {
-        return baseUrl($file);
-    }
+    $path = $file . '?version=' . urlencode($version) . $additional;
+    return baseUrl($path);
+}
 
-    throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
+/**
+ * Helper method to get the current User.
+ * Defaults to public 'Guest' user if not logged in.
+ * @return \BookStack\User
+ */
+function user()
+{
+    return auth()->user() ?: \BookStack\User::getDefault();
 }
 
 /**
@@ -40,7 +48,7 @@ function versioned_asset($file)
 function userCan($permission, Ownable $ownable = null)
 {
     if ($ownable === null) {
-        return auth()->user() && auth()->user()->can($permission);
+        return user() && user()->can($permission);
     }
 
     // Check permission on ownable item
@@ -56,7 +64,7 @@ function userCan($permission, Ownable $ownable = null)
  */
 function setting($key, $default = false)
 {
-    $settingService = app('BookStack\Services\SettingService');
+    $settingService = app(\BookStack\Services\SettingService::class);
     return $settingService->get($key, $default);
 }
 
@@ -72,11 +80,17 @@ function baseUrl($path, $forceAppDomain = false)
     if ($isFullUrl && !$forceAppDomain) return $path;
     $path = trim($path, '/');
 
+    // Remove non-specified domain if forced and we have a domain
     if ($isFullUrl && $forceAppDomain) {
         $explodedPath = explode('/', $path);
         $path = implode('/', array_splice($explodedPath, 3));
     }
 
+    // Return normal url path if not specified in config
+    if (config('app.url') === '') {
+        return url($path);
+    }
+
     return rtrim(config('app.url'), '/') . '/' . $path;
 }
 
@@ -115,14 +129,14 @@ function sortUrl($path, $data, $overrideData = [])
 {
     $queryStringSections = [];
     $queryData = array_merge($data, $overrideData);
-    
+
     // Change sorting direction is already sorted on current attribute
     if (isset($overrideData['sort']) && $overrideData['sort'] === $data['sort']) {
         $queryData['order'] = ($data['order'] === 'asc') ? 'desc' : 'asc';
     } else {
         $queryData['order'] = 'asc';
     }
-    
+
     foreach ($queryData as $name => $value) {
         $trimmedVal = trim($value);
         if ($trimmedVal === '') continue;
@@ -132,4 +146,4 @@ function sortUrl($path, $data, $overrideData = [])
     if (count($queryStringSections) === 0) return $path;
 
     return baseUrl($path . '?' . implode('&', $queryStringSections));
-}
\ No newline at end of file
+}