Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

lib/classes/mail.class.php

@@ -258,7 +258,7 @@ class mail
         $mail->ConfirmReadingTo = $reading_confirm_to;
       }
 
-      $mail->MsgHTML(strip_tags($body, '<div><br><ul><li>'));
+      $mail->MsgHTML(strip_tags($body, '<div><br><ul><li><em><strong><span><br>'));
 
       foreach ($files as $f)
       {

lib/classes/patch/320h.class.php

@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2010 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ * @package
+ * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
+ * @link        www.phraseanet.com
+ */
+class patch_320h implements patchInterface
+{
+
+  /**
+   *
+   * @var string
+   */
+  private $release = '3.2.0.0.a8';
+  /**
+   *
+   * @var Array
+   */
+  private $concern = array(base::APPLICATION_BOX);
+
+  /**
+   *
+   * @return string
+   */
+  function get_release()
+  {
+    return $this->release;
+  }
+
+  public function require_all_upgrades()
+  {
+    return true;
+  }
+
+  /**
+   *
+   * @return Array
+   */
+  function concern()
+  {
+    return $this->concern;
+  }
+
+  function apply(base &$appbox)
+  {
+    $sql = 'DELETE FROM basusr WHERE actif = "0"';
+
+    $stmt = $appbox->get_connection()->prepare($sql);
+    $stmt->execute();
+    $stmt->closeCursor();
+
+    return true;
+  }
+
+}

www/client/index.php

@@ -587,7 +587,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
   <!--<iframe style="display:none;" id="download" name="download"></iframe>-->
     <form style="display:none;" action="./index.php" target="_self" id="mainForm">
     </form>
-    <div id="dialog_dwnl" title="<?php echo _('action : exporter') ?>" style="display:none;z-index:8000;"></div>
+    <div id="dialog_dwnl" title="<?php echo _('action : exporter') ?>" style="display:none;z-index:12000;"></div>
     <form name="formChu" id="formChu" action="./baskets.php" method="post" style="visibility:hidden; display:none" >
       <input type="hidden" name="bas" id="formChubas" value="">
       <input type="hidden" name="act" id="formChuact" value="">

www/client/jquery.p4client.1.0.js

@@ -780,8 +780,6 @@ function evt_dwnl(lst)
 {
 	var dialog_box = $('#dialog_dwnl');
 
-	dialog_box = $('#dialog_dwnl');
-
 	dialog_box.empty().addClass('loading').dialog({
 		width:800,
 		height:600,

www/skins/prod/000000/prodcolor.css

@@ -2161,7 +2161,7 @@ EDITING
     BORDER:  #666666 1px solid;
     BACKGROUND-COLOR: #666666;
 }*/
-#idFrameE #ZTextMultiValued_values
+#ZTextMultiValued_values
 {
 	background-color:#444444;
 	border:1px solid #999999;
@@ -2170,13 +2170,14 @@ EDITING
   left:4px;
   right:4px;
   bottom:4px;
-  overflow:auto;
+  overflow-x:auto;
+  overflow-y:scroll;
 }
 #idFrameE #ZTextMultiValued_values div
 {
 	cursor:pointer;
   height:20px;
-	padding:2px;
+	padding:2px 14px 2px 2px;
 }
 #idFrameE #ZTextMultiValued_values div table
 {

www/skins/prod/959595/prodcolor.css

@@ -2165,7 +2165,7 @@ EDITING
     BORDER:  #666666 1px solid;
     BACKGROUND-COLOR: #666666;
 }*/
-#idFrameE #ZTextMultiValued_values
+#ZTextMultiValued_values
 {
 	background-color:#FFFFFF;
 	border:1px solid #999999;
@@ -2174,13 +2174,14 @@ EDITING
   left:4px;
   right:4px;
   bottom:4px;
-  overflow:auto;
+  overflow-x:auto;
+  overflow-y:scroll;
 }
 #idFrameE #ZTextMultiValued_values div
 {
 	cursor:pointer;
   height:20px;
-	padding:2px;
+	padding:2px 14px 2px 2px;
 }
 #idFrameE #ZTextMultiValued_values div table
 {