fixed removing permissions

ocmod-space · Feb 15, 2024 · 2058065 · 2058065
1 parent f042014
commit 2058065
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change log (3.0.x.x)
 
+## 2024.02.15_1 [#c458419](https://github.com/opencart/opencart/commit/c4584195a900250d52ba46e524ba71b7bdb8a495)
+### Fixed
+- Removing permissions.
+
 ## 2024.02.11_2 [#c458419](https://github.com/opencart/opencart/commit/c4584195a900250d52ba46e524ba71b7bdb8a495)
 ### Fixed
 - Cache control headers

diff --git a/admin/controller/extension/extension/analytics.php b/admin/controller/extension/extension/analytics.php
@@ -31,10 +31,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/analytics/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/analytics/' . $this->request->get['extension']);
-			$this->model_user_user_group->removePermissions('analytics/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -52,6 +48,10 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/analytics/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/analytics/' . $this->request->get['extension']);
+			$this->model_user_user_group->removePermissions('analytics/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/captcha.php b/admin/controller/extension/extension/captcha.php
@@ -31,10 +31,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/captcha/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/captcha/' . $this->request->get['extension']);
-			$this->model_user_user_group->removePermissions('captcha/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -52,6 +48,10 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/captcha/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/captcha/' . $this->request->get['extension']);
+			$this->model_user_user_group->removePermissions('captcha/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/currency.php b/admin/controller/extension/extension/currency.php
@@ -27,9 +27,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/currency/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/currency/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -47,6 +44,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/currency/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/currency/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/dashboard.php b/admin/controller/extension/extension/dashboard.php
@@ -27,9 +27,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/dashboard/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/dashboard/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -47,6 +44,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/dashboard/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/dashboard/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/feed.php b/admin/controller/extension/extension/feed.php
@@ -27,9 +27,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/feed/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/feed/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -47,6 +44,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/feed/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/feed/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/fraud.php b/admin/controller/extension/extension/fraud.php
@@ -27,9 +27,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/fraud/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/fraud/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -47,6 +44,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/fraud/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/fraud/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/menu.php b/admin/controller/extension/extension/menu.php
@@ -27,9 +27,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/menu/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/menu/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -47,6 +44,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/menu/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/menu/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/module.php b/admin/controller/extension/extension/module.php
@@ -31,9 +31,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/module/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/module/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		} else {
 			$this->session->data['error'] = $this->error['warning'];
@@ -57,6 +54,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/module/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/module/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/payment.php b/admin/controller/extension/extension/payment.php
@@ -27,9 +27,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/payment/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/payment/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -47,6 +44,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/payment/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/payment/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/report.php b/admin/controller/extension/extension/report.php
@@ -26,9 +26,6 @@ public function install() {
 
 			$this->load->controller('extension/report/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/report/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -45,6 +42,9 @@ public function uninstall() {
 
 			$this->load->controller('extension/report/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/report/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/shipping.php b/admin/controller/extension/extension/shipping.php
@@ -27,9 +27,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/shipping/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/shipping/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -47,6 +44,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/shipping/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/shipping/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/theme.php b/admin/controller/extension/extension/theme.php
@@ -27,9 +27,6 @@ public function install() {
 			// Call install method if it exsits
 			$this->load->controller('extension/theme/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/theme/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -47,6 +44,9 @@ public function uninstall() {
 			// Call uninstall method if it exsits
 			$this->load->controller('extension/theme/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/theme/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 

diff --git a/admin/controller/extension/extension/total.php b/admin/controller/extension/extension/total.php
@@ -26,9 +26,6 @@ public function install() {
 
 			$this->load->controller('extension/total/' . $this->request->get['extension'] . '/install');
 
-			$this->load->model('user/user_group');
-			$this->model_user_user_group->removePermissions('extension/total/' . $this->request->get['extension']);
-
 			$this->session->data['success'] = $this->language->get('text_success');
 		}
 
@@ -45,6 +42,9 @@ public function uninstall() {
 
 			$this->load->controller('extension/total/' . $this->request->get['extension'] . '/uninstall');
 
+			$this->load->model('user/user_group');
+			$this->model_user_user_group->removePermissions('extension/total/' . $this->request->get['extension']);
+
 			$this->session->data['success'] = $this->language->get('text_success');
 		}