Skip to content

Commit 8441df9

Browse files
ywarnierywarnier
committed
Merge branch 'master' of github.com:chamilo/chamilo-lms
2 parents 7ccafe1 + 7c277d2 commit 8441df9

File tree

28 files changed

+272
-638
lines changed

28 files changed

+272
-638
lines changed

‎public/main/inc/lib/TicketManager.php‎

Lines changed: 63 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public static function get_all_tickets_categories($projectId, $order = '')
5858
$order = empty($order) ? 'category.total_tickets DESC' : $order;
5959
$order = Database::escape_string($order);
6060
$projectId = (int) $projectId;
61+
$accessUrlId = Container::getAccessUrlHelper()->getCurrent()->getId();
6162

6263
$sql = "SELECT
6364
category.*,
@@ -68,7 +69,7 @@ public static function get_all_tickets_categories($projectId, $order = '')
6869
$table_support_category category
6970
INNER JOIN $table_support_project project
7071
ON project.id = category.project_id
71-
WHERE project.id = $projectId
72+
WHERE project.id = $projectId AND project.access_url_id = $accessUrlId
7273
ORDER BY $order";
7374
$result = Database::query($sql);
7475
$types = [];
@@ -121,7 +122,7 @@ public static function getCategory($id)
121122
{
122123
$table = Database::get_main_table(TABLE_TICKET_CATEGORY);
123124
$id = (int) $id;
124-
$sql = "SELECT id, title, description, total_tickets
125+
$sql = "SELECT id, title, title as name, description, total_tickets
125126
FROM $table WHERE id = $id";
126127

127128
$result = Database::query($sql);
@@ -373,6 +374,7 @@ public static function add(
373374
'message' => $content,
374375
'code' => '',
375376
'total_messages' => 0,
377+
'access_url_id' => Container::getAccessUrlHelper()->getCurrent()->getId(),
376378
];
377379

378380
if (!empty($exerciseId)) {
@@ -810,6 +812,7 @@ public static function getTicketsByCurrentUser($from, $number_of_items, $column,
810812
$direction = !empty($direction) ? $direction : 'DESC';
811813
$userId = api_get_user_id();
812814
$userInfo = api_get_user_info($userId);
815+
$accessUrlId = Container::getAccessUrlHelper()->getCurrent()->getId();
813816

814817
if (empty($userInfo)) {
815818
return [];
@@ -873,6 +876,7 @@ public static function getTicketsByCurrentUser($from, $number_of_items, $column,
873876
ON (ticket.status_id = status.id)
874877
WHERE 1=1
875878
";
879+
$sql .= " AND ticket.access_url_id = $accessUrlId ";
876880

877881
$projectId = (int) $_GET['project_id'];
878882
$userIsAllowInProject = self::userIsAllowInProject($projectId);
@@ -1058,6 +1062,8 @@ public static function getTotalTicketsCurrentUser()
10581062
return 0;
10591063
}
10601064

1065+
$accessUrlId = Container::getAccessUrlHelper()->getCurrent()->getId();
1066+
10611067
$sql = "SELECT COUNT(ticket.id) AS total
10621068
FROM $table_support_tickets ticket
10631069
INNER JOIN $table_support_category cat
@@ -1068,6 +1074,8 @@ public static function getTotalTicketsCurrentUser()
10681074
ON (ticket.status_id = status.id)
10691075
WHERE 1 = 1";
10701076

1077+
$sql .= " AND ticket.access_url_id = $accessUrlId ";
1078+
10711079
$projectId = (int) $_GET['project_id'];
10721080
$allowRoleList = self::getAllowedRolesFromProject($projectId);
10731081

@@ -1558,6 +1566,7 @@ public static function getNumberOfMessages()
15581566
$sql .= " AND user_id NOT IN (SELECT user_id FROM $table_main_admin)
15591567
AND ticket.status_id != '".self::STATUS_FORWARDED."'";
15601568
}
1569+
$sql .= ' AND ticket.access_url_id = '.(int) Container::getAccessUrlHelper()->getCurrent()->getId();
15611570
$sql .= " AND ticket.project_id != '' ";
15621571
$res = Database::query($sql);
15631572
$obj = Database::fetch_object($res);
@@ -1619,17 +1628,21 @@ public static function close_old_tickets()
16191628
$table = Database::get_main_table(TABLE_TICKET_TICKET);
16201629
$now = api_get_utc_datetime();
16211630
$userId = api_get_user_id();
1631+
$accessUrlId = (int) Container::getAccessUrlHelper()->getCurrent()->getId();
1632+
16221633
$sql = "UPDATE $table
1623-
SET
1624-
status_id = '".self::STATUS_CLOSE."',
1625-
sys_lastedit_user_id ='$userId',
1626-
sys_lastedit_datetime ='$now',
1627-
end_date = '$now'
1628-
WHERE
1629-
DATEDIFF('$now', sys_lastedit_datetime) > 7 AND
1630-
status_id != '".self::STATUS_CLOSE."' AND
1631-
status_id != '".self::STATUS_NEW."' AND
1632-
status_id != '".self::STATUS_FORWARDED."'";
1634+
SET
1635+
status_id = '".self::STATUS_CLOSE."',
1636+
sys_lastedit_user_id ='$userId',
1637+
sys_lastedit_datetime ='$now',
1638+
end_date = '$now'
1639+
WHERE
1640+
DATEDIFF('$now', sys_lastedit_datetime) > 7 AND
1641+
status_id != '".self::STATUS_CLOSE."' AND
1642+
status_id != '".self::STATUS_NEW."' AND
1643+
status_id != '".self::STATUS_FORWARDED."' AND
1644+
access_url_id = $accessUrlId";
1645+
16331646
Database::query($sql);
16341647
}
16351648

@@ -1720,6 +1733,8 @@ public static function export_tickets_by_user_id(
17201733
AND ticket.priority_id = priority.id
17211734
AND ticket.status_id = status.id
17221735
AND user.user_id = ticket.request_user ";
1736+
$sql .= ' AND ticket.access_url_id = '.(int) Container::getAccessUrlHelper()->getCurrent()->getId();
1737+
17231738
// Search simple
17241739
if (isset($_GET['submit_simple'])) {
17251740
if ('' !== $_GET['keyword']) {
@@ -1898,7 +1913,10 @@ public static function getCategoryForm($url, $projectId)
18981913
*/
18991914
public static function getStatusList()
19001915
{
1901-
$items = Database::getManager()->getRepository(TicketStatus::class)->findAll();
1916+
$accessUrl = Container::getAccessUrlHelper()->getCurrent();
1917+
$items = Database::getManager()
1918+
->getRepository(TicketStatus::class)
1919+
->findBy(['accessUrl' => $accessUrl]);
19021920

19031921
$list = [];
19041922
/** @var TicketStatus $row */
@@ -1950,10 +1968,14 @@ public static function getStatusIdFromCode($code)
19501968
*/
19511969
public static function getPriorityList()
19521970
{
1953-
$projects = Database::getManager()->getRepository(TicketPriority::class)->findAll();
1971+
$accessUrl = Container::getAccessUrlHelper()->getCurrent();
1972+
$priorities = Database::getManager()
1973+
->getRepository(TicketPriority::class)
1974+
->findBy(['accessUrl' => $accessUrl]);
1975+
19541976
$list = [];
19551977
/** @var TicketPriority $row */
1956-
foreach ($projects as $row) {
1978+
foreach ($priorities as $row) {
19571979
$list[$row->getId()] = $row->getTitle();
19581980
}
19591981

@@ -1965,7 +1987,10 @@ public static function getPriorityList()
19651987
*/
19661988
public static function getProjects()
19671989
{
1968-
$projects = Database::getManager()->getRepository(TicketProject::class)->findAll();
1990+
$accessUrl = Container::getAccessUrlHelper()->getCurrent();
1991+
$projects = Database::getManager()
1992+
->getRepository(TicketProject::class)
1993+
->findBy(['accessUrl' => $accessUrl]);
19691994

19701995
$list = [];
19711996
/** @var TicketProject $row */
@@ -1987,7 +2012,11 @@ public static function getProjects()
19872012
*/
19882013
public static function getProjectsSimple()
19892014
{
1990-
$projects = Database::getManager()->getRepository(TicketProject::class)->findAll();
2015+
$accessUrl = Container::getAccessUrlHelper()->getCurrent();
2016+
$projects = Database::getManager()
2017+
->getRepository(TicketProject::class)
2018+
->findBy(['accessUrl' => $accessUrl]);
2019+
19912020
$list = [];
19922021
/** @var TicketProject $row */
19932022
foreach ($projects as $row) {
@@ -2025,6 +2054,7 @@ public static function addProject($params)
20252054
$project->setTitle($params['title']);
20262055
$project->setDescription($params['description']);
20272056
$project->setInsertUserId(api_get_user_id());
2057+
$project->setAccessUrl(Container::getAccessUrlHelper()->getCurrent());
20282058

20292059
Database::getManager()->persist($project);
20302060
Database::getManager()->flush();
@@ -2051,6 +2081,7 @@ public static function updateProject($id, $params)
20512081
$project->setDescription($params['description']);
20522082
$project->setLastEditDateTime(new DateTime($params['sys_lastedit_datetime']));
20532083
$project->setLastEditUserId($params['sys_lastedit_user_id']);
2084+
$project->setAccessUrl(Container::getAccessUrlHelper()->getCurrent());
20542085

20552086
Database::getManager()->persist($project);
20562087
Database::getManager()->flush();
@@ -2088,7 +2119,11 @@ public static function getProjectForm($url)
20882119
*/
20892120
public static function getStatusAdminList()
20902121
{
2091-
$items = Database::getManager()->getRepository(TicketStatus::class)->findAll();
2122+
$accessUrl = Container::getAccessUrlHelper()->getCurrent();
2123+
$items = Database::getManager()
2124+
->getRepository(TicketStatus::class)
2125+
->findBy(['accessUrl' => $accessUrl]);
2126+
20922127
$list = [];
20932128
/** @var TicketStatus $row */
20942129
foreach ($items as $row) {
@@ -2145,6 +2180,7 @@ public static function addStatus($params)
21452180
$item->setCode(URLify::filter($params['title']));
21462181
$item->setTitle($params['title']);
21472182
$item->setDescription($params['description']);
2183+
$item->setAccessUrl(Container::getAccessUrlHelper()->getCurrent());
21482184

21492185
Database::getManager()->persist($item);
21502186
Database::getManager()->flush();
@@ -2169,6 +2205,7 @@ public static function updateStatus($id, $params)
21692205
$item = self::getStatus($id);
21702206
$item->setTitle($params['title']);
21712207
$item->setDescription($params['description']);
2208+
$item->setAccessUrl(Container::getAccessUrlHelper()->getCurrent());
21722209

21732210
Database::getManager()->persist($item);
21742211
Database::getManager()->flush();
@@ -2204,12 +2241,15 @@ public static function getStatusForm($url)
22042241
/**
22052242
* @return array
22062243
*/
2207-
public static function getPriorityAdminList()
2244+
public static function getPriorityAdminList(): array
22082245
{
2209-
$items = Database::getManager()->getRepository(TicketPriority::class)->findAll();
2246+
$accessUrl = Container::getAccessUrlHelper()->getCurrent();
2247+
$items = Database::getManager()
2248+
->getRepository(TicketPriority::class)
2249+
->findBy(['accessUrl' => $accessUrl]);
22102250

22112251
$list = [];
2212-
/** @var TicketStatus $row */
2252+
/** @var TicketPriority $row */
22132253
foreach ($items as $row) {
22142254
$list[] = [
22152255
'id' => $row->getId(),
@@ -2248,7 +2288,7 @@ public static function addPriority($params)
22482288
->setColor('')
22492289
->setInsertUserId(api_get_user_id())
22502290
->setUrgency('')
2251-
;
2291+
->setAccessUrl(Container::getAccessUrlHelper()->getCurrent());
22522292

22532293
Database::getManager()->persist($item);
22542294
Database::getManager()->flush();
@@ -2273,6 +2313,7 @@ public static function updatePriority($id, $params)
22732313
$item = self::getPriority($id);
22742314
$item->setTitle($params['title']);
22752315
$item->setDescription($params['description']);
2316+
$item->setAccessUrl(Container::getAccessUrlHelper()->getCurrent());
22762317

22772318
Database::getManager()->persist($item);
22782319
Database::getManager()->flush();

‎public/main/ticket/categories.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@
9494
$values = $form->getSubmitValues();
9595

9696
$params = [
97-
'name' => $values['name'],
97+
'title' => $values['name'],
9898
'description' => $values['description'],
9999
'total_tickets' => 0,
100100
'sys_insert_user_id' => api_get_user_id(),
101101
'sys_insert_datetime' => api_get_utc_datetime(),
102-
'course_required' => '',
102+
'course_required' => isset($values['course_required']) ? (int) $values['course_required'] : 0,
103103
'project_id' => $projectId,
104104
];
105105
TicketManager::addCategory($params);
@@ -131,12 +131,12 @@
131131
$values = $form->getSubmitValues();
132132

133133
$params = [
134-
'name' => $values['name'],
134+
'title' => $values['name'],
135135
'description' => $values['description'],
136136
'sys_lastedit_datetime' => api_get_utc_datetime(),
137137
'sys_lastedit_user_id' => api_get_user_id(),
138138
];
139-
$cat = TicketManager::updateCategory($_GET['id'], $params);
139+
TicketManager::updateCategory($_GET['id'], $params);
140140
Display::addFlash(Display::return_message(get_lang('Update successful')));
141141
header('Location: '.api_get_self().'?project_id='.$projectId);
142142
exit;

‎public/main/ticket/priorities.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
$values = $form->getSubmitValues();
7272

7373
$params = [
74-
'name' => $values['name'],
74+
'title' => $values['name'],
7575
'description' => $values['description'],
7676
];
7777
TicketManager::addPriority($params);
@@ -101,10 +101,10 @@
101101
if ($form->validate()) {
102102
$values = $form->getSubmitValues();
103103
$params = [
104-
'name' => $values['name'],
104+
'title' => $values['name'],
105105
'description' => $values['description'],
106106
];
107-
$cat = TicketManager::updatePriority($_GET['id'], $params);
107+
TicketManager::updatePriority($_GET['id'], $params);
108108
Display::addFlash(Display::return_message(get_lang('Update successful')));
109109
header('Location: '.api_get_self());
110110
exit;

‎public/main/ticket/projects.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
$values = $form->getSubmitValues();
7272

7373
$params = [
74-
'name' => $values['name'],
74+
'title' => $values['name'],
7575
'description' => $values['description'],
7676
];
7777
TicketManager::addProject($params);
@@ -102,7 +102,7 @@
102102
$values = $form->getSubmitValues();
103103

104104
$params = [
105-
'name' => $values['name'],
105+
'title' => $values['name'],
106106
'description' => $values['description'],
107107
'sys_lastedit_datetime' => api_get_utc_datetime(),
108108
'sys_lastedit_user_id' => api_get_user_id(),

‎public/main/ticket/status.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
$values = $form->getSubmitValues();
7272

7373
$params = [
74-
'name' => $values['name'],
74+
'title' => $values['name'],
7575
'description' => $values['description'],
7676
];
7777
TicketManager::addStatus($params);
@@ -101,10 +101,10 @@
101101
$values = $form->getSubmitValues();
102102

103103
$params = [
104-
'name' => $values['name'],
104+
'title' => $values['name'],
105105
'description' => $values['description'],
106106
];
107-
$cat = TicketManager::updateStatus($id, $params);
107+
TicketManager::updateStatus($id, $params);
108108
Display::addFlash(Display::return_message(get_lang('Update successful')));
109109
header('Location: '.api_get_self());
110110
exit;

‎public/plugin/AzureActiveDirectory/CHANGELOG.md‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)