diff --git a/core/services/resources/classes/services.php b/core/services/resources/classes/services.php index f447ad08f..39a978e7c 100644 --- a/core/services/resources/classes/services.php +++ b/core/services/resources/classes/services.php @@ -99,7 +99,7 @@ class services { */ public function delete($records) { // Permission not found - if (permission_exists($this->name.'_delete')) { + if (!permission_exists($this->name.'_delete')) { return; } @@ -237,7 +237,7 @@ class services { foreach($service_files as $file) { // Get the service name $service_name = $this->find_service_name($file); - + // Get the service status if ($details) { $service_status = $this->is_running($service_name); diff --git a/core/services/services.php b/core/services/services.php index b10ceaa96..ebace227b 100644 --- a/core/services/services.php +++ b/core/services/services.php @@ -50,30 +50,6 @@ // process the http post data by action if (!empty($action) && !empty($services) && is_array($services) && @sizeof($services) != 0) { - - // validate the token - $token = new token; - if (!$token->validate($_SERVER['PHP_SELF'])) { - message::add($text['message-invalid_token'],'negative'); - header('Location: services.php'); - exit; - } - - // prepare the array - if (!empty($services)) { - foreach ($services as $row) { - $array['services'][$x]['checked'] = $row['checked']; - $array['services'][$x]['service_uuid'] = $row['service_uuid']; - $array['services'][$x]['service_enabled'] = $row['service_enabled']; - $x++; - } - } - - // prepare the database object - $database->app_name = 'services'; - $database->app_uuid = '540c3ec2-4f0c-467f-a09d-d644439c96f2'; - - // send the array to the database class switch ($action) { case 'toggle': if (permission_exists('service_edit')) { @@ -83,9 +59,8 @@ break; case 'delete': if (permission_exists('service_delete')) { - $database->delete($array); - // $obj = new services; - // $obj->delete($services); + $obj = new services; + $obj->delete($services); } break; }