diff --git a/bureau/admin/browseforfolder2.php b/bureau/admin/browseforfolder2.php index 30697b39..bae7fbbf 100644 --- a/bureau/admin/browseforfolder2.php +++ b/bureau/admin/browseforfolder2.php @@ -70,6 +70,9 @@ function _subbrowse($curdir,$pos,$level) { } } +/** + * @param string $curdir + */ function browseforfolder($curdir) { global $maxlevel,$root,$brlist; $maxlevel=0; diff --git a/bureau/admin/head.php b/bureau/admin/head.php index 28decf8e..04badcfd 100644 --- a/bureau/admin/head.php +++ b/bureau/admin/head.php @@ -22,7 +22,7 @@ Purpose of file: Main header of all html files ---------------------------------------------------------------------- */ -if (!$charset) $charset="UTF-8"; +if (!isset($charset) || ! $charset) $charset="UTF-8"; @header("Content-Type: text/html; charset=$charset"); ?> diff --git a/bureau/admin/hta_add.php b/bureau/admin/hta_add.php index e34ab29d..16b518f3 100644 --- a/bureau/admin/hta_add.php +++ b/bureau/admin/hta_add.php @@ -55,7 +55,7 @@ if (isset($error) && $error) { " maxlength="255" /> - + diff --git a/bureau/admin/hta_edit.php b/bureau/admin/hta_edit.php index 87219541..8603e500 100644 --- a/bureau/admin/hta_edit.php +++ b/bureau/admin/hta_edit.php @@ -36,7 +36,9 @@ $fields = array ( getFields($fields); if (!$dir) { - $error=_("No folder selected!"); + echo "

"._("No folder selected!")."

"; + require_once('foot.php'); + die(); } else { $r=$hta->get_hta_detail($dir); if (!$r) { diff --git a/bureau/admin/index.php b/bureau/admin/index.php index 7e56343b..d8feeeba 100644 --- a/bureau/admin/index.php +++ b/bureau/admin/index.php @@ -36,7 +36,7 @@ $H=getenv("HTTP_HOST"); if (!isset($restrictip)) { $restrictip=1; } -if (!$charset) $charset="UTF-8"; +if (!isset($charset) || ! $charset) $charset="UTF-8"; @header("Content-Type: text/html; charset=$charset"); ?> diff --git a/bureau/admin/mem_logout.php b/bureau/admin/mem_logout.php index a6aec4f0..e0f63b6d 100644 --- a/bureau/admin/mem_logout.php +++ b/bureau/admin/mem_logout.php @@ -31,7 +31,7 @@ require_once("../class/config.php"); $mem->del_session(); -if (!$charset) $charset="UTF-8"; +if (!isset($charset) || ! $charset) $charset="UTF-8"; @header("Content-Type: text/html; charset=$charset"); ?> diff --git a/bureau/admin/webmail-redirect.php b/bureau/admin/webmail-redirect.php index 1b042471..22da57f6 100644 --- a/bureau/admin/webmail-redirect.php +++ b/bureau/admin/webmail-redirect.php @@ -26,13 +26,13 @@ require_once("../class/config_nochk.php"); - $res=$hooks->invoke("hook_admin_webmail"); +$res=$hooks->invoke("hook_admin_webmail"); if (($wr=variable_get("webmail_redirect")) && isset($res[$wr]) && $res[$wr]) { $url=$res[$wr]; } else { foreach($res as $r) if ($r!==false) { $url=$r; break; } } -if ($url) { +if (isset($url) && $url) { header("Location: $url"); } else { header("Location: /nowebmail"); diff --git a/bureau/class/config.php b/bureau/class/config.php index 31c6ef7a..0a531206 100644 --- a/bureau/class/config.php +++ b/bureau/class/config.php @@ -34,7 +34,7 @@ if (DO_XHPROF_STATS) require_once('/usr/share/alternc/panel/admin/xhprof_header. // To enable the display of the alternc debug error, do the following : // # touch /etc/alternc/alternc_display_php_error if (file_exists('/etc/alternc/alternc_display_php_error')) { - ini_set('display_errors', true); + ini_set('display_errors', '1'); } session_name('AlternC_Panel'); session_start(); @@ -137,7 +137,10 @@ if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"]=="on" && $host!=$L_FQDN) { */ class DB_system extends DB_Sql { - var $Host,$Database,$User,$Password = null; + var $Host = null; + var $Database = null; + var $User = null; + var $Password = null; /** * Creator