You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2017/03/15 16:21:07 UTC
svn commit: r1787071 - in /vcl/trunk/web: .ht-inc/privileges.php
.ht-inc/requests.php .ht-inc/utils.php .ht-inc/xmlrpcWrappers.php
js/newresservercommon.js js/requests.js
Author: jfthomps
Date: Wed Mar 15 16:21:07 2017
New Revision: 1787071
URL: http://svn.apache.org/viewvc?rev=1787071&view=rev
Log:
VCL-1024 - comment out Server Profile code
privileges.php: modified getNodePrivileges and getNodeCascadePrivileges: added conditional to queries including userprivtype table
to not include records where name is configAdmin or serverProfileAdmin
requests.php:
-modified newReservationHTML: commented out block dealing with $extraimages; commented out block that displays dropdown for selecti
ng a Server Profile; changed div name from deployprofilediv to deployserverdiv
-modified AJupdateWaitTime: commented out block that adds additional images available from Server Profiles
-modified AJnewRequest: commented out 'serverprofileid' and $data['profileid'] from $fields and $values
-modified processRequestInput: commented out code dealing with $extraimages; commented out code processing $return['profileid']
states.php: commented out the following: serverProfiles, AJsaveServerProfile, AJserverProfileData, AJdelServerProfile, jsonProfileGroupingGroups, jsonProfileGroupingProfiles, AJaddGroupToProfile, AJremGroupFromProfile, AJaddProfileToGroup, AJremProfileFromGroup, AJserverProfileStoreData, AJfetchRouterDNS
utils.php:
-modified initGlobals: commented out require_once form serverprofiles.php when mode is xmlrpccall or xmlrpcaffiliations; commented
out require_once's in serverProfiles case
-modified checkAccess: commented out serverProfiles case in switch statement
-commented out getServerProfiles and getServerProfileImages
-modified getOverallUserPrivs and getTypes: added conditional to query to not return userprivtypes configAdmin or serverProfileAdmin
-modified getNavMenuData: commented out serverProfileAdmin section
-modified getDojoHTML: commented out serverProfiles cases; commented out continuation for AJserverProfileStoreData and addOnLoad call to populateProfileStore
xmlrpcaffiliations.php: modified XMLRPCdeployServer: commented out code related to $extraimages
newresservercommon.js: commented out populateProfileStore, populateProfileStoreCB, deployProfileChanged, getServerProfileData, getServerProfileDataDeployCB
requests.js:
-commented out profilestoredata global
-modified resetNewResDlg: commented out reset for deployprofileid
-modified selectResType: commented out adding hidden class to deployprofileslist; commented out code related to profilestore
-modified getDeployData: commented out line setting data.profileid
Modified:
vcl/trunk/web/.ht-inc/privileges.php
vcl/trunk/web/.ht-inc/requests.php
vcl/trunk/web/.ht-inc/utils.php
vcl/trunk/web/.ht-inc/xmlrpcWrappers.php
vcl/trunk/web/js/newresservercommon.js
vcl/trunk/web/js/requests.js
Modified: vcl/trunk/web/.ht-inc/privileges.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/privileges.php?rev=1787071&r1=1787070&r2=1787071&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/privileges.php (original)
+++ vcl/trunk/web/.ht-inc/privileges.php Wed Mar 15 16:21:07 2017
@@ -1641,6 +1641,7 @@ function userLookup() {
. "userprivtype upt "
. "WHERE up.privnodeid = p.id AND "
. "up.userprivtypeid = upt.id AND "
+ . "upt.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "up.userid = {$userdata['id']} "
. "ORDER BY p.name, "
. "upt.name";
@@ -1680,6 +1681,7 @@ function userLookup() {
. "up.userprivtypeid = upt.id AND "
. "upt.name != 'cascade' AND "
. "upt.name != 'block' AND "
+ . "upt.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "up.usergroupid IN (" . implode(',', array_keys($userdata['groups'])) . ") "
. "ORDER BY p.name, "
. "upt.name";
@@ -2725,6 +2727,7 @@ function getNodePrivileges($node, $type=
. "affiliation a "
. "WHERE up.privnodeid = $node AND "
. "up.userprivtypeid = t.id AND "
+ . "t.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "up.userid = u.id AND "
. "up.userid IS NOT NULL AND "
. "u.affiliationid = a.id "
@@ -2745,6 +2748,7 @@ function getNodePrivileges($node, $type=
. "LEFT JOIN affiliation a ON (g.affiliationid = a.id) "
. "WHERE up.privnodeid = $node AND "
. "up.userprivtypeid = t.id AND "
+ . "t.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "up.usergroupid = g.id AND "
. "up.usergroupid IS NOT NULL "
. "ORDER BY g.name";
@@ -2916,6 +2920,7 @@ function getNodeCascadePrivileges($node,
. "userprivtype t, "
. "affiliation a "
. "WHERE up.userprivtypeid = t.id AND "
+ . "t.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "up.userid = u.id AND "
. "up.userid IS NOT NULL AND "
. "t.name = 'block' AND "
@@ -2942,6 +2947,7 @@ function getNodeCascadePrivileges($node,
. "up.userid IS NOT NULL AND "
. "t.name != 'cascade' AND "
. "t.name != 'block' AND "
+ . "t.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "Cup.userprivtypeid = Ct.id AND "
. "Ct.name = 'cascade' AND "
. "Cup.privnodeid = up.privnodeid AND "
@@ -2981,6 +2987,7 @@ function getNodeCascadePrivileges($node,
. "userpriv up, "
. "userprivtype t "
. "WHERE up.userprivtypeid = t.id AND "
+ . "t.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "up.usergroupid = g.id AND "
. "up.usergroupid IS NOT NULL AND "
. "t.name = 'block'";
@@ -3008,6 +3015,7 @@ function getNodeCascadePrivileges($node,
. "up.usergroupid IS NOT NULL AND "
. "t.name != 'cascade' AND "
. "t.name != 'block' AND "
+ . "t.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "Cup.userprivtypeid = Ct.id AND "
. "Ct.name = 'cascade' AND "
. "Cup.privnodeid = up.privnodeid AND "
Modified: vcl/trunk/web/.ht-inc/requests.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1787071&r1=1787070&r2=1787071&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Wed Mar 15 16:21:07 2017
@@ -1310,7 +1310,7 @@ function newReservationHTML() {
if(in_array('serverCheckOut', $user['privileges']) &&
count($checkout['image'])) {
$serveraccess = 1;
- $extraimages = getServerProfileImages($user['id']);
+ /*$extraimages = getServerProfileImages($user['id']);
foreach($extraimages as $id => $name) {
if(! array_key_exists($id, $images)) {
$images[$id] = array('name' => $name,
@@ -1346,7 +1346,7 @@ function newReservationHTML() {
$dorevisionscont = 1;
}
}
- }
+ }*/
}
$imageid = getUsersLastImage($user['id']);
@@ -1469,7 +1469,7 @@ function newReservationHTML() {
if($showradios)
$h .= "<br><br>\n";
- $h .= "<span id=\"deployprofileslist\" class=\"hidden\">\n";
+ /*$h .= "<span id=\"deployprofileslist\" class=\"hidden\">\n";
$h .= "<div dojoType=\"dojo.data.ItemFileWriteStore\" jsId=\"profilesstore\" ";
$h .= "data=\"profilesstoredata\"></div>\n";
$h .= i("Profile:") . " ";
@@ -1488,9 +1488,9 @@ function newReservationHTML() {
$h .= "</button>";
$h .= "<br><br>\n";
$h .= "<input type=\"hidden\" id=\"appliedprofileid\" value=\"0\">\n";
- $h .= "</span>\n"; # deployprofileslist
+ $h .= "</span>\n"; # deployprofileslist*/
- $h .= "<div id=\"deployprofilediv\">\n";
+ $h .= "<div id=\"deployserverdiv\">\n";
# directions
$h .= "<span id=\"nrdirections\">";
$h .= i("Please select the environment you want to use from the list:");
@@ -1769,7 +1769,7 @@ function newReservationHTML() {
$h .= "<div id=\"deployerr\" class=\"rederrormsg\"></div>\n";
$h .= "<div id=\"waittime\"></div><br>\n";
- $h .= "</div>\n"; # deployprofilediv
+ $h .= "</div>\n"; # deployserverdiv
$h .= " </div>\n";
$h .= " <input type=\"hidden\" id=\"newrescont\">\n";
@@ -1819,10 +1819,10 @@ function AJupdateWaitTime() {
# process imageid
$resources = getUserResources(array("imageAdmin", "imageCheckOut"));
$validImageids = array_keys($resources['image']);
- if($type == 'server') {
+ /*if($type == 'server') {
$extraimages = getServerProfileImages($user['id']);
$validImageids = array_merge($validImageids, array_keys($extraimages));
- }
+ }*/
if(! in_array($imageid, $validImageids))
return;
@@ -2369,8 +2369,8 @@ function AJnewRequest() {
. "WHERE requestid = $requestid";
doQuery($query);
- $fields = array('requestid', 'serverprofileid');
- $values = array($requestid, $data['profileid']);
+ $fields = array('requestid'/*, 'serverprofileid'*/);
+ $values = array($requestid/*, $data['profileid']*/);
if($data['name'] == '') {
$fields[] = 'name';
$name = $images[$data['imageid']]['prettyname'];
@@ -4579,10 +4579,10 @@ function processRequestInput() {
$resources = getUserResources(array("imageAdmin", "imageCheckOut"));
$withnocheckout = $resources['image'];
$images = removeNoCheckout($resources["image"]);
- $extraimages = getServerProfileImages($user['id']);
+ #$extraimages = getServerProfileImages($user['id']);
if((! array_key_exists($return['imageid'], $images) &&
- ($return['type'] != 'server' ||
- ! array_key_exists($return['imageid'], $extraimages)) &&
+ /*($return['type'] != 'server' ||
+ ! array_key_exists($return['imageid'], $extraimages)) &&*/
($return['type'] != 'imaging' ||
! array_key_exists($return['imageid'], $withnocheckout))) ||
($return['type'] == 'imaging' &&
@@ -4740,7 +4740,7 @@ function processRequestInput() {
}
# profileid
- $return['profileid'] = processInputVar('profileid', ARG_NUMERIC, 0);
+ /*$return['profileid'] = processInputVar('profileid', ARG_NUMERIC, 0);
$resources = getUserResources(array("serverCheckOut", "serverProfileAdmin"),
array("available","administer"));
if(! array_key_exists($return['profileid'], $resources['serverprofile']))
@@ -4753,7 +4753,7 @@ function processRequestInput() {
($tmp['fixedIP'] == $return['ipaddr'] && $return['ipaddr'] == '' &&
$tmp['fixedMAC'] == $return['macaddr'] && $return['macaddr'] == '')))
$return['profileid'] = 0;
- }
+ }*/
# admingroupid
$usergroups = getUserGroups();
Modified: vcl/trunk/web/.ht-inc/utils.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1787071&r1=1787070&r2=1787071&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Wed Mar 15 16:21:07 2017
@@ -197,7 +197,7 @@ function initGlobals() {
if($mode == 'xmlrpccall' || $mode == 'xmlrpcaffiliations') {
require_once(".ht-inc/xmlrpcWrappers.php");
require_once(".ht-inc/requests.php");
- require_once(".ht-inc/serverprofiles.php");
+ #require_once(".ht-inc/serverprofiles.php");
require_once(".ht-inc/groups.php");
setupSession();
}
@@ -308,10 +308,10 @@ function initGlobals() {
case 'storebackend':
require_once(".ht-inc/storebackend.php");
break;
- case 'serverProfiles':
+ /*case 'serverProfiles':
require_once(".ht-inc/serverprofiles.php");
require_once(".ht-inc/requests.php");
- break;
+ break;*/
case 'oneClicks':
require_once(".ht-inc/oneclick.php");
break;
@@ -521,7 +521,7 @@ function checkAccess() {
$mode = "main";
$actionFunction = "main";
return;
- }
+ }
else {
if(! $inContinuation) {
# check that user has access to this area
@@ -533,14 +533,14 @@ function checkAccess() {
return;
}
break;
- case 'serverProfiles':
+ /*case 'serverProfiles':
if(! in_array("serverProfileAdmin", $user["privileges"]) &&
! in_array("serverCheckOut", $user["privileges"])) {
$mode = "";
$actionFunction = "main";
return;
}
- break;
+ break;*/
case 'pickTimeTable':
$computermetadata = getUserComputerMetaData();
if(! count($computermetadata["platforms"]) ||
@@ -1427,7 +1427,7 @@ function getImages($includedeleted=0, $i
/// \brief gets information about server profiles
///
////////////////////////////////////////////////////////////////////////////////
-function getServerProfiles($id=0) {
+/*function getServerProfiles($id=0) {
$key = getKey(array('getServerProfiles', $id));
if(isset($_SESSION['usersessiondata'][$key]))
return $_SESSION['usersessiondata'][$key];
@@ -1486,7 +1486,7 @@ function getServerProfiles($id=0) {
}
$_SESSION['usersessiondata'][$key] = $profiles;
return $profiles;
-}
+}*/
////////////////////////////////////////////////////////////////////////////////
///
@@ -1500,7 +1500,7 @@ function getServerProfiles($id=0) {
/// \brief builds an array of images that user has access to via server profiles
///
////////////////////////////////////////////////////////////////////////////////
-function getServerProfileImages($userid) {
+/*function getServerProfileImages($userid) {
$key = getKey(array('getServerProfileImages', $userid));
if(isset($_SESSION['usersessiondata'][$key]))
return $_SESSION['usersessiondata'][$key];
@@ -1524,7 +1524,7 @@ function getServerProfileImages($userid)
$profiles[$row['id']] = $row['image'];
$_SESSION['usersessiondata'][$key] = $profiles;
return $profiles;
-}
+}*/
////////////////////////////////////////////////////////////////////////////////
///
@@ -3981,6 +3981,7 @@ function getOverallUserPrivs($userid) {
. "FROM userprivtype t, "
. "userpriv u "
. "WHERE u.userprivtypeid = t.id AND "
+ . "t.name NOT IN ('configAdmin', 'serverProfileAdmin') AND "
. "(u.userid = $userid OR "
. "u.usergroupid IN (SELECT usergroupid "
. "FROM usergroupmembers "
@@ -10246,7 +10247,7 @@ function getTypes($subtype="both") {
$types = array("users" => array(),
"resources" => array());
if($subtype == "users" || $subtype == "both") {
- $query = "SELECT id, name FROM userprivtype";
+ $query = "SELECT id, name FROM userprivtype WHERE name NOT IN ('configAdmin', 'serverProfileAdmin')";
$qh = doQuery($query, 365);
while($row = mysql_fetch_assoc($qh)) {
if($row["name"] == "block" || $row["name"] == "cascade")
@@ -12780,12 +12781,12 @@ function getNavMenuData($homeurl=HOMEURL
$menudata['managementnode']['selected'] = checkMenuItemSelected('managementnode');
}
- if(in_array("serverProfileAdmin", $user["privileges"]) ||
+ /*if(in_array("serverProfileAdmin", $user["privileges"]) ||
in_array("serverCheckOut", $user["privileges"])) {
$menudata['serverProfiles']['url'] = BASEURL . SCRIPT . "?mode=serverProfiles";
$menudata['serverProfiles']['title'] = i('Server Profiles');
$menudata['serverProfiles']['selected'] = checkMenuItemSelected('serverProfiles');
- }
+ }*/
if(count($computermetadata["platforms"]) &&
count($computermetadata["schedules"])) {
@@ -13113,7 +13114,7 @@ function getDojoHTML($refresh) {
'dojox.grid.DataGrid',
'dijit.form.Button');
break;
- case 'serverProfiles':
+ /*case 'serverProfiles':
$filename = 'vclServerProfiles.js';
$dojoRequires = array('dojo.parser',
'dijit.Dialog',
@@ -13128,7 +13129,7 @@ function getDojoHTML($refresh) {
'dijit.layout.TabContainer',
'dojox.string.sprintf',
'dojo.data.ItemFileWriteStore');
- break;
+ break;*/
case 'editVMInfo':
$filename = 'vclVirtualHosts.js';
$dojoRequires = array('dojo.parser',
@@ -13263,8 +13264,8 @@ function getDojoHTML($refresh) {
$rt .= " testJS();\n";
$rt .= " document.onmousemove = updateMouseXY;\n";
$rt .= " showScriptOnly();\n";
- $cont = addContinuationsEntry('AJserverProfileStoreData', array(), 120, 1, 0);
- $rt .= " populateProfileStore('$cont');\n";
+ /*$cont = addContinuationsEntry('AJserverProfileStoreData', array(), 120, 1, 0);
+ $rt .= " populateProfileStore('$cont');\n";*/
$rt .= " });\n";
if($refresh)
$rt .= " refresh_timer = setTimeout(resRefresh, 12000);\n";
@@ -13487,7 +13488,7 @@ function getDojoHTML($refresh) {
$rt .= "<script type=\"text/javascript\" src=\"js/$jsfile?v=$v\"></script>\n";
return $rt;
- case "serverProfiles":
+ /*case "serverProfiles":
$rt .= "<style type=\"text/css\">\n";
$rt .= " @import \"themes/$skin/css/dojo/$skin.css\";\n";
$rt .= "</style>\n";
@@ -13506,7 +13507,7 @@ function getDojoHTML($refresh) {
$rt .= " });\n";
$rt .= " dojo.addOnLoad(getProfiles);\n";
$rt .= "</script>\n";
- return $rt;
+ return $rt;*/
case 'selectauth':
$rt .= "<script type=\"text/javascript\" src=\"dojo/dojo/dojo.js\"></script>\n";
Modified: vcl/trunk/web/.ht-inc/xmlrpcWrappers.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/xmlrpcWrappers.php?rev=1787071&r1=1787070&r2=1787071&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/xmlrpcWrappers.php (original)
+++ vcl/trunk/web/.ht-inc/xmlrpcWrappers.php Wed Mar 15 16:21:07 2017
@@ -417,9 +417,9 @@ function XMLRPCdeployServer($imageid, $s
$imageid = processInputData($imageid, ARG_NUMERIC);
$resources = getUserResources(array("imageAdmin", "imageCheckOut"));
$images = removeNoCheckout($resources["image"]);
- $extraimages = getServerProfileImages($user['id']);
- if(! array_key_exists($imageid, $images) &&
- ! array_key_exists($imageid, $extraimages)) {
+ #$extraimages = getServerProfileImages($user['id']);
+ if(! array_key_exists($imageid, $images) /*&&
+ ! array_key_exists($imageid, $extraimages)*/) {
return array('status' => 'error',
'errorcode' => 3,
'errormsg' => "access denied to $imageid");
Modified: vcl/trunk/web/js/newresservercommon.js
URL: http://svn.apache.org/viewvc/vcl/trunk/web/js/newresservercommon.js?rev=1787071&r1=1787070&r2=1787071&view=diff
==============================================================================
--- vcl/trunk/web/js/newresservercommon.js (original)
+++ vcl/trunk/web/js/newresservercommon.js Wed Mar 15 16:21:07 2017
@@ -85,7 +85,7 @@ function int2bstr(a) {
return b;
}
-function populateProfileStore(cont) {
+/*function populateProfileStore(cont) {
if(typeof(offsetreloading) != 'undefined' && offsetreloading == 1)
return;
RPCwrapper({continuation: cont}, populateProfileStoreCB, 1);
@@ -171,4 +171,4 @@ function getServerProfileDataDeployCB(da
dijit.byId('deployrouter').set('disabled', true);
dijit.byId('deploydns').set('disabled', true);
}
-}
+}*/
Modified: vcl/trunk/web/js/requests.js
URL: http://svn.apache.org/viewvc/vcl/trunk/web/js/requests.js?rev=1787071&r1=1787070&r2=1787071&view=diff
==============================================================================
--- vcl/trunk/web/js/requests.js (original)
+++ vcl/trunk/web/js/requests.js Wed Mar 15 16:21:07 2017
@@ -28,11 +28,11 @@ var revisiongrids;
var waittimeobj;
var waittimeh;
-var profilesstoredata = {
+/*var profilesstoredata = {
identifier: 'id',
label: 'name',
items: []
-}
+}*/
function generalReqCB(data, ioArgs) {
eval(data);
@@ -92,7 +92,7 @@ function resetNewResDlg() {
setLastImage();
dojo.byId('basicrdo').checked = true;
selectResType();
- dijit.byId('deployprofileid').reset();
+ //dijit.byId('deployprofileid').reset();
if(dijit.byId('nousercheck'))
dijit.byId('nousercheck').reset();
dijit.byId('deployname').reset();
@@ -147,7 +147,7 @@ function selectResType() {
dojo.removeClass('limitstart', 'hidden');
dojo.removeClass('durationend', 'hidden');
dojo.addClass('whentitleserver', 'hidden');
- dojo.addClass('deployprofileslist', 'hidden');
+ //dojo.addClass('deployprofileslist', 'hidden');
dojo.addClass('nrnamespan', 'hidden');
dojo.addClass('nrservergroupspan', 'hidden');
//dojo.addClass('nrmacaddrspan', 'hidden');
@@ -217,10 +217,10 @@ function selectResType() {
dojo.addClass('limitstart', 'hidden');
dojo.addClass('durationend', 'hidden');
dojo.removeClass('whentitleserver', 'hidden');
- if(profilesstore._arrayOfAllItems.length != 0 &&
+ /*if(profilesstore._arrayOfAllItems.length != 0 &&
(profilesstore._arrayOfAllItems.length != 1 ||
profilesstore._arrayOfAllItems[0].name != _('(New Profile)')))
- dojo.removeClass('deployprofileslist', 'hidden');
+ dojo.removeClass('deployprofileslist', 'hidden');*/
dojo.removeClass('nrnamespan', 'hidden');
dojo.removeClass('nrservergroupspan', 'hidden');
//dojo.removeClass('nrmacaddrspan', 'hidden');
@@ -487,7 +487,7 @@ function getDeployData(waitonly) {
data.nousercheck = 1;
else
data.nousercheck = 0;
- data.profileid = dojo.byId('appliedprofileid').value;
+ //data.profileid = dojo.byId('appliedprofileid').value;
data.name = dijit.byId('deployname').get('value');
data.admingroupid = getSelectValue('deployadmingroup');
data.logingroupid = getSelectValue('deploylogingroup');