From d5b60a96659d91670ace5962a9100a6a8157949d Mon Sep 17 00:00:00 2001
From: alban <>
Date: Fri, 18 Oct 2013 09:12:41 +0000
Subject: [PATCH] =?UTF-8?q?[enh]=C2=A0Adds=20more=20granular=20alert=20mes?=
 =?UTF-8?q?sages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bureau/admin/adm_authip_whitelist.php | 4 ++--
 bureau/admin/adm_dodel.php            | 2 +-
 bureau/admin/adm_panel.php            | 2 +-
 bureau/admin/cron.php                 | 2 +-
 bureau/admin/dom_add.php              | 4 ++--
 bureau/admin/dom_dodel.php            | 2 +-
 bureau/admin/dom_edit.php             | 6 +++---
 bureau/admin/dom_import.php           | 4 ++--
 bureau/admin/dom_subdel.php           | 2 +-
 bureau/admin/ftp_list.php             | 2 +-
 bureau/admin/ip_main.php              | 2 +-
 bureau/admin/mail_edit.php            | 4 ++--
 bureau/admin/sql_del.php              | 2 +-
 bureau/admin/sql_users_del.php        | 2 +-
 bureau/admin/vm.php                   | 6 +++---
 15 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/bureau/admin/adm_authip_whitelist.php b/bureau/admin/adm_authip_whitelist.php
index 5ad423a9..53f39f5c 100644
--- a/bureau/admin/adm_authip_whitelist.php
+++ b/bureau/admin/adm_authip_whitelist.php
@@ -33,10 +33,10 @@ $list_ip = $authip->list_ip_whitelist();
 <br />
 
 <?php if (isset($error) && $error) { ?>
-  <p class="error"><?php echo $error ?></p>
+  <p class="alert alert-danger"><?php echo $error ?></p>
 <?php } ?>
 <center>
-  <p class="error"><?php __("Warning"); echo "<br/>"; __("The IP and subnet you have here are allowed for ALL users and ALL usages"); ?></p>
+  <p class="alert alert-warning"><?php __("Warning"); echo "<br/>"; __("The IP and subnet you have here are allowed for ALL users and ALL usages"); ?></p>
 </center>
 
 <br/>
diff --git a/bureau/admin/adm_dodel.php b/bureau/admin/adm_dodel.php
index 9f99a090..3864ed78 100644
--- a/bureau/admin/adm_dodel.php
+++ b/bureau/admin/adm_dodel.php
@@ -74,7 +74,7 @@ if($del_confirm == "y"){
     <form action="adm_dodel.php" method="post">
       <input type="hidden" name="action" value="delete" />
       <input type="hidden" name="del_confirm" value="y" />
-      <p class="error"><?php __("WARNING : Confirm the deletion of the users"); ?></p>
+      <p class="alert alert-warning"><?php __("WARNING : Confirm the deletion of the users"); ?></p>
       <p>
       <?php
         foreach($d as $userid){
diff --git a/bureau/admin/adm_panel.php b/bureau/admin/adm_panel.php
index 453da78f..11882bf5 100644
--- a/bureau/admin/adm_panel.php
+++ b/bureau/admin/adm_panel.php
@@ -90,7 +90,7 @@ closedir($d);
 </ul>
 
 <?php if ($cuid == 2000) { ?>
-  <p class="error">
+  <p class="alert alert-info">
     <?php if (panel_islocked()) { ?>
       <a href="adm_lockpanel.php?action=unlock"><?php __("Click here to unlock the panel and allow user to login.");?></a>
     <?php } else { ?>
diff --git a/bureau/admin/cron.php b/bureau/admin/cron.php
index 0a5e25a4..3de77768 100644
--- a/bureau/admin/cron.php
+++ b/bureau/admin/cron.php
@@ -23,7 +23,7 @@ $lst_cron = $cron->lst_cron();
 <br />
 
 <?php if (isset($error) && $error) { ?>
-  <p class="error"><?php echo $error ?></p>
+  <p class="alert alert-danger"><?php echo $error ?></p>
 <?php } ?>
 
 <form method="post" action="cron.php" id="main" name="cron" >
diff --git a/bureau/admin/dom_add.php b/bureau/admin/dom_add.php
index be09defa..18f0898f 100644
--- a/bureau/admin/dom_add.php
+++ b/bureau/admin/dom_add.php
@@ -46,7 +46,7 @@ if (!isset($dns)) $dns="1";
 <hr />
 <?php
 if (!$quota->cancreate("dom")) { ?>
-<p class="error"><?php echo _("You cannot add any new domain, your quota is over.")." "._("Contact your administrator for more information."); ?></p>
+<p class="alert alert-danger"><?php echo _("You cannot add any new domain, your quota is over.")." "._("Contact your administrator for more information."); ?></p>
 <?php
 exit();
 }
@@ -87,7 +87,7 @@ $dl=$dom->get_domain_list($cuid);
   <input type="submit" class="inb ok" name="submit" value="<?php __("Add this domain"); ?>" />
 </p>
 
-<p class="error">
+<p class="alert alert-info">
 <?php __("If you don't want to host in our server the DNS of your domain, don't check the box 'host my dns here'. If you don't know what it mean, leave it checked."); ?></p>
 <?php $mem->show_help("add_domain"); ?>
 </form>
diff --git a/bureau/admin/dom_dodel.php b/bureau/admin/dom_dodel.php
index 88942d27..753d76ba 100644
--- a/bureau/admin/dom_dodel.php
+++ b/bureau/admin/dom_dodel.php
@@ -64,7 +64,7 @@ if ($del_confirm!="y") {
 <h3><?php printf(_("Confirm the deletion of domain %s"),$domain); ?></h3>
 <hr id="topbar"/>
 <br />
-<p class="error"><?php __("WARNING"); ?><br /><?php printf(_("Confirm the deletion of domain %s"),$domain); ?><br />
+<p class="alert alert-warning"><?php __("WARNING"); ?><br /><?php printf(_("Confirm the deletion of domain %s"),$domain); ?><br />
 
 <?php __("This will delete the related sub-domains too."); ?></p>
 <form method="post" action="dom_dodel.php" id="main">
diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index 068258f9..1fab8e17 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -93,10 +93,10 @@ function destruction_alert() {
 <?php
 
 if ($r['dns_action']=='UPDATE') {?>
-  <p class="error"><?php __("This domain have some DNS change pending. Please wait."); ?></p>
+  <p class="alert alert-info"><?php __("This domain have some DNS change pending. Please wait."); ?></p>
 <?php
 } elseif ($r['dns_action']=='DELETE') {?>
-  <p class="error"><?php printf(_("You requested deletion of domain %s."), $domain);?></p>
+  <p class="alert alert-warning"><?php printf(_("You requested deletion of domain %s."), $domain);?></p>
 <?php
 /*
   // Link hidden as long as the del_domain_cancel function is not complete
@@ -255,7 +255,7 @@ if (!$r['noerase']) {
   </td>
 </tr>
 </table>
-<p class="error">    <?php __("Warning: If you set this to 'no', all your email accounts and aliases on this domain will be immediately deleted."); ?></p>
+<p class="alert alert-warning">    <?php __("Warning: If you set this to 'no', all your email accounts and aliases on this domain will be immediately deleted."); ?></p>
 <input type="submit" class="inb ok" name="submit" value="<?php __("Submit the changes"); ?>" />
 	</form>
 
diff --git a/bureau/admin/dom_import.php b/bureau/admin/dom_import.php
index d622c474..ddb0c196 100644
--- a/bureau/admin/dom_import.php
+++ b/bureau/admin/dom_import.php
@@ -46,13 +46,13 @@ $domain=trim($domain);
 
 <?php
 if (!empty($error)) {
-  echo '<p class="error">'.$error.'</p>';
+  echo '<p class="alert alert-danger">'.$error.'</p>';
 } 
 ?>
 
 <?php if ( !empty($zone) ) { 
 if ( empty($domain) ) {
-  echo '<p class="error">'._("The domain field seems to be empty").'</p>';
+  echo '<p class="alert alert-danger">'._("The domain field seems to be empty").'</p>';
 } else { ?>
   <?php __("Here is my proposition. Modify your zone until my proposition seems good to you"); ?>
   <table class="tlist">
diff --git a/bureau/admin/dom_subdel.php b/bureau/admin/dom_subdel.php
index 74d3fd5f..1e3a17d7 100644
--- a/bureau/admin/dom_subdel.php
+++ b/bureau/admin/dom_subdel.php
@@ -62,7 +62,7 @@ if (!$isinvited && $dt[strtolower($r['type'])]["enable"] != "ALL" ) {
 		 gestion du sous-domaine
  -->
 <form action="dom_subdodel.php" method="post">
-	<p class="error">
+	<p class="alert alert-warning">
 	<input type="hidden" name="sub_domain_id" value="<?php echo $sub_domain_id ?>" />
 <?php __("WARNING : Confirm the deletion of the subdomain"); ?> : </p>
 	<p><?php ecif($r['name'],$r['name']."."); echo $r['domain']; ?></p>
diff --git a/bureau/admin/ftp_list.php b/bureau/admin/ftp_list.php
index cd3f7fb7..e3c47eca 100644
--- a/bureau/admin/ftp_list.php
+++ b/bureau/admin/ftp_list.php
@@ -49,7 +49,7 @@ if (!$r=$ftp->get_list($domain)) {
 <?php
 if (isset($error) && $error && !$noftp) {
 ?>
-<p class="error"><?php echo $error ?></p>
+<p class="alert alert-danger"><?php echo $error ?></p>
 <?php } ?>
 
 <?php if ($quota->cancreate("ftp")) { ?>
diff --git a/bureau/admin/ip_main.php b/bureau/admin/ip_main.php
index db3ff0a8..64e235c4 100644
--- a/bureau/admin/ip_main.php
+++ b/bureau/admin/ip_main.php
@@ -52,7 +52,7 @@ $lac = $authip->list_affected();
 <br />
 
 <?php if (isset($error) && $error) { ?>
-  <p class="error"><?php echo $error ; $error=''; ?></p>
+  <p class="alert alert-danger"><?php echo $error ; $error=''; ?></p>
 <?php } ?>
 
 <p><?php __("Here you can add rules to restrict access to AlternC's services, filtered by IP. First, add trusted IPs in the 'Known IP and networks' list. Then, add rules to grant access on services to the chosen IPs from this list.") ?></p>
diff --git a/bureau/admin/mail_edit.php b/bureau/admin/mail_edit.php
index cbba3a1d..69ee7803 100644
--- a/bureau/admin/mail_edit.php
+++ b/bureau/admin/mail_edit.php
@@ -82,7 +82,7 @@ if (isset($error)) {
 <p><?php printf(_('This mailbox is currently using %1$s / %2$s'),format_size($used),format_size($quotabytes)); ?></p>
 <?php } ?>
 <?php if ($mailbox_action=="DELETE") { ?>
-<p class="error"><?php __("This mailbox is pending deletion. You can recover its mails by setting it to 'Yes' NOW!"); ?></p>
+<p class="alert alert-warning"><?php __("This mailbox is pending deletion. You can recover its mails by setting it to 'Yes' NOW!"); ?></p>
 <?php } ?>
 </td>
     <td>
@@ -100,7 +100,7 @@ if (isset($error)) {
       </div>
   </td></tr>
   <?php if ($islocal) { ?>
-<tr id="turnoff"><td colspan="2" class="error"><?php __("WARNING: turning POP/IMAP off will DELETE the stored messages in this email address."); ?></td></tr>
+<tr id="turnoff"><td colspan="2" class="alert alert-warning"><?php __("WARNING: turning POP/IMAP off will DELETE the stored messages in this email address."); ?></td></tr>
 <?php } ?>
   <tr><th colspan="2"><b><?php __("Is it a redirection to other email addresses?"); ?></b></th></tr>
 
diff --git a/bureau/admin/sql_del.php b/bureau/admin/sql_del.php
index f60de65e..9ff349f4 100644
--- a/bureau/admin/sql_del.php
+++ b/bureau/admin/sql_del.php
@@ -72,7 +72,7 @@ if (!$found) {
 <h3><?php __("MySQL Databases"); ?></h3>
 <hr id="topbar"/>
 <br />
-<p class="error"><?php __("WARNING"); ?></big><br /><?php __("Confirm the deletion of the following SQL databases"); ?><br />
+<p class="alert alert-warning"><?php __("WARNING"); ?></big><br /><?php __("Confirm the deletion of the following SQL databases"); ?><br />
 <?php __("This will delete all the tables currently in those db."); ?></p>
 <form method="post" action="sql_del.php" id="main">
 <p>
diff --git a/bureau/admin/sql_users_del.php b/bureau/admin/sql_users_del.php
index add91803..00dcafd2 100644
--- a/bureau/admin/sql_users_del.php
+++ b/bureau/admin/sql_users_del.php
@@ -58,7 +58,7 @@ include_once("head.php");
 <h3><?php __("MySQL users"); ?></h3>
 <hr id="topbar"/>
 <br />
-<p class="error"><?php __("WARNING"); ?></big><br /><?php __("Confirm the deletion of the following MySQL users"); ?><br />
+<p class="alert alert-warning"><?php __("WARNING"); ?></big><br /><?php __("Confirm the deletion of the following MySQL users"); ?><br />
 </p>
 <form method="post" action="sql_users_del.php" id="main">
 <p>
diff --git a/bureau/admin/vm.php b/bureau/admin/vm.php
index 822bb5cc..850ebf59 100644
--- a/bureau/admin/vm.php
+++ b/bureau/admin/vm.php
@@ -52,7 +52,7 @@ include_once("head.php");
 
 <?php if (!empty($error)) { ?>
 <div>
-<span class="error">
+<span class="alert alert-danger">
    <?php echo implode(" - ", array_unique($error)); ?>
 
 </span>
@@ -63,7 +63,7 @@ include_once("head.php");
 <div>
 <?php if (empty($infos)) { 
 ?>
-<p class="error"><?php __("You can start a virtual machine."); ?></p>
+<p class="alert alert-info"><?php __("You can start a virtual machine."); ?></p>
 <form method="post" action="vm.php">
    <input type="hidden" name="action" value="start" />
 <input type="submit" class="inb" name="go" value="<?php __("Click here to start a virtual machine."); ?>" />
@@ -80,7 +80,7 @@ include_once("head.php");
  echo "</pre></td></tr>";
  echo "</table>";
 ?>
-<p class="error"><?php __("You can stop your virtual machine."); ?></p>
+<p class="alert alert-info"><?php __("You can stop your virtual machine."); ?></p>
 <form method="post" action="vm.php">
    <input type="hidden" name="action" value="stop" />
 <input type="submit" class="inb" name="go" value="<?php __("Click here to stop your running virtual machine."); ?>" />