diff --git a/.gitattributes b/.gitattributes index 22d4343e..f7295c7a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -95,7 +95,6 @@ bureau/admin/bro_tgzdown.php -text bureau/admin/bro_view.php -text bureau/admin/browseforfolder.php -text bureau/admin/cron.php -text -bureau/admin/direct.php -text bureau/admin/dom_add.php -text bureau/admin/dom_doadd.php -text bureau/admin/dom_dodel.php -text @@ -285,7 +284,6 @@ bureau/admin/quota_show.php -text bureau/admin/quotas_oneuser.php -text bureau/admin/quotas_users.php -text bureau/admin/sql_add.php -text -bureau/admin/sql_addmain.php -text bureau/admin/sql_admin.php -text bureau/admin/sql_bck.php -text bureau/admin/sql_del.php -text @@ -294,8 +292,6 @@ bureau/admin/sql_dobck.php -text bureau/admin/sql_dorestore.php -text bureau/admin/sql_getparam.php -text bureau/admin/sql_list.php -text -bureau/admin/sql_pass.php -text -bureau/admin/sql_passchg.php -text bureau/admin/sql_restore.php -text bureau/admin/sql_users_add.php -text bureau/admin/sql_users_del.php -text diff --git a/bureau/admin/adm_variables.php b/bureau/admin/adm_variables.php index 7e89909b..e3a17cc8 100644 --- a/bureau/admin/adm_variables.php +++ b/bureau/admin/adm_variables.php @@ -57,10 +57,8 @@ include_once ("head.php"); query("SELECT * FROM `variable` WHERE `comment` IS NOT NULL ORDER BY `name`"); -while ($db->next_record()) { - $vars = $db->Record; +foreach( variables_list() as $vars) { $col=3-$col; ?> diff --git a/bureau/admin/bro_editor.php b/bureau/admin/bro_editor.php index 6746892e..ff8565f5 100644 --- a/bureau/admin/bro_editor.php +++ b/bureau/admin/bro_editor.php @@ -29,6 +29,16 @@ */ require_once("../class/config.php"); +$fields = array ( + "editfile" => array ("request", "string", ""), + "texte" => array ("post", "string", ""), + "save" => array ("post", "string", ""), + "saveret" => array ("post", "string", ""), + "cancel" => array ("post", "string", ""), + "R" => array ("request", "string", ""), +); +getFields($fields); + $editfile=ssla($editfile); $texte=ssla($texte); diff --git a/bureau/admin/direct.php b/bureau/admin/direct.php deleted file mode 100644 index 7d609a74..00000000 --- a/bureau/admin/direct.php +++ /dev/null @@ -1,54 +0,0 @@ -checkid()) { - $error=$err->errstr(); - include("index.php"); - exit(); -} - -?> - - - -Administration de <?php echo $host ?> - - - - - - - Votre navigateur doit supporter les cadres.<br /> - Your browser must support frames - - - diff --git a/bureau/admin/ftp_add.php b/bureau/admin/ftp_add.php index a96145f2..c2929562 100644 --- a/bureau/admin/ftp_add.php +++ b/bureau/admin/ftp_add.php @@ -35,18 +35,30 @@ if (!$quota->cancreate("ftp")) { $fatal=1; } +$fields = array ( + "id" => array ("post", "integer", 0), + "prefixe" => array ("post", "string", ""), + "login" => array ("post", "string", ""), + "dir" => array ("post", "string", ""), + "pass" => array ("post", "string", ""), + "passconf" => array ("post", "string", ""), + "submit" => array ("post", "string", ""), +); +getFields($fields); + + ?>


$error

"; - if ($fatal) { - include_once("foot.php"); - exit(); - } +if (isset($error) && $error) { + echo "

$error

"; + if (isset($fatal) && $fatal) { + include_once("foot.php"); + exit(); } +} ?>
diff --git a/bureau/admin/ftp_edit.php b/bureau/admin/ftp_edit.php index 55675c2e..9f688c9b 100644 --- a/bureau/admin/ftp_edit.php +++ b/bureau/admin/ftp_edit.php @@ -51,7 +51,6 @@ if (isset($error) && $error) { include_once("foot.php"); exit(); } -printVar($r); ?>
diff --git a/bureau/admin/index.php b/bureau/admin/index.php index e801aa5f..fce5ec35 100644 --- a/bureau/admin/index.php +++ b/bureau/admin/index.php @@ -75,7 +75,7 @@ if (!$_SERVER[HTTPS]) { ";__("You are attemping to connect without IP restriction."); echo "

"; } ?>
- + @@ -133,6 +133,11 @@ if (!$_SERVER[HTTPS]) { + diff --git a/bureau/admin/mem_param.php b/bureau/admin/mem_param.php index f9c8f8ff..084da519 100644 --- a/bureau/admin/mem_param.php +++ b/bureau/admin/mem_param.php @@ -31,7 +31,14 @@ require_once("../class/config.php"); include_once("head.php"); -if (isset($help_setting) && $help_setting) { +$fields = array ( + "help_setting" => array ("request", "string", ""), + "showhelp" => array ("request", "integer", ""), +); +getFields($fields); + + +if (!empty($help_setting)) { $mem->set_help_param($showhelp); $error=_("Your help setting has been updated."); } diff --git a/bureau/admin/menu.php b/bureau/admin/menu.php index a8e4354f..bb6b16f8 100644 --- a/bureau/admin/menu.php +++ b/bureau/admin/menu.php @@ -44,7 +44,7 @@ foreach($file as $v) { if ( file_exists($MENUPATH.$v)) include($MENUPATH.$v); } ?> -

AlternC +

AlternC
new_mysql($pass)) { - $error=$err->errstr(); -} else { - $error=_("Your database has been successfully created"); -} -include("sql_list.php"); -exit(); -?> diff --git a/bureau/admin/sql_list.php b/bureau/admin/sql_list.php index 51d70fa1..fce2171d 100644 --- a/bureau/admin/sql_list.php +++ b/bureau/admin/sql_list.php @@ -70,7 +70,7 @@ for($i=0;$i

- + diff --git a/bureau/admin/sql_pass.php b/bureau/admin/sql_pass.php deleted file mode 100644 index 74916969..00000000 --- a/bureau/admin/sql_pass.php +++ /dev/null @@ -1,42 +0,0 @@ -put_mysql_details($pass)) { - $error=$err->errstr(); - include("sql_passchg.php"); - exit(); -} else { - $error=_("Your password has been successfully changed."); - include("sql_list.php"); - exit(); -} -?> diff --git a/bureau/admin/sql_passchg.php b/bureau/admin/sql_passchg.php deleted file mode 100644 index 61ed7216..00000000 --- a/bureau/admin/sql_passchg.php +++ /dev/null @@ -1,65 +0,0 @@ -get_dblist()) { - $error=$err->errstr(); -} - -?> -

-
-
-$error

"; - } - -echo "

"._("Enter the new password of your MySQL database and click 'change the password' to change it")."

"; -?> - - -
" name="del_" value="" />
">
">
- - - - - -
user["login"]; ?>
server; ?>
- " /> - " onclick="document.location='sql_list.php'"/> -
- - - diff --git a/bureau/class/variables.php b/bureau/class/variables.php index 2672e238..637b7d63 100644 --- a/bureau/class/variables.php +++ b/bureau/class/variables.php @@ -132,4 +132,15 @@ function variable_del($name) { unset($conf[$name]); } + +function variables_list() { + global $db; + $t=array(); + $db->query("SELECT * FROM `variable` WHERE `comment` IS NOT NULL ORDER BY `name`"); + while ($db->next_record()) { + $t[]=$db->Record; + } + return $t; +} + ?>