Removed indexed array option for get_domain_default_props() function …

…to avoid usage of list()

gui/library/client-functions.php

@@ -37,46 +37,18 @@
  * Note: For performance reasons, the data are retrieved once per request.
  *
  * @param int $domainAdminId User unique identifier
- * @param bool $returnWKeys    Tells whether or not return value should be a
- *                             associative array
- * @return array               If $returnWkeys is TRUE, returns an associative array
- *                             where each key is a domain propertie name. Otherwise
- *                             returns an indexed array where each value correspond
- *                             to  a propertie value, following the columns order in
- *                             database table.
- * @todo Remove indexed array option to avoid using PHP list() function
+ * @return array Returns an associative array where each key is a domain propertie name.
  */
-function get_domain_default_props($domainAdminId, $returnWKeys = false)
+function get_domain_default_props($domainAdminId)
 {
 	static $domainProperties = null;
 
 	if (null === $domainProperties) {
-		$query = "
-			SELECT
-				`domain_id`, `domain_name`, `domain_gid`, `domain_uid`,
-				`domain_created_id`, `domain_created`, `domain_expires`,
-				`domain_last_modified`, `domain_mailacc_limit`, `domain_ftpacc_limit`,
-				`domain_traffic_limit`, `domain_sqld_limit`, `domain_sqlu_limit`,
-				`domain_status`, `domain_alias_limit`, `domain_subd_limit`,
-				`domain_ip_id`, `domain_disk_limit`, `domain_disk_usage`,
-				`domain_php`, `domain_cgi`, `allowbackup`, `domain_dns`,
-				`domain_software_allowed`, `phpini_perm_system`,
-				`phpini_perm_allow_url_fopen`, `phpini_perm_display_errors`,
-				`phpini_perm_disable_functions`, `domain_external_mail`
-			FROM
-				`domain`
-			WHERE
-				`domain_admin_id` = ?
-		";
-		$stmt = exec_query($query, $domainAdminId);
+		$stmt = exec_query("SELECT * FROM `domain` WHERE `domain_admin_id` = ?", $domainAdminId);
 		$domainProperties = $stmt->fields;
 	}
 
-    if ($returnWKeys) {
-		return $domainProperties;
-    } else {
-        return array_values($domainProperties);
-    }
+    return $domainProperties;
 }
 
 /**
@@ -749,7 +721,7 @@ function customerHasFeature($featureNames, $forceReload = false)
 		/** @var $cfg iMSCP_Config_Handler_File */
 		$cfg = iMSCP_Registry::get('config');
         $debug = (bool) $cfg->DEBUG;
-		$dmnProps = get_domain_default_props((int)$_SESSION['user_id'], true);
+		$dmnProps = get_domain_default_props((int)$_SESSION['user_id']);
 
 		$availableFeatures = array(
 			'domain' => ($dmnProps['domain_alias_limit'] != '-1'

gui/library/iMSCP/View/Helpers/Functions/Common.php

@@ -297,7 +297,7 @@ function generateNavigation($tpl)
 	// Dynamic links (only at customer level)
 	if (isset($_SESSION['user_type']) && $_SESSION['user_type'] == 'user') {
 
-		$domainProperties = get_domain_default_props($_SESSION['user_id'], true);
+		$domainProperties = get_domain_default_props($_SESSION['user_id']);
 
 		$tpl->assign(array(
 			'FILEMANAGER_PATH' => $cfg->FILEMANAGER_PATH,

gui/library/iMSCP/View/Helpers/Functions/User.php

@@ -233,7 +233,7 @@ function gen_client_menu($tpl, $menuTemplateFile)
 	}
 
 	// Getting domain properties
-	$domainProperties = get_domain_default_props($_SESSION['user_id'], true);
+	$domainProperties = get_domain_default_props($_SESSION['user_id']);
 
 	if (customerHasFeature('awstats')) {
 		$tpl->assign(array(

gui/public/admin/domain_details.php

@@ -58,7 +58,7 @@ function admin_generatePage($tpl, $domainId)
 		redirectTo('manage_users.php');
 	}
 
-	$domainProperties = get_domain_default_props($stmt->fields['domain_admin_id'], true);
+	$domainProperties = get_domain_default_props($stmt->fields['domain_admin_id']);
 
 	/** @var $cfg iMSCP_Config_Handler_File */
 	$cfg = iMSCP_Registry::get('config');

gui/public/client/alias_add.php

@@ -46,12 +46,10 @@
  */
 function check_client_domainalias_counts($user_id)
 {
-	$domainProperties = get_domain_default_props($user_id, true);
+	$domainProperties = get_domain_default_props($user_id);
 	$domainAliasesUsage = get_domain_running_als_cnt($domainProperties['domain_id']);
 
-	if ($domainProperties['domain_alias_limit'] != 0 &&
-		$domainAliasesUsage >= $domainProperties['domain_alias_limit']
-	) {
+	if ($domainProperties['domain_alias_limit'] != 0 && $domainAliasesUsage >= $domainProperties['domain_alias_limit']) {
 		set_page_message(tr('You reached your domain aliases limit.'), 'error');
 		redirectTo('domains_manage.php');
 	}
@@ -402,7 +400,7 @@ function add_domain_alias()
 	generateNavigation($tpl);
 }
 
-$domainProperties = get_domain_default_props($_SESSION['user_id'], true);
+$domainProperties = get_domain_default_props($_SESSION['user_id']);
 $currentNumberDomainAliases = get_domain_running_als_cnt($domainProperties['domain_id']);
 
 /**

gui/public/client/alias_edit.php

@@ -132,7 +132,9 @@ function gen_editalias_page(&$tpl, $edit_id) {
 	$cfg = iMSCP_Registry::get('config');
 
 	// Get data from sql
-	list($domain_id) = get_domain_default_props($_SESSION['user_id']);
+	$domainProps = get_domain_default_props($_SESSION['user_id']);
+    $domain_id = $domainProps['domain_id'];
+
 	$res = exec_query("SELECT * FROM `domain_aliasses` WHERE `alias_id` = ? AND `domain_id` = ?", array($edit_id, $domain_id));
 
 	if ($res->recordCount() <= 0) {

gui/public/client/dns_edit.php

@@ -260,9 +260,10 @@ function gen_editdns_page($tpl, $edit_id) {
 	/** @var $cfg iMSCP_Config_Handler_File */
 	$cfg = iMSCP_Registry::get('config');
 
-	list(
-		$dmn_id, $dmn_name,,,,,,,,,,,,,,,,,,,,,$dmn_dns
-	) = get_domain_default_props($_SESSION['user_id']);
+    $domainProps = get_domain_default_props($_SESSION['user_id']);
+    $dmn_id = $domainProps['domain_id'];
+    $dmn_name = $domainProps['domain_name'];
+    $dmn_dns = $domainProps['domain_dns'];
 
 	if ($dmn_dns != 'yes') {
 		not_allowed();
@@ -577,7 +578,8 @@ function check_fwd_data($tpl, $edit_id) {
 	$_class = $_POST['class'];
 	$_type = $_POST['type'];
 
-	list($dmn_id) = get_domain_default_props($_SESSION['user_id']);
+    $domainProps = get_domain_default_props($_SESSION['user_id']);
+    $dmn_id = $domainProps['domain_id'];
 	if ($add_mode) {
 		$query = "
 			SELECT

gui/public/client/ftp_accounts.php

@@ -47,7 +47,8 @@
  */
 function gen_page_ftp_list($tpl)
 {
-	list(,$dmn_name) = get_domain_default_props($_SESSION['user_id']);
+    $domainProps = get_domain_default_props($_SESSION['user_id']);
+    $dmn_name = $domainProps['domain_name'];
 
 	$query = "
 		SELECT

gui/public/client/ftp_add.php

@@ -257,30 +257,10 @@ function get_ftp_user_gid($dmn_name, $ftp_user) {
 	$rs = exec_query($query, $dmn_name);
 
 	if ($rs->recordCount() == 0) { // there is no such group. we'll need a new one.
-		list($temp_dmn_id,
-			$temp_dmn_name,
-			$temp_dmn_gid,
-			$temp_dmn_uid,
-			$temp_dmn_created_id,
-			$temp_dmn_created,
-			$temp_dmn_expires,
-			$temp_dmn_last_modified,
-			$temp_dmn_mailacc_limit,
-			$temp_dmn_ftpacc_limit,
-			$temp_dmn_traff_limit,
-			$temp_dmn_sqld_limit,
-			$temp_dmn_sqlu_limit,
-			$temp_dmn_status,
-			$temp_dmn_als_limit,
-			$temp_dmn_subd_limit,
-			$temp_dmn_ip_id,
-			$temp_dmn_disk_limit,
-			$temp_dmn_disk_usage,
-			$temp_dmn_php,
-			$temp_dmn_cgi,
-			$allowbackup,
-			$dmn_dns
-		) = get_domain_default_props($_SESSION['user_id']);
+        $domainProps =  get_domain_default_props($_SESSION['user_id']);
+        $temp_dmn_name = $domainProps['domain_name'];
+        $temp_dmn_gid = $domainProps['domain_gid'];
+        $temp_dmn_disk_limit = $domainProps['domain_disk_limit'];
 
 		$query = "
 			INSERT INTO ftp_group
@@ -366,30 +346,8 @@ function get_ftp_user_uid($dmn_name, $ftp_user, $ftp_user_gid) {
 		return -1;
 	}
 
-	list($temp_dmn_id,
-		$temp_dmn_name,
-		$temp_dmn_gid,
-		$temp_dmn_uid,
-		$temp_dmn_created_id,
-		$temp_dmn_created,
-		$temp_dmn_expires,
-		$temp_dmn_last_modified,
-		$temp_dmn_mailacc_limit,
-		$temp_dmn_ftpacc_limit,
-		$temp_dmn_traff_limit,
-		$temp_dmn_sqld_limit,
-		$temp_dmn_sqlu_limit,
-		$temp_dmn_status,
-		$temp_dmn_als_limit,
-		$temp_dmn_subd_limit,
-		$temp_dmn_ip_id,
-		$temp_dmn_disk_limit,
-		$temp_dmn_disk_usage,
-		$temp_dmn_php,
-		$temp_dmn_cgi,
-		$allowbackup,
-		$dmn_dns
-	) = get_domain_default_props($_SESSION['user_id']);
+    $domainProps = get_domain_default_props($_SESSION['user_id']);
+    $temp_dmn_uid = $domainProps['domain_uid'];
 
 	return $temp_dmn_uid;
 }
@@ -481,7 +439,7 @@ function add_ftp_user($dmn_name)
 	exec_query($query, array($ftp_user, $ftp_passwd, $ftp_rawpasswd, $ftp_uid, $ftp_gid, $ftp_shell, $ftp_home));
 
 	$domain_props = get_domain_default_props($_SESSION['user_id']);
-	update_reseller_c_props($domain_props[4]);
+	update_reseller_c_props($domain_props['domain_created_id']);
 
 	iMSCP_Events_Manager::getInstance()->dispatch(iMSCP_Events::onAfterAddFtp);
 
@@ -551,30 +509,10 @@ function check_ftp_acc_data($tpl, $dmn_id, $dmn_name) {
  * @return void
  */
 function gen_page_ftp_acc_props($tpl, $user_id) {
-	list($dmn_id,
-		$dmn_name,
-		$dmn_gid,
-		$dmn_uid,
-		$dmn_created_id,
-		$dmn_created,
-		$dmn_expires,
-		$dmn_last_modified,
-		$dmn_mailacc_limit,
-		$dmn_ftpacc_limit,
-		$dmn_traff_limit,
-		$dmn_sqld_limit,
-		$dmn_sqlu_limit,
-		$dmn_status,
-		$dmn_als_limit,
-		$dmn_subd_limit,
-		$dmn_ip_id,
-		$dmn_disk_limit,
-		$dmn_disk_usage,
-		$dmn_php,
-		$dmn_cgi,
-		$allowbackup,
-		$dmn_dns
-	) = get_domain_default_props($user_id);
+    $domainProps = get_domain_default_props($user_id);
+    $dmn_id = $domainProps['domain_id'];
+    $dmn_name = $domainProps['domain_name'];
+    $dmn_ftpacc_limit = $domainProps['domain_ftpacc_limit'];
 
 	list($ftp_acc_cnt, $dmn_ftp_acc_cnt, $sub_ftp_acc_cnt, $als_ftp_acc_cnt) = get_domain_running_ftp_acc_cnt($dmn_id);
 

gui/public/client/ftp_delete.php

@@ -133,7 +133,7 @@
 	$rs = exec_query($query, $ftp_id);
 
 	$domain_props = get_domain_default_props($_SESSION['user_id']);
-	update_reseller_c_props($domain_props[4]);
+	update_reseller_c_props($domain_props['domain_created_id']);
 
 	iMSCP_Events_Manager::getInstance()->dispatch(iMSCP_Events::onAfterDeleteFtp, array('ftpid' => $ftp_id));
 

gui/public/client/hosting_plan_update.php

@@ -73,7 +73,7 @@ function client_generateHostingPlanEntries($tpl, $customerId)
 	/** @var $cfg iMSCP_Config_Handler_File */
 	$cfg = iMSCP_Registry::get('config');
 
-	$domainProperties = get_domain_default_props($_SESSION['user_id'], true);
+	$domainProperties = get_domain_default_props($_SESSION['user_id']);
 
 	//$availabe_order = 0;
 	$hpTitle = tr('Hosting plans available for update');
@@ -383,7 +383,7 @@ function client_addNewOrder($orderId, $customerId)
 	/** @var $cfg iMSCP_Config_Handler_File */
 	$cfg = iMSCP_Registry::get('config');
 
-	$domainProperties = get_domain_default_props($customerId, true);
+	$domainProperties = get_domain_default_props($customerId);
 
 	$query = "SELECT * FROM `hosting_plans` WHERE `id` = ?";
 	$stmt = exec_query($query, $orderId);

gui/public/client/index.php

@@ -179,7 +179,7 @@ function client_generateFeatureStatus($tpl)
     );
 
 	if (customerHasFeature('backup')) {
-		$domainProperties = get_domain_default_props($_SESSION['user_id'], true);
+		$domainProperties = get_domain_default_props($_SESSION['user_id']);
 
 		// Backup feature for customer can also be disabled by reseller via GUI
 		switch ($domainProperties['allowbackup']) {
@@ -211,7 +211,7 @@ function client_generateFeatureStatus($tpl)
  */
 function client_makeTrafficUsage($domainId)
 {
-	$domainProperties = get_domain_default_props($_SESSION['user_id'], true);
+	$domainProperties = get_domain_default_props($_SESSION['user_id']);
 	$fdofmnth = mktime(0, 0, 0, date('m'), 1, date('Y'));
 	$ldofmnth = mktime(1, 0, 0, date('m') + 1, 0, date('Y'));
 
@@ -279,7 +279,7 @@ function client_generateDomainExpiresInformation($tpl)
 {
 	/** @var $cfg iMSCP_Config_Handler_File */
 	$cfg = iMSCP_Registry::get('config');
-	$domainProperties = get_domain_default_props($_SESSION['user_id'], true);
+	$domainProperties = get_domain_default_props($_SESSION['user_id']);
 
 	if ($domainProperties['domain_expires'] != 0) {
 		$domainRemainingTime = '';
@@ -348,7 +348,7 @@ function client_generateDomainExpiresInformation($tpl)
 client_generateDomainExpiresInformation($tpl);
 client_generateFeatureStatus($tpl);
 
-$domainProperties = get_domain_default_props($_SESSION['user_id'], true);
+$domainProperties = get_domain_default_props($_SESSION['user_id']);
 
 list(
 	$domainTrafficPercent, $domainTrafficUsage

gui/public/client/mail_accounts.php

@@ -819,8 +819,10 @@ function gen_page_lists($tpl, $user_id) {
 	/** @var $cfg iMSCP_Config_Handler_File */
 	$cfg = iMSCP_Registry::get('config');
 
-	list($domainId,$dmn_name,,,,,,,$dmn_mailacc_limit
-	) = get_domain_default_props($user_id);
+    $domainProps = get_domain_default_props($user_id);
+    $domainId = $domainProps['domain_id'];
+    $dmn_name = $domainProps['domain_name'];
+    $dmn_mailacc_limit = $domainProps['domain_mailacc_limit'];
 
 	$dmn_mails = gen_page_dmn_mail_list($tpl, $domainId, $dmn_name);
 	$sub_mails = gen_page_sub_mail_list($tpl, $domainId, $dmn_name);

gui/public/client/mail_add.php

@@ -615,30 +615,11 @@ function check_mail_acc_data($dmn_id, $dmn_name) {
  * @return void
  */
 function gen_page_mail_acc_props($tpl, $user_id) {
-	list($dmn_id,
-		$dmn_name,
-		$dmn_gid,
-		$dmn_uid,
-		$dmn_created_id,
-		$dmn_created,
-		$dmn_expires,
-		$dmn_last_modified,
-		$dmn_mailacc_limit,
-		$dmn_ftpacc_limit,
-		$dmn_traff_limit,
-		$dmn_sqld_limit,
-		$dmn_sqlu_limit,
-		$dmn_status,
-		$dmn_als_limit,
-		$dmn_subd_limit,
-		$dmn_ip_id,
-		$dmn_disk_limit,
-		$dmn_disk_usage,
-		$dmn_php,
-		$dmn_cgi,
-		$allowbackup,
-		$dmn_dns
-	) = get_domain_default_props($user_id);
+
+    $domainProps = get_domain_default_props($user_id);
+    $dmn_id = $domainProps['domain_id'];
+    $dmn_name = $domainProps['domain_name'];
+    $dmn_mailacc_limit = $domainProps['domain_mailacc_limit'];
 
 	list($mail_acc_cnt,
 		$dmn_mail_acc_cnt,