server/lib/classes/ini_parser.inc.php

@@ -86,8 +86,8 @@ class ini_parser{
 				}
 			}
 		}
-		if($q!=true && !empty($out))
-			return "[".$out."]\r\n".$t;
+		if($q!==true && !empty($out))
+			return "\r\n\r\n[".$out."]".$t;
 		if(!empty($out))
 			return  $t;
 		return trim($t);

server/lib/classes/system.inc.php

@@ -2809,7 +2809,7 @@ $app->log("update_jailkit_chroot: removing deprecated directory which jk_update
 		// remove non-existent jails from /etc/jailkit/jk_socketd.ini
 		if (is_file('/etc/jailkit/jk_socketd.ini')) {
 			$rewrite = false;
-			$jk_socketd_ini = $app->ini_parser->parse_ini_file('/etc/jailkit/jk_socketd.ini');
+			$jk_socketd_ini = parse_ini_file('/etc/jailkit/jk_socketd.ini', true);
 			foreach ($jk_socketd_ini as $log => $settings) {
 				$jail = preg_replace('@/dev/log$@', '', $log);
 				if ($jail != $log && !is_dir($jail)) {
@@ -2819,7 +2819,7 @@ $app->log("update_jailkit_chroot: removing deprecated directory which jk_update
 			}
 			if ($rewrite) {
 				$app->log('update_jailkit_chroot: writing /etc/jailkit/jk_socketd.ini', LOGLEVEL_DEBUG);
-				$app->ini_parse->write_ini_file($jk_socketd_ini, '/etc/jailkit/jk_socketd.ini');
+				$app->ini_parser->write_ini_file($jk_socketd_ini, '/etc/jailkit/jk_socketd.ini');
 			}
 		}
 
@@ -2901,12 +2901,12 @@ $app->log("delete_jailkit_chroot called for $home_dir with options ".print_r($op
 
 		// remove $home_dir from /etc/jailkit/jk_socketd.ini
 		if (is_file('/etc/jailkit/jk_socketd.ini')) {
-			$jk_socketd_ini = $app->ini_parser->parse_ini_file('/etc/jailkit/jk_socketd.ini');
+			$jk_socketd_ini = parse_ini_file('/etc/jailkit/jk_socketd.ini', true);
 			$log = $home . '/dev/log';
 			if (isset($jk_socketd_ini[$log])) {
 				unset($jk_socketd_ini[$log]);
 				$app->log('delete_jailkit_chroot: writing /etc/jailkit/jk_socketd.ini', LOGLEVEL_DEBUG);
-				$app->ini_parse->write_ini_file($jk_socketd_ini, '/etc/jailkit/jk_socketd.ini');
+				$app->ini_parser->write_ini_file($jk_socketd_ini, '/etc/jailkit/jk_socketd.ini');
 			}
 		}