Skip to content
Snippets Groups Projects
Commit f01321d1 authored by Florian Azizian's avatar Florian Azizian
Browse files

Fix countable php7.2

parent 1bf1136a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
modules/entities/class/class_manage_listdiff_Abstract.php
+ 50
− 26
View file @ f01321d1
...@@ -116,7 +116,9 @@ abstract class diffusion_list_Abstract extends functions ...@@ -116,7 +116,9 @@ abstract class diffusion_list_Abstract extends functions
.'and l.object_id = ? ' .'and l.object_id = ? '
."and u.enabled = 'Y' " ."and u.enabled = 'Y' "
."and u.status != 'DEL' " ."and u.status != 'DEL' "
.'ORDER BY l.sequence', array($item_mode, $objectType, $objectId)); .'ORDER BY l.sequence',
array($item_mode, $objectType, $objectId)
);
while ($user = $stmt->fetchObject()) { while ($user = $stmt->fetchObject()) {
if (!isset($listmodel[$role_id])) { if (!isset($listmodel[$role_id])) {
$listmodel[$role_id] = array(); $listmodel[$role_id] = array();
...@@ -160,7 +162,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -160,7 +162,8 @@ abstract class diffusion_list_Abstract extends functions
."and l.item_type = 'entity_id' " ."and l.item_type = 'entity_id' "
.'and l.object_type = ? ' .'and l.object_type = ? '
.'and l.object_id = ? ' .'and l.object_id = ? '
.'ORDER BY l.sequence ', array($item_mode, $objectType, $objectId) .'ORDER BY l.sequence ',
array($item_mode, $objectType, $objectId)
); );
while ($entity = $stmt->fetchObject()) { while ($entity = $stmt->fetchObject()) {
...@@ -211,7 +214,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -211,7 +214,8 @@ abstract class diffusion_list_Abstract extends functions
'delete from '.ENT_LISTMODELS 'delete from '.ENT_LISTMODELS
.' where ' .' where '
.'object_type = ? ' .'object_type = ? '
.'and object_id = ? ', array($objectType, $objectId) .'and object_id = ? ',
array($objectType, $objectId)
); );
foreach ($roles as $role_id => $role_label) { foreach ($roles as $role_id => $role_label) {
if ($role_id == 'copy') { if ($role_id == 'copy') {
...@@ -245,7 +249,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -245,7 +249,8 @@ abstract class diffusion_list_Abstract extends functions
.'?,' .'?,'
.'?,' .'?,'
.'?' .'?'
.')', array($objectId, $objectType, $i, $user['user_id'], $item_mode, $description, $title, $user['visible'], $user['process_comment']) .')',
array($objectId, $objectType, $i, $user['user_id'], $item_mode, $description, $title, $user['visible'], $user['process_comment'])
); );
} }
// Entities // Entities
...@@ -269,7 +274,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -269,7 +274,8 @@ abstract class diffusion_list_Abstract extends functions
.'?, ' .'?, '
.'?,' .'?,'
.'?' .'?'
.')', array($objectId, $objectType, $i, $entity['entity_id'], $item_mode, $description, $title, $entity['visible']) .')',
array($objectId, $objectType, $i, $entity['entity_id'], $item_mode, $description, $title, $entity['visible'])
); );
} }
} }
...@@ -290,7 +296,9 @@ abstract class diffusion_list_Abstract extends functions ...@@ -290,7 +296,9 @@ abstract class diffusion_list_Abstract extends functions
'delete from '.ENT_LISTMODELS 'delete from '.ENT_LISTMODELS
.' where ' .' where '
.'object_type = ? ' .'object_type = ? '
.'and object_id = ? ', array($objectType, $objectId)); .'and object_id = ? ',
array($objectType, $objectId)
);
} }
//************************************************************************** //**************************************************************************
...@@ -371,21 +379,23 @@ abstract class diffusion_list_Abstract extends functions ...@@ -371,21 +379,23 @@ abstract class diffusion_list_Abstract extends functions
foreach ($roles as $role_id => $role_label) { foreach ($roles as $role_id => $role_label) {
if ($stmt->rowCount() > 0 && (isset($oldListInst[$role_id]) || isset($diffList[$role_id]))) { if ($stmt->rowCount() > 0 && (isset($oldListInst[$role_id]) || isset($diffList[$role_id]))) {
//compare old and new difflist //compare old and new difflist
for ($iOld = 0; $iOld < count($oldListInst[$role_id]['users']); ++$iOld) { if (!empty($oldListInst[$role_id]['users'])) {
if ($oldListInst[$role_id]['users'][$iOld]['user_id'] != $diffList[$role_id]['users'][$iOld]['user_id']) { for ($iOld = 0; $iOld < count($oldListInst[$role_id]['users']); ++$iOld) {
$diffUser = true; if ($oldListInst[$role_id]['users'][$iOld]['user_id'] != $diffList[$role_id]['users'][$iOld]['user_id']) {
break; $diffUser = true;
break;
}
} }
} }
//USELESS ? //USELESS ?
if (!$diffUser && isset($oldListInst[$role_id]['users'])) { if (!$diffUser && isset($oldListInst[$role_id]['users']) && !empty($oldListInst[$role_id]['users'])) {
if (count($oldListInst[$role_id]['users']) != count($diffList[$role_id]['users'])) { if (count($oldListInst[$role_id]['users']) != count($diffList[$role_id]['users'])) {
$diffCopyUsers = true; $diffCopyUsers = true;
} }
} }
if (!$diffUser && !$diffCopyEntities && isset($oldListInst[$role_id]['entities'])) { if (!$diffUser && !$diffCopyEntities && isset($oldListInst[$role_id]['entities']) && !empty($oldListInst[$role_id]['entities'])) {
if (count($oldListInst[$role_id]['entities']) != count($diffList[$role_id]['entities'])) { if (count($oldListInst[$role_id]['entities']) != count($diffList[$role_id]['entities'])) {
$diffCopyEntities = true; $diffCopyEntities = true;
} }
...@@ -414,7 +424,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -414,7 +424,8 @@ abstract class diffusion_list_Abstract extends functions
$stmt = $db->query( $stmt = $db->query(
'DELETE FROM '.ENT_LISTINSTANCE 'DELETE FROM '.ENT_LISTINSTANCE
.' WHERE coll_id = ?' .' WHERE coll_id = ?'
.' AND res_id = ? AND difflist_type = ?', array($collId, $resId, $difflistType) .' AND res_id = ? AND difflist_type = ?',
array($collId, $resId, $difflistType)
); );
$roles = $this->list_difflist_roles(); $roles = $this->list_difflist_roles();
...@@ -476,7 +487,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -476,7 +487,8 @@ abstract class diffusion_list_Abstract extends functions
.'?, ' .'?, '
.'?, ' .'?, '
.'?' .'?'
.' )', array($collId, $resId, $i, $userId, $item_mode, $creatorUser, $creatorEntity, $visible, $viewed, $difflistType, $processComment, $processDate, $signatory, $requested_signature) .' )',
array($collId, $resId, $i, $userId, $item_mode, $creatorUser, $creatorEntity, $visible, $viewed, $difflistType, $processComment, $processDate, $signatory, $requested_signature)
); );
} else { } else {
$stmt = $db->query( $stmt = $db->query(
...@@ -495,7 +507,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -495,7 +507,8 @@ abstract class diffusion_list_Abstract extends functions
.'?, ' .'?, '
.'?, ' .'?, '
.'?' .'?'
.' )', array($collId, $resId, $i, $userId, $item_mode, $creatorUser, $creatorEntity, $visible, $viewed, $difflistType, $processComment, $signatory, $requested_signature) .' )',
array($collId, $resId, $i, $userId, $item_mode, $creatorUser, $creatorEntity, $visible, $viewed, $difflistType, $processComment, $signatory, $requested_signature)
); );
} }
...@@ -550,7 +563,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -550,7 +563,8 @@ abstract class diffusion_list_Abstract extends functions
.'?, ' .'?, '
.'?,?, ' .'?,?, '
.'?' .'?'
.' )', array($collId, $resId, $j, $entityId, $item_mode, $creatorUser, $creatorEntity, $visible, $viewed, $difflistType) .' )',
array($collId, $resId, $j, $entityId, $item_mode, $creatorUser, $creatorEntity, $visible, $viewed, $difflistType)
); );
if (!$entityFound || $fromQualif) { if (!$entityFound || $fromQualif) {
...@@ -592,7 +606,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -592,7 +606,8 @@ abstract class diffusion_list_Abstract extends functions
.'?,?, ' .'?,?, '
.'?, ' .'?, '
.'?' .'?'
.' )', array($listinstance_history_id, $resListinstance->coll_id, $res_id, $resListinstance->sequence, $resListinstance->item_id, $resListinstance->item_type, $resListinstance->item_mode, $resListinstance->added_by_user, $resListinstance->added_by_entity, $resListinstance->visible, $resListinstance->viewed, $resListinstance->difflist_type, $resListinstance->process_comment) .' )',
array($listinstance_history_id, $resListinstance->coll_id, $res_id, $resListinstance->sequence, $resListinstance->item_id, $resListinstance->item_type, $resListinstance->item_mode, $resListinstance->added_by_user, $resListinstance->added_by_entity, $resListinstance->visible, $resListinstance->viewed, $resListinstance->difflist_type, $resListinstance->process_comment)
); );
} }
} }
...@@ -686,7 +701,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -686,7 +701,8 @@ abstract class diffusion_list_Abstract extends functions
." ue where l.coll_id = '".$collId."' " ." ue where l.coll_id = '".$collId."' "
." and l.item_type = 'user_id' and l.item_id = u.user_id " ." and l.item_type = 'user_id' and l.item_id = u.user_id "
.' and l.item_id = ue.user_id and ue.user_id=u.user_id ' .' and l.item_id = ue.user_id and ue.user_id=u.user_id '
." and e.entity_id = ue.entity_id and l.difflist_type = ? and l.res_id = ? and ue.primary_entity = 'Y' order by l.sequence ", array($typeList, $resId) ." and e.entity_id = ue.entity_id and l.difflist_type = ? and l.res_id = ? and ue.primary_entity = 'Y' order by l.sequence ",
array($typeList, $resId)
); );
//$this->show(); //$this->show();
while ($res = $stmt->fetchObject()) { while ($res = $stmt->fetchObject()) {
...@@ -722,7 +738,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -722,7 +738,8 @@ abstract class diffusion_list_Abstract extends functions
'select l.item_id, e.entity_label, l.visible, l.viewed, l.item_mode, l.difflist_type, l.process_date, l.process_comment from '.ENT_LISTINSTANCE 'select l.item_id, e.entity_label, l.visible, l.viewed, l.item_mode, l.difflist_type, l.process_date, l.process_comment from '.ENT_LISTINSTANCE
.' l, '.ENT_ENTITIES.' e where l.difflist_type = ? and l.coll_id = ? ' .' l, '.ENT_ENTITIES.' e where l.difflist_type = ? and l.coll_id = ? '
."and l.item_type = 'entity_id' and l.item_id = e.entity_id " ."and l.item_type = 'entity_id' and l.item_id = e.entity_id "
.'and l.res_id = ? order by l.sequence ', array($typeList, $collId, $resId) .'and l.res_id = ? order by l.sequence ',
array($typeList, $collId, $resId)
); );
while ($res = $stmt->fetchObject()) { while ($res = $stmt->fetchObject()) {
...@@ -762,17 +779,20 @@ abstract class diffusion_list_Abstract extends functions ...@@ -762,17 +779,20 @@ abstract class diffusion_list_Abstract extends functions
) { ) {
$db = new Database(); $db = new Database();
$stmt = $db->query( $stmt = $db->query(
'select item_id from '.ENT_LISTINSTANCE." where res_id = ? and coll_id = ? and sequence = 0 and item_type = ? and item_mode = 'dest'", array($resId, $collId, $itemType) 'select item_id from '.ENT_LISTINSTANCE." where res_id = ? and coll_id = ? and sequence = 0 and item_type = ? and item_mode = 'dest'",
array($resId, $collId, $itemType)
); );
if ($stmt->rowCount() == 1) { if ($stmt->rowCount() == 1) {
$stmt = $db->query( $stmt = $db->query(
'update '.ENT_LISTINSTANCE." set item_id = ?, viewed = ? where res_id = ? and coll_id = ? and sequence = 0 and item_type = ? and item_mode = 'dest'", array($dest, $viewed, $resId, $collId, $itemType) 'update '.ENT_LISTINSTANCE." set item_id = ?, viewed = ? where res_id = ? and coll_id = ? and sequence = 0 and item_type = ? and item_mode = 'dest'",
array($dest, $viewed, $resId, $collId, $itemType)
); );
} else { } else {
$stmt = $db->query( $stmt = $db->query(
'insert into '.ENT_LISTINSTANCE.' (coll_id, res_id, ' 'insert into '.ENT_LISTINSTANCE.' (coll_id, res_id, '
.'item_id, item_type, item_mode, sequence, ' .'item_id, item_type, item_mode, sequence, '
."added_by_user, added_by_entity, viewed) values (?, ?, ?, ?, 'dest', 0, ?,?, ?)", array($collId, $resId, $dest, $itemType, $_SESSION['user']['UserId'], $_SESSION['primaryentity']['id'], $viewed) ."added_by_user, added_by_entity, viewed) values (?, ?, ?, ?, 'dest', 0, ?,?, ?)",
array($collId, $resId, $dest, $itemType, $_SESSION['user']['UserId'], $_SESSION['primaryentity']['id'], $viewed)
); );
} }
} }
...@@ -940,7 +960,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -940,7 +960,8 @@ abstract class diffusion_list_Abstract extends functions
$db = new Database(); $db = new Database();
$stmt = $db->query( $stmt = $db->query(
'SELECT * FROM '.ENT_DIFFLIST_TYPES 'SELECT * FROM '.ENT_DIFFLIST_TYPES
.' WHERE difflist_type_id = ?', array($difflist_type_id) .' WHERE difflist_type_id = ?',
array($difflist_type_id)
); );
$difflist_type = $stmt->fetchObject(); $difflist_type = $stmt->fetchObject();
...@@ -998,7 +1019,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -998,7 +1019,8 @@ abstract class diffusion_list_Abstract extends functions
.'?,' .'?,'
.'?,' .'?,'
.'?' .'?'
.')', array($difflist_type_id, $difflist_type_label, $difflist_type_roles, $allow_entities) .')',
array($difflist_type_id, $difflist_type_label, $difflist_type_roles, $allow_entities)
); );
} }
...@@ -1015,7 +1037,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -1015,7 +1037,8 @@ abstract class diffusion_list_Abstract extends functions
.' difflist_type_label = ?,' .' difflist_type_label = ?,'
.' difflist_type_roles = ?,' .' difflist_type_roles = ?,'
.' allow_entities = ?' .' allow_entities = ?'
.' where difflist_type_id = ?', array($difflist_type_label, $difflist_type_roles, $allow_entities, $difflist_type_id) .' where difflist_type_id = ?',
array($difflist_type_label, $difflist_type_roles, $allow_entities, $difflist_type_id)
); );
} }
...@@ -1025,7 +1048,8 @@ abstract class diffusion_list_Abstract extends functions ...@@ -1025,7 +1048,8 @@ abstract class diffusion_list_Abstract extends functions
$db = new Database(); $db = new Database();
$stmt = $db->query( $stmt = $db->query(
'DELETE FROM '.ENT_DIFFLIST_TYPES 'DELETE FROM '.ENT_DIFFLIST_TYPES
.' WHERE difflist_type_id = ?', array($difflist_type_id) .' WHERE difflist_type_id = ?',
array($difflist_type_id)
); );
} }
} }
modules/entities/loadDiffListHistory.php
+ 124
− 114
View file @ f01321d1
...@@ -8,142 +8,152 @@ require_once('modules/entities/class/class_manage_listdiff.php'); ...@@ -8,142 +8,152 @@ require_once('modules/entities/class/class_manage_listdiff.php');
$diff_list = new diffusion_list(); $diff_list = new diffusion_list();
$db = new Database(); $db = new Database();
$roles = $diff_list->list_difflist_roles(); $roles = $diff_list->list_difflist_roles();
$listinstance = array();
# Load header
$query =
"SELECT distinct coll_id, res_id, difflist_type"
. " FROM listinstance_history_details WHERE listinstance_history_id = ? GROUP BY coll_id, res_id, difflist_type";
$stmt = $db->query($query,array($_REQUEST['listinstance_history_id'])); $listinstance = array();
$listinstance = $stmt->fetch(); # Load header
if($listinstance['difflist_type'] == "") $query =
$listinstance['difflist_type'] = 'entity_id'; "SELECT distinct coll_id, res_id, difflist_type"
. " FROM listinstance_history_details WHERE listinstance_history_id = ? GROUP BY coll_id, res_id, difflist_type";
# OTHER ROLES USERS
#**********************************************************************
$stmt = $db->query(
"select l.item_id, u.firstname, u.lastname, e.entity_id, "
. "e.entity_label, l.visible, l.viewed, l.item_mode, l.difflist_type from listinstance_history_details l, " . USERS_TABLE
. " u, " . ENT_ENTITIES . " e, " . ENT_USERS_ENTITIES
. " ue where l.listinstance_history_id = ?"
. " and l.item_type = 'user_id' and l.item_id = u.user_id "
. " and l.item_id = ue.user_id and ue.user_id=u.user_id "
. " and e.entity_id = ue.entity_id"
. " and ue.primary_entity = 'Y' order by l.sequence ",array($_REQUEST['listinstance_history_id'])
);
//$diff_list->show();
while ($res = $stmt->fetchObject()) {
if($res->item_mode == 'cc')
$role_id = 'copy';
else
$role_id = $res->item_mode;
if(!isset($listinstance[$role_id]['users']))
$listinstance[$role_id]['users'] = array();
array_push(
$listinstance[$role_id]['users'],
array(
'user_id' => functions::show_string($res->item_id),
'lastname' => functions::show_string($res->lastname),
'firstname' => functions::show_string($res->firstname),
'entity_id' => functions::show_string($res->entity_id),
'entity_label' => functions::show_string($res->entity_label),
'visible' => functions::show_string($res->visible),
'viewed' => functions::show_string($res->viewed),
'difflist_type' => functions::show_string($res->difflist_type)
)
);
}
# OTHER ROLES ENTITIES $stmt = $db->query($query, array($_REQUEST['listinstance_history_id']));
#**********************************************************************
$stmt = $db->query(
"select l.item_id, e.entity_label, l.visible, l.viewed, l.item_mode, l.difflist_type from listinstance_history_details l, "
. ENT_ENTITIES . " e where l.listinstance_history_id = ?"
. " and l.item_type = 'entity_id' and l.item_id = e.entity_id "
. "order by l.sequence ",array($_REQUEST['listinstance_history_id'])
);
while ($res = $stmt->fetchObject()) { $listinstance = $stmt->fetch();
if($res->item_mode == 'cc') if ($listinstance['difflist_type'] == "") {
$role_id = 'copy'; $listinstance['difflist_type'] = 'entity_id';
else }
$role_id = $res->item_mode;
# OTHER ROLES USERS
if(!isset($listinstance[$role_id]['entities'])) #**********************************************************************
$listinstance[$role_id]['entities'] = array(); $stmt = $db->query(
array_push( "select l.item_id, u.firstname, u.lastname, e.entity_id, "
$listinstance[$role_id]['entities'], . "e.entity_label, l.visible, l.viewed, l.item_mode, l.difflist_type from listinstance_history_details l, " . USERS_TABLE
array( . " u, " . ENT_ENTITIES . " e, " . ENT_USERS_ENTITIES
'entity_id' => functions::show_string($res->item_id), . " ue where l.listinstance_history_id = ?"
'entity_label' => functions::show_string($res->entity_label), . " and l.item_type = 'user_id' and l.item_id = u.user_id "
'visible' => functions::show_string($res->visible), . " and l.item_id = ue.user_id and ue.user_id=u.user_id "
'viewed' => functions::show_string($res->viewed), . " and e.entity_id = ue.entity_id"
'difflist_type' => functions::show_string($res->difflist_type) . " and ue.primary_entity = 'Y' order by l.sequence ",
) array($_REQUEST['listinstance_history_id'])
); );
} //$diff_list->show();
while ($res = $stmt->fetchObject()) {
if ($res->item_mode == 'cc') {
$role_id = 'copy';
} else {
$role_id = $res->item_mode;
}
if (!isset($listinstance[$role_id]['users'])) {
$listinstance[$role_id]['users'] = array();
}
array_push(
$listinstance[$role_id]['users'],
array(
'user_id' => functions::show_string($res->item_id),
'lastname' => functions::show_string($res->lastname),
'firstname' => functions::show_string($res->firstname),
'entity_id' => functions::show_string($res->entity_id),
'entity_label' => functions::show_string($res->entity_label),
'visible' => functions::show_string($res->visible),
'viewed' => functions::show_string($res->viewed),
'difflist_type' => functions::show_string($res->difflist_type)
)
);
}
$difflist = $listinstance; # OTHER ROLES ENTITIES
#**********************************************************************
$stmt = $db->query(
"select l.item_id, e.entity_label, l.visible, l.viewed, l.item_mode, l.difflist_type from listinstance_history_details l, "
. ENT_ENTITIES . " e where l.listinstance_history_id = ?"
. " and l.item_type = 'entity_id' and l.item_id = e.entity_id "
. "order by l.sequence ",
array($_REQUEST['listinstance_history_id'])
);
while ($res = $stmt->fetchObject()) {
if ($res->item_mode == 'cc') {
$role_id = 'copy';
} else {
$role_id = $res->item_mode;
}
if (!isset($listinstance[$role_id]['entities'])) {
$listinstance[$role_id]['entities'] = array();
}
array_push(
$listinstance[$role_id]['entities'],
array(
'entity_id' => functions::show_string($res->item_id),
'entity_label' => functions::show_string($res->entity_label),
'visible' => functions::show_string($res->visible),
'viewed' => functions::show_string($res->viewed),
'difflist_type' => functions::show_string($res->difflist_type)
)
);
}
$difflist = $listinstance;
// $diff_list->get_difflist_type($listinstance['difflist_type']); // $diff_list->get_difflist_type($listinstance['difflist_type']);
$return = ''; $return = '';
foreach($roles as $role_id => $role_label) { foreach ($roles as $role_id => $role_label) {
if($role_id == 'dest' && $onlyCC) continue; if ($role_id == 'dest' && $onlyCC) {
if(count($difflist[$role_id]['users']) > 0 continue;
|| count($difflist[$role_id]['entities']) > 0 }
) { if ((!empty($difflist[$role_id]['users']) && count($difflist[$role_id]['users']) > 0) || (!empty($difflist[$role_id]['entities']) && count($difflist[$role_id]['entities']) > 0)) {
$return .= '<h3 class="sstit">'.$role_label.'</h3>'; $return .= '<h3 class="sstit">'.$role_label.'</h3>';
if(count($difflist[$role_id]['users']) > 0) { if (count($difflist[$role_id]['users']) > 0) {
$return .= '<table cellpadding="0" cellspacing="0" border="0" class="listingsmall liste_diff spec" style="width:100%;margin:0;">'; $return .= '<table cellpadding="0" cellspacing="0" border="0" class="listingsmall liste_diff spec" style="width:100%;margin:0;">';
$color = ' class="col"'; $color = ' class="col"';
for($i=0, $l=count($difflist[$role_id]['users']); for ($i=0, $l=count($difflist[$role_id]['users']);
$i<$l; $i<$l;
$i++ $i++
) { ) {
$user = $difflist[$role_id]['users'][$i]; $user = $difflist[$role_id]['users'][$i];
if ($color == ' class="col"') $color = ' '; if ($color == ' class="col"') {
else $color = ' class="col"'; $color = ' ';
$return .= '<tr '. $color.' >'; } else {
$color = ' class="col"';
}
$return .= '<tr '. $color.' >';
$return .= '<td style="width:15%;text-align:center;">'; $return .= '<td style="width:15%;text-align:center;">';
$return .= '<i class="fa fa-user fa-2x" title="'._USER.' '.$role_label.'"></i>'; $return .= '<i class="fa fa-user fa-2x" title="'._USER.' '.$role_label.'"></i>';
$return .= '</td>'; $return .= '</td>';
$return .= '<td style="width:10%;">'; $return .= '<td style="width:10%;">';
if($user['visible'] == 'Y') { if ($user['visible'] == 'Y') {
$return .= '<i class="fa fa-check fa-2x" title="'._VISIBLE.'"></i>'; $return .= '<i class="fa fa-check fa-2x" title="'._VISIBLE.'"></i>';
} else { } else {
$return .= '<i class="fa fa-times fa-2x" title="'._NOT_VISIBLE.'"></i>'; $return .= '<i class="fa fa-times fa-2x" title="'._NOT_VISIBLE.'"></i>';
} }
$return .= '</td>'; $return .= '</td>';
$return .= '<td style="width:37%;">'. $user['lastname'] . ' ' . $user['firstname'].'</td>'; $return .= '<td style="width:37%;">'. $user['lastname'] . ' ' . $user['firstname'].'</td>';
$return .= '<td style="width:38%;">'. $user['entity_label'].'</td>'; $return .= '<td style="width:38%;">'. $user['entity_label'].'</td>';
$return .= '</tr>'; $return .= '</tr>';
} }
$return .= '</table>'; $return .= '</table>';
} }
if(count($difflist[$role_id]['entities']) > 0) { if (!empty($difflist[$role_id]['entities']) && count($difflist[$role_id]['entities']) > 0) {
$return .= '<table cellpadding="0" cellspacing="0" border="0" class="listingsmall liste_diff spec" style="width:100%;margin:0;">'; $return .= '<table cellpadding="0" cellspacing="0" border="0" class="listingsmall liste_diff spec" style="width:100%;margin:0;">';
$color = ' class="col"'; $color = ' class="col"';
for ($i=0, $l=count($difflist[$role_id]['entities']); for ($i=0, $l=count($difflist[$role_id]['entities']); $i<$l; $i++) {
$i<$l; $entity = $difflist[$role_id]['entities'][$i];
$i++ if ($color == ' class="col"') {
) { $color = '';
$entity = $difflist[$role_id]['entities'][$i]; } else {
if ($color == ' class="col"') $color = ''; $color = ' class="col"';
else $color = ' class="col"'; }
$return .= '<tr'. $color.'>'; $return .= '<tr'. $color.'>';
$return .= '<td style="width:15%;text-align:center;">'; $return .= '<td style="width:15%;text-align:center;">';
$return .= '<i class="fa fa-sitemap fa-2x" title="'._ENTITY . ' ' . $role_label.'" ></i>'; $return .= '<i class="fa fa-sitemap fa-2x" title="'._ENTITY . ' ' . $role_label.'" ></i>';
$return .= '</td>'; $return .= '</td>';
$return .= '<td style="width:10%;">'; $return .= '<td style="width:10%;">';
if($entity['visible'] == 'Y') { if ($entity['visible'] == 'Y') {
$return .= '<i class="fa fa-check fa-2x" title="'._VISIBLE.'"></i>'; $return .= '<i class="fa fa-check fa-2x" title="'._VISIBLE.'"></i>';
} else { } else {
$return .= '<i class="fa fa-times fa-2x" title="'._NOT_VISIBLE.'"></i>'; $return .= '<i class="fa fa-times fa-2x" title="'._NOT_VISIBLE.'"></i>';
...@@ -151,13 +161,13 @@ foreach($roles as $role_id => $role_label) { ...@@ -151,13 +161,13 @@ foreach($roles as $role_id => $role_label) {
$return .= '</td>'; $return .= '</td>';
$return .= '<td style="width:37%;">'. $entity['entity_id'].'</td>'; $return .= '<td style="width:37%;">'. $entity['entity_id'].'</td>';
$return .= '<td style="width:38%;">'. $entity['entity_label'].'</td>'; $return .= '<td style="width:38%;">'. $entity['entity_label'].'</td>';
$return .= '</tr>'; $return .= '</tr>';
}
$return .= '</table>';
} }
$return .= '</table>'; $return .= '<br/>';
}
$return .= '<br/>';
} }
} }
echo "{status : 0, toShow : '" . addslashes($return) . "'}"; echo "{status : 0, toShow : '" . addslashes($return) . "'}";
exit (); exit();
\ No newline at end of file
modules/entities/manage_listinstance.php
+ 181
− 115
View file @ f01321d1
This diff is collapsed.
modules/folder/lang/en.php
+ 314
− 165
View file @ f01321d1
This diff is collapsed.
modules/folder/lang/fr.php
+ 316
− 166
View file @ f01321d1
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment