set version to 0.10.38 for upcoming maintenance release

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

api_keys.php

@@ -1,5 +1,5 @@
 <?php
-if (! defined('AREA')) {
+if (!defined('AREA')) {
 	header("Location: index.php");
 	exit();
 }
@@ -27,39 +27,47 @@ use Froxlor\Database\Database;
 
 $del_stmt = Database::prepare("DELETE FROM `" . TABLE_API_KEYS . "` WHERE id = :id");
 $success_message = "";
-$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+$id = isset($_POST['id']) ? (int) $_POST['id'] : (isset($_GET['id']) ? (int) $_GET['id'] : 0);
 $area = AREA;
 
 // do the delete and then just show a success-message and the apikeys list again
 if ($action == 'delete') {
 	if ($id > 0) {
-		$chk = (AREA == 'admin' && $userinfo['customers_see_all'] == '1') ? true : false;
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		if (AREA == 'customer') {
+			$chk = (AREA == 'admin' && $userinfo['customers_see_all'] == '1') ? true : false;
-			$chk_stmt = Database::prepare("
+			if (AREA == 'customer') {
-				SELECT c.customerid FROM `" . TABLE_PANEL_CUSTOMERS . "` c
+				$chk_stmt = Database::prepare("
-				LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.customerid = c.customerid
+					SELECT c.customerid FROM `" . TABLE_PANEL_CUSTOMERS . "` c
-				WHERE ak.`id` = :id AND c.`customerid` = :cid
+					LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.customerid = c.customerid
-			");
+					WHERE ak.`id` = :id AND c.`customerid` = :cid
-			$chk = Database::pexecute_first($chk_stmt, array(
+				");
-				'id' => $id,
+				$chk = Database::pexecute_first($chk_stmt, array(
-				'cid' => $userinfo['customerid']
+					'id' => $id,
-			));
+					'cid' => $userinfo['customerid']
-		} elseif (AREA == 'admin' && $userinfo['customers_see_all'] == '0') {
+				));
-			$chk_stmt = Database::prepare("
+			} elseif (AREA == 'admin' && $userinfo['customers_see_all'] == '0') {
-				SELECT a.adminid FROM `" . TABLE_PANEL_ADMINS . "` a
+				$chk_stmt = Database::prepare("
-				LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.adminid = a.adminid
+					SELECT a.adminid FROM `" . TABLE_PANEL_ADMINS . "` a
-				WHERE ak.`id` = :id AND a.`adminid` = :aid
+					LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.adminid = a.adminid
-			");
+					WHERE ak.`id` = :id AND a.`adminid` = :aid
-			$chk = Database::pexecute_first($chk_stmt, array(
+				");
-				'id' => $id,
+				$chk = Database::pexecute_first($chk_stmt, array(
-				'aid' => $userinfo['adminid']
+					'id' => $id,
-			));
+					'aid' => $userinfo['adminid']
-		}
+				));
-		if ($chk !== false) {
+			}
-			Database::pexecute($del_stmt, array(
+			if ($chk !== false) {
+				Database::pexecute($del_stmt, array(
+					'id' => $id
+				));
+				$success_message = sprintf($lng['apikeys']['apikey_removed'], $id);
+			}
+		} else {
+			\Froxlor\UI\HTML::askYesNo('api_reallydelete', $filename, array(
+				'page' => $page,
+				'action' => $action,
 				'id' => $id
-			));
+			), $id);
-			$success_message = sprintf($lng['apikeys']['apikey_removed'], $id);
 		}
 	}
 } elseif ($action == 'add') {
@@ -85,10 +93,10 @@ if ($action == 'delete') {
 } elseif ($action == 'jqEditApiKey') {
 	$keyid = isset($_POST['id']) ? (int) $_POST['id'] : 0;
 	$allowed_from = isset($_POST['allowed_from']) ? $_POST['allowed_from'] : "";
-	$valid_until = isset($_POST['valid_until']) ? (int) $_POST['valid_until'] : - 1;
+	$valid_until = isset($_POST['valid_until']) ? (int) $_POST['valid_until'] : -1;
 
 	// validate allowed_from
-	if (! empty($allowed_from)) {
+	if (!empty($allowed_from)) {
 		$ip_list = array_map('trim', explode(",", $allowed_from));
 		$_check_list = $ip_list;
 		foreach ($_check_list as $idx => $ip) {
@@ -100,8 +108,8 @@ if ($action == 'delete') {
 		$allowed_from = implode(",", array_unique($ip_list));
 	}
 
-	if ($valid_until <= 0 || ! is_numeric($valid_until)) {
+	if ($valid_until <= 0 || !is_numeric($valid_until)) {
-		$valid_until = - 1;
+		$valid_until = -1;
 	}
 
 	$upd_stmt = Database::prepare("

install/froxlor.sql

@@ -723,7 +723,7 @@ opcache.validate_timestamps'),
 	('panel', 'logo_image_login', ''),
 	('panel', 'logo_overridetheme', '0'),
 	('panel', 'logo_overridecustom', '0'),
-	('panel', 'version', '0.10.37'),
+	('panel', 'version', '0.10.38'),
 	('panel', 'db_version', '202112310');
 
 

install/updates/froxlor/0.10/update_0.10.inc.php

@@ -1001,3 +1001,8 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.10.36')) {
 	showUpdateStep("Updating from 0.10.36 to 0.10.37", false);
 	\Froxlor\Froxlor::updateToVersion('0.10.37');
 }
+
+if (\Froxlor\Froxlor::isFroxlorVersion('0.10.37')) {
+        showUpdateStep("Updating from 0.10.37 to 0.10.38", false);
+        \Froxlor\Froxlor::updateToVersion('0.10.38');
+}

lib/Froxlor/Api/Commands/PhpSettings.php

@@ -99,7 +99,7 @@ class PhpSettings extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour
 				}
 
 				// check whether we use that config as froxor-vhost config
-				if (Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $row['id'] || Settings::Get('phpfpm.vhost_defaultini') == $row['id']) {
+				if ((Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $row['id']) || (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.vhost_defaultini') == $row['id'])) {
 					$domains[] = Settings::Get('system.hostname');
 				}
 

lib/Froxlor/FileDir.php

@@ -491,7 +491,7 @@ class FileDir
 					new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS),
 					$filter
 				),
-				\RecursiveIteratorIterator::LEAVES_ONLY,
+				\RecursiveIteratorIterator::SELF_FIRST,
 				\RecursiveIteratorIterator::CATCH_GET_CHILD
 			);
 			// we can limit the recursion-depth, but will it be helpful or

lib/Froxlor/Froxlor.php

@@ -7,7 +7,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '0.10.37';
+	const VERSION = '0.10.38';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202112310';

lng/english.lng.php

@@ -2138,3 +2138,5 @@ $lng['serversettings']['phpfpm_settings']['allow_all_customers']['description']
 $lng['error']['pathmustberelative'] = 'The user does not have the permission to specify directories outside the customers home-directory. Please specify a relative path (no leading /).';
 $lng['serversettings']['acmeshpath']['title'] = 'Path to acme.sh';
 $lng['serversettings']['acmeshpath']['description'] = 'Set this to where acme.sh is installed to, including the acme.sh script<br>Default is <b>/root/.acme.sh/acme.sh</b>';
+
+$lng['question']['api_reallydelete'] = 'Do you really want to delete the api-key #%d?';

lng/german.lng.php

@@ -1784,3 +1784,5 @@ $lng['serversettings']['phpfpm_settings']['allow_all_customers']['description']
 $lng['error']['pathmustberelative'] = 'Der Benutzer hat nicht die benötigten Berechtigungen, um Pfade außerhalb des Kunden-Heimatverzeichnisses anzugeben. Bitte einen relativen Pfad angeben (kein führendes /).';
 $lng['serversettings']['acmeshpath']['title'] = 'Pfad zu acme.sh';
 $lng['serversettings']['acmeshpath']['description'] = 'Installationspfad zu acme.sh, inklusive acme.sh Script<br>Standard ist <b>/root/.acme.sh/acme.sh</b>';
+
+$lng['question']['api_reallydelete'] = 'Api-Key #%d wirklich löschen?';