From b0446e29b678176643b82a47e107a4e7325e40d9 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Fri, 25 Oct 2019 11:35:52 +0200
Subject: [PATCH] FEAT #12003 TIME 0:45 Remove menu V1
---
.../contact_purposes/contact_purposes_up.php | 29 +-
.../contact_types/contact_types_up.php | 27 --
.../admin/update_control/update_control.php | 149 -------
apps/maarch_entreprise/lang/en.php | 91 -----
apps/maarch_entreprise/log.php | 4 -
apps/maarch_entreprise/shibbolethConnect.php | 1 -
apps/maarch_entreprise/template/header.html | 32 +-
core/class/class_core_tools.php | 367 ------------------
modules/export_seda/RequestSeda.php | 1 -
.../folder-pinned/folder-pinned.component.ts | 2 +-
10 files changed, 3 insertions(+), 700 deletions(-)
delete mode 100755 apps/maarch_entreprise/admin/update_control/update_control.php
diff --git a/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php b/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
index 69a93c2b6bf..3733ce1fae1 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
@@ -220,33 +220,6 @@ if (isset($_REQUEST['valid'])) {
?>
<div id="header">
<div id="nav">
- <div id="menu" onmouseover="ShowHideMenu('menunav','on');" onmouseout="ShowHideMenu('menunav','off');" class="off">
- <p>
- <span style="background:url('data:image/png;base64,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');background-position: 10px 2px;background-size:25%;
- background-repeat: no-repeat;
- height: 30px;
- font-weight: bold;
- width: 85px;
- display: block;
- font-size: 23px;
- padding-left: 65px;
- padding-top: 4px;
- color: #ffffff;">Menu</span>
- </p>
- <div id="menunav" style="display: none;">
- <?php
- echo '<div class="header_menu"></div>';
- echo '<div class="header_menu_blank"> </div>';?>
- <ul >
- <?php
- //here we building the maarch menu
- $core->build_menu($_SESSION['menu']);
- ?>
- </ul>
- <div class="header_menu_blank"> </div>
- <div class="footer_menu"><a onclick="triggerAngular('#/about-us')" style="cursor: pointer;color:white;float:right;"><?php echo _MAARCH_CREDITS ;?></a></div>
- </div>
- </div>
<div><p id="ariane"><?php
?></p></div>
<p id="gauchemenu"></p>
@@ -377,4 +350,4 @@ if (isset($_REQUEST['valid']) && $mode <> 'popup') {
</div>
</div>
<?php
-}
\ No newline at end of file
+}
diff --git a/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php b/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
index 9aa1d57fa5c..83a7d6233f8 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
@@ -209,33 +209,6 @@ if (isset($_REQUEST['valid'])) {
?>
<div id="header">
<div id="nav">
- <div id="menu" onmouseover="ShowHideMenu('menunav','on');" onmouseout="ShowHideMenu('menunav','off');" class="off">
- <p>
- <span style="background:url('data:image/png;base64,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');background-position: 10px 2px;background-size:25%;
- background-repeat: no-repeat;
- height: 30px;
- font-weight: bold;
- width: 85px;
- display: block;
- font-size: 23px;
- padding-left: 65px;
- padding-top: 4px;
- color: #ffffff;">Menu</span>
- </p>
- <div id="menunav" style="display: none;">
- <?php
- echo '<div class="header_menu"></div>';
- echo '<div class="header_menu_blank"> </div>';?>
- <ul >
- <?php
- //here we building the maarch menu
- $core->build_menu($_SESSION['menu']);
- ?>
- </ul>
- <div class="header_menu_blank"> </div>
- <div class="footer_menu"><a onclick="triggerAngular('#/about-us')" style="cursor: pointer;color:white;float:right;"><?php echo _MAARCH_CREDITS ;?></a></div>
- </div>
- </div>
<div><p id="ariane"><?php
?></p></div>
<p id="gauchemenu"></p>
diff --git a/apps/maarch_entreprise/admin/update_control/update_control.php b/apps/maarch_entreprise/admin/update_control/update_control.php
deleted file mode 100755
index 4ee0c84748e..00000000000
--- a/apps/maarch_entreprise/admin/update_control/update_control.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Copyright Maarch since 2008 under licence GPLv3.
- * See LICENCE.txt file at the root folder for more details.
- * This file is part of Maarch software.
- */
-/**
- * @brief Maarch version test
- *
- * @file
- *
- * @author dev@maarch.org
- * @date $date$
- *
- * @version $Revision$
- * @ingroup admin
- */
-core_tools::load_lang();
-$core_tools = new core_tools();
-$core_tools->test_admin('admin_update_control', 'apps');
-
-$init = false;
-if (isset($_REQUEST['reinit']) && $_REQUEST['reinit'] == 'true') {
- $init = true;
-}
-
-$pagePath = $_SESSION['config']['businessappurl'].'index.php?page='.'update_control&admin=update_control';
-$pageLabel = _ADMIN_UPDATE_CONTROL;
-$pageId = 'update_control';
-$level = '';
-if (isset($_REQUEST['level'])
- && ($_REQUEST['level'] == 2 || $_REQUEST['level'] == 3
- || $_REQUEST['level'] == 4 || $_REQUEST['level'] == 1)) {
- $level = $_REQUEST['level'];
-}
-$core_tools->manage_location_bar($pagePath, $pageLabel, $pageId, $init, $level);
-
-//retrives tags
-$client = new \Gitlab\Client('https://labs.maarch.org/api/v4/');
-
-$tags = $client->api('tags')->all('12');
-
-//retrieve current version
-$db = new Database();
-$query = "SELECT param_value_string FROM parameters WHERE id = 'database_version'";
-$stmt = $db->query($query, []);
-$currentVersion = $stmt->fetchObject();
-
-$currentVersionBranch = substr($currentVersion->param_value_string, 0, 5);
-$currentVersionBranchYear = substr($currentVersion->param_value_string, 0, 2);
-$currentVersionBranchMonth = substr($currentVersion->param_value_string, 3, 2);
-$currentVersionTag = substr($currentVersion->param_value_string, 6);
-
-$allCurrentTags = [];
-$allNextTags = [];
-$cptCurrentTags = 0;
-$isAnyAvailableTag = false;
-
-foreach ($tags as $value) {
- if (!preg_match("/^\d{2}\.\d{2}\.\d+$/", $value['name'])) {
- continue;
- }
- $tag = substr($value['name'], 6);
- $pos = strpos($value['name'], $currentVersionBranch);
- if ($pos === false) {
- $year = substr($value['name'], 0, 2);
- $month = substr($value['name'], 3, 2);
- if (($year == $currentVersionBranchYear && $month > $currentVersionBranchMonth) || $year > $currentVersionBranchYear) {
- $allNextTags[] = $value['name'];
- }
- } else {
- $allCurrentTags[$cptCurrentTags] = [];
- $allCurrentTags[$cptCurrentTags]['name'] = $value['name'];
- if ($tag > $currentVersionTag) {
- $allCurrentTags[$cptCurrentTags]['enabled'] = true;
- $isAnyAvailableTag = true;
- } else {
- $allCurrentTags[$cptCurrentTags]['enabled'] = false;
- }
- ++$cptCurrentTags;
- }
-}
-?>
-<h1><i class="fa fa-download fa-2x"></i> <?php echo _ADMIN_UPDATE_CONTROL; ?></h1>
-
-<div id="inner_content">
-<table align="center" style="margin-top:100px">
- <tr>
- <td><?php echo _YOUR_VERSION; ?></td>
- <td>:</td>
- <td>
- <?php echo '<b>'.$currentVersion->param_value_string.'</b>'; ?>
- </td>
- </tr>
- <tr>
- <td colspan="3"> </td>
- </tr>
- <tr>
- <td><?php echo _AVAILABLE_VERSION_TO_UPDATE; ?></td>
- <td>:</td>
- <td>
- <?php
- if (count($tags) > 0) {
- ?>
- <select id="version" id="name">
- <?php
- for ($i = 0; $i < count($allCurrentTags); ++$i) {
- if ($allCurrentTags[$i]['enabled']) {
- echo '<option value="'.$allCurrentTags[$i]['name'].'">';
- echo $allCurrentTags[$i]['name'];
- echo '</option>';
- } else {
- echo '<option value="'.$allCurrentTags[$i]['name'].'" disabled>';
- echo $allCurrentTags[$i]['name'];
- echo '</option>';
- }
- } ?>
- </select>
- <?php
- } else {
- echo _NO_AVAILABLE_TAG_TO_UPDATE.'<br />';
- }
- ?>
- </td>
- </tr>
- <tr><td colspan="3"> </td></tr>
-</table>
-
-<div align="center" style="margin-bottom:150px">
- <?php
- if ($isAnyAvailableTag && count($tags) > 0) {
- if ($_SESSION['user']['UserId'] != 'superadmin') {
- echo _CONNECT_YOU_IN_SUPERADMIN;
- } else {
- echo '<a style="margin-top:100px" href="'.$_SESSION['config']['coreurl'].'install/index.php?step=update_language"><input class="button" value="'._CLICK_HERE_TO_GO_TO_UPDATE_MANAGEMENT.'" type="button"></a>';
- }
- }
-
- if (!empty($allNextTags)) {
- echo '<br><br><br><b>'._NEW_MAJOR_VERSION_AVAILABLE.'</b> : <br>';
- for ($j = 0; $j < count($allNextTags); ++$j) {
- echo $allNextTags[$j].'<br />';
- }
- }
- ?>
-</div>
-
-</div>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index 1391efc7a77..a59c34f6e0a 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -4449,97 +4449,6 @@ if (!defined('_DELETED_PRIORITY')) {
}
/***** Administration *****/
-/**** admin update control ****/
-if (!defined('_ADMIN_UPDATE_CONTROL')) {
- define('_ADMIN_UPDATE_CONTROL', 'Verify update');
-}
-if (!defined('_ADMIN_UPDATE_CONTROL_DESC')) {
- define('_ADMIN_UPDATE_CONTROL_DESC', 'Check new tags of Maarch Courrier and update application in latest tag.');
-}
-if (!defined('_YOUR_VERSION')) {
- define('_YOUR_VERSION', 'Your version');
-}
-if (!defined('_AVAILABLE_VERSION_TO_UPDATE')) {
- define('_AVAILABLE_VERSION_TO_UPDATE', 'Available versions');
-}
-if (!defined('_CLICK_HERE_TO_GO_TO_UPDATE_MANAGEMENT')) {
- define('_CLICK_HERE_TO_GO_TO_UPDATE_MANAGEMENT', 'To begin the update process');
-}
-if (!defined('_NEW_MAJOR_VERSION_AVAILABLE')) {
- define('_NEW_MAJOR_VERSION_AVAILABLE', 'New major version available');
-}
-if (!defined('_BRANCH_VERSION')) {
- define('_BRANCH_VERSION', 'Branch');
-}
-if (!defined('_TAG_VERSION')) {
- define('_TAG_VERSION', 'Tag');
-}
-if (!defined('_CONNECT_YOU_IN_SUPERADMIN')) {
- define('_CONNECT_YOU_IN_SUPERADMIN', 'You have to be connected with superadmin profile to process update');
-}
-if (!defined('_UPDATE_WELCOME')) {
- define('_UPDATE_WELCOME', 'Update');
-}
-if (!defined('_UPDATE_WELCOME_INSTALL')) {
- define('_UPDATE_WELCOME_INSTALL', 'Update process');
-}
-if (!defined('_UPDATE_DESC_INSTALL')) {
- define('_UPDATE_DESC_INSTALL', 'Update MaarchCourrier (only minor version)');
-}
-if (!defined('_UPDATE_BACKUP')) {
- define('_UPDATE_BACKUP', 'Backup');
-}
-if (!defined('_UPDATE_BACKUP_INFOS')) {
- define('_UPDATE_BACKUP_INFOS', 'Backup your version');
-}
-if (!defined('_UPDATE_BACKUP_DETAILS')) {
- define('_UPDATE_BACKUP_DETAILS', 'Backup your version, you can restore it if necessary');
-}
-if (!defined('_ACTUAL_VERSION_PATH')) {
- define('_ACTUAL_VERSION_PATH', 'Path of your installation');
-}
-if (!defined('_UPDATE_BACKUP_PATH')) {
- define('_UPDATE_BACKUP_PATH', 'Path of your backup');
-}
-if (!defined('_BACKUP_ACTUAL_VERSION')) {
- define('_BACKUP_ACTUAL_VERSION', 'Backup your version');
-}
-if (!defined('_UPDATE_DOWNLOAD')) {
- define('_UPDATE_DOWNLOAD', 'Download');
-}
-if (!defined('_LAST_RELEASE_INFOS')) {
- define('_LAST_RELEASE_INFOS', 'Download last minor version');
-}
-if (!defined('_LAST_RELEASE_DETAILS')) {
- define('_LAST_RELEASE_DETAILS', 'Available minor versions');
-}
-if (!defined('_CHOOSE_VERSION_TO_UPDATE')) {
- define('_CHOOSE_VERSION_TO_UPDATE', 'Choose the version');
-}
-if (!defined('_DOWNLOAD_VERSION')) {
- define('_DOWNLOAD_VERSION', 'Download the version');
-}
-if (!defined('_UPDATE_DEPLOY')) {
- define('_UPDATE_DEPLOY', 'Deploiement');
-}
-if (!defined('_UPDATE_DEPLOY_INFOS')) {
- define('_UPDATE_DEPLOY_INFOS', 'Deploiement of the downloaded version');
-}
-if (!defined('_UPDATE_DEPLOY_DETAILS')) {
- define('_UPDATE_DEPLOY_DETAILS', 'Deploiement of the downloaded version');
-}
-if (!defined('_DEPLOY_VERSION')) {
- define('_DEPLOY_VERSION', 'Deploy the version');
-}
-if (!defined('_UPDATE_END')) {
- define('_UPDATE_END', 'Update sucessful');
-}
-if (!defined('_UPDATE_DESC_END')) {
- define('_UPDATE_DESC_END', 'Update sucessful');
-}
-if (!defined('_NO_AVAILABLE_TAG_TO_UPDATE')) {
- define('_NO_AVAILABLE_TAG_TO_UPDATE', 'No available tag to update');
-}
if (!defined('_ADDRESS_NB')) {
define('_ADDRESS_NB', 'Address number');
}
diff --git a/apps/maarch_entreprise/log.php b/apps/maarch_entreprise/log.php
index a53173278d2..48aa5afb66a 100755
--- a/apps/maarch_entreprise/log.php
+++ b/apps/maarch_entreprise/log.php
@@ -104,7 +104,6 @@ if (empty($_SESSION['config']['databasename'])) {
$businessAppTools->build_business_app_config();
$core->load_modules_config($_SESSION['modules']);
- $core->load_menu($_SESSION['modules']);
$core->load_lang();
$core->load_app_services();
$core->load_modules_services($_SESSION['modules']);
@@ -195,7 +194,6 @@ if (!empty($_SESSION['error'])) {
\SrcCore\models\AuthenticationModel::setCookieAuth(['userId' => $login]);
\SrcCore\models\AuthenticationModel::resetFailedAuthentication(['userId' => $login]);
$user = \User\models\UserModel::getByLogin(['login' => $login, 'select' => ['id']]);
- $core->load_menu($_SESSION['modules']);
header(
'location: ' . $_SESSION['config']['businessappurl']
. $res['url']
@@ -261,7 +259,6 @@ if (!empty($_SESSION['error'])) {
} else {
$_SESSION['error'] = $res['error'];
}
- $core->load_menu($_SESSION['modules']);
header(
'location: ' . $_SESSION['config']['businessappurl']
. $res['url']
@@ -299,7 +296,6 @@ if (!empty($_SESSION['error'])) {
if (empty($res['error'])) {
\SrcCore\models\AuthenticationModel::setCookieAuth(['userId' => $login]);
\SrcCore\models\AuthenticationModel::resetFailedAuthentication(['userId' => $login]);
- $core->load_menu($_SESSION['modules']);
} else {
$_SESSION['error'] = $res['error'];
}
diff --git a/apps/maarch_entreprise/shibbolethConnect.php b/apps/maarch_entreprise/shibbolethConnect.php
index 2f92585c895..cf9ce2a4934 100755
--- a/apps/maarch_entreprise/shibbolethConnect.php
+++ b/apps/maarch_entreprise/shibbolethConnect.php
@@ -35,7 +35,6 @@ if ($_SERVER['REMOTE_USER'] <> '' && $_SERVER['AUTH_TYPE'] = 'shibboleth') {
if ($res['error'] == '') {
\SrcCore\models\AuthenticationModel::setCookieAuth(['userId' => $login]);
- $core->load_menu($_SESSION['modules']);
//login OK
$trace = new history();
header('location: ' . $_SESSION['config']['businessappurl']. $res['url']);
diff --git a/apps/maarch_entreprise/template/header.html b/apps/maarch_entreprise/template/header.html
index 4677dfe0f1b..1f403f2e9e0 100755
--- a/apps/maarch_entreprise/template/header.html
+++ b/apps/maarch_entreprise/template/header.html
@@ -6,36 +6,6 @@
</div>
</a>
<div style="justify-content: flex-end;display: flex;width: 100%;color: white;align-items: center;">
- <span class="maarchToolButton" style="cursor:pointer;padding:15px;padding-left: 20px;padding-right: 20px;position: relative;margin-right: 15px;" onclick="$j('#menunav').slideToggle('fast');event.stopPropagation();" title="Menu">
- <i class="fa fa-th fa-2x" style="font-size: 20px;"></i>
- <div id="menunav" class="menunav" style="left: -225px;display:none;">
- <div class="header_menu_blank"> </div>
- <ul>
- <?php
- //here we building the maarch menu
- $core->build_menu($_SESSION['menu']);
- ?>
- </ul>
- <div class="header_menu_blank"> </div>
- <div class="footer_menu">
- <i style="font-style:normal;color:white;float:left;">
- <?php echo $_SESSION['config']['applicationname']; ?>
- </i>
- <a onclick="triggerAngular('#/about-us')" style="cursor: pointer;color:white;float:right;"><?php echo _MAARCH_CREDITS ;?></a>
- <div style="clear:both;"></div>
- </div>
- </div>
- <script>
- $j(window).click(function(event) {
- if ($j('#menunav').css('display') != 'none') {
- $j('#menunav').slideToggle('fast');
- }
- if ($j('#profilenav').css('display') != 'none') {
- $j('#profilenav').slideToggle('fast');
- }
- });
- </script>
- </span>
<span class="maarchToolButton" style="padding-left:10px;padding-right:10px;font-size: 14px;text-align: center;display: flex;align-items: center;position: relative;cursor:pointer;" onclick="$j('#profilenav').slideToggle('fast');event.stopPropagation();" title="Mes groupes">
<?php
$strUserInfos = '<i class="fa fa-user fa-2x" style="padding-right:5px;"></i> ' . $_SESSION['user']['FirstName']." <b>".$_SESSION['user']['LastName']."</b>";
@@ -72,4 +42,4 @@
</div>
</div>
</div>
-<div><p id="ariane"></p></div>
\ No newline at end of file
+<div><p id="ariane"></p></div>
diff --git a/core/class/class_core_tools.php b/core/class/class_core_tools.php
index 5881c9536ce..f090ac00100 100755
--- a/core/class/class_core_tools.php
+++ b/core/class/class_core_tools.php
@@ -68,12 +68,9 @@ class core_tools extends functions
// Loads core tables into session ($_SESSION['tablename'] array)
$TABLENAME = $xmlconfig->TABLENAME;
$_SESSION['tablename']['actions'] = (string) $TABLENAME->actions;
- $_SESSION['tablename']['authors'] = (string) $TABLENAME->authors;
$_SESSION['tablename']['docservers'] = (string) $TABLENAME->docservers;
$_SESSION['tablename']['doctypes'] = (string) $TABLENAME->doctypes;
$_SESSION['tablename']['history'] = (string) $TABLENAME->history;
- $_SESSION['tablename']['history_batch'] = (string) $TABLENAME->history_batch;
- $_SESSION['tablename']['param'] = (string) $TABLENAME->param;
$_SESSION['tablename']['security'] = (string) $TABLENAME->security;
$_SESSION['tablename']['status'] = (string) $TABLENAME->status;
$_SESSION['tablename']['usergroups'] = (string) $TABLENAME->usergroups;
@@ -328,370 +325,6 @@ class core_tools extends functions
}
}
- /**
- * Loads menu items of each module and the application into session from menu.xml files.
- *
- * @param $modules array Enabled modules of the application
- */
- public function load_menu($modules)
- {
- $k = 0;
- if (file_exists(
- $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
- .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'
- .DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml'
- )
- ) {
- $path = $_SESSION['config']['corepath'].'custom'
- .DIRECTORY_SEPARATOR.$_SESSION['custom_override_id']
- .DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR
- .$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'
- .DIRECTORY_SEPARATOR.'menu.xml';
- } else {
- $path = 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml';
- }
- // Reads the apps/apps_name/xml/menu.xml file and loads into session
- $xmlconfig = simplexml_load_file($path);
- foreach ($xmlconfig->MENU as $MENU2) {
- $_SESSION['menu'][$k]['id'] = (string) $MENU2->id;
- $_SESSION['menu'][$k]['angular'] = empty((string) $MENU2->angular) ? 'false' : (string) $MENU2->angular;
- if (isset($_SESSION['menu'][$k]['id'])
- && isset($_SESSION['user']['services'][$_SESSION['menu'][$k]['id']])
- && $_SESSION['user']['services'][$_SESSION['menu'][$k]['id']] == true
- ) { // Menu Identifier must be equal to the Service identifier
- $libmenu = (string) $MENU2->libconst;
- if (!empty($libmenu) && defined($libmenu)
- && constant($libmenu) != null
- ) {
- $libmenu = constant($libmenu);
- }
- $_SESSION['menu'][$k]['libconst'] = $libmenu;
- if ($_SESSION['menu'][$k]['angular'] == 'true') {
- $_SESSION['menu'][$k]['url'] = (string) $MENU2->url;
- } else {
- $_SESSION['menu'][$k]['url'] = $_SESSION['config']['businessappurl'].(string) $MENU2->url;
- }
- if (trim((string) $MENU2->target) != '') {
- $tmp = preg_replace(
- '/\/core\/$/', '/', $_SESSION['urltocore']
- );
- $_SESSION['menu'][$k]['url'] = $tmp.(string) $MENU2->url;
- $_SESSION['menu'][$k]['target'] = (string) $MENU2->target;
- }
- $_SESSION['menu'][$k]['style'] = (string) $MENU2->style;
- $_SESSION['menu'][$k]['show'] = true;
- } else {
- $_SESSION['menu'][$k]['libconst'] = '';
- $_SESSION['menu'][$k]['url'] = '';
- $_SESSION['menu'][$k]['style'] = '';
- $_SESSION['menu'][$k]['show'] = false;
- }
- ++$k;
- }
- // Browses the enabled modules array
- for ($i = 0; $i < count($modules); ++$i) {
- if (file_exists(
- $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
- .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR
- .'modules'.DIRECTORY_SEPARATOR.$modules[$i]['moduleid']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml'
- )
- ) {
- $menuPath = $_SESSION['config']['corepath'].'custom'
- .DIRECTORY_SEPARATOR.$_SESSION['custom_override_id']
- .DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR
- .$modules[$i]['moduleid'].DIRECTORY_SEPARATOR.'xml'
- .DIRECTORY_SEPARATOR.'menu.xml';
- } else {
- $menuPath = 'modules'.DIRECTORY_SEPARATOR
- .$modules[$i]['moduleid'].DIRECTORY_SEPARATOR.'xml'
- .DIRECTORY_SEPARATOR.'menu.xml';
- }
-
- if (file_exists(
- $_SESSION['config']['corepath'].'modules'
- .DIRECTORY_SEPARATOR.$modules[$i]['moduleid']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml'
- ) || file_exists(
- $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
- .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR
- .'modules'.DIRECTORY_SEPARATOR.$modules[$i]['moduleid']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml'
- )
- ) {
- $xmlconfig = simplexml_load_file($menuPath);
- foreach ($xmlconfig->MENU as $MENU) {
- $_SESSION['menu'][$k]['id'] = (string) $MENU->id;
- $_SESSION['menu'][$k]['angular'] = empty((string) $MENU->angular) ? 'false' : (string) $MENU->angular;
- if (isset(
- $_SESSION['user']['services'][$_SESSION['menu'][$k]['id']]
- )
- && $_SESSION['user']['services'][$_SESSION['menu'][$k]['id']] == true
- ) {
- $libmenu = (string) $MENU->libconst;
- if (!empty($libmenu) && defined($libmenu)
- && constant($libmenu) != null
- ) {
- $libmenu = constant($libmenu);
- }
- $_SESSION['menu'][$k]['libconst'] = $libmenu;
- if ($_SESSION['menu'][$k]['angular'] == 'true') {
- $_SESSION['menu'][$k]['url'] = (string) $MENU->url;
- } else {
- $_SESSION['menu'][$k]['url'] = $_SESSION['config']['businessappurl'].(string) $MENU->url;
- }
-
- if (trim((string) $MENU->target) != '') {
- $tmp = preg_replace(
- '/\/core\/$/', '/', $_SESSION['urltocore']
- );
- $_SESSION['menu'][$k]['url'] = $tmp
- .(string) $MENU->url;
- $_SESSION['menu'][$k]['target'] = (string) $MENU->target;
- }
- $_SESSION['menu'][$k]['style'] = (string) $MENU->style;
- $_SESSION['menu'][$k]['show'] = true;
- } else {
- $_SESSION['menu'][$k]['libconst'] = '';
- $_SESSION['menu'][$k]['url'] = '';
- $_SESSION['menu'][$k]['style'] = '';
- $_SESSION['menu'][$k]['show'] = false;
- }
- ++$k;
- }
- }
- }
- $this->load_quicklaunch($modules);
- }
-
- /**
- * Builds the application menu from the session var menu.
- *
- * @param $menu array Enabled menu items
- * @param $myProfil boolean Enabled my profil item
- * @param $logout boolean Enabled logout item
- */
- public function build_menu($menu, $myProfil = true, $logout = true)
- {
- //menu tri
- $i = 0;
- foreach ($menu as $key => $row) {
- $label[$i] = $row['libconst'];
- ++$i;
- }
- // Trie les données par volume décroissant, edition croissant
- // Ajoute $data en tant que dernier paramètre, pour trier par la clé commune
- array_multisort($label, SORT_ASC, $label, SORT_ASC, $menu);
-
- // Browses the menu items
- for ($i = 0; $i < count($menu); ++$i) {
- if ($menu[$i]['show'] == true) {
- if ($menu[$i]['angular'] == 'true') {
- echo '<li onmouseover="this.className=\'on\';" onmouseout="this.className=\'\';">';
- echo '<a style="display:flex;align-items:center;" onClick="triggerAngular(\'#'.$menu[$i]['url'].'\')">';
- echo "<i style='width:40px;text-align:center;' class='{$menu[$i]['style']} fa-2x'></i>";
- echo '<span>';
- echo trim($menu[$i]['libconst']);
- echo '</span></span></a></li>';
- } else {
- $tmp = $menu[$i]['url'];
-
- if (preg_match('/php$/', $tmp)) {
- $tmp .= '?reinit=true';
- } else {
- $tmp .= '&reinit=true';
- }
- $tmp = htmlentities($tmp, ENT_COMPAT, 'UTF-8', true); // Encodes
- echo "<li onmouseover=\"this.className='on';\" onmouseout=\"this.className='';\">";
- echo '<a style="display:flex;align-items:center;" href="#" ';
- if ($menu[$i]['id'] == 'index_mlb') {
- echo 'onclick="checkMultiIndexingGroup(\''.$tmp.'\');">';
- } else {
- echo 'onclick="window.open(\''.$tmp.'\',\'';
- if (isset($menu[$i]['target']) && $menu[$i]['target'] != '') {
- echo $menu[$i]['target'];
- } else {
- echo '_self';
- }
- echo '\');">';
- }
- echo '<i style="width:40px;text-align:center;" class="'.$menu[$i]['style'].' fa-2x"></i>';
- echo '<span>';
- echo trim($menu[$i]['libconst']);
- echo '</span></span></a></li>';
- }
- }
- }
-
- $userGroups = \User\models\UserModel::getGroupsByLogin(['login' => $_SESSION['user']['UserId']]);
- $indexingGroups = [];
- foreach ($userGroups as $group) {
- if ($group['can_index']) {
- $indexingGroups[] = ['id' => $group['id'], 'label' => $group['group_desc']];
- }
- }
- if (!empty($indexingGroups)) {
- echo '<li onmouseover="this.className=\'on\';" onmouseout="this.className=\'\';">';
- echo '<a style="display:flex;align-items:center;" onClick="">';
- echo '<i style="width:40px;text-align:center;" class="fa fa-file-medical fa-2x"></i>';
- echo '<span>'._INDEXING_MLB.'</span></a></li>';
- }
-
- // Menu items always displayed
- if ($myProfil) {
- echo '<li onmouseover="this.className=\'on\';" onmouseout="this.className=\'\';">';
- echo '<a style="display:flex;align-items:center;" onClick="triggerAngular(\'#/profile\')">';
- echo '<i style="width:40px;text-align:center;" class="fa fa-user fa-2x"></i>';
- echo '<span>'._MY_INFO.'</span></a></li>';
- }
- if ($logout) {
- echo '<li onmouseover="this.className=\'on\';" onmouseout="this.className=\'\';">';
- echo '<a style="display:flex;align-items:center;" href="'.$_SESSION['config']['businessappurl'].'index.php?display=true&page=logout&logout=true">';
- echo '<i style="width:40px;text-align:center;" class="fa fa-power-off fa-2x"></i>';
- echo '<span>'._LOGOUT.'</span></a></li>';
- }
- }
-
- /**
- * Loads menu items of each module and the application into session from menu.xml files.
- *
- * @param $modules array Enabled modules of the application
- */
- public function load_quicklaunch($modules)
- {
- $k = 0;
- if (file_exists(
- $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
- .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'
- .DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml'
- )
- ) {
- $path = $_SESSION['config']['corepath'].'custom'
- .DIRECTORY_SEPARATOR.$_SESSION['custom_override_id']
- .DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR
- .$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'
- .DIRECTORY_SEPARATOR.'menu.xml';
- } else {
- $path = 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml';
- }
- // Reads the apps/apps_name/xml/menu.xml file and loads into session
- $xmlconfig = simplexml_load_file($path);
- foreach ($xmlconfig->MENU as $MENU2) {
- $_SESSION['quicklaunch'][$k]['id'] = (string) $MENU2->id;
- $_SESSION['quicklaunch'][$k]['angular'] = empty((string) $MENU2->angular) ? 'false' : (string) $MENU2->angular;
- if (isset($_SESSION['quicklaunch'][$k]['id'])
- && isset($_SESSION['user']['services'][$_SESSION['quicklaunch'][$k]['id']])
- && $_SESSION['user']['services'][$_SESSION['quicklaunch'][$k]['id']] == true
- ) { // Menu Identifier must be equal to the Service identifier
- $libmenu = (string) $MENU2->libconst;
- if (!empty($libmenu) && defined($libmenu)
- && constant($libmenu) != null
- ) {
- $libmenu = constant($libmenu);
- }
- $_SESSION['quicklaunch'][$k]['libconst'] = $libmenu;
-
- if ($_SESSION['quicklaunch'][$k]['angular'] == 'true') {
- $_SESSION['quicklaunch'][$k]['url'] = (string) $MENU2->url;
- } else {
- $_SESSION['quicklaunch'][$k]['url'] = $_SESSION['config']['businessappurl'].(string) $MENU2->url;
- }
-
- if (trim((string) $MENU2->target) != '') {
- $tmp = preg_replace(
- '/\/core\/$/', '/', $_SESSION['urltocore']
- );
- $_SESSION['quicklaunch'][$k]['url'] = $tmp.(string) $MENU2->url;
- $_SESSION['quicklaunch'][$k]['target'] = (string) $MENU2->target;
- }
- $_SESSION['quicklaunch'][$k]['style'] = (string) $MENU2->style;
- $_SESSION['quicklaunch'][$k]['show'] = true;
- } else {
- $_SESSION['quicklaunch'][$k]['libconst'] = '';
- $_SESSION['quicklaunch'][$k]['url'] = '';
- $_SESSION['quicklaunch'][$k]['style'] = '';
- $_SESSION['quicklaunch'][$k]['show'] = false;
- }
- ++$k;
- }
- // Browses the enabled modules array
- for ($i = 0; $i < count($modules); ++$i) {
- if (file_exists(
- $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
- .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR
- .'modules'.DIRECTORY_SEPARATOR.$modules[$i]['moduleid']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml'
- )
- ) {
- $menuPath = $_SESSION['config']['corepath'].'custom'
- .DIRECTORY_SEPARATOR.$_SESSION['custom_override_id']
- .DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR
- .$modules[$i]['moduleid'].DIRECTORY_SEPARATOR.'xml'
- .DIRECTORY_SEPARATOR.'menu.xml';
- } else {
- $menuPath = 'modules'.DIRECTORY_SEPARATOR
- .$modules[$i]['moduleid'].DIRECTORY_SEPARATOR.'xml'
- .DIRECTORY_SEPARATOR.'menu.xml';
- }
-
- if (file_exists(
- $_SESSION['config']['corepath'].'modules'
- .DIRECTORY_SEPARATOR.$modules[$i]['moduleid']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml'
- ) || file_exists(
- $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
- .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR
- .'modules'.DIRECTORY_SEPARATOR.$modules[$i]['moduleid']
- .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'menu.xml'
- )
- ) {
- $xmlconfig = simplexml_load_file($menuPath);
- foreach ($xmlconfig->MENU as $MENU) {
- $_SESSION['quicklaunch'][$k]['id'] = (string) $MENU->id;
- $_SESSION['quicklaunch'][$k]['angular'] = empty((string) $MENU->angular) ? 'false' : (string) $MENU->angular;
- if (isset(
- $_SESSION['user']['services'][$_SESSION['quicklaunch'][$k]['id']]
- )
- && $_SESSION['user']['services'][$_SESSION['quicklaunch'][$k]['id']] == true
- ) {
- $libmenu = (string) $MENU->libconst;
- if (!empty($libmenu) && defined($libmenu)
- && constant($libmenu) != null
- ) {
- $libmenu = constant($libmenu);
- }
- $_SESSION['quicklaunch'][$k]['libconst'] = $libmenu;
- if ($_SESSION['quicklaunch'][$k]['angular'] == 'true') {
- $_SESSION['quicklaunch'][$k]['url'] = (string) $MENU->url;
- } else {
- $_SESSION['quicklaunch'][$k]['url'] = $_SESSION['config']['businessappurl'].(string) $MENU->url;
- }
- if (trim((string) $MENU->target) != '') {
- $tmp = preg_replace(
- '/\/core\/$/', '/', $_SESSION['urltocore']
- );
- $_SESSION['quicklaunch'][$k]['url'] = $tmp
- .(string) $MENU->url;
- $_SESSION['quicklaunch'][$k]['target'] = (string) $MENU->target;
- }
- $_SESSION['quicklaunch'][$k]['style'] = (string) $MENU->style;
- $_SESSION['quicklaunch'][$k]['show'] = true;
- } else {
- $_SESSION['quicklaunch'][$k]['libconst'] = '';
- $_SESSION['quicklaunch'][$k]['url'] = '';
- $_SESSION['quicklaunch'][$k]['style'] = '';
- $_SESSION['quicklaunch'][$k]['show'] = false;
- }
- ++$k;
- }
- }
- }
- }
-
/**
* Loads application services into session.
*/
diff --git a/modules/export_seda/RequestSeda.php b/modules/export_seda/RequestSeda.php
index b40358cd8a6..32ef1020989 100755
--- a/modules/export_seda/RequestSeda.php
+++ b/modules/export_seda/RequestSeda.php
@@ -74,7 +74,6 @@ class RequestSeda
$businessAppTools->build_business_app_config();
$coreTools->load_modules_config($_SESSION['modules']);
- $coreTools->load_menu($_SESSION['modules']);
}
$this->statement = [];
diff --git a/src/frontend/app/folder/folder-pinned/folder-pinned.component.ts b/src/frontend/app/folder/folder-pinned/folder-pinned.component.ts
index f4291921f3e..1e5972e6da8 100644
--- a/src/frontend/app/folder/folder-pinned/folder-pinned.component.ts
+++ b/src/frontend/app/folder/folder-pinned/folder-pinned.component.ts
@@ -28,7 +28,7 @@ export class FolderPinnedComponent implements OnInit {
private notify: NotificationService,
private dialog: MatDialog,
private router: Router,
- private foldersService: FoldersService
+ public foldersService: FoldersService
) {
// Event after process action
this.subscription = this.foldersService.catchEvent().subscribe((result: any) => {
--
GitLab