fix add/edit domain due to wrong access to settings; setting version to 0.9.39.4 for bugfix release

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

admin_domains.php

@@ -55,7 +55,7 @@ if ($page == 'domains' || $page == 'overview') {
 			$syshostname = "AND `d`.`id` <> " . Settings::Get('system.hostname_id');
 		}
 		$result_stmt = Database::prepare("
-			SELECT `d`.*, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `c`.`company`, `c`.`standardsubdomain`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`
+			SELECT `d`.*, `c`.`loginname`, `c`.`deactivated`, `c`.`name`, `c`.`firstname`, `c`.`company`, `c`.`standardsubdomain`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`
 			FROM `" . TABLE_PANEL_DOMAINS . "` `d`
 			LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`)
 			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id`

admin_plans.php

@@ -244,6 +244,11 @@ if ($page == '' || $page == 'overview') {
 				}
 			}
 			
+			// dummy to avoid unknown variables
+			$language_options = null;
+			$gender_options = null;
+			$hosting_plans = null;
+
 			$plans_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/plans/formfield.plans_add.php';
 			$cust_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/customer/formfield.customer_add.php';
 			// unset unneeded stuff
@@ -462,7 +467,31 @@ if ($page == '' || $page == 'overview') {
 						);
 					}
 				}
-				
+
+				// dummy to avoid unknown variables
+				$result['loginname'] = null;
+				$result['documentroot'] = null;
+				$result['standardsubdomain'] = null;
+				$result['deactivated'] = null;
+				$language_options = null;
+				$result['firstname'] = null;
+				$gender_options = null;
+				$result['company'] = null;
+				$result['street'] = null;
+				$result['zipcode'] = null;
+				$result['city'] = null;
+				$result['phone'] = null;
+				$result['fax'] = null;
+				$result['email'] = null;
+				$result['customernumber'] = null;
+				$result['custom_notes'] = null;
+				$result['custom_notes_show'] = null;
+				$hosting_plans = null;
+				$result['imap'] = null;
+				$result['pop3'] = null;
+				$admin_select_cnt = null;
+				$admin_select = null;
+
 				$plans_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/plans/formfield.plans_edit.php';
 				$cust_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/customer/formfield.customer_edit.php';
 				// unset unneeded stuff

install/froxlor.sql

@@ -687,7 +687,7 @@ opcache.interned_strings_buffer'),
 	('panel', 'password_special_char_required', '0'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
-	('panel', 'version', '0.9.39.3'),
+	('panel', 'version', '0.9.39.4'),
 	('panel', 'db_version', '201802130');
 
 

install/updates/froxlor/0.9/update_0.9.inc.php

@@ -3927,3 +3927,9 @@ if (isFroxlorVersion('0.9.39.2')) {
 	showUpdateStep("Updating from 0.9.39.2 to 0.9.39.3", false);
 	updateToVersion('0.9.39.3');
 }
+
+if (isFroxlorVersion('0.9.39.3')) {
+
+	showUpdateStep("Updating from 0.9.39.3 to 0.9.39.4", false);
+	updateToVersion('0.9.39.4');
+}

lib/formfields/admin/domains/formfield.domains_add.php

@@ -133,7 +133,7 @@ return array(
 						'rows' => 12
 					),
 					'notryfiles' => array(
-						'visible' => (Settings('system.webserver') == 'nginx' && $userinfo['change_serversettings'] == '1'),
+						'visible' => (Settings::Get('system.webserver') == 'nginx' && $userinfo['change_serversettings'] == '1'),
 						'label' => $lng['admin']['notryfiles']['title'],
 						'desc' => $lng['admin']['notryfiles']['description'],
 						'type' => 'checkbox',

lib/formfields/admin/domains/formfield.domains_edit.php

@@ -163,7 +163,7 @@ return array(
 						)
 					),
 					'notryfiles' => array(
-						'visible' => (Settings('system.webserver') == 'nginx' && $userinfo['change_serversettings'] == '1'),
+						'visible' => (Settings::Get('system.webserver') == 'nginx' && $userinfo['change_serversettings'] == '1'),
 						'label' => $lng['admin']['notryfiles']['title'],
 						'desc' => $lng['admin']['notryfiles']['description'],
 						'type' => 'checkbox',

lib/version.inc.php

@@ -16,7 +16,7 @@
  */
 
 // Main version variable
-$version = '0.9.39.3';
+$version = '0.9.39.4';
 
 // Database version (YYYYMMDDC where C is a daily counter)
 $dbversion = '201802130';

templates/Sparkle/admin/domains/domains_domain.tpl

@@ -1,8 +1,8 @@
 <if $row['termination_css'] != ''>
-	<tr class="{$row['termination_css']}">
+	<tr class="{$row['termination_css']}<if $row['deactivated'] == 1> disabled</if>">
 </if>
 <if $row['termination_css'] == ''>
-	<tr>
+	<tr <if $row['deactivated'] == 1>class="disabled"</if>>
 </if>
 	<td>{$row['domain']}
 		<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>

templates/Sparkle/admin/plans/plans.tpl

@@ -26,7 +26,7 @@ $header
 						<tr>
 							<th>{$lng['admin']['plans']['name']}&nbsp;{$arrowcode['p.name']}</th>
 							<th>{$lng['admin']['plans']['description']}&nbsp;{$arrowcode['p.description']}</th>
-							<th>{$lng['admin']['admin']}&nbsp;{$arrowcode['a.adminname']}</th>
+							<th>{$lng['admin']['admin']}&nbsp;{$arrowcode['adminname']}</th>
 							<th>{$lng['admin']['plans']['last_update']}&nbsp;{$arrowcode['p.ts']}</th>
 							<th>{$lng['panel']['options']}</th>
 						</tr>