Updated issue template and added TinyMCE autolinking

[bookstack] / app / helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index 541f23fbe046b4842e8c5df780e7ace8cbc0032d..6decb08e96517233086eb9fe2e76ad002ce892fa 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -2,33 +2,39 @@
 
 use BookStack\Ownable;
 
 
 use BookStack\Ownable;
 

-if (!function_exists('versioned_asset')) {
-    /**
-     * Get the path to a versioned file.
-     *
-     * @param  string $file
-     * @return string
-     *
-     * @throws \InvalidArgumentException
-     */
-    function versioned_asset($file)
-    {
-        static $manifest = null;
-
-        if (is_null($manifest)) {
-            $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
-        }
-
-        if (isset($manifest[$file])) {
-            return baseUrl($manifest[$file]);
-        }
-
-        if (file_exists(public_path($file))) {
-            return baseUrl($file);
-        }
-
-        throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
+/**
+ * Get the path to a versioned file.
+ *
+ * @param  string $file
+ * @return string
+ * @throws Exception
+ */
+function versioned_asset($file = '')
+{
+    static $version = null;
+
+    if (is_null($version)) {
+        $versionFile = base_path('version');
+        $version = trim(file_get_contents($versionFile));

     }
     }

+
+    $additional = '';
+    if (config('app.env') === 'development') {
+        $additional = sha1_file(public_path($file));
+    }
+
+    $path = $file . '?version=' . urlencode($version) . $additional;
+    return baseUrl($path);
+}
+
+/**
+ * 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();

 }
 
 /**
 }
 
 /**


@@ -42,7 +48,7 @@ if (!function_exists('versioned_asset')) {
 function userCan($permission, Ownable $ownable = null)
 {
     if ($ownable === null) {
 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
     }
 
     // Check permission on ownable item


@@ -54,23 +60,38 @@ function userCan($permission, Ownable $ownable = null)
  * Helper to access system settings.
  * @param $key
  * @param bool $default
  * Helper to access system settings.
  * @param $key
  * @param bool $default

- * @return mixed
+ * @return bool|string|\BookStack\Services\SettingService

  */
  */

-function setting($key, $default = false)
+function setting($key = null, $default = false)

 {
 {

-    $settingService = app('BookStack\Services\SettingService');
+    $settingService = app(\BookStack\Services\SettingService::class);
+    if (is_null($key)) return $settingService;

     return $settingService->get($key, $default);
 }
 
 /**
  * Helper to create url's relative to the applications root path.
     return $settingService->get($key, $default);
 }
 
 /**
  * Helper to create url's relative to the applications root path.

- * @param $path
+ * @param string $path
+ * @param bool $forceAppDomain

  * @return string
  */
  * @return string
  */

-function baseUrl($path)
+function baseUrl($path, $forceAppDomain = false)

 {
 {

-    if (strpos($path, 'http') === 0) return $path;
+    $isFullUrl = strpos($path, 'http') === 0;
+    if ($isFullUrl && !$forceAppDomain) return $path;

     $path = trim($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;
 }
 
     return rtrim(config('app.url'), '/') . '/' . $path;
 }
 


@@ -109,14 +130,14 @@ function sortUrl($path, $data, $overrideData = [])
 {
     $queryStringSections = [];
     $queryData = array_merge($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';
     }
     // 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;
     foreach ($queryData as $name => $value) {
         $trimmedVal = trim($value);
         if ($trimmedVal === '') continue;


@@ -126,4 +147,4 @@ function sortUrl($path, $data, $overrideData = [])
     if (count($queryStringSections) === 0) return $path;
 
     return baseUrl($path . '?' . implode('&', $queryStringSections));
     if (count($queryStringSections) === 0) return $path;
 
     return baseUrl($path . '?' . implode('&', $queryStringSections));

-}
\ No newline at end of file
+}