From 0d307bd6d60423b5862383669b594d0a9c831d36 Mon Sep 17 00:00:00 2001 From: alban Date: Wed, 26 Mar 2014 14:47:27 +0100 Subject: [PATCH] =?UTF-8?q?[fix]=C2=A0Rewrites=20code=20to=20be=205.3=20co?= =?UTF-8?q?mpliant=20by=20removing=20func()[key]=20notations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bureau/admin/adm_var_edit.php | 4 ++-- bureau/admin/adm_variables.php | 3 ++- bureau/class/class_system_bind.php | 12 ++++++++---- bureau/class/m_variables.php | 16 +++++++++------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/bureau/admin/adm_var_edit.php b/bureau/admin/adm_var_edit.php index 92f2f27f..c6a34f6b 100644 --- a/bureau/admin/adm_var_edit.php +++ b/bureau/admin/adm_var_edit.php @@ -113,9 +113,9 @@ $creators_list=array(); foreach($admin->get_creator_list() as $mid=>$mlogin) { $creators_list[$mid] = $mlogin['login']; } - +$variablesList = $variables->variables_list_name(); echo "
"._("Description").""; -echo "

".$variables->variables_list_name()[$var]."

"; +echo "

".$variablesList[$var]."

"; echo "
"; echo "
"; diff --git a/bureau/admin/adm_variables.php b/bureau/admin/adm_variables.php index 58d5a27e..714a16ba 100644 --- a/bureau/admin/adm_variables.php +++ b/bureau/admin/adm_variables.php @@ -101,7 +101,8 @@ echo "get_sub_domain_all($fqdn_id); -$fqdn=$dom->get_panel_url_list()[$fqdn_id]; +$domList = $dom->get_panel_url_list(); +$fqdn=$domList[$fqdn_id]; $impersonated_conf=$variables->get_impersonated($fqdn, $member_id); echo sprintf(_("Here are values for members %s logged via %s"), ''.$ml[$member_id].'', "$fqdn") ;?> diff --git a/bureau/class/class_system_bind.php b/bureau/class/class_system_bind.php index b4b82028..d9f485c3 100644 --- a/bureau/class/class_system_bind.php +++ b/bureau/class/class_system_bind.php @@ -181,7 +181,8 @@ class system_bind { */ function dkim_generate_key($domain) { // Stop here if we do not manage the mail - if ( ! $this->get_domain_summary($domain)['gesmx'] ) return; + $domainInfo = $this->get_domain_summary($domain); + if ( ! $domainInfo['gesmx'] ) return; $target_dir = "/etc/opendkim/keys/$domain"; @@ -266,7 +267,8 @@ class system_bind { */ function dkim_entry($domain) { $keyfile="/etc/opendkim/keys/$domain/alternc.txt"; - if (! file_exists($keyfile) && $this->get_domain_summary($domain)['gesmx'] ) { + $domainInfo = $this->get_domain_summary($domain); + if (! file_exists($keyfile) && $domainInfo['gesmx'] ) { $this->dkim_generate_key($domain); } return @file_get_contents($keyfile); @@ -283,7 +285,8 @@ class system_bind { $zone= implode("\n",$this->conf_from_db($domain))."\n".$this->get_persistent($domain); $entry=''; - if ( $this->get_domain_summary($domain)['gesmx'] ) { + $domainInfo = $this->get_domain_summary($domain); + if ( $domainInfo['gesmx'] ) { // If we manage the mail // Check if there is no the same entry (defined or manual) @@ -324,6 +327,7 @@ class system_bind { $zone.="\n;;;END ALTERNC AUTOGENERATE CONFIGURATION"; $zone.=$this->get_persistent($domain); + $domainInfo = $this->get_domain_summary($domain); // FIXME check those vars $zone = strtr($zone, array( @@ -340,7 +344,7 @@ class system_bind { "@@DOMAINE@@"=>"$domain", "@@SERIAL@@"=>$this->get_serial($domain), "@@PUBLIC_IP@@"=>"$L_PUBLIC_IP", - "@@ZONETTL@@"=> $this->get_domain_summary($domain)['zonettl'], + "@@ZONETTL@@"=> $domainInfo['zonettl'], )); return $zone; diff --git a/bureau/class/m_variables.php b/bureau/class/m_variables.php index 33871347..de555318 100644 --- a/bureau/class/m_variables.php +++ b/bureau/class/m_variables.php @@ -31,6 +31,7 @@ * * @author Drupal Developpement Team * @link http://cvs.drupal.org/viewcvs/drupal/drupal/includes/bootstrap.inc?rev=1.38&view=auto + * @ */ class m_variables { var $strata_order = array('DEFAULT','GLOBAL','FQDN_CREATOR','FQDN','CREATOR','MEMBER','DOMAIN'); @@ -299,6 +300,7 @@ class m_variables { */ function display_valueraw_html($v,$varname,$echo = true) { $output = ""; + $varList = $this->variables_list(); if (is_array($v)) { if (empty($v)) { $output .= ""._("Empty array").""; @@ -310,19 +312,19 @@ class m_variables { if (is_null($varname)) { $output .= "$k"; } else { - if ( !isset($this->variables_list()['DEFAULT'][null][$varname]['type'][$k]) || is_array( $this->variables_list()['DEFAULT'][null][$varname]['type'][$k] ) ) { - if (isset($this->variables_list()['DEFAULT'][null][$varname]['type'][$k]['desc'])) { - $output .= $this->variables_list()['DEFAULT'][null][$varname]['type'][$k]['desc']; + if ( !isset($varList['DEFAULT'][null][$varname]['type'][$k]) || is_array( $varList['DEFAULT'][null][$varname]['type'][$k] ) ) { + if (isset($varList['DEFAULT'][null][$varname]['type'][$k]['desc'])) { + $output .= $varList['DEFAULT'][null][$varname]['type'][$k]['desc']; } else { $output .= $k; } } else { - $output .= $this->variables_list()['DEFAULT'][null][$varname]['type'][$k]; + $output .= $varList['DEFAULT'][null][$varname]['type'][$k]; } } } else { - if (isset($this->variables_list()['DEFAULT'][null][$varname]['type'][$k]['desc'] )) { - $output .= $this->variables_list()['DEFAULT'][null][$varname]['type'][$k]['desc']; + if (isset($varList['DEFAULT'][null][$varname]['type'][$k]['desc'] )) { + $output .= $varList['DEFAULT'][null][$varname]['type'][$k]['desc']; } } if (is_array($l)) { @@ -332,7 +334,7 @@ class m_variables { if ( is_numeric($m)) { $output .= "$m"; } else { - $output .= $this->variables_list()['DEFAULT'][null][$varname]['type'][$k][$m]['desc']; + $output .= $varList['DEFAULT'][null][$varname]['type'][$k][$m]['desc']; } $output .= " => $n"; $output .= "";