diff --git a/apps/maarch_entreprise/class/class_list_show_Abstract.php b/apps/maarch_entreprise/class/class_list_show_Abstract.php index b6685932e68da6cc18b8f9f02f4cbafac026ec70..0b9850565071f73d1c06d92bf292757f65a22176 100755 --- a/apps/maarch_entreprise/class/class_list_show_Abstract.php +++ b/apps/maarch_entreprise/class/class_list_show_Abstract.php @@ -1139,16 +1139,6 @@ class list_show_Abstract extends functions <?php } - } else { - ?> - <a href="<?php echo $path_ban.$param_comp; ?>" class="actionList" onclick="return(confirm('<?php echo _REALLY_SUSPEND.' '; - if (isset($page_name) && $page_name == 'users') { - echo $complete_name; - } else { - echo $admin_id; - } ?> ?'));"><i class="fa fa-pause fa-2x" title="<?php echo _SUSPEND; ?>"></i></a> - <?php - } } } } ?> diff --git a/apps/maarch_entreprise/reports/get_report_by_period_val.php b/apps/maarch_entreprise/reports/get_report_by_period_val.php index 21eec9c514fd8df499c2bb55a08eb47180fcd3b5..4774c667554d130c6c3f7cfcf45cb3d83cec6aed 100755 --- a/apps/maarch_entreprise/reports/get_report_by_period_val.php +++ b/apps/maarch_entreprise/reports/get_report_by_period_val.php @@ -335,7 +335,7 @@ else { //$src1 .= "&labels[]=".$_SESSION['labels1'][$i]; } - $_SESSION['GRAPH']['VALUES']=''; + $_SESSION['GRAPH']['VALUES']=[]; for($i=0;$i<count($val_an);$i++) { $_SESSION['GRAPH']['VALUES'][$i]=$val_an[$i]; @@ -360,6 +360,9 @@ else { if($report_type == 'graph') { + if (!is_array($_SESSION['GRAPH']['VALUES'])) { + $_SESSION['GRAPH']['VALUES'] = [$_SESSION['GRAPH']['VALUES']]; + } echo "{label: ['".utf8_encode(str_replace(",", "','", addslashes(implode(",", $_SESSION['labels1']))))."'] ". ", data: ['".utf8_encode(str_replace(",", "','", addslashes(implode(",", $_SESSION['GRAPH']['VALUES']))))."']". ", title: '".addslashes($title)."'}"; @@ -659,7 +662,7 @@ else } $src1 = $_SESSION['config']['businessappurl']."index.php?display=true&module=reports&page=graphs&type=histo&largeur=$largeur&hauteur=600&marge_bas=300&title=".$title; - $_SESSION['GRAPH']['VALUES']=''; + $_SESSION['GRAPH']['VALUES']=[]; for($i=0;$i<count($vol_an);$i++) { $_SESSION['GRAPH']['VALUES'][$i]=$vol_an[$i]; @@ -717,7 +720,10 @@ else } $totalCourrier=array(); - $totalEntities = count($entities); + $totalEntities = 0; + if (!empty($entities) && is_countable($entities)) { + $totalEntities = count($entities); + } foreach(array_keys($_SESSION['coll_categories']['letterbox_coll']) as $key) { @@ -751,7 +757,7 @@ else $src1 = $_SESSION['config']['businessappurl']."index.php?display=true&module=reports&page=graphs&type=histo&largeur=$largeur&hauteur=600&marge_bas=150&title=".$title; - $_SESSION['GRAPH']['VALUES']=''; + $_SESSION['GRAPH']['VALUES']=[]; for($i=0;$i<count($vol_an);$i++) { //$src1 .= "&values[]=".$vol_an[$i]; diff --git a/modules/entities/get_entity_process_delay.php b/modules/entities/get_entity_process_delay.php index ad0e921bbe4fda5f4e655d02ba9859f7e7411d82..caf5383d5d2a5580cb9c0c6e180ae5dacffede75 100755 --- a/modules/entities/get_entity_process_delay.php +++ b/modules/entities/get_entity_process_delay.php @@ -296,7 +296,7 @@ if($report_type == 'graph') $src1 = $_SESSION['config']['businessappurl']."index.php?display=true&module=reports&page=graphs&type=histo&largeur=$largeur&hauteur=600&marge_bas=300&title=".$title."&labelY="._N_DAYS; - $_SESSION['GRAPH']['VALUES']=''; + $_SESSION['GRAPH']['VALUES']=[]; for($i=0;$i<count($val_an);$i++) { $_SESSION['GRAPH']['VALUES'][$i]=$val_an[$i]; diff --git a/modules/entities/get_entity_response_rate_stat.php b/modules/entities/get_entity_response_rate_stat.php index 26a70149b2ac6e7f2880fe1b22a0a1eb18b46906..4dbd19b387cbe553f10a2831dc561e64035ff40a 100755 --- a/modules/entities/get_entity_response_rate_stat.php +++ b/modules/entities/get_entity_response_rate_stat.php @@ -280,7 +280,7 @@ if($report_type == 'graph') } $src1 = $_SESSION['config']['businessappurl']."index.php?display=true&module=reports&page=graphs&type=histo&largeur=$largeur&hauteur=600&marge_bas=300&title=".$title; - $_SESSION['GRAPH']['VALUES']=''; + $_SESSION['GRAPH']['VALUES']=[]; for($i=0;$i<count($vol_an);$i++) { $_SESSION['GRAPH']['VALUES'][$i]=$vol_an[$i]; diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index 1ace78a68e9b95140ce208832ab9c5f582a3bf30..46acc801f894aaa8841faaf4d66461e03634d203 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -215,11 +215,14 @@ class ResController extends ResourceControlController 'data' => [$GLOBALS['userId']] ]); $entities = array_column($entities, 'id'); - $folders = FolderModel::getWithEntitiesAndResources([ - 'select' => ['distinct(resources_folders.folder_id)'], - 'where' => ['resources_folders.res_id = ?', '(entities_folders.entity_id in (?) OR folders.user_id = ? OR keyword = ?)'], - 'data' => [$args['resId'], $entities, $GLOBALS['id'], 'ALL_ENTITIES'] - ]); + $folders = []; + if (!empty($entities)) { + $folders = FolderModel::getWithEntitiesAndResources([ + 'select' => ['distinct(resources_folders.folder_id)'], + 'where' => ['resources_folders.res_id = ?', '(entities_folders.entity_id in (?) OR folders.user_id = ? OR keyword = ?)'], + 'data' => [$args['resId'], $entities, $GLOBALS['id'], 'ALL_ENTITIES'] + ]); + } $formattedData['folders'] = array_column($folders, 'folder_id'); $tags = ResourceTagModel::get(['select' => ['tag_id'], 'where' => ['res_id = ?'], 'data' => [$args['resId']]]);