replace GPL diff lib with MIT lib

[bookstack] / app / helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index 582e4e03ad56242ffabcfd1f11d5537be90ac938..42e4c189476c8669a2d8bd336a7c9b84a7223df2 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,5 +1,7 @@
 <?php
 
 <?php
 

+use BookStack\Ownable;
+

 if (!function_exists('versioned_asset')) {
     /**
      * Get the path to a versioned file.
 if (!function_exists('versioned_asset')) {
     /**
      * Get the path to a versioned file.


@@ -31,22 +33,21 @@ if (!function_exists('versioned_asset')) {
 
 /**
  * Check if the current user has a permission.
 
 /**
  * Check if the current user has a permission.

- * If an ownable element is passed in the permissions are checked against
+ * If an ownable element is passed in the jointPermissions are checked against

  * that particular item.
  * @param $permission
  * that particular item.
  * @param $permission

- * @param \BookStack\Ownable $ownable
+ * @param Ownable $ownable

  * @return mixed
  */
  * @return mixed
  */

-function userCan($permission, \BookStack\Ownable $ownable = null)
+function userCan($permission, Ownable $ownable = null)

 {
 {

-    if (!auth()->check()) return false;

     if ($ownable === null) {
         return auth()->user() && auth()->user()->can($permission);
     }
 
     // Check permission on ownable item
     if ($ownable === null) {
         return auth()->user() && auth()->user()->can($permission);
     }
 
     // Check permission on ownable item

-    $restrictionService = app('BookStack\Services\RestrictionService');
-    return $restrictionService->checkEntityUserAccess($ownable, $permission);
+    $permissionService = app(\BookStack\Services\PermissionService::class);
+    return $permissionService->checkOwnableUserAccess($ownable, $permission);

 }
 
 /**
 }
 
 /**


@@ -60,3 +61,35 @@ function setting($key, $default = false)
     $settingService = app('BookStack\Services\SettingService');
     return $settingService->get($key, $default);
 }
     $settingService = app('BookStack\Services\SettingService');
     return $settingService->get($key, $default);
 }

+
+/**
+ * Generate a url with multiple parameters for sorting purposes.
+ * Works out the logic to set the correct sorting direction
+ * Discards empty parameters and allows overriding.
+ * @param $path
+ * @param array $data
+ * @param array $overrideData
+ * @return string
+ */
+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;
+        $queryStringSections[] = urlencode($name) . '=' . urlencode($trimmedVal);
+    }
+
+    if (count($queryStringSections) === 0) return $path;
+
+    return $path . '?' . implode('&', $queryStringSections);
+}
\ No newline at end of file