diff --git a/.gitattributes b/.gitattributes index 2cf97b90..72559bbf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -164,6 +164,10 @@ 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 diff --git a/bureau/admin/images/flag_de_DE.png b/bureau/admin/images/flag_de_DE.png new file mode 100644 index 00000000..0a6a8703 Binary files /dev/null and b/bureau/admin/images/flag_de_DE.png differ diff --git a/bureau/admin/images/flag_en_US.png b/bureau/admin/images/flag_en_US.png new file mode 100644 index 00000000..a1e212e9 Binary files /dev/null and b/bureau/admin/images/flag_en_US.png differ diff --git a/bureau/admin/images/flag_es_ES.png b/bureau/admin/images/flag_es_ES.png new file mode 100644 index 00000000..ba6f854b Binary files /dev/null and b/bureau/admin/images/flag_es_ES.png differ diff --git a/bureau/admin/images/flag_fr_FR.png b/bureau/admin/images/flag_fr_FR.png new file mode 100644 index 00000000..1d3c5dc4 Binary files /dev/null and b/bureau/admin/images/flag_fr_FR.png differ diff --git a/bureau/admin/menu.php b/bureau/admin/menu.php index 9e1e7cd2..8e8b3a4c 100644 --- a/bureau/admin/menu.php +++ b/bureau/admin/menu.php @@ -50,7 +50,13 @@ if ($tt) { } ?> -
"; +foreach($locales as $l) { ?> +
diff --git a/bureau/class/lang_env.php b/bureau/class/lang_env.php index 1cd34d1f..51e5c95e 100644 --- a/bureau/class/lang_env.php +++ b/bureau/class/lang_env.php @@ -2,18 +2,17 @@ function update_locale($langpath) { $locales=array(); - $f=@fopen("/etc/locale.gen","rb"); - if ($f) { - while ($s=fgets($f,1024)) { - if (preg_match("/^([a-z][a-z]_[A-Z][A-Z])/",trim($s),$mat) && file_exists($langpath . '/' . $mat[1])) { - $locales[$mat[1]]=$mat[1]; - } + $file=file("/etc/locale.gen", FILE_SKIP_EMPTY_LINES); + if (! is_array($file) ) return $locales; + foreach ($file as $v ) { + if ( (preg_match("/^([a-z][a-z]_[A-Z][A-Z])/",trim($v),$mat) && file_exists($langpath . '/' . $mat[1]) ) ) { + $locales[$mat[1]]=$mat[1]; } - fclose($f); } return $locales; } + // setlang is on the link at the login page if (isset($_REQUEST["setlang"])) { $lang=$_REQUEST["setlang"]; diff --git a/bureau/class/local.php b/bureau/class/local.php index d746ddbe..49ea298a 100644 --- a/bureau/class/local.php +++ b/bureau/class/local.php @@ -1,7 +1,7 @@ 'MX', diff --git a/debian/changelog b/debian/changelog index 84724f46..6dee42ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +alternc (1.0~rc2) stable; urgency=low + * Major patch + * Web & DNS file generation rebuild from scratch + * Drop of apache 1 support + * Big changes in database schema (domaines, sub_domaines, *_standby) + * Major changes + * Drop mass virtual hosting, now use full vhost + * New features + * Domains type are dynamic, the administrator can create domaine type with his own apache template + * Advanced DNS options (ipv6, cname, txt, mx) + * Possibility to create a temporary mail + * Bugfixes + * Too many to be listed (we change the update_domaines.sh) + * Dash compatibility + * Use iana.org to have whois server list up to date + + -- Alan Garcia