From fb514b928c9f42ca0bfa7d98d66fe154a0e7d034 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Tue, 16 Oct 2012 09:21:00 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20d'un=20bouton=20pour=20"upgrader"=20les?=
 =?UTF-8?q?=20quotas=20des=20membres=20lorsqu'on=20a=20modifi=C3=A9=20les?=
 =?UTF-8?q?=20quotas=20du=20profil.=20Fix=20#1317?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bureau/admin/adm_defquotas.php | 15 ++++++++++++---
 bureau/class/m_quota.php       | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/bureau/admin/adm_defquotas.php b/bureau/admin/adm_defquotas.php
index ad0ff2ca..cb5cacb1 100644
--- a/bureau/admin/adm_defquotas.php
+++ b/bureau/admin/adm_defquotas.php
@@ -35,6 +35,10 @@ if (!$admin->enabled) {
 	__("This page is restricted to authorized staff");
 	exit();
 }
+$fields = array (
+  "synchronise"        => array ("get", "integer", "0"),
+);
+getFields($fields);
 
 include_once ("head.php");
 
@@ -43,10 +47,14 @@ include_once ("head.php");
 <hr id="topbar"/>
 <br />
 <?php
-	if (isset($error) && $error) {
-	  echo "<p class=\"error\">$error</p>";
-	}
+if ($synchronise==true) {
+  $quota->synchronise_user_profile();
+  echo "<p class=\"error\">";__("User's quotas synchronised");echo "</p>";
+}
 
+if (isset($error) && $error) {
+  echo "<p class=\"error\">$error</p>";
+}
 ?>
 <form method="post" action="adm_dodefquotas.php">
 <p>
@@ -78,6 +86,7 @@ foreach($quota->listtype() as $type) {
 <p>
 <?php __("Here is the list of the quotas on the server for the new accounts. If you want to change them, enter new values"); ?>
 </p>
+<span class="inb"><a href="adm_defquotas.php?synchronise=1"><?php __("Synchronise user's quota"); ?></a></span>  
 
 <form method="post" action="adm_dodefquotas.php">
 <div>
diff --git a/bureau/class/m_quota.php b/bureau/class/m_quota.php
index b01599a3..53f2da2a 100644
--- a/bureau/class/m_quota.php
+++ b/bureau/class/m_quota.php
@@ -83,6 +83,22 @@ class m_quota {
     return $qlist;
   }
   
+
+  /**
+    * Synchronise the quotas of the users with the quota of the
+    * user's profile.
+    * If the user have a greater quota than the profile, no change.
+    * If the quota entry doesn't exist for the user, create it with
+    * the defaults value.
+    */
+  function synchronise_user_profile() {
+    global $db,$err;
+    $err->log("quota","apply_greater_quota");
+    $q="insert into quotas select m.uid as uid, d.quota as name, d.value as total from membres m, defquotas d left join quotas q on q.name=d.quota  where m.type=d.type  ON DUPLICATE KEY UPDATE total = greatest(d.value, quotas.total);";
+    $db->query($q);
+    return true;
+  }
+
   /* ----------------------------------------------------------------- */
   /** Return a ressource usage (u) and total quota (t)
    * @param string $ressource ressource to get quota of