From a956b38c009f23db42bf6e389e2ae0e3a6683d93 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Sun, 22 May 2016 20:14:26 +0200 Subject: [PATCH] =?UTF-8?q?[wip]=C2=A0adding=20missing=20ehe()=20and=20eue?= =?UTF-8?q?()=20for=20htmlentities=20or=20urlencode=20in=20form=20fields?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bureau/admin/about.php | 6 +- bureau/admin/adm_authip_whitelist.php | 14 ++-- bureau/admin/adm_deactivate.php | 2 +- bureau/admin/adm_defquotas.php | 2 +- bureau/admin/adm_domstypeedit.php | 8 +- bureau/admin/adm_list.php | 24 +++--- bureau/admin/adm_passpolicy.php | 2 +- bureau/admin/adm_quotaedit.php | 4 +- bureau/admin/adm_tld.php | 6 +- bureau/admin/adm_tldedit.php | 2 +- bureau/admin/adm_variables.php | 4 +- bureau/admin/bro_editor.php | 4 +- bureau/admin/bro_main.php | 113 +++++++++++++------------- bureau/admin/browseforfolder2.php | 12 +-- bureau/admin/cron.php | 8 +- bureau/admin/dom_dodel.php | 2 +- bureau/admin/dom_edit.inc.php | 20 ++--- bureau/admin/dom_edit.php | 2 +- bureau/admin/dom_import.php | 2 +- bureau/admin/dom_subdel.php | 2 +- bureau/admin/ftp_del.php | 2 +- bureau/admin/ftp_edit.php | 8 +- bureau/admin/ftp_list.php | 12 +-- bureau/admin/hta_add.php | 2 +- bureau/admin/hta_dodeluser.php | 6 +- bureau/admin/hta_edit.php | 14 ++-- bureau/admin/hta_edituser.php | 4 +- bureau/admin/hta_list.php | 6 +- bureau/admin/index.php | 2 +- bureau/admin/ip_main.php | 20 ++--- bureau/admin/logs_tail.php | 8 +- bureau/admin/mail_del.php | 4 +- bureau/admin/mail_edit.php | 2 +- bureau/admin/mail_list.php | 12 +-- bureau/admin/mail_manage_catchall.php | 6 +- bureau/admin/mem_cm.php | 2 +- bureau/admin/mem_param.php | 8 +- bureau/admin/phpinfo.php | 5 -- bureau/admin/piwik_site_dodel.php | 2 +- bureau/admin/piwik_user_dodel.php | 2 +- bureau/admin/sql_bck.php | 4 +- bureau/admin/sql_del.php | 2 +- bureau/admin/sql_restore.php | 2 +- bureau/admin/sql_users_del.php | 2 +- bureau/admin/sql_users_password.php | 2 +- bureau/admin/sql_users_rights.php | 2 +- bureau/class/functions.php | 20 +++++ 47 files changed, 208 insertions(+), 192 deletions(-) delete mode 100644 bureau/admin/phpinfo.php diff --git a/bureau/admin/about.php b/bureau/admin/about.php index a66fd26a..6966cdc1 100644 --- a/bureau/admin/about.php +++ b/bureau/admin/about.php @@ -44,9 +44,9 @@ __("AlternC is an automatic hosting software suite. It features a PHP-based admi

diff --git a/bureau/admin/adm_authip_whitelist.php b/bureau/admin/adm_authip_whitelist.php index c17698ea..27ce90e7 100755 --- a/bureau/admin/adm_authip_whitelist.php +++ b/bureau/admin/adm_authip_whitelist.php @@ -49,11 +49,11 @@ $list_ip = $authip->list_ip_whitelist();

IPv4, IPv6 and subnet allowed"); ?>
- +


- +

" /> @@ -61,8 +61,8 @@ $list_ip = $authip->list_ip_whitelist();
- - +
+ list_ip_whitelist(); } else { $txt = "Unknow IP"; } - echo ""; + echo ""; ?> - - + + diff --git a/bureau/admin/adm_deactivate.php b/bureau/admin/adm_deactivate.php index da1d9218..e678d522 100755 --- a/bureau/admin/adm_deactivate.php +++ b/bureau/admin/adm_deactivate.php @@ -70,7 +70,7 @@ if (! ($confirmed ) ) { ?> - + " /> " onclick="document.location='adm_list.php'"/> diff --git a/bureau/admin/adm_defquotas.php b/bureau/admin/adm_defquotas.php index eccc2461..71881db0 100755 --- a/bureau/admin/adm_defquotas.php +++ b/bureau/admin/adm_defquotas.php @@ -114,7 +114,7 @@ foreach($q as $name => $value) { - + - +
$txt{$i['ip_human']}{$i['infos']}
$txt{$i['ip_human']}{$i['infos']}
);">
">
);">
">
@@ -77,7 +77,7 @@ if (isset($error_edit) && $error_edit) { - + @@ -91,11 +91,11 @@ if (isset($error_edit) && $error_edit) { - + - + diff --git a/bureau/admin/adm_list.php b/bureau/admin/adm_list.php index 2b58bc9e..3ed696af 100755 --- a/bureau/admin/adm_list.php +++ b/bureau/admin/adm_list.php @@ -99,9 +99,9 @@ if ($mem->user["admlist"] == 0) { // Normal (large) mode /> - + " /> - +

@@ -186,17 +186,17 @@ if (!is_array($accountList) || empty($accountList)) { - + - - - - - - - - - + + + + + + + + + diff --git a/bureau/admin/adm_passpolicy.php b/bureau/admin/adm_passpolicy.php index 8b679e0b..18e364ef 100755 --- a/bureau/admin/adm_passpolicy.php +++ b/bureau/admin/adm_passpolicy.php @@ -85,7 +85,7 @@ if (!empty($edit)) { - +
">  " value="" />" value="" /> >" href="mailto:"> 
renew_get_expiry($val['uid']) ?>
>" href="mailto:"> 
renew_get_expiry($val['uid'])); ?>
diff --git a/bureau/admin/adm_quotaedit.php b/bureau/admin/adm_quotaedit.php index 57413e61..51cc345d 100755 --- a/bureau/admin/adm_quotaedit.php +++ b/bureau/admin/adm_quotaedit.php @@ -65,8 +65,8 @@ $mem->unsu();
- +qlist(); diff --git a/bureau/admin/adm_tld.php b/bureau/admin/adm_tld.php index d55e51e3..8e9115e9 100755 --- a/bureau/admin/adm_tld.php +++ b/bureau/admin/adm_tld.php @@ -77,9 +77,9 @@ for($i=0;$i - - - + + +
- 
+ 
" />
">
" />
">
 tldmode[$c[$i]["mode"]]); ?>
- + diff --git a/bureau/admin/adm_variables.php b/bureau/admin/adm_variables.php index 047b2162..f4114d90 100755 --- a/bureau/admin/adm_variables.php +++ b/bureau/admin/adm_variables.php @@ -61,9 +61,9 @@ include_once ("head.php"); foreach( variables_list() as $vars) { ?> - + - +
diff --git a/bureau/admin/bro_editor.php b/bureau/admin/bro_editor.php index 8d9959fb..ce0feb77 100755 --- a/bureau/admin/bro_editor.php +++ b/bureau/admin/bro_editor.php @@ -105,8 +105,8 @@ echo "
$content
";
".$error."

"; ?> - " /> - " /> + + " name="save" /> " name="saveret" /> diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php index 3156ba27..3ff32372 100755 --- a/bureau/admin/bro_main.php +++ b/bureau/admin/bro_main.php @@ -104,13 +104,13 @@ if (!empty($formu) && $formu) {

user["login"].$R."/"; ?>

" />   - " /> + " />
$error

";
- +
@@ -203,7 +203,7 @@ if (isset($error) && $error) echo "

$error

";
- + @@ -220,18 +220,19 @@ if (isset($error) && $error) echo "

$error

"; "; for ($i=0;$i"; - echo ""; + echo ""; + echo ""; } echo ""; echo "
" />
\n"; echo "\n"; csrf_get(); - echo "\n"; + echo "\n"; echo "\n"; echo "
"._("Rename")."
".$d[$i]."
".ehe($d[$i],false)."
\n"; @@ -242,7 +243,7 @@ if (isset($formu) && $formu==2 && isset($actrename) && $actrename && count($d)) if ($formu==2 && ! (empty($actperms)) && count($d)) { echo "
\n"; csrf_get(); - echo "\n"; + echo "\n"; echo "\n"; echo "

"._("Permissions")."

"; @@ -259,11 +260,11 @@ if ($formu==2 && ! (empty($actperms)) && count($d)) { $modes = $stats[2]; echo ""; - echo "".$d[$i].""; + echo "".ehe($d[$i],false).""; // Owner echo ""; - echo ""; + echo ""; echo " "; echo ""; @@ -283,7 +284,7 @@ if (count($c)) { ?> - +
@@ -348,7 +349,7 @@ function actmoveto_not_empty() { for($i=0;$i\n"; if ($c[$i]["type"]) { - echo " "; + echo " "; if ($p["showicons"]) { echo "icon($c[$i]["name"])."\" width=\"16\" height=\"16\" alt=\"\" />"; } @@ -389,21 +390,21 @@ function actmoveto_not_empty() { echo ""; echo ""; } echo "\n"; } else { // DOSSIER : - echo " "; + echo " "; if ($p["showicons"]) { echo "\"\""; } echo ""; ehe($c[$i]["name"]); echo "/\n"; echo " ".format_size($c[$i]["size"]).""; echo "".format_date(_('%3$d-%2$d-%1$d %4$d:%5$d'),date("Y-m-d h:i:s",$c[$i]["date"]))."
"; @@ -427,13 +428,13 @@ function actmoveto_not_empty() { for($i=0;$i\n"; if ($c[$i]["type"]) { - echo " "; + echo " "; echo "can_edit($R,$c[$i]["name"]); - if ($canedit&&($c[$i]["size"]<$memory_limit)) { - echo "bro_editor.php?editfile=".urlencode($c[$i]["name"])."&R=".urlencode($R); + if ($canedit && ($c[$i]["size"]<$memory_limit)) { + echo "bro_editor.php?editfile=".eue($c[$i]["name"],false)."&R=".eue($R,false); } else { - echo "bro_downloadfile.php?dir=".urlencode($R)."&file=".urlencode($c[$i]["name"]); + echo "bro_downloadfile.php?dir=".eue($R,false)."&file=".eue($c[$i]["name"],false); } echo "\">"; ehe($c[$i]["name"]); echo "\n"; @@ -446,9 +447,9 @@ function actmoveto_not_empty() { } echo "\n"; } else { - echo " ".htmlentities($c[$i]["name"])."/\n"; + echo " ".ehe($c[$i]["name"],false)."/\n"; echo " ".format_size($c[$i]["size"]).""; echo " "; echo "\n"; @@ -462,9 +463,9 @@ function actmoveto_not_empty() { for($i=round(count($c)/2);$i\n"; if ($c[$i]["type"]) { - echo " can_edit($R,$c[$i]["name"]); - if ($canedit&&($c[$i]["size"]<$memory_limit)) { + if ($canedit && ($c[$i]["size"]<$memory_limit)) { echo "bro_editor.php?editfile=".urlencode($c[$i]["name"])."&R=".urlencode($R); } else { echo "bro_downloadfile.php?dir=".urlencode($R)."&file=".urlencode($c[$i]["name"]); @@ -480,9 +481,9 @@ function actmoveto_not_empty() { } echo "\n"; } else { - echo " ".htmlentities($c[$i]["name"])."/\n"; + echo " ".ehe($c[$i]["name"],false)."/\n"; echo " ".format_size($c[$i]["size"]).""; echo " "; echo "\n"; @@ -503,14 +504,14 @@ function actmoveto_not_empty() { for($i=0;$i\n"; if ($c[$i]["type"]) { - echo " can_edit($R,$c[$i]["name"]); if ($canedit&&($c[$i]["size"]<$memory_limit)) { - echo "bro_editor.php?editfile=".urlencode($c[$i]["name"])."&R=".urlencode($R); + echo "bro_editor.php?editfile=".eue($c[$i]["name"],false)."&R=".eue($R,false); } else { - echo "bro_downloadfile.php?dir=".urlencode($R)."&file=".urlencode($c[$i]["name"]); + echo "bro_downloadfile.php?dir=".eue($R,false)."&file=".eue($c[$i]["name"],false); } - echo "\">"; ehe($c[$i]["name"]); + echo "\">"; ehe($c[$i]["name"],false); echo "\n"; echo " ".format_size($c[$i]["size"]).""; $vu=$bro->viewurl($R,$c[$i]["name"]); @@ -521,9 +522,9 @@ function actmoveto_not_empty() { } echo "\n"; } else { - echo " ".htmlentities($c[$i]["name"])."/\n"; + echo " ".ehe($c[$i]["name"],false)."/\n"; echo " ".format_size($c[$i]["size"]).""; echo " "; echo "\n"; @@ -537,14 +538,14 @@ function actmoveto_not_empty() { for($i=round(count($c)/3);$i\n"; if ($c[$i]["type"]) { - echo " can_edit($R,$c[$i]["name"]); if ($canedit&&($c[$i]["size"]<$memory_limit)) { - echo "bro_editor.php?editfile=".urlencode($c[$i]["name"])."&R=".urlencode($R); + echo "bro_editor.php?editfile=".eue($c[$i]["name"],false)."&R=".eue($R,false); } else { - echo "bro_downloadfile.php?dir=".urlencode($R)."&file=".urlencode($c[$i]["name"]); + echo "bro_downloadfile.php?dir=".eue($R,false)."&file=".eue($c[$i]["name"],false); } - echo "\">"; ehe($c[$i]["name"]); + echo "\">"; ehe($c[$i]["name"],false); echo "\n"; echo " ".format_size($c[$i]["size"]).""; $vu=$bro->viewurl($R,$c[$i]["name"]); @@ -556,9 +557,9 @@ function actmoveto_not_empty() { echo "\n"; } else { - echo " ".htmlentities($c[$i]["name"])."/\n"; + echo " ".ehe($c[$i]["name"],false)."/\n"; echo " ".format_size($c[$i]["size"]).""; echo " "; echo "\n"; @@ -572,14 +573,14 @@ function actmoveto_not_empty() { for($i=round(2*count($c)/3);$i\n"; if ($c[$i]["type"]) { - echo " can_edit($R,$c[$i]["name"]); - if ($canedit&&($c[$i]["size"]<$memory_limit)) { - echo "bro_editor.php?editfile=".urlencode($c[$i]["name"])."&R=".urlencode($R); + if ($canedit && ($c[$i]["size"]<$memory_limit)) { + echo "bro_editor.php?editfile=".eue($c[$i]["name"],false)."&R=".eue($R,false); } else { - echo "bro_downloadfile.php?dir=".urlencode($R)."&file=".urlencode($c[$i]["name"]); + echo "bro_downloadfile.php?dir=".eue($R)."&file=".eue($c[$i]["name"]); } - echo "\">"; ehe($c[$i]["name"]); + echo "\">"; ehe($c[$i]["name"],false); echo "\n"; echo " ".format_size($c[$i]["size"]).""; $vu=$bro->viewurl($R,$c[$i]["name"]); @@ -590,9 +591,9 @@ function actmoveto_not_empty() { } echo "\n"; } else { - echo " ".htmlentities($c[$i]["name"])."/\n"; + echo " ".ehe($c[$i]["name"],false)."/\n"; echo " ".format_size($c[$i]["size"]).""; echo " "; echo "\n"; @@ -620,19 +621,19 @@ else {
-&showdirsize=1">
 
+&showdirsize=1">
 
is_protected($R)) { - echo ""._("Edit this folder's protection").""; + echo ""._("Edit this folder's protection").""; } else { - echo ""._("Protect this folder").""; + echo ""._("Protect this folder").""; } ?>

-"> +">   l_tgz[$p["downfmt"]]); ?>

diff --git a/bureau/admin/browseforfolder2.php b/bureau/admin/browseforfolder2.php index 3beb5cce..5db25788 100755 --- a/bureau/admin/browseforfolder2.php +++ b/bureau/admin/browseforfolder2.php @@ -141,14 +141,14 @@ if ($errbrowsefold) {

- - - + + +
" class="inb" onclick="retour();" />  - " class="inb" onclick="window.parent.jQuery('#').dialog('close');" />  + " class="inb" onclick="window.parent.jQuery('#').dialog('close');" /> 

@@ -170,9 +170,9 @@ if ($errbrowsefold) { } echo ""; if ($val["put"]!="") { - echo "".$val["dir"].""; + echo "".ehe($val["dir"],false).""; } else { - echo "".$val["dir"].""; + echo "".ehe($val["dir"],false).""; } echo "\n\n"; } diff --git a/bureau/admin/cron.php b/bureau/admin/cron.php index 10f5b7fc..9422cd41 100755 --- a/bureau/admin/cron.php +++ b/bureau/admin/cron.php @@ -54,7 +54,7 @@ for ($i=0; $i < $max_cron ; $i++) { <?php __(" title=""/> -
" size="40" maxlength="255" value=""/> +
" size="40" maxlength="255" value=""/> " size="20" maxlength="64" value=""/> -
" size="20" maxlength="64" value=""/> -
" size="25" maxlength="64" value=""/> +
" size="20" maxlength="64" value=""/> +
" size="20" maxlength="64" value=""/> +
" size="25" maxlength="64" value=""/> diff --git a/bureau/admin/dom_dodel.php b/bureau/admin/dom_dodel.php index b1217cb5..42cd9446 100755 --- a/bureau/admin/dom_dodel.php +++ b/bureau/admin/dom_dodel.php @@ -71,7 +71,7 @@ if ($del_confirm!="y") {

- + " /> " onclick="history.back()" /> diff --git a/bureau/admin/dom_edit.inc.php b/bureau/admin/dom_edit.inc.php index a1901c11..57a74c0e 100755 --- a/bureau/admin/dom_edit.inc.php +++ b/bureau/admin/dom_edit.inc.php @@ -34,7 +34,7 @@ $dom->unlock(); - + unlock(); __("Create a subdomain:"); } ?> -. + . unlock(); ?> - OnClick="getElementById('t_').focus();"/> - + OnClick="getElementById('t_').focus();"/> + - + - + - + - + - + - +  : - " /> + " /> diff --git a/bureau/admin/dom_import.php b/bureau/admin/dom_import.php index 64c3d000..12436574 100755 --- a/bureau/admin/dom_import.php +++ b/bureau/admin/dom_import.php @@ -97,7 +97,7 @@ if ($save) { - + diff --git a/bureau/admin/dom_subdel.php b/bureau/admin/dom_subdel.php index ab2116a2..21c30c72 100755 --- a/bureau/admin/dom_subdel.php +++ b/bureau/admin/dom_subdel.php @@ -61,7 +61,7 @@ if (isset($error) && $error) {

- +

\n"; + echo ''."\n"; } ?> " /> " onclick="document.location='ftp_list.php'" /> diff --git a/bureau/admin/ftp_edit.php b/bureau/admin/ftp_edit.php index 144f637c..8925f45a 100755 --- a/bureau/admin/ftp_edit.php +++ b/bureau/admin/ftp_edit.php @@ -70,17 +70,17 @@ if (isset($error) && $error) { - - + + - + - - + + - - diff --git a/bureau/admin/hta_add.php b/bureau/admin/hta_add.php index 7266899f..27ceb961 100755 --- a/bureau/admin/hta_add.php +++ b/bureau/admin/hta_add.php @@ -56,7 +56,7 @@ if (isset($error) && $error) {
 _ " size="20" maxlength="64" /> _ " size="20" maxlength="64" />
- " size="20" maxlength="64" /> + " size="20" maxlength="64" />

diff --git a/bureau/admin/ftp_list.php b/bureau/admin/ftp_list.php index 17214dd5..b950ce3d 100755 --- a/bureau/admin/ftp_list.php +++ b/bureau/admin/ftp_list.php @@ -77,10 +77,10 @@ if (isset($error) && $error && !$noftp) { reset($r); while (list($key,$val)=each($r)) { ?>
" name="del_" value="" />
">
" name="del_" value="" />
">
' onClick='return confirm("");'>' onClick='return confirm("");'>"; echo "ENABLED"; // for tablesorter @@ -90,11 +90,11 @@ if ( $val['enabled']) { } ?> - ]' value='' /> + + " /> - "> +"> "._("Directory not found").""; } ?>
" maxlength="255" /> - +
diff --git a/bureau/admin/hta_dodeluser.php b/bureau/admin/hta_dodeluser.php index 62bb4798..08086925 100755 --- a/bureau/admin/hta_dodeluser.php +++ b/bureau/admin/hta_dodeluser.php @@ -52,15 +52,15 @@ include_once('head.php');

    $t\n"; + echo "
  • ".ehe($t,false)."
    • \n"; } ?>
- + \n"; + echo ''."\n"; } ?> " /> " onclick="document.location='/hta_edit.php?dir='" /> diff --git a/bureau/admin/hta_edit.php b/bureau/admin/hta_edit.php index 4ea1ec1c..2948fa7d 100755 --- a/bureau/admin/hta_edit.php +++ b/bureau/admin/hta_edit.php @@ -60,17 +60,17 @@ if (!$dir) { - + - + - +

- +

 

@@ -99,8 +99,8 @@ for($i=0;$i
-
<?php __(" />
+
<?php __(" />
- - + + diff --git a/bureau/admin/hta_edituser.php b/bureau/admin/hta_edituser.php index 2faddef9..2819ca9e 100755 --- a/bureau/admin/hta_edituser.php +++ b/bureau/admin/hta_edituser.php @@ -50,8 +50,8 @@ getFields($fields); - - + +
'.htmlspecialchars($dir).''; ?>'.ehe($dir,false).''; ?>
diff --git a/bureau/admin/hta_list.php b/bureau/admin/hta_list.php index f2a93cfc..3a603e35 100755 --- a/bureau/admin/hta_list.php +++ b/bureau/admin/hta_list.php @@ -73,11 +73,11 @@ $mem->show_help("hta_list2"); for($i=0;$i - + - + - - + +
-
+
'.htmlspecialchars($r[$i]).''; ?>'.ehe($r[$i],false).''; ?>
" /> -
+ diff --git a/bureau/admin/ip_main.php b/bureau/admin/ip_main.php index 57c4d34c..bc6656e7 100755 --- a/bureau/admin/ip_main.php +++ b/bureau/admin/ip_main.php @@ -97,19 +97,19 @@ $lac = $authip->list_affected();

- - + + 1 ) { ?> - $v) { ?> - + $v) { ?> - - + +

@@ -122,7 +122,7 @@ $lac = $authip->list_affected();

IPv4, IPv6 and subnet allowed"); ?>
" />
diff --git a/bureau/admin/logs_tail.php b/bureau/admin/logs_tail.php index 0c0b12ac..b268ceb4 100644 --- a/bureau/admin/logs_tail.php +++ b/bureau/admin/logs_tail.php @@ -50,15 +50,15 @@ if (!$string) {

%s"),$file); ?>

- - + + -" onclick="document.location='logs_tail.php?file=&autoreload=0&lines='"/> +" onclick="document.location='logs_tail.php?file=&autoreload=0&lines='"/> -" onclick="document.location='logs_tail.php?file=&autoreload=1&lines='"/> +" onclick="document.location='logs_tail.php?file=&autoreload=1&lines='"/> - + get_details($val); - echo ""; + echo ""; echo $m["address"]."@".$m["domain"]."
"; } diff --git a/bureau/admin/mail_edit.php b/bureau/admin/mail_edit.php index 442a9f5e..5517cfd1 100755 --- a/bureau/admin/mail_edit.php +++ b/bureau/admin/mail_edit.php @@ -67,7 +67,7 @@ if (isset($error)) { - + diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php index e84140de..114bd5b0 100755 --- a/bureau/admin/mail_list.php +++ b/bureau/admin/mail_list.php @@ -79,7 +79,7 @@ if ($fatal) { - + " onClick="return false_if_empty('mail_arg', '');" /> cancreate("mail") ?> @@ -104,19 +104,19 @@ if (empty($allmails_list) && empty($search)) {
- diff --git a/bureau/admin/sql_del.php b/bureau/admin/sql_del.php index 893301d2..550e1050 100755 --- a/bureau/admin/sql_del.php +++ b/bureau/admin/sql_del.php @@ -82,7 +82,7 @@ if (!$found) { reset($_POST); while (list($key,$val)=each($_POST)) { if (substr($key,0,4)=="del_") { - echo "".$val."
\n"; + echo "".ehe($val,false)."
\n"; } } diff --git a/bureau/admin/sql_restore.php b/bureau/admin/sql_restore.php index cb515c41..80b0b744 100755 --- a/bureau/admin/sql_restore.php +++ b/bureau/admin/sql_restore.php @@ -63,7 +63,7 @@ echo "

"; ?> - +

" />

diff --git a/bureau/admin/sql_users_del.php b/bureau/admin/sql_users_del.php index d558984d..9e087def 100755 --- a/bureau/admin/sql_users_del.php +++ b/bureau/admin/sql_users_del.php @@ -69,7 +69,7 @@ include_once("head.php"); reset($_POST); while (list($key,$val)=each($_POST)) { if (substr($key,0,4)=="del_") { - echo "".$val."
\n"; + echo "".ehe($val,false)."
\n"; } } diff --git a/bureau/admin/sql_users_password.php b/bureau/admin/sql_users_password.php index f9f41142..71592ede 100755 --- a/bureau/admin/sql_users_password.php +++ b/bureau/admin/sql_users_password.php @@ -54,7 +54,7 @@ if (! empty($error) ) { - + diff --git a/bureau/admin/sql_users_rights.php b/bureau/admin/sql_users_rights.php index b235d248..d7608bcc 100755 --- a/bureau/admin/sql_users_rights.php +++ b/bureau/admin/sql_users_rights.php @@ -55,7 +55,7 @@ if ($r) { - +
- + <?php __(" title="" src="/images/search.png" style="vertical-align: middle"/>
total,"mail_list.php?domain_id=".$domain_id."&count=".$count."&search=".urlencode($search)."&offset=%%offset%%"); ?> - value="1"onclick="document.getElementById('formlist1').submit();" /> + value="1" onclick="document.getElementById('formlist1').submit();" />
- +
@@ -124,7 +124,7 @@ if (empty($allmails_list) && empty($search)) {
- + <?php __(" /> diff --git a/bureau/admin/mail_manage_catchall.php b/bureau/admin/mail_manage_catchall.php index bb180c89..4fc4667e 100644 --- a/bureau/admin/mail_manage_catchall.php +++ b/bureau/admin/mail_manage_catchall.php @@ -108,7 +108,7 @@ __("You can choose what to do with emails sent to unexisting address of this dom - + diff --git a/bureau/admin/mem_cm.php b/bureau/admin/mem_cm.php index c635289d..380cb33f 100644 --- a/bureau/admin/mem_cm.php +++ b/bureau/admin/mem_cm.php @@ -49,7 +49,7 @@ if (isset($error) && $error) { ?>
- " /> + " />
">


- " /> + " />

    @@ -121,11 +121,11 @@ __("You can choose what to do with emails sent to unexisting address of this dom
/> />

- " /> + " />

- diff --git a/bureau/admin/mem_param.php b/bureau/admin/mem_param.php index ea6a9013..c6c20b5a 100755 --- a/bureau/admin/mem_param.php +++ b/bureau/admin/mem_param.php @@ -85,9 +85,9 @@ echo "

";

+

- - - + + +
" size="20" maxlength="128" />
(1)" size="20" maxlength="60" />
(2)" size="20" maxlength="61" />
" size="20" maxlength="128" />
(1)" size="20" maxlength="60" />
(2)" size="20" maxlength="61" />
" />
@@ -101,7 +101,7 @@ echo "

"; - +
user["mail"]; ?>
" size="40" maxlength="128" />
" size="40" maxlength="128" />
" />
diff --git a/bureau/admin/phpinfo.php b/bureau/admin/phpinfo.php deleted file mode 100644 index 9f016e1f..00000000 --- a/bureau/admin/phpinfo.php +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/bureau/admin/piwik_site_dodel.php b/bureau/admin/piwik_site_dodel.php index 6cf1bba3..11b01385 100755 --- a/bureau/admin/piwik_site_dodel.php +++ b/bureau/admin/piwik_site_dodel.php @@ -67,7 +67,7 @@ include_once('head.php');

- + " /> " onclick="document.location='piwik_sitelist.php'" />
diff --git a/bureau/admin/piwik_user_dodel.php b/bureau/admin/piwik_user_dodel.php index 0c54a5e6..3fc42114 100755 --- a/bureau/admin/piwik_user_dodel.php +++ b/bureau/admin/piwik_user_dodel.php @@ -65,7 +65,7 @@ include_once('head.php');
- + " /> " onclick="document.location='piwik_userlist.php'" />
diff --git a/bureau/admin/sql_bck.php b/bureau/admin/sql_bck.php index 723f0792..07415296 100755 --- a/bureau/admin/sql_bck.php +++ b/bureau/admin/sql_bck.php @@ -70,7 +70,7 @@ if (is_array($r)) {
- + />
/>
/>
@@ -99,7 +99,7 @@ if (is_array($r)) {
" /> + " />
diff --git a/bureau/class/functions.php b/bureau/class/functions.php index 8c4808eb..e6e062c6 100755 --- a/bureau/class/functions.php +++ b/bureau/class/functions.php @@ -633,6 +633,26 @@ function ehe($str, $affiche = TRUE) { return $retour; } +/** + /* Echo the URLENCODED version of a value. + * Must be called when pre-filling fields values in URLS such as : + * document.location='logs_tail.php?file= + * Use the charset of the current language for transcription + * + * @global string $charset + * @param string $str + * @param boolean $affiche + * @return string + */ +function eue($str, $affiche = TRUE) { + global $charset; + $retour = urlencode($str); + if ($affiche) { + echo $retour; + } + return $retour; +} + /* Get the Fields of the posted form from $_REQUEST or POST or GET * and check their type */