FIX #6457 control added on mail category and on id type + validation rules modified

apps/maarch_entreprise/actions/process.php

@@ -743,9 +743,16 @@ function get_form_txt($values, $path_manage_action,  $id_action, $table, $module
     $frm_str .='</div>';
     
     //RESOURCE FRAME
+
+    if($data['category_id']['value'] == "outgoing"){
+        $watermark_outgoing = "true";
+    } else {
+        $watermark_outgoing = "false";
+    }
+
     $frm_str .= '<iframe src="' . $_SESSION['config']['businessappurl']
         . 'index.php?display=true&dir=indexing_searching&page=view_resource_controler&id='
-        . $res_id . '&watermark_outgoing=true" name="viewframe" id="viewframe" scrolling="auto" frameborder="0" width="100%" style="width:100% !important;"></iframe>';
+        . $res_id . '&watermark_outgoing='.$watermark_outgoing.'" name="viewframe" id="viewframe" scrolling="auto" frameborder="0" width="100%" style="width:100% !important;"></iframe>';
 
     $frm_str .= '</div>';
 

apps/maarch_entreprise/indexing_searching/watermark.php

@@ -58,10 +58,17 @@ if ($watermarkTab['text'] == '') {
     	} elseif ($matches[1][$z] == 'hour_now') {
     		$currentText = date('H:m:i');
     	} elseif($matches[1][$z] == 'alt_identifier'){
+            
+            if($_REQUEST['watermark_outgoing'] == "true"){
+                $res_id = $_REQUEST['res_id_master'];
+            } else {
+                $res_id = $s_id;
+            }
+
             $dbView = new Database();
 		    $query = " select " . $matches[1][$z] 
 		        . " as thecolumn from mlb_coll_ext where res_id = ?";
-		    $stmt = $dbView->query($query, array($_REQUEST['res_id_master']));
+		    $stmt = $dbView->query($query, array($res_id));
             $returnQuery = $stmt->fetchObject();
             $currentText = $returnQuery->thecolumn;
         } else {

apps/maarch_entreprise/xml/IVS/validation_rules.xml

@@ -513,6 +513,7 @@
       <parameter name="aVersion" type="boolean" />
       <parameter name="dir" type="identifier" />
       <parameter name="editingMode" type="string" />
+      <parameter name="watermark_outgoing" type="string" />
     </validationRule>
 
     <validationRule name="multi_contacts" extends="standardForm" mode="error">  

modules/attachments/xml/IVS/validation_rules.xml

@@ -81,6 +81,7 @@
 		<parameter name="res_id_master" type="integer" />
 		<parameter name="id" type="identifier" />
 		<parameter name="editingMode" type="string" />
+		<parameter name="watermark_outgoing" type="string" />
 	</validationRule>
 
 </validationRules>