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 2011/10/07 21:11:04 UTC
svn commit: r1180161 - in /incubator/vcl/trunk/web/.ht-inc:
authmethods/itecsauth.php authmethods/ldapauth.php computers.php groups.php
images.php managementnodes.php privileges.php schedules.php utils.php
Author: jfthomps
Date: Fri Oct 7 19:11:03 2011
New Revision: 1180161
URL: http://svn.apache.org/viewvc?rev=1180161&view=rev
Log:
VCL-474
recent versions of mysql don't accept double quotes to signify strings in where clauses
I think findManagementNode in utils.php was the only place where there was a query using double quotes instead of single ones. Updated that and changed many array key references in queries from double quotes to single quotes to make it easier to find places that were using double quotes in queries. Updated a few other array key references to use double quotes instead of single ones in functions that also had queries that were updates since I was already there.
Modified:
incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php
incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php
incubator/vcl/trunk/web/.ht-inc/computers.php
incubator/vcl/trunk/web/.ht-inc/groups.php
incubator/vcl/trunk/web/.ht-inc/images.php
incubator/vcl/trunk/web/.ht-inc/managementnodes.php
incubator/vcl/trunk/web/.ht-inc/privileges.php
incubator/vcl/trunk/web/.ht-inc/schedules.php
incubator/vcl/trunk/web/.ht-inc/utils.php
Modified: incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/authmethods/itecsauth.php Fri Oct 7 19:11:03 2011
@@ -184,7 +184,7 @@ function updateITECSUser($userid) {
. "affiliation af "
. "WHERE u.IMtypeid = i.id AND "
. "u.affiliationid = af.id AND "
- . "u.uid = " . $userData["uid"];
+ . "u.uid = {$userData['uid']}";
$qh = doQuery($query, 255);
// if get a row
// update db
@@ -205,7 +205,7 @@ function updateITECSUser($userid) {
. "lastname = '$last', "
. "email = '$email', "
. "lastupdated = '$now' "
- . "WHERE uid = " . $userData["uid"];
+ . "WHERE uid = {$userData['uid']}";
doQuery($query, 256, 'vcl', 1);
}
else {
Modified: incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php Fri Oct 7 19:11:03 2011
@@ -195,7 +195,7 @@ function updateLDAPUser($authtype, $user
. "af.id = $affilid AND ";
if(array_key_exists('numericid', $userData) &&
is_numeric($userData['numericid']))
- $query .= "u.uid = " . $userData["numericid"];
+ $query .= "u.uid = {$userData['numericid']}";
else {
$query .= "u.unityid = '$userid' AND "
. "u.affiliationid = $affilid";
@@ -218,7 +218,7 @@ function updateLDAPUser($authtype, $user
. "lastupdated = '$now' ";
if(array_key_exists('numericid', $userData) &&
is_numeric($userData['numericid']))
- $query .= "WHERE uid = " . $userData["numericid"];
+ $query .= "WHERE uid = {$userData['numericid']}";
else
$query .= "WHERE unityid = '$userid' AND "
. "affiliationid = $affilid";
Modified: incubator/vcl/trunk/web/.ht-inc/computers.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/computers.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/computers.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/computers.php Fri Oct 7 19:11:03 2011
@@ -1560,16 +1560,16 @@ function submitAddBulkComputers() {
$query .= "eth0macaddress, "
. "eth1macaddress, ";
$query .= "type) "
- . "VALUES ({$data["stateid"]}, "
+ . "VALUES ({$data['stateid']}, "
. "$ownerid, "
- . "{$data["platformid"]}, "
- . "{$data["provisioningid"]}, "
- . "{$data["scheduleid"]}, "
+ . "{$data['platformid']}, "
+ . "{$data['provisioningid']}, "
+ . "{$data['scheduleid']}, "
. "4, "
- . "{$data["ram"]}, "
- . "{$data["numprocs"]}, "
- . "{$data["procspeed"]}, "
- . "{$data["network"]}, "
+ . "{$data['ram']}, "
+ . "{$data['numprocs']}, "
+ . "{$data['procspeed']}, "
+ . "{$data['network']}, "
. "'$hostname', "
. "'$ipaddress', ";
if($dopr)
@@ -1577,7 +1577,7 @@ function submitAddBulkComputers() {
if($domacs)
$query .= "'$eth0', "
. "'$eth1', ";
- $query .= "'{$data["type"]}')";
+ $query .= "'{$data['type']}')";
$qh = doQuery($query, 235);
$addedrows += mysql_affected_rows($mysql_link_vcl);
$compid = dbLastInsertID();
@@ -3501,24 +3501,24 @@ function getCompIdList($groups) {
///
////////////////////////////////////////////////////////////////////////////////
function updateComputer($data) {
- $ownerid = getUserlistID($data["owner"]);
+ $ownerid = getUserlistID($data['owner']);
$query = "UPDATE computer "
- . "SET stateid = {$data["stateid"]}, "
+ . "SET stateid = {$data['stateid']}, "
. "ownerid = $ownerid, "
- . "platformid = {$data["platformid"]}, "
- . "scheduleid = {$data["scheduleid"]}, "
- . "RAM = {$data["ram"]}, "
- . "procnumber = {$data["numprocs"]}, "
- . "procspeed = {$data["procspeed"]}, "
- . "network = {$data["network"]}, "
- . "hostname = '{$data["hostname"]}', "
- . "IPaddress = '{$data["ipaddress"]}', "
- . "type = '{$data["type"]}', "
- . "provisioningid = {$data["provisioningid"]}, "
- . "notes = '{$data["notes"]}' "
- . "WHERE id = {$data["compid"]}";
+ . "platformid = {$data['platformid']}, "
+ . "scheduleid = {$data['scheduleid']}, "
+ . "RAM = {$data['ram']}, "
+ . "procnumber = {$data['numprocs']}, "
+ . "procspeed = {$data['procspeed']}, "
+ . "network = {$data['network']}, "
+ . "hostname = '{$data['hostname']}', "
+ . "IPaddress = '{$data['ipaddress']}', "
+ . "type = '{$data['type']}', "
+ . "provisioningid = {$data['provisioningid']}, "
+ . "notes = '{$data['notes']}' "
+ . "WHERE id = {$data['compid']}";
$qh = doQuery($query, 185);
- return mysql_affected_rows($GLOBALS["mysql_link_vcl"]);
+ return mysql_affected_rows($GLOBALS['mysql_link_vcl']);
}
////////////////////////////////////////////////////////////////////////////////
@@ -3534,7 +3534,7 @@ function updateComputer($data) {
////////////////////////////////////////////////////////////////////////////////
function addComputer($data) {
global $user;
- $ownerid = getUserlistID($data["owner"]);
+ $ownerid = getUserlistID($data['owner']);
if($data['stateid'] == 10) {
$now = unixToDatetime(time());
$notes = "'{$user['unityid']} $now@in maintenance state when added to database'";
@@ -3556,20 +3556,20 @@ function addComputer($data) {
. "type, "
. "notes, "
. "provisioningid) "
- . "VALUES ({$data["stateid"]}, "
+ . "VALUES ({$data['stateid']}, "
. "$ownerid, "
- . "{$data["platformid"]}, "
- . "{$data["scheduleid"]}, "
+ . "{$data['platformid']}, "
+ . "{$data['scheduleid']}, "
. "4, "
- . "{$data["ram"]}, "
- . "{$data["numprocs"]}, "
- . "{$data["procspeed"]}, "
- . "{$data["network"]}, "
- . "'{$data["hostname"]}', "
- . "'{$data["ipaddress"]}', "
- . "'{$data["type"]}', "
+ . "{$data['ram']}, "
+ . "{$data['numprocs']}, "
+ . "{$data['procspeed']}, "
+ . "{$data['network']}, "
+ . "'{$data['hostname']}', "
+ . "'{$data['ipaddress']}', "
+ . "'{$data['type']}', "
. "$notes, "
- . "'{$data["provisioningid"]}')";
+ . "'{$data['provisioningid']}')";
doQuery($query, 195);
$compid = dbLastInsertID();
@@ -3583,7 +3583,7 @@ function addComputer($data) {
// add computer into selected groups
$vals = array();
- foreach(array_keys($data["computergroup"]) as $groupid)
+ foreach(array_keys($data['computergroup']) as $groupid)
$vals[] = "($resid, $groupid)";
$allvals = implode(',', $vals);
$query = "INSERT INTO resourcegroupmembers "
Modified: incubator/vcl/trunk/web/.ht-inc/groups.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/groups.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/groups.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/groups.php Fri Oct 7 19:11:03 2011
@@ -737,30 +737,30 @@ function checkForGroupName($name, $type,
///
////////////////////////////////////////////////////////////////////////////////
function updateGroup($data) {
- if($data["type"] == "user") {
+ if($data['type'] == "user") {
if($data['editgroupid'] == 0)
$data['editgroupid'] = 'NULL';
- $ownerid = getUserlistID($data["owner"]);
+ $ownerid = getUserlistID($data['owner']);
$query = "UPDATE usergroup "
- . "SET name = '{$data["name"]}', "
+ . "SET name = '{$data['name']}', "
. "affiliationid = {$data['affiliationid']}, "
. "ownerid = $ownerid, "
- . "editusergroupid = {$data["editgroupid"]}, "
- . "initialmaxtime = {$data["initialmax"]}, "
- . "totalmaxtime = {$data["totalmax"]}, ";
+ . "editusergroupid = {$data['editgroupid']}, "
+ . "initialmaxtime = {$data['initialmax']}, "
+ . "totalmaxtime = {$data['totalmax']}, ";
if(checkUserHasPerm('Set Overlapping Reservation Count'))
- $query .= "overlapResCount = {$data["overlap"]}, ";
- $query .= "maxextendtime = {$data["maxextend"]} "
- . "WHERE id = {$data["groupid"]}";
+ $query .= "overlapResCount = {$data['overlap']}, ";
+ $query .= "maxextendtime = {$data['maxextend']} "
+ . "WHERE id = {$data['groupid']}";
}
else {
$query = "UPDATE resourcegroup "
- . "SET name = '{$data["name"]}', "
- . "ownerusergroupid = {$data["ownergroup"]} "
- . "WHERE id = {$data["groupid"]}";
+ . "SET name = '{$data['name']}', "
+ . "ownerusergroupid = {$data['ownergroup']} "
+ . "WHERE id = {$data['groupid']}";
}
$qh = doQuery($query, 300);
- return mysql_affected_rows($GLOBALS["mysql_link_vcl"]);
+ return mysql_affected_rows($GLOBALS['mysql_link_vcl']);
}
////////////////////////////////////////////////////////////////////////////////
@@ -777,7 +777,7 @@ function updateGroup($data) {
function addGroup($data) {
if($data['editgroupid'] == 0 || $data['edigroupid'] == '')
$data['editgroupid'] = 'NULL';
- if($data["type"] == "user") {
+ if($data['type'] == "user") {
if(! array_key_exists('custom', $data))
$data['custom'] = 1;
elseif($data['custom'] == 0) {
@@ -785,7 +785,7 @@ function addGroup($data) {
$data['editgroupid'] = 'NULL';
}
if($data['custom'])
- $ownerid = getUserlistID($data["owner"]);
+ $ownerid = getUserlistID($data['owner']);
$query = "INSERT INTO usergroup "
. "(name, "
. "affiliationid, "
@@ -797,29 +797,29 @@ function addGroup($data) {
if(checkUserHasPerm('Set Overlapping Reservation Count'))
$query .= "overlapResCount, ";
$query .= "maxextendtime) "
- . "VALUES ('{$data["name"]}', "
- . "{$data["affiliationid"]}, "
+ . "VALUES ('{$data['name']}', "
+ . "{$data['affiliationid']}, "
. "$ownerid, "
- . "{$data["editgroupid"]}, "
+ . "{$data['editgroupid']}, "
. "{$data['custom']}, "
- . "{$data["initialmax"]}, "
- . "{$data["totalmax"]}, ";
+ . "{$data['initialmax']}, "
+ . "{$data['totalmax']}, ";
if(checkUserHasPerm('Set Overlapping Reservation Count'))
- $query .= "{$data["overlap"]}, ";
- $query .= "{$data["maxextend"]})";
+ $query .= "{$data['overlap']}, ";
+ $query .= "{$data['maxextend']})";
}
else {
$query = "INSERT INTO resourcegroup "
. "(name, "
. "ownerusergroupid, "
. "resourcetypeid) "
- . "VALUES ('" . $data["name"] . "', "
- . $data["ownergroup"] . ", "
- . "'" . $data["resourcetypeid"] . "')";
+ . "VALUES ('{$data['name']}', "
+ . "{$data['ownergroup']}, "
+ . "'{$data['resourcetypeid']}')";
}
$qh = doQuery($query, 305);
clearPrivCache();
- return mysql_affected_rows($GLOBALS["mysql_link_vcl"]);
+ return mysql_affected_rows($GLOBALS['mysql_link_vcl']);
}
////////////////////////////////////////////////////////////////////////////////
Modified: incubator/vcl/trunk/web/.ht-inc/images.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/images.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/images.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/images.php Fri Oct 7 19:11:03 2011
@@ -3119,34 +3119,34 @@ function checkForImageName($name, $longs
///
////////////////////////////////////////////////////////////////////////////////
function updateImage($data) {
- $imgdata = getImages(0, $data["imageid"]);
+ $imgdata = getImages(0, $data['imageid']);
$imagenotes = getImageNotes($data['imageid']);
- $ownerid = getUserlistID($data["owner"]);
+ $ownerid = getUserlistID($data['owner']);
if(empty($data['maxconcurrent']) || ! is_numeric($data['maxconcurrent']))
$data['maxconcurrent'] = 'NULL';
$query = "UPDATE image "
- . "SET prettyname = '{$data["prettyname"]}', "
+ . "SET prettyname = '{$data['prettyname']}', "
. "ownerid = $ownerid, "
- . "minram = {$data["minram"]}, "
- . "minprocnumber = {$data["minprocnumber"]}, "
- . "minprocspeed = {$data["minprocspeed"]}, "
- . "minnetwork = {$data["minnetwork"]}, "
- . "maxconcurrent = {$data["maxconcurrent"]}, "
- . "reloadtime = {$data["reloadtime"]}, "
- . "forcheckout = {$data["forcheckout"]}, "
- . "description = '{$data["description"]}', "
- . "`usage` = '{$data["usage"]}' "
- . "WHERE id = {$data["imageid"]}";
+ . "minram = {$data['minram']}, "
+ . "minprocnumber = {$data['minprocnumber']}, "
+ . "minprocspeed = {$data['minprocspeed']}, "
+ . "minnetwork = {$data['minnetwork']}, "
+ . "maxconcurrent = {$data['maxconcurrent']}, "
+ . "reloadtime = {$data['reloadtime']}, "
+ . "forcheckout = {$data['forcheckout']}, "
+ . "description = '{$data['description']}', "
+ . "`usage` = '{$data['usage']}' "
+ . "WHERE id = {$data['imageid']}";
$qh = doQuery($query, 200);
- $return = mysql_affected_rows($GLOBALS["mysql_link_vcl"]);
- if(empty($imgdata[$data["imageid"]]["imagemetaid"]) &&
- ($data["checkuser"] == 0 ||
+ $return = mysql_affected_rows($GLOBALS['mysql_link_vcl']);
+ if(empty($imgdata[$data['imageid']]['imagemetaid']) &&
+ ($data['checkuser'] == 0 ||
$data['rootaccess'] == 0)) {
$query = "INSERT INTO imagemeta "
. "(checkuser, "
. "rootaccess) "
- . "VALUES ({$data["checkuser"]}, "
- . "{$data["rootaccess"]})";
+ . "VALUES ({$data['checkuser']}, "
+ . "{$data['rootaccess']})";
doQuery($query, 101);
$qh = doQuery("SELECT LAST_INSERT_ID() FROM imagemeta", 101);
if(! $row = mysql_fetch_row($qh))
@@ -3154,16 +3154,16 @@ function updateImage($data) {
$imagemetaid = $row[0];
$query = "UPDATE image "
. "SET imagemetaid = $imagemetaid "
- . "WHERE id = {$data["imageid"]}";
+ . "WHERE id = {$data['imageid']}";
doQuery($query, 101);
}
- elseif(! empty($imgdata[$data["imageid"]]["imagemetaid"])) {
- if($data["checkuser"] != $imgdata[$data["imageid"]]["checkuser"] ||
- $data["rootaccess"] != $imgdata[$data["imageid"]]["rootaccess"]) {
+ elseif(! empty($imgdata[$data['imageid']]['imagemetaid'])) {
+ if($data['checkuser'] != $imgdata[$data['imageid']]['checkuser'] ||
+ $data['rootaccess'] != $imgdata[$data['imageid']]['rootaccess']) {
$query = "UPDATE imagemeta "
- . "SET checkuser = {$data["checkuser"]}, "
- . "rootaccess = {$data["rootaccess"]} "
- . "WHERE id = {$imgdata[$data["imageid"]]["imagemetaid"]}";
+ . "SET checkuser = {$data['checkuser']}, "
+ . "rootaccess = {$data['rootaccess']} "
+ . "WHERE id = {$imgdata[$data['imageid']]['imagemetaid']}";
doQuery($query, 101);
}
checkClearImageMeta($imgdata[$data['imageid']]['imagemetaid'], $data['imageid']);
@@ -3221,16 +3221,16 @@ function addImage($data) {
. "description, "
. "`usage`, "
. "basedoffrevisionid) "
- . "VALUES ('{$data["prettyname"]}', "
+ . "VALUES ('{$data['prettyname']}', "
. "$ownerid, "
- . "{$data["platformid"]}, "
- . "{$data["osid"]}, "
- . "{$data["minram"]}, "
- . "{$data["minprocnumber"]}, "
- . "{$data["minprocspeed"]}, "
- . "{$data["minnetwork"]}, "
- . "{$data["maxconcurrent"]}, "
- . "{$data["reloadtime"]}, "
+ . "{$data['platformid']}, "
+ . "{$data['osid']}, "
+ . "{$data['minram']}, "
+ . "{$data['minprocnumber']}, "
+ . "{$data['minprocspeed']}, "
+ . "{$data['minnetwork']}, "
+ . "{$data['maxconcurrent']}, "
+ . "{$data['reloadtime']}, "
. "1, "
. "'$arch', "
. "'{$data['description']}', "
@@ -3276,8 +3276,8 @@ function addImage($data) {
// create name from pretty name, os, and last insert id
$OSs = getOSList();
- $name = $OSs[$data["osid"]]["name"] . "-" .
- preg_replace('/\W/', '', $data["prettyname"]) . $imageid . "-v0";
+ $name = $OSs[$data['osid']]['name'] . "-" .
+ preg_replace('/\W/', '', $data['prettyname']) . $imageid . "-v0";
if($imagemetaid) {
$query = "UPDATE image "
. "SET name = '$name', "
Modified: incubator/vcl/trunk/web/.ht-inc/managementnodes.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/managementnodes.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/managementnodes.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/managementnodes.php Fri Oct 7 19:11:03 2011
@@ -1178,7 +1178,7 @@ function updateMgmtnode($data) {
$data['sharedmailbox'] = 'NULL';
else
$data['sharedmailbox'] = "'" . mysql_real_escape_string($data['sharedmailbox']) . "'";
- $ownerid = getUserlistID($data["owner"]);
+ $ownerid = getUserlistID($data['owner']);
$data['installpath'] = mysql_real_escape_string($data['installpath']);
$data['keys'] = mysql_real_escape_string($data['keys']);
$data['imagelibuser'] = mysql_real_escape_string($data['imagelibuser']);
@@ -1204,28 +1204,28 @@ function updateMgmtnode($data) {
$data['publicdnsserver'] = "'" . mysql_real_escape_string($data['publicdnsserver']) . "'";
}
$query = "UPDATE managementnode "
- . "SET hostname = '{$data["hostname"]}', "
- . "IPaddress = '{$data["IPaddress"]}', "
+ . "SET hostname = '{$data['hostname']}', "
+ . "IPaddress = '{$data['IPaddress']}', "
. "ownerid = $ownerid, "
- . "stateid = {$data["stateid"]}, "
- . "predictivemoduleid = {$data["premoduleid"]}, "
- . "checkininterval = {$data["checkininterval"]}, "
- . "installpath = '{$data["installpath"]}', "
- . "`keys` = {$data["keys"]}, "
- . "sshport = {$data["sshport"]}, "
- . "imagelibenable = {$data["imagelibenable"]}, "
- . "imagelibgroupid = {$data["imagelibgroupid"]}, "
- . "imagelibuser = {$data["imagelibuser"]}, "
- . "imagelibkey = {$data["imagelibkey"]}, "
- . "publicIPconfiguration = '{$data["publicIPconfig"]}', "
- . "publicSubnetMask = {$data["publicnetmask"]}, "
- . "publicDefaultGateway = {$data["publicgateway"]}, "
- . "publicDNSserver = {$data["publicdnsserver"]}, "
- . "sysadminEmailAddress = {$data["sysadminemail"]}, "
- . "sharedMailBox = {$data["sharedmailbox"]} "
- . "WHERE id = " . $data["mgmtnodeid"];
+ . "stateid = {$data['stateid']}, "
+ . "predictivemoduleid = {$data['premoduleid']}, "
+ . "checkininterval = {$data['checkininterval']}, "
+ . "installpath = '{$data['installpath']}', "
+ . "`keys` = {$data['keys']}, "
+ . "sshport = {$data['sshport']}, "
+ . "imagelibenable = {$data['imagelibenable']}, "
+ . "imagelibgroupid = {$data['imagelibgroupid']}, "
+ . "imagelibuser = {$data['imagelibuser']}, "
+ . "imagelibkey = {$data['imagelibkey']}, "
+ . "publicIPconfiguration = '{$data['publicIPconfig']}', "
+ . "publicSubnetMask = {$data['publicnetmask']}, "
+ . "publicDefaultGateway = {$data['publicgateway']}, "
+ . "publicDNSserver = {$data['publicdnsserver']}, "
+ . "sysadminEmailAddress = {$data['sysadminemail']}, "
+ . "sharedMailBox = {$data['sharedmailbox']} "
+ . "WHERE id = {$data['mgmtnodeid']}";
$qh = doQuery($query, 101);
- return mysql_affected_rows($GLOBALS["mysql_link_vcl"]);
+ return mysql_affected_rows($GLOBALS['mysql_link_vcl']);
}
////////////////////////////////////////////////////////////////////////////////
@@ -1293,25 +1293,25 @@ function addMgmtnode($data) {
. "publicDNSserver, "
. "sysadminEmailAddress, "
. "sharedMailBox) "
- . "VALUES ('{$data["hostname"]}', "
- . "'{$data["IPaddress"]}', "
+ . "VALUES ('{$data['hostname']}', "
+ . "'{$data['IPaddress']}', "
. "$ownerid, "
- . "{$data["stateid"]}, "
- . "{$data["checkininterval"]}, "
- . "'{$data["installpath"]}', "
- . "{$data["imagelibenable"]}, "
- . "{$data["imagelibgroupid"]}, "
- . "{$data["imagelibuser"]}, "
- . "{$data["imagelibkey"]}, "
- . "{$data["keys"]}, "
- . "{$data["premoduleid"]}, "
- . "{$data["sshport"]}, "
- . "'{$data["publicIPconfig"]}', "
- . "{$data["publicnetmask"]}, "
- . "{$data["publicgateway"]}, "
- . "{$data["publicdnsserver"]}, "
- . "{$data["sysadminemail"]}, "
- . "{$data["sharedmailbox"]})";
+ . "{$data['stateid']}, "
+ . "{$data['checkininterval']}, "
+ . "'{$data['installpath']}', "
+ . "{$data['imagelibenable']}, "
+ . "{$data['imagelibgroupid']}, "
+ . "{$data['imagelibuser']}, "
+ . "{$data['imagelibkey']}, "
+ . "{$data['keys']}, "
+ . "{$data['premoduleid']}, "
+ . "{$data['sshport']}, "
+ . "'{$data['publicIPconfig']}', "
+ . "{$data['publicnetmask']}, "
+ . "{$data['publicgateway']}, "
+ . "{$data['publicdnsserver']}, "
+ . "{$data['sysadminemail']}, "
+ . "{$data['sharedmailbox']})";
doQuery($query, 205);
// get last insert id
Modified: incubator/vcl/trunk/web/.ht-inc/privileges.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/privileges.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/privileges.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/privileges.php Fri Oct 7 19:11:03 2011
@@ -1354,7 +1354,7 @@ function userLookup() {
. "image i, "
. "computer c, "
. "sublog s "
- . "WHERE l.userid = {$userdata["id"]} AND "
+ . "WHERE l.userid = {$userdata['id']} AND "
. "s.logid = l.id AND "
. "i.id = s.imageid AND "
. "c.id = s.computerid "
Modified: incubator/vcl/trunk/web/.ht-inc/schedules.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/schedules.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/schedules.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/schedules.php Fri Oct 7 19:11:03 2011
@@ -693,13 +693,13 @@ function checkForScheduleName($name, $id
///
////////////////////////////////////////////////////////////////////////////////
function updateSchedule($data) {
- $ownerid = getUserlistID($data["owner"]);
+ $ownerid = getUserlistID($data['owner']);
$query = "UPDATE schedule "
- . "SET name = '" . $data["name"] . "', "
+ . "SET name = '{$data['name']}', "
. "ownerid = $ownerid "
- . "WHERE id = " . $data["scheduleid"];
+ . "WHERE id = {$data['scheduleid']}";
$qh = doQuery($query, 215);
- return mysql_affected_rows($GLOBALS["mysql_link_vcl"]);
+ return mysql_affected_rows($GLOBALS['mysql_link_vcl']);
}
////////////////////////////////////////////////////////////////////////////////
@@ -714,14 +714,14 @@ function updateSchedule($data) {
///
////////////////////////////////////////////////////////////////////////////////
function addSchedule($data) {
- $ownerid = getUserlistID($data["owner"]);
+ $ownerid = getUserlistID($data['owner']);
$query = "INSERT INTO schedule "
. "(name, "
. "ownerid) "
- . "VALUES ('" . $data["name"] . "', "
+ . "VALUES ('{$data['name']}', "
. "$ownerid)";
doQuery($query, 220);
- $affectedrows = mysql_affected_rows($GLOBALS["mysql_link_vcl"]);
+ $affectedrows = mysql_affected_rows($GLOBALS['mysql_link_vcl']);
$qh = doQuery("SELECT LAST_INSERT_ID() FROM schedule", 221);
if(! $row = mysql_fetch_row($qh)) {
@@ -731,7 +731,7 @@ function addSchedule($data) {
. "(resourcetypeid, "
. "subid) "
. "VALUES (15, "
- . $row[0] . ")";
+ . "{$row[0]})";
doQuery($query, 223);
return $row[0];
}
Modified: incubator/vcl/trunk/web/.ht-inc/utils.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/utils.php?rev=1180161&r1=1180160&r2=1180161&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/utils.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/utils.php Fri Oct 7 19:11:03 2011
@@ -4595,8 +4595,8 @@ function findManagementNode($compid, $st
. "request rq "
. "WHERE rs.managementnodeid IN ($inlist) AND "
. "rs.requestid = rq.id AND "
- . "rq.start > \"$start\" AND "
- . "rq.start < \"$end\" "
+ . "rq.start > '$start' AND "
+ . "rq.start < '$end' "
. "GROUP BY rs.managementnodeid "
. "ORDER BY count";
$qh = doQuery($query, 101);
@@ -4836,7 +4836,7 @@ function deleteRequest($request) {
$query = "UPDATE request "
. "SET stateid = 1, "
. "laststateid = 3 "
- . "WHERE id = " . $request["id"];
+ . "WHERE id = {$request['id']}";
}
# current: reserved, last: new OR
# current: pending, last: reserved
@@ -4845,7 +4845,7 @@ function deleteRequest($request) {
$query = "UPDATE request "
. "SET stateid = 1, "
. "laststateid = 3 "
- . "WHERE id = " . $request["id"];
+ . "WHERE id = {$request['id']}";
}
# current: inuse, last: reserved OR
# current: pending, last: inuse
@@ -4854,7 +4854,7 @@ function deleteRequest($request) {
$query = "UPDATE request "
. "SET stateid = 1, "
. "laststateid = 8 "
- . "WHERE id = " . $request["id"];
+ . "WHERE id = {$request['id']}";
}
# shouldn't happen, but if current: pending, set to deleted or
// if not current: pending, set laststate to current state and
@@ -4863,7 +4863,7 @@ function deleteRequest($request) {
if($request["stateid"] == 14) {
$query = "UPDATE request "
. "SET stateid = 1 "
- . "WHERE id = " . $request["id"];
+ . "WHERE id = {$request['id']}";
}
else {
# somehow a user submitted a deleteRequest where the current
@@ -4872,8 +4872,8 @@ function deleteRequest($request) {
$request["stateid"] = 1;
$query = "UPDATE request "
. "SET stateid = 1, "
- . "laststateid = " . $request["stateid"] . " "
- . "WHERE id = " . $request["id"];
+ . "laststateid = {$request['stateid']} "
+ . "WHERE id = {$request['id']}";
}
}
$qh = doQuery($query, 150);
@@ -4884,14 +4884,14 @@ function deleteRequest($request) {
}
if($request['serverrequest']) {
- $query = "DELETE FROM serverrequest WHERE requestid = {$request["id"]}";
+ $query = "DELETE FROM serverrequest WHERE requestid = {$request['id']}";
$qh = doQuery($query, 152);
}
- $query = "DELETE FROM request WHERE id = {$request["id"]}";
+ $query = "DELETE FROM request WHERE id = {$request['id']}";
$qh = doQuery($query, 153);
- $query = "DELETE FROM reservation WHERE requestid = {$request["id"]}";
+ $query = "DELETE FROM reservation WHERE requestid = {$request['id']}";
doQuery($query, 154);
addChangeLogEntry($request["logid"], NULL, NULL, NULL, NULL, "deleted");
@@ -4985,7 +4985,7 @@ function moveReservationsOffComputer($co
$query = "UPDATE reservation "
. "SET computerid = $newcompid, "
. "managementnodeid = $mgmtnodeid "
- . "WHERE id = {$res["id"]}";
+ . "WHERE id = {$res['id']}";
doQuery($query, 101);
# add changelog entry
addChangeLogEntry($res['logid'], NULL, NULL, NULL, $newcompid);
@@ -8202,7 +8202,7 @@ function addLogEntry($nowfuture, $start,
. "ending, "
. "imageid) "
. "VALUES "
- . "(" . $user["id"] . ", "
+ . "({$user['id']}, "
. "'$nowfuture', "
. "'$start', "
. "'$end', "
@@ -8871,8 +8871,8 @@ function timeToNextReservation($request)
$query = "SELECT rq.start "
. "FROM reservation rs, "
. "request rq "
- . "WHERE rs.computerid = {$res["computerid"]} AND "
- . "rq.start >= '{$request["end"]}' AND "
+ . "WHERE rs.computerid = {$res['computerid']} AND "
+ . "rq.start >= '{$request['end']}' AND "
. "rs.requestid = rq.id "
. "ORDER BY start "
. "LIMIT 1";