From cb6f5e81c702bbcb8c99d0b053dd021c8784bb3d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 15 Dec 2023 08:45:33 +0800
Subject: [PATCH] * Fix bug #41553, save closed features base on the config of
 featureGroup, and modify callback function.

---
 module/admin/control.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index 07fca22254..0fd233dc6f 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -249,19 +249,23 @@ class admin extends control
 
         if($_POST)
         {
-            $data = form::data()->get();
+            $data           = form::data()->get();
             $closedFeatures = '';
-            foreach($data->module as $module => $checked)
+            foreach($this->config->featureGroup as $group => $features)
             {
-                if($module == 'myScore') continue;
-                if(!$checked) $closedFeatures .= "$module,";
+                foreach($features as $feature)
+                {
+                    if($feature == 'score' || $feature == 'UR') continue;
+                    $code = $group . ucfirst($feature);
+                    if(!isset($data->module[$code])) $closedFeatures .= "{$code},";
+                }
             }
 
             $this->setting->setItem('system.common.closedFeatures', rtrim($closedFeatures, ','));
-            $this->setting->setItem('system.common.global.scoreStatus', $data->module['myScore']);
-            $this->loadModel('setting')->setItem('system.custom.URAndSR', $this->config->edition == 'ipd' ? 1 : $data->module['productUR']);
+            $this->setting->setItem('system.common.global.scoreStatus', zget($data->module, 'myScore', 0));
+            $this->setting->setItem('system.custom.URAndSR', $this->config->edition == 'ipd' ? 1 : zget($data->module, 'UR', 0));
             $this->loadModel('custom')->processMeasrecordCron();
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => '$.apps.updateAppMenu'));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => '$.apps.updateAppsMenu'));
         }
         $this->view->title            = $this->lang->admin->setModuleIndex;
         $this->view->closedFeatures   = $this->setting->getItem('owner=system&module=common&section=&key=closedFeatures');