Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(widget) : widget params on public view #7408

Merged
merged 6 commits into from
Apr 18, 2019
Merged

fix(widget) : widget params on public view #7408

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df86e62
fix(widget) : widget params on public view #7383
tanguyvda Apr 10, 2019
e4922e3
fix(ci): codingStyle and psr2
sc979 Apr 10, 2019
0e8855a
fix(widget): correct the query using user's the custom view's locked …
sc979 Apr 11, 2019
48c9019
fix wrong binding name
sc979 Apr 15, 2019
5a58c68
enh : check if $userId is non empty
sc979 Apr 15, 2019
a701e1d
Update www/class/centreonCustomView.class.php
loiclau Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 74 additions & 18 deletions www/class/centreonCustomView.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright 2005-2015 Centreon
* Centreon is developped by : Julien Mathis and Romain Le Merlus under
* Copyright 2005-2019 Centreon
* Centreon is developed by : Julien Mathis and Romain Le Merlus under
* GPL Licence 2.0.
*
* This program is free software; you can redistribute it and/or modify it under
Expand Down Expand Up @@ -640,9 +640,60 @@ public function loadCustomView($params)
if (!$dbResult) {
throw new \Exception("An error occured");
}

//if the view is being added for the first time, we make sure that the widget parameters are going to be set
if (!$update) {
$this->addPublicViewWidgetParams($params['viewLoad'], $this->userId);
}

return $params['viewLoad'];
}

/**
* @param $viewId
* @param $userId
* @throws Exception
*/
public function addPublicViewWidgetParams($viewId, $userId)
{
//get all widget parameters from the view that is being added
if (!empty($userId)) {
$stmt = $this->db->prepare(
'SELECT * FROM widget_views wv ' .
'LEFT JOIN widget_preferences wp ON wp.widget_view_id = wv.widget_view_id ' .
'LEFT JOIN custom_view_user_relation cvur ON cvur.custom_view_id = wv.custom_view_id ' .
'WHERE cvur.custom_view_id = :viewId AND cvur.is_owner = 1 AND cvur.user_id = wp.user_id'
);
$stmt->bindParam(':viewId', $viewId, PDO::PARAM_INT);
$dbResult = $stmt->execute();
if (!$dbResult) {
throw new \Exception(
"An error occurred when retrieving user's Id : " . $userId .
" parameters of the widgets from the view: Id = " . $viewId
);
}

//add every widget parameters for the current user
while ($row = $stmt->fetch()) {
$stmt2 = $this->db->prepare(
'INSERT INTO widget_preferences ' .
'VALUES (:widgetViewId, :parameterId, :preferenceValue, :userId)'
);
$stmt2->bindParam(':widgetViewId', $row['widget_view_id'], PDO::PARAM_INT);
$stmt2->bindParam(':parameterId', $row['parameter_id'], PDO::PARAM_INT);
$stmt2->bindParam(':preferenceValue', $row['preference_value'], PDO::PARAM_STR);
$stmt2->bindParam(':userId', $userId, PDO::PARAM_INT);

$dbResult2 = $stmt2->execute();
if (!$dbResult2) {
throw new \Exception(
"An error occurred when adding user's Id : " . $userId .
" parameters to the widgets from the view: Id = " . $viewId
);
}
}
}
}

/**
* @param $params
Expand Down Expand Up @@ -674,11 +725,12 @@ public function shareCustomView($params, $userId)
}

// select user already share
$query = 'SELECT user_id FROM custom_view_user_relation ' .
$stmt = $this->db->prepare(
'SELECT user_id FROM custom_view_user_relation ' .
'WHERE custom_view_id = :viewId ' .
'AND user_id <> :userId ' .
'AND usergroup_id IS NULL ';
$stmt = $this->db->prepare($query);
'AND usergroup_id IS NULL '
);
$stmt->bindParam(':viewId', $params['custom_view_id'], PDO::PARAM_INT);
$stmt->bindParam(':userId', $userId, PDO::PARAM_INT);
$dbResult = $stmt->execute();
Expand All @@ -693,10 +745,11 @@ public function shareCustomView($params, $userId)
// check if the view is share at a new user
foreach ($sharedUsers as $sharedUserId => $locked) {
if (isset($oldSharedUsers[$sharedUserId])) {
$query = 'UPDATE custom_view_user_relation SET is_share = 1, locked = :isLocked ' .
$stmt = $this->db->prepare(
'UPDATE custom_view_user_relation SET is_share = 1, locked = :isLocked ' .
'WHERE user_id = :userId ' .
'AND custom_view_id = :viewId';
$stmt = $this->db->prepare($query);
'AND custom_view_id = :viewId'
);
$stmt->bindParam(':isLocked', $locked, PDO::PARAM_INT);
$stmt->bindParam(':userId', $sharedUserId, PDO::PARAM_INT);
$stmt->bindParam(':viewId', $params['custom_view_id'], PDO::PARAM_INT);
Expand All @@ -706,10 +759,11 @@ public function shareCustomView($params, $userId)
}
unset($oldSharedUsers[$sharedUserId]);
} else {
$query = 'INSERT INTO custom_view_user_relation ' .
$stmt = $this->db->prepare(
'INSERT INTO custom_view_user_relation ' .
'(custom_view_id, user_id, locked, is_consumed, is_share ) ' .
'VALUES ( :viewId, :sharedUser, :isLocked, 0, 1) ';
$stmt = $this->db->prepare($query);
'VALUES ( :viewId, :sharedUser, :isLocked, 0, 1) '
);
$stmt->bindParam(':viewId', $params['custom_view_id'], PDO::PARAM_INT);
$stmt->bindParam(':sharedUser', $sharedUserId, PDO::PARAM_INT);
$stmt->bindParam(':isLocked', $locked, PDO::PARAM_INT);
Expand All @@ -736,24 +790,26 @@ public function shareCustomView($params, $userId)
}

// delete widget preferences for old user
$query = 'DELETE FROM widget_preferences ' .
$stmt = $this->db->prepare(
'DELETE FROM widget_preferences ' .
'WHERE widget_view_id IN (SELECT wv.widget_view_id FROM widget_views wv ' .
'WHERE wv.custom_view_id = ? ) ' .
'AND user_id IN (' . $userIdKey . ') ';
$stmt = $this->db->prepare($query);
'AND user_id IN (' . $userIdKey . ') '
);
$dbResult = $stmt->execute($queryValue);
if (!$dbResult) {
throw new \Exception($stmt->errorInfo());
}

// delete view / user relation
$query = 'DELETE FROM custom_view_user_relation ' .
$stmt = $this->db->prepare(
'DELETE FROM custom_view_user_relation ' .
'WHERE custom_view_id = ? ' .
'AND user_id IN (' . $userIdKey . ') ';
$stmt = $this->db->prepare($query);
'AND user_id IN (' . $userIdKey . ') '
);
$dbResult = $stmt->execute($queryValue);
if (!$dbResult) {
throw new \Exception("An error occured");
throw new \Exception("An error occurred");
}

////////////////////////////
Expand Down