diff --git a/modules/cases/cases_details.php b/modules/cases/cases_details.php
index 1d57831f85bb147d696de0a54d32e54146f0612c..061c7a6939a4ab3d278a799bcfe315afc120bd92 100755
--- a/modules/cases/cases_details.php
+++ b/modules/cases/cases_details.php
@@ -35,7 +35,6 @@ require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manag
$case_id = $_REQUEST['id'];
$default_action = $_SESSION['current_basket']['default_action'];
-
$db = new Database();
$status_obj = new manage_status();
@@ -44,18 +43,15 @@ $sec = new security();
$func= new functions();
$array_what = array();
$status_str = '';
-for($i=0; $i<count($status);$i++)
-{
- $status_str .= "?,";
- $array_what[] = $status[$i]['ID'];
+
+for ($i=0; $i<count($status); $i++) {
+ $status_str .= "?,";
+ $array_what[] = $status[$i]['ID'];
}
-//$status_str = preg_replace('/,$/', '', $status_str);
-//$where_request.= " status not in (".$status_str.") ";
if ($status_str <> '') {
$status_str = preg_replace('/,$/', '', $status_str);
$where_request.= " status not in (".$status_str.") ";
-
} else {
$where_request .= " 1=1 ";
}
@@ -64,92 +60,83 @@ if ($status_str <> '') {
$where_clause =" case_id = ? ";
$array_what[] = $case_id;
-if(!empty($where_request))
-{
- if($_SESSION['searching']['where_clause_bis'] <> "")
- {
- $where_clause = "((".$where_clause.") or (".$_SESSION['searching']['where_clause_bis']."))";
- }
- $where_request = '('.$where_request.') and ('.$where_clause.')';
-}
-else
-{
- if($_SESSION['searching']['where_clause_bis'] <> "")
- {
- $where_clause = "((".$where_clause.") or (".$_SESSION['searching']['where_clause_bis']."))";
- }
- $where_request = $where_clause;
+if (!empty($where_request)) {
+ if ($_SESSION['searching']['where_clause_bis'] <> "") {
+ $where_clause = "((".$where_clause.") or (".$_SESSION['searching']['where_clause_bis']."))";
+ }
+ $where_request = '('.$where_request.') and ('.$where_clause.')';
+} else {
+ if ($_SESSION['searching']['where_clause_bis'] <> "") {
+ $where_clause = "((".$where_clause.") or (".$_SESSION['searching']['where_clause_bis']."))";
+ }
+ $where_request = $where_clause;
}
$where_request = str_replace("()", "(1=-1)", $where_request);
$where_request = str_replace("and ()", "", $where_request);
//if in basket
-if ($_SESSION['current_basket']['clause'] <> '' )
-{
- $array_what = array();
- $where_request =" case_id = ? ";
- $array_what[] = $case_id;
- $where_request .= " and (".$_SESSION['current_basket']['clause'].") ";
-}else
-
-//if search adv
-if(isset($_SESSION['searching']['comp_query']) && trim($_SESSION['searching']['comp_query']) <> '') {
- $where_security = $sec->get_where_clause_from_coll_id($_SESSION['collection_id_choice']);
- $where_request .= ' and (('.$where_security.') or ('.$_SESSION['searching']['comp_query'].'))';
+if ($_SESSION['current_basket']['clause'] <> '') {
+ $array_what = array();
+ $where_request =" case_id = ? ";
+ $array_what[] = $case_id;
+ $where_request .= " and (".$_SESSION['current_basket']['clause'].") ";
+} elseif //if search adv
+(isset($_SESSION['searching']['comp_query']) && trim($_SESSION['searching']['comp_query']) <> '') {
+ $where_security = $sec->get_where_clause_from_coll_id($_SESSION['collection_id_choice']);
+ $where_request .= ' and (('.$where_security.') or ('.$_SESSION['searching']['comp_query'].'))';
//if no extend basket security
-}else{
- $where_security = $sec->get_where_clause_from_coll_id($_SESSION['collection_id_choice']);
- $where_request .= ' and ('.$where_security.')';
+} else {
+ $where_security = $sec->get_where_clause_from_coll_id($_SESSION['collection_id_choice']);
+ $where_request .= ' and ('.$where_security.')';
}
$stmt = $db->query(
- "select res_id, status, subject, dest_user, type_label, creation_date, entity_label, category_id, exp_user_id, category_id as category_img, process_limit_date, priority"
- . " from ".$_SESSION['collections'][0]['view']
- . " where ".$where_request." order by res_id"
- ,$array_what);
-
-if ($stmt->rowCount() >0)
-{
- require_once("core/class/class_security.php");
- $security = new security();
- $external = '<table border="0" style="font-size:9px; margin:0px;" width="100%" cellspacing="0">';
- while ($ext_result=$stmt->fetchObject())
- {
- $res_status = $status_obj->get_status_data($ext_result->status);
- $img_class = substr($res_status['IMG_SRC'], 0, 2);
-
-
- $my_action = 'onclick="validForm( \'page\', \''.$ext_result->res_id.'\', \''.$default_action.' \');"';
-
- $right = $security->test_right_doc($_SESSION['collections'][0]['id'],$ext_result->res_id);
- if($right==false)
- $external .='<tr class="col" style="color:#BBBBBB;" '.$my_action.'>';
- else
- $external .='<tr class="col" onmouseover="document.body.style.cursor=\'pointer\';" onmouseout="document.body.style.cursor=\'auto\';" '.$my_action.'>';
-
-
- $external .='<td width="8%" > </td>';
- $external .='<td width="40px" style="vertical-align:top;text-align:center;">';
-
- if (!isset($res_status['IMG_SRC']) || empty($res_status['IMG_SRC'])){
- $external .= "<i ".$style." class = 'fm fm-letter-status-new' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
- } else {
- $external .= "<i ".$style." class = '".$img_class." ".$res_status['IMG_SRC']."' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
- }
-
- $external .='</td>';
- //$external .='<td width="40px"><p><img src="'. get_img_cat($ext_result->category_id,$extension_icon).'" title="'.$_SESSION['mail_categories'][$ext_result->category_id].'" alt="'.$_SESSION['mail_categories'][$ext_result->category_id].'"></p></td>';
- $external .='<td width="40px" ><b><p align="center" title="'._GED_NUM.' : '.functions::xssafe($ext_result->res_id).'" alt="'._GED_NUM.' : '.functions::xssafe($ext_result->res_id).'">'.functions::xssafe($func->cut_string($ext_result->res_id,50)).'</td></b></p>';
- $external .='<td ><p title="'._SUBJECT.' : '.functions::xssafe(functions::show_string($ext_result->subject)).'" alt="'.SUBJECT.' : '.functions::xssafe(functions::show_string($ext_result->subject)).'">'.functions::xssafe($func->cut_string(functions::show_string($ext_result->subject),70)).'</p></td>';
- //$external .='<td width="100px"><p>'.$ext_result->dest_user.'</td></p>';
- $external .='<td ><p title="'._TYPE.' : '.functions::xssafe(functions::show_string($ext_result->type_label)).'" alt="'._TYPE.' : '.functions::xssafe(functions::show_string($ext_result->type_label)).'">('.functions::xssafe(functions::show_string($ext_result->type_label)).')</p></td>';
- $external .='<td ><p title="'._ENTITY.' : '.functions::xssafe(functions::show_string($ext_result->entity_label)).'" alt="'._ENTITY.' : '.functions::xssafe(functions::show_string($ext_result->entity_label)).'"><b>'.functions::xssafe(functions::show_string($ext_result->entity_label)).'</b></p></td>';
- $external .='<td ><p title="'._PROCESS_LIMIT_DATE.' : '.functions::format_date_db($ext_result->process_limit_date,false).'" alt="'._PROCESS_LIMIT_DATE.' : '.functions::format_date_db($ext_result->process_limit_date,false).'">'.functions::format_date_db($ext_result->process_limit_date,false).'</p></td>';
- $external .='</a></tr>';
- }
- $external .='</table>';
-
+ "select res_id, status, subject, dest_user, type_label, creation_date, entity_label, category_id, exp_user_id, category_id as category_img, process_limit_date, priority"
+ . " from ".$_SESSION['collections'][0]['view']
+ . " where ".$where_request." order by res_id",
+ $array_what
+);
+
+if ($stmt->rowCount() >0) {
+ require_once("core/class/class_security.php");
+ $security = new security();
+ $external = '<table border="0" style="font-size:9px; margin:0px;" width="100%" cellspacing="0">';
+ while ($ext_result=$stmt->fetchObject()) {
+ $res_status = $status_obj->get_status_data($ext_result->status);
+ $img_class = substr($res_status['IMG_SRC'], 0, 2);
+
+
+ $my_action = 'onclick="validForm( \'page\', \''.$ext_result->res_id.'\', \''.$default_action.' \');"';
+
+ $right = $security->test_right_doc($_SESSION['collections'][0]['id'], $ext_result->res_id);
+ if ($right==false) {
+ $external .='<tr class="col" style="color:#BBBBBB;" '.$my_action.'>';
+ } else {
+ $external .='<tr class="col" onmouseover="document.body.style.cursor=\'pointer\';" onmouseout="document.body.style.cursor=\'auto\';" '.$my_action.'>';
+ }
+
+
+ $external .='<td width="8%" > </td>';
+ $external .='<td width="40px" style="vertical-align:top;text-align:center;">';
+
+ if (!isset($res_status['IMG_SRC']) || empty($res_status['IMG_SRC'])) {
+ $external .= "<i ".$style." class = 'fm fm-letter-status-new' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+ } else {
+ $external .= "<i ".$style." class = '".$img_class." ".$res_status['IMG_SRC']."' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+ }
+
+ $external .='</td>';
+ //$external .='<td width="40px"><p><img src="'. get_img_cat($ext_result->category_id,$extension_icon).'" title="'.$_SESSION['mail_categories'][$ext_result->category_id].'" alt="'.$_SESSION['mail_categories'][$ext_result->category_id].'"></p></td>';
+ $external .='<td width="40px" ><b><p align="center" title="'._GED_NUM.' : '.functions::xssafe($ext_result->res_id).'" alt="'._GED_NUM.' : '.functions::xssafe($ext_result->res_id).'">'.functions::xssafe($func->cut_string($ext_result->res_id, 50)).'</td></b></p>';
+ $external .='<td ><p title="'._SUBJECT.' : '.functions::xssafe(functions::show_string($ext_result->subject)).'" alt="'._SUBJECT.' : '.functions::xssafe(functions::show_string($ext_result->subject)).'">'.functions::xssafe($func->cut_string(functions::show_string($ext_result->subject), 70)).'</p></td>';
+ //$external .='<td width="100px"><p>'.$ext_result->dest_user.'</td></p>';
+ $external .='<td ><p title="'._TYPE.' : '.functions::xssafe(functions::show_string($ext_result->type_label)).'" alt="'._TYPE.' : '.functions::xssafe(functions::show_string($ext_result->type_label)).'">('.functions::xssafe(functions::show_string($ext_result->type_label)).')</p></td>';
+ $external .='<td ><p title="'._ENTITY.' : '.functions::xssafe(functions::show_string($ext_result->entity_label)).'" alt="'._ENTITY.' : '.functions::xssafe(functions::show_string($ext_result->entity_label)).'"><b>'.functions::xssafe(functions::show_string($ext_result->entity_label)).'</b></p></td>';
+ $external .='<td ><p title="'._PROCESS_LIMIT_DATE.' : '.functions::format_date_db($ext_result->process_limit_date, false).'" alt="'._PROCESS_LIMIT_DATE.' : '.functions::format_date_db($ext_result->process_limit_date, false).'">'.functions::format_date_db($ext_result->process_limit_date, false).'</p></td>';
+ $external .='</a></tr>';
+ }
+ $external .='</table>';
}
echo "{status : 0 , content : '" . addslashes($external) . "', error : '" . addslashes($error) . "'}";
-exit ();
+exit();
diff --git a/src/app/resource/controllers/SummarySheetController.php b/src/app/resource/controllers/SummarySheetController.php
index f89a7a3e04b16ac7f7691856af80cee36c6f183a..07041864a5685aba18437fe7b469199272cada53 100644
--- a/src/app/resource/controllers/SummarySheetController.php
+++ b/src/app/resource/controllers/SummarySheetController.php
@@ -146,7 +146,7 @@ class SummarySheetController
'data' => ['entity_id', $tmpIds],
'orderBy' => ['listinstance_id']
]);
- } elseif ($unit['unit'] == 'secondaryInformations') {
+ } elseif ($unit['unit'] == 'senderRecipientInformations') {
$data['mlbCollExt'] = ResModel::getExt([
'select' => ['category_id', 'address_id', 'exp_user_id', 'dest_user_id', 'is_multicontacts', 'res_id'],
'where' => ['res_id in (?)'],