Merge pull request #3718 from zikula/3694

fixes for #3694

Author: craigh

src/lib/legacy/dbobject/CategoryArray.php

@@ -75,10 +75,18 @@ public function selectPostProcess($objArray = null)
         if (!$objArray) {
             return $objArray;
         }
+        /** @var \Doctrine\Common\Persistence\ObjectManager $manager */
+        $manager = ServiceUtil::get('doctrine')->getManager();
 
         foreach ($objArray as $k => $obj) {
             $objArray[$k]['display_name'] = DataUtil::formatForDisplayHTML(unserialize($obj['display_name']));
             $objArray[$k]['display_desc'] = DataUtil::formatForDisplayHTML(unserialize($obj['display_desc']));
+            /**
+             * ugly BC hack
+             */
+            $entity = $manager->getRepository(\Zikula\CategoriesModule\Entity\CategoryEntity::class)->find($k);
+            $objArray[$k]['path'] = $entity->getPath();
+            $objArray[$k]['ipath'] = $entity->getIPath();
         }
 
         return $objArray;

src/lib/legacy/util/CategoryUtil.php

@@ -687,7 +687,31 @@ public static function rebuildPaths($pathField = 'path', $sourceField = 'name',
     public static function hasCategoryAccess($categories, $module, $permLevel = ACCESS_OVERVIEW)
     {
         @trigger_error('CategoryUtil is deprecated. please use the new category permission api instead.', E_USER_DEPRECATED);
-
-        return ServiceUtil::get('zikula_categories_module.api.category_permission')->hasCategoryAccess($categories, $permLevel);
+        // Always allow access to content with no categories associated
+        if (count($categories) == 0) {
+            return true;
+        }
+
+        // Check if access is required for all categories or for at least one category
+        $requireAccessForAll = \ModUtil::getVar('ZikulaCategoriesModule', 'permissionsall', 0);
+
+        $accessGranted = true;
+        foreach ($categories as $propertyName => $cats) {
+            $categoriesForProperty = is_array($cats) ? $cats : [$cats];
+            foreach ($categoriesForProperty as $cat) {
+                $hasAccess = \SecurityUtil::checkPermission("ZikulaCategoriesModule:$propertyName:Category", "$cat[id]:$cat[path]:$cat[ipath]", $permLevel);
+                if ($requireAccessForAll && !$hasAccess) {
+                    return false;
+                }
+                if (!$requireAccessForAll) {
+                    if ($hasAccess) {
+                        return true;
+                    }
+                    $accessGranted = false;
+                }
+            }
+        }
+
+        return $accessGranted;
     }
 }

src/lib/legacy/util/UserUtil.php

@@ -1448,6 +1448,14 @@ public static function getTheme($force = false)
             $request->attributes->set('_theme', $themeName);
 
             return $themeName;
+        } else {
+            // on upgrade, if a user doesn't add their custom theme back to the /theme dir, it should be reset to a core
+            // theme, if available.
+            if (ServiceUtil::get('kernel')->isBundle('ZikulaBootstrapTheme')) {
+                System::setVar('Default_Theme', 'ZikulaBootstrapTheme');
+
+                return 'ZikulaBootstrapTheme';
+            }
         }
 
         if (\ServiceUtil::getManager()->getParameter('installed')) {

src/system/CategoriesModule/tables.php

@@ -40,6 +40,7 @@ function ZikulaCategoriesModule_tables()
         'status'          => 'status'
     ];
     ObjectUtil::addStandardFieldsToTableDefinition($columns);
+    unset($columns['obj_status']);
     $dbtable['categories_category_column'] = $columns;
 
     // Enable attribution services
@@ -68,6 +69,7 @@ function ZikulaCategoriesModule_tables()
         'status'          => "C(1) NOTNULL DEFAULT 'A'"
     ];
     ObjectUtil::addStandardFieldsToTableDataDefinition($tabledef);
+    unset($tabledef['obj_status']);
     $dbtable['categories_category_column_def'] = $tabledef;
 
     $table = 'categories_mapmeta';