From 57d93e600ea3233b63dabbb1bb06e9df3e0c3383 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Mon, 18 Feb 2013 11:57:56 +0000
Subject: [PATCH] Continue de ranger le panel au bon endroit

---
 bureau/admin/dom_edit.php                 | 2 +-
 bureau/class/config.php                   | 2 +-
 etc/alternc/apache2.conf                  | 4 ++--
 etc/alternc/phpmyadmin.inc.php            | 2 +-
 etc/alternc/templates/alternc/bureau.conf | 2 +-
 etc/alternc/templates/apache2/panel.conf  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index e109da84..6f03b3b0 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -234,7 +234,7 @@ if (!$r['noerase']) {
 <h3><?php __("Domain removal"); ?></h3>
 
 <br />
-<?php printf(_("help_domain_del %s"),$domain); ?><br />
+<?php printf(_("If you want to destroy the domain %s, click on the button below. Warning: this also deletes all FTP accounts, email, mailing lists associated with the domain and subdomains."),$domain); ?><br />
 <form action="dom_dodel.php?domain=<?php echo urlencode($domain) ?>" method="post">
 <p>
 <input type="submit" class="inb" name="detruire" value="<?php printf(_("Delete %s from this server"),$domain); ?>" />
diff --git a/bureau/class/config.php b/bureau/class/config.php
index b161e3c5..a6c4e7a1 100644
--- a/bureau/class/config.php
+++ b/bureau/class/config.php
@@ -54,7 +54,7 @@ define('ALTERNC_MAIL',     "/var/alternc/mail");
 define('ALTERNC_HTML',     "/var/alternc/html");
 define('ALTERNC_PANEL',    "/usr/lib/alternc/panel");
 define('ALTERNC_LOGS',     "/var/alternc/logs");
-define('ALTERNC_LOCALES',  "/var/alternc/bureau/locales");
+define('ALTERNC_LOCALES',  ALTERNC_PANEL."/locales");
 
 /* Toutes les pages du bureau passent ici. On utilise une sémaphore pour 
    s'assurer que personne ne pourra accéder à 2 pages du bureau en même temps.
diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf
index 23383ea9..410f226e 100644
--- a/etc/alternc/apache2.conf
+++ b/etc/alternc/apache2.conf
@@ -23,7 +23,7 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
     AddHandler cgi-script .cgi
 </Directory>
 
-<Directory /var/alternc/bureau/admin/>
+<Directory /usr/lib/alternc/panel/admin/>
   Order allow,deny
   Allow from all
 
@@ -31,7 +31,7 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
   php_admin_flag safe_mode off
   AddDefaultCharset UTF-8
 # open_basedir allows access to specifics directories. We need to grant access to these directories for alternc, awstats, mailman...
-  php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/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:/var/log/alternc/bureau.log:/var/log/alternc/update_domains.log:/var/alternc/logs/:/etc/awstats/
+  php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/etc/alternc/:/var/run/alternc/:/usr/lib/alternc/panel/:/var/alternc/html/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen:/var/log/alternc/bureau.log:/var/log/alternc/update_domains.log:/var/alternc/logs/:/etc/awstats/
 
 </Directory>
 
diff --git a/etc/alternc/phpmyadmin.inc.php b/etc/alternc/phpmyadmin.inc.php
index 0c063732..9333faed 100644
--- a/etc/alternc/phpmyadmin.inc.php
+++ b/etc/alternc/phpmyadmin.inc.php
@@ -14,7 +14,7 @@
  * /etc/phpmyadmin/config.inc.php
  */
 
-include_once('/var/alternc/bureau/class/local.php');
+include_once('/usr/lib/alternc/panel/class/local.php');
 $cfg['SuhosinDisableWarning'] = true;
 $cfg['ShowCreateDb'] = false; 
 $cfg['ShowChgPassword'] = false; 
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index 552ff65b..2f94f615 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -2,7 +2,7 @@
   AssignUserId alterncpanel alterncpanel
   SetEnv LOGIN "0000-panel"
 
-  DocumentRoot /var/alternc/bureau/admin
+  DocumentRoot /usr/lib/alternc/panel/admin
   ServerName %%fqdn%%
   RewriteEngine on
   RewriteRule   ^/admin/(.*)  /$1 [R=301,L]
diff --git a/etc/alternc/templates/apache2/panel.conf b/etc/alternc/templates/apache2/panel.conf
index 256d05fe..676fabdc 100644
--- a/etc/alternc/templates/apache2/panel.conf
+++ b/etc/alternc/templates/apache2/panel.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-  DocumentRoot /var/alternc/bureau/admin
+  DocumentRoot /usr/lib/alternc/panel/admin
   AssignUserId alterncpanel alterncpanel
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
   ServerName %%fqdn%%