From 61071e8c6c43f3ef97127a1d842e580f2c8621eb Mon Sep 17 00:00:00 2001 From: Alan Garcia Date: Fri, 11 Mar 2011 10:18:38 +0000 Subject: [PATCH] =?UTF-8?q?Correction=20:=20langue=20on=20enleve=20le=20fl?= =?UTF-8?q?ag.=20Securit=C3=A9=20:=20deny=20access=20=C3=A0=20http://panel?= =?UTF-8?q?-alternc/class/=20Menulist=20dans=20/etc/alternc=20et=20plus=20?= =?UTF-8?q?dans=20/var/alternc/bureau/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 5 +---- bureau/admin/images/flag_de_DE.png | Bin 147 -> 0 bytes bureau/admin/images/flag_en_US.png | Bin 803 -> 0 bytes bureau/admin/images/flag_es_ES.png | Bin 168 -> 0 bytes bureau/admin/images/flag_fr_FR.png | Bin 178 -> 0 bytes bureau/admin/menu.php | 18 ++++-------------- bureau/admin/menu_lang.php | 12 ++++++++++++ debian/alternc.links | 1 - debian/alternc.preinst | 4 +--- etc/alternc/apache2.conf | 24 ++++++++++++++++-------- etc/alternc/menulist.txt | 1 + 11 files changed, 35 insertions(+), 30 deletions(-) delete mode 100644 bureau/admin/images/flag_de_DE.png delete mode 100644 bureau/admin/images/flag_en_US.png delete mode 100644 bureau/admin/images/flag_es_ES.png delete mode 100644 bureau/admin/images/flag_fr_FR.png create mode 100644 bureau/admin/menu_lang.php diff --git a/.gitattributes b/.gitattributes index 72559bbf..8365479b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -164,10 +164,6 @@ bureau/admin/images/delete.png -text bureau/admin/images/dom.png -text bureau/admin/images/edit.png -text bureau/admin/images/exit.png -text -bureau/admin/images/flag_de_DE.png -text -bureau/admin/images/flag_en_US.png -text -bureau/admin/images/flag_es_ES.png -text -bureau/admin/images/flag_fr_FR.png -text bureau/admin/images/folder.png -text bureau/admin/images/folderhta.png -text bureau/admin/images/ftp.png -text @@ -234,6 +230,7 @@ bureau/admin/menu_aide.php -text bureau/admin/menu_brouteur.php -text bureau/admin/menu_dom.php -text bureau/admin/menu_ftp.php -text +bureau/admin/menu_lang.php -text bureau/admin/menu_mail.php -text bureau/admin/menu_mem.php -text bureau/admin/menu_quota.php -text diff --git a/bureau/admin/images/flag_de_DE.png b/bureau/admin/images/flag_de_DE.png deleted file mode 100644 index 0a6a87036bd9388f6a4ca05cfe2ed7e2cc71460a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^qCm{Y#0(_&X6%mzQak}ZA+G;{;0(imAeVumg75n# zAjMhW5n0T@z%2~Ij105pNB{-dOFVsD*{?B+il|y=G4E;s3Q2joIEHXsPyWHr#4hn6 laJ9n%Mr%ZW00004XF*Lt006O% z3;baP00007bV*G`2h#)_3U|20K{f{d;H{{Q~^|NZ{^>ch#@Bq{sb+GTi|`v3ed zOMyd9i1PIH{`~vlxwFa{9W_OF#VET=I-petK2g++i`OC`TF?(|JZwc%?u7mScNl6h_$=L z`~3Xy($3i;D)Q&&?X|J@)T)FB<% zBp=r)BGM!x*(NC2EGpL?8rUNx*(fX3C?wV@DBCV5(hHrF*X>4${%_4)YH*4f?UI!J;!LVSagulCW>;Iz2uuBO&9G}tsY z+>M6&{q@Nr9@$n{lbW_VP=|1dsqXRY=!c5r^z_l)>)dN>&|6pMnwa?I=;o}bxn-Yh!o<>t-H+bly0Be9S$N*J0*imkoN-RZT>9YYt-2lzc4!ucjQFIzdsFE`z@_=tLu4LcaT z)M|A**9?j+_w<0bXPbTBybBxd-f?A_G{BYpSY)@l1C4BL!UTYm{Mv2Ex&%BeT+dGd z+~>1$&oI28wVNctjR6FmMZlFeAgPITAoYQ%@Ji5R22vHir*$sRQRa~ PsD#1O)z4*}Q$iB}@t-)J diff --git a/bureau/admin/menu.php b/bureau/admin/menu.php index 8e8b3a4c..84a2af30 100644 --- a/bureau/admin/menu.php +++ b/bureau/admin/menu.php @@ -38,25 +38,15 @@ require_once("../class/config.php");

AlternC

"; -foreach($locales as $l) { ?> - <?php __($l); ?>

diff --git a/bureau/admin/menu_lang.php b/bureau/admin/menu_lang.php new file mode 100644 index 00000000..a10f1277 --- /dev/null +++ b/bureau/admin/menu_lang.php @@ -0,0 +1,12 @@ +
+
+ <?php __(" /> 
+
+
    + +
    • + +
+
+
+ diff --git a/debian/alternc.links b/debian/alternc.links index 0406226f..366b9315 100644 --- a/debian/alternc.links +++ b/debian/alternc.links @@ -1,4 +1,3 @@ /usr/share/alternc/install/alternc.install usr/sbin/alternc.install -/etc/alternc/menulist.txt var/alternc/bureau/admin/menulist.txt fr_FR var/alternc/bureau/locales/fr_CA en_US var/alternc/bureau/locales/en_GB diff --git a/debian/alternc.preinst b/debian/alternc.preinst index baf0be1a..e9381271 100644 --- a/debian/alternc.preinst +++ b/debian/alternc.preinst @@ -55,12 +55,10 @@ case "$1" in echo "/etc/bind/master was not empty. Please remove it manually." fi - if [ ! -h /var/alternc/bureau/admin/menulist.txt ]; then + if [ ! -e /etc/alternc/menulist.txt ]; then if [ -f /var/alternc/bureau/admin/menulist.txt ]; then mv -f /var/alternc/bureau/admin/menulist.txt \ /etc/alternc/menulist.txt - ln -sf /etc/alternc/menulist.txt \ - /var/alternc/bureau/admin/menulist.txt fi fi diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf index a5667c6c..47ef014c 100644 --- a/etc/alternc/apache2.conf +++ b/etc/alternc/apache2.conf @@ -3,6 +3,20 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ +#### Some security parameters +# We set a PhpMyAdmin alias to override the one PhpMyAdmin may have installed +# to prevent phpmyadmin to be bruteforced "by default" +Alias /phpmyadmin /usr/share/phpmyadmin + +# Deny access to the root filesystem + + Options FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + +#### End security parameters + Options FollowSymLinks IncludesNOEXEC ExecCGI AllowOverride None @@ -11,14 +25,7 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ AddHandler cgi-script .cgi - - Options FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - + Order allow,deny Allow from all @@ -27,6 +34,7 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ php_admin_flag register_globals on AddDefaultCharset ISO-8859-1 php_admin_value open_basedir /etc/alternc/:/var/run/alternc/:/var/alternc/bureau/:/var/alternc/html/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen + diff --git a/etc/alternc/menulist.txt b/etc/alternc/menulist.txt index 6d3d31d6..84219dc7 100644 --- a/etc/alternc/menulist.txt +++ b/etc/alternc/menulist.txt @@ -9,3 +9,4 @@ menu_sql.php menu_quota.php menu_aide.php menu_mem.php +menu_lang.php