From ed3ab589ddd8738b879975bc3a50845507bb0258 Mon Sep 17 00:00:00 2001 From: Alan Garcia Date: Wed, 26 Mar 2014 11:22:32 +0000 Subject: [PATCH] Coding style --- awstats/bureau/class/m_aws.php | 2 +- bureau/admin/adm_var_edit.php | 1 + bureau/admin/adm_variables.php | 2 +- bureau/admin/browseforfolder2.php | 1 - bureau/class/config.php | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awstats/bureau/class/m_aws.php b/awstats/bureau/class/m_aws.php index bcf1818f..2ca628b4 100644 --- a/awstats/bureau/class/m_aws.php +++ b/awstats/bureau/class/m_aws.php @@ -611,7 +611,7 @@ class m_aws { * @param string $dom the domain to uninstall */ function alternc_del_domain($dom) { - global $db,$err,$cuid; + global $err,$cuid; $err->log("aws","alternc_del_domain",$dom); $db=new DB_System(); $db->query("SELECT id,hostname FROM aws WHERE uid='$cuid' AND (hostname='$dom' OR hostname like '%.$dom')"); diff --git a/bureau/admin/adm_var_edit.php b/bureau/admin/adm_var_edit.php index b3a1ec9f..92f2f27f 100644 --- a/bureau/admin/adm_var_edit.php +++ b/bureau/admin/adm_var_edit.php @@ -80,6 +80,7 @@ array( if (empty($var)) { echo "

";__("Missing var name");echo "

"; include_once("foot.php"); + die(); } // Which one between var_value and var_value_arr ? diff --git a/bureau/admin/adm_variables.php b/bureau/admin/adm_variables.php index b37da6d3..58d5a27e 100644 --- a/bureau/admin/adm_variables.php +++ b/bureau/admin/adm_variables.php @@ -124,7 +124,7 @@ foreach( $variables->variables_list_name() as $varname => $varcomment) { ?> display_value_html($allvars, 'CREATOR', $creator, $varname); ?> display_value_html($allvars, 'MEMBER', $member_id, $varname); ?> display_value_html($allvars, 'DOMAIN', 'FIXME', $varname); ?> - display_valueraw_html($impersonated_conf[$varname]['value'], $varname); ?> + display_valueraw_html($impersonated_conf[$varname]['value'], $varname); ?> "/","level"=>0,"put"=> ife($curdir=="/","","/") )); _subbrowse($curdir,0,1); return $brlist; diff --git a/bureau/class/config.php b/bureau/class/config.php index d7ce85fc..dc0071ff 100644 --- a/bureau/class/config.php +++ b/bureau/class/config.php @@ -136,7 +136,7 @@ if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"]=="on" && $host!=$L_FQDN) { */ class DB_system extends DB_Sql { - var $Host,$Database,$User,$Password; + var $Host,$Database,$User,$Password = null; /** * Creator @@ -190,7 +190,7 @@ $hooks=new m_hooks(); if (!defined('NOCHECK')) { if (!$mem->checkid()) { $error=$err->errstr(); - include("index.php"); + include("$root/admin/index.php"); exit(); } }