Merge branch 'master' of https://github.com/unacms/una

unacms · Sep 11, 2024 · 9d9dc21 · 9d9dc21
2 parents 34e7e69 + c2fab91
commit 9d9dc21
Show file tree

Hide file tree

Showing 8 changed files with 983 additions and 22 deletions.
diff --git a/upgrade/files/14.0.0.B2-14.0.0.RC1/check.php b/upgrade/files/14.0.0.B2-14.0.0.RC1/check.php
@@ -2,8 +2,13 @@
 
 $mixCheckResult = 'Update can not be applied';
 
-$sVer = $this->oDb->getOne("SELECT `version` FROM `sys_modules` WHERE `name` = 'system'");
-if ('14.0.0.B2' == $sVer || '14.0.0-B2' == $sVer)
-    $mixCheckResult = true;
+if (!(PHP_VERSION_ID >= 80100)) {
+    $mixCheckResult = 'This update requires a PHP version ">= 8.1.0". You are running ' . PHP_VERSION;
+}
+else {
+    $sVer = $this->oDb->getOne("SELECT `version` FROM `sys_modules` WHERE `name` = 'system'");
+    if ('14.0.0.B2' == $sVer || '14.0.0-B2' == $sVer)
+        $mixCheckResult = true;
+}
 
 return $mixCheckResult;
diff --git a/upgrade/files/14.0.0.B2-14.0.0.RC1/files/inc/classes/BxDolGrid.php b/upgrade/files/14.0.0.B2-14.0.0.RC1/files/inc/classes/BxDolGrid.php
@@ -383,7 +383,7 @@ protected function _getDataArray ($sFilter, $sOrderField, $sOrderDir, $iStart, $
         // sort
         $sSortField = false;
         $iSortDir = 1;
-        if ($sOrderField && !empty($this->_aOptions['sorting_fields']) && is_array($this->_aOptions['sorting_fields']) && in_array($sOrderField, $this->_aOptions['sorting_fields'])) { // explicit order
+        if ($sOrderField && ($aSortingFields = $this->_getOrderFields()) && in_array($sOrderField, $aSortingFields)) { // explicit order
             $sSortField = $sOrderField;
             $iSortDir = 0 === strcasecmp($sOrderDir, 'desc') ? -1 : 1;
         } elseif (!empty($this->_aOptions['field_order'])) { // order by "order" field
@@ -568,11 +568,11 @@ protected function _getDataSqlOrderClause ($sOrderByFilter, $sOrderField, $sOrde
     {
         $sOrderClause = '';
 
-        if ($sOrderField && is_array($this->_aOptions['sorting_fields']) && in_array($sOrderField, $this->_aOptions['sorting_fields'])) { // explicit order
+        if ($sOrderField && ($aSortingFields = $this->_getOrderFields()) && in_array($sOrderField, $aSortingFields)) { // explicit order
 
             $sDir = (0 === strcasecmp($sOrderDir, 'desc') ? 'DESC' : 'ASC');
 
-            if (is_array($this->_aOptions['sorting_fields_translatable']) && in_array($sOrderField, $this->_aOptions['sorting_fields_translatable'])) {
+            if (($aSortingFieldsTranslatable = $this->_getOrderFieldsTranslatable()) && in_array($sOrderField, $aSortingFieldsTranslatable)) {
 
                 // translatable fields
                 $iLang = BxDolLanguages::getInstance()->getCurrentLangId();
@@ -647,6 +647,17 @@ protected function _getFilterValue()
         return bx_unicode_urldecode(bx_process_input(bx_get($this->_aOptions['filter_get'])));
     }
 
+    protected function _getOrderFields($bTranslatable = false)
+    {
+        $sKey = 'sorting_fields' . ($bTranslatable ? '_translatable' : '');
+        return !empty($this->_aOptions[$sKey]) && is_array($this->_aOptions[$sKey]) ? $this->_aOptions[$sKey] : [];
+    }
+
+    protected function _getOrderFieldsTranslatable()
+    {
+        return $this->_getOrderFields(true);
+    }
+
     protected function _getOrderValue()
     {
         return bx_unicode_urldecode(bx_process_input(bx_get($this->_aOptions['order_get_field'])));

diff --git a/upgrade/files/14.0.0.B2-14.0.0.RC1/files/plugins/autoload.php b/upgrade/files/14.0.0.B2-14.0.0.RC1/files/plugins/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit03a8066c470486be30535b543d47f96a::getLoader();
+return ComposerAutoloaderInitfd83e10aca1f370f3d7f53da5d1e7afa::getLoader();
diff --git a/upgrade/files/14.0.0.B2-14.0.0.RC1/files/plugins/composer/autoload_real.php b/upgrade/files/14.0.0.B2-14.0.0.RC1/files/plugins/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit03a8066c470486be30535b543d47f96a
+class ComposerAutoloaderInitfd83e10aca1f370f3d7f53da5d1e7afa
 {
     private static $loader;
 
@@ -24,15 +24,15 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit03a8066c470486be30535b543d47f96a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitfd83e10aca1f370f3d7f53da5d1e7afa', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit03a8066c470486be30535b543d47f96a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitfd83e10aca1f370f3d7f53da5d1e7afa', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit03a8066c470486be30535b543d47f96a::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitfd83e10aca1f370f3d7f53da5d1e7afa::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -53,19 +53,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit03a8066c470486be30535b543d47f96a::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitfd83e10aca1f370f3d7f53da5d1e7afa::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire03a8066c470486be30535b543d47f96a($fileIdentifier, $file);
+            composerRequirefd83e10aca1f370f3d7f53da5d1e7afa($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire03a8066c470486be30535b543d47f96a($fileIdentifier, $file)
+function composerRequirefd83e10aca1f370f3d7f53da5d1e7afa($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

diff --git a/upgrade/files/14.0.0.B2-14.0.0.RC1/files/plugins/composer/autoload_static.php b/upgrade/files/14.0.0.B2-14.0.0.RC1/files/plugins/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit03a8066c470486be30535b543d47f96a
+class ComposerStaticInitfd83e10aca1f370f3d7f53da5d1e7afa
 {
     public static $files = array (
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
@@ -216,10 +216,10 @@ class ComposerStaticInit03a8066c470486be30535b543d47f96a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit03a8066c470486be30535b543d47f96a::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit03a8066c470486be30535b543d47f96a::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit03a8066c470486be30535b543d47f96a::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit03a8066c470486be30535b543d47f96a::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitfd83e10aca1f370f3d7f53da5d1e7afa::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitfd83e10aca1f370f3d7f53da5d1e7afa::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitfd83e10aca1f370f3d7f53da5d1e7afa::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitfd83e10aca1f370f3d7f53da5d1e7afa::$classMap;
 
         }, null, ClassLoader::class);
     }

diff --git a/upgrade/files/14.0.0.B2-14.0.0.RC1/files/plugins/composer/installed.php b/upgrade/files/14.0.0.B2-14.0.0.RC1/files/plugins/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '53588980042992e9da0cf02b65071d4a81815440',
+        'reference' => '53576e1540d7625f6f9bed8ee0f17a99467d2870',
         'name' => 'unaio/una',
         'dev' => true,
     ),
@@ -359,7 +359,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '53588980042992e9da0cf02b65071d4a81815440',
+            'reference' => '53576e1540d7625f6f9bed8ee0f17a99467d2870',
             'dev_requirement' => false,
         ),
         'wikimedia/less.php' => array(