Author: jfthomps
Date: Fri Mar 13 14:25:52 2009
New Revision: 753282
URL: http://svn.apache.org/viewvc?rev=753282&view=rev
Log:
VCL-88
computers.php:
modified submitReloadComputers and submitCompStateChange to use
'vclrel...@local' when calling getUserlistID instead of just 'vclreload'
statistics.php:
modified viewStatistics, getStatGraphDayData, getStatGraphHourData,
getStatGraphDayConUsersData, and getStatGraphConBladeUserData to use
'vclrel...@local' when calling getUserlistID instead of just 'vclreload'
vm.php:
modified AJvmFromHost and AJvmFromHostDelayed to use 'vclrel...@local' when
calling getUserlistID instead of just 'vclreload'
Modified:
incubator/vcl/trunk/web/.ht-inc/computers.php
incubator/vcl/trunk/web/.ht-inc/statistics.php
incubator/vcl/trunk/web/.ht-inc/vm.php
Modified: incubator/vcl/trunk/web/.ht-inc/computers.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/computers.php?rev=753282&r1=753281&r2=753282&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/computers.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/computers.php Fri Mar 13 14:25:52 2009
@@ -2316,7 +2316,7 @@
break;
}
}
- $vclreloadid = getUserlistID('vclreload');
+ $vclreloadid = getUserlistID('vclrel...@local');
$fails = array();
$passes = array();
foreach($reloadnow as $compid) {
@@ -2456,7 +2456,7 @@
$data['notes'] = mysql_escape_string($data['notes']);
$data["notes"] = $user["unityid"] . " " .
unixToDatetime(time()) . "@"
. $data["notes"];
- $vclreloadid = getUserlistID('vclreload');
+ $vclreloadid = getUserlistID('vclrel...@local');
// get semaphore lock
if(! semLock())
abort(3);
@@ -2630,7 +2630,7 @@
$start = unixToDatetime($start);
$end = unixToDatetime($end);
$imagerevisionid =
getProductionRevisionid($data['profiles'][$profileid]['imageid']);
- $vclreloadid = getUserlistID('vclreload');
+ $vclreloadid = getUserlistID('vclrel...@local');
simpleAddRequest($compid,
$data['profiles'][$profileid]['imageid'],
$imagerevisionid, $start,
$end, 21, $vclreloadid);
unset_by_val($compid, $changeasap);
Modified: incubator/vcl/trunk/web/.ht-inc/statistics.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/statistics.php?rev=753282&r1=753281&r2=753282&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/statistics.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/statistics.php Fri Mar 13 14:25:52 2009
@@ -183,7 +183,7 @@
print "<H3>Reservation information between $month1/$day1/$year1 and ";
print "$month2/$day2/$year2:\n";
print "</H3>\n";
- $reloadid = getUserlistID('vclreload');
+ $reloadid = getUserlistID('vclrel...@local');
$query = "SELECT l.userid, "
. "l.nowfuture, "
. "UNIX_TIMESTAMP(l.start) AS start, "
@@ -540,7 +540,7 @@
$data = array();
$data["points"] = array();
$data["labels"] = array();
- $reloadid = getUserlistID('vclreload');
+ $reloadid = getUserlistID('vclrel...@local');
for($i = $startunix; $i < $endunix; $i += SECINDAY) {
array_push($data["labels"], date('Y-m-d', $i));
$startdt = unixToDatetime($i);
@@ -651,7 +651,7 @@
$data["points"][$i] = 0;
}
- $reloadid = getUserlistID('vclreload');
+ $reloadid = getUserlistID('vclrel...@local');
if($affilid != 0) {
$query = "SELECT DATE_FORMAT(l.start, '%k') AS shour, "
. "DATE_FORMAT(l.start, '%i') AS smin, "
@@ -791,7 +791,7 @@
$data["points"] = array();
$data["labels"] = array();
- $reloadid = getUserlistID('vclreload');
+ $reloadid = getUserlistID('vclrel...@local');
for($daystart = $startunix; $daystart < $endunix; $daystart +=
SECINDAY) {
array_push($data["labels"], date('Y-m-d', $daystart));
$count = array();
@@ -927,7 +927,7 @@
$data["points"] = array();
$data["labels"] = array();
- $reloadid = getUserlistID('vclreload');
+ $reloadid = getUserlistID('vclrel...@local');
for($daystart = $startunix; $daystart < $endunix; $daystart +=
SECINDAY) {
array_push($data["labels"], date('Y-m-d', $daystart));
$count = array();
Modified: incubator/vcl/trunk/web/.ht-inc/vm.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/vm.php?rev=753282&r1=753281&r2=753282&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/vm.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/vm.php Fri Mar 13 14:25:52 2009
@@ -532,7 +532,7 @@
$vmids = explode(',', $vmlistids);
$rems = array();
$checks = array();
- $vclreloadid = getUserlistID('vclreload');
+ $vclreloadid = getUserlistID('vclrel...@local');
$start = getReloadStartTime();
$end = $start + SECINMONTH;
$start = unixToDatetime($start);
@@ -604,7 +604,7 @@
////////////////////////////////////////////////////////////////////////////////
function AJvmFromHostDelayed() {
$data = getContinuationVar();
- $vclreloadid = getUserlistID('vclreload');
+ $vclreloadid = getUserlistID('vclrel...@local');
foreach($data as $comp) {
$end = datetimeToUnix($comp['end2']) + SECINMONTH;
$end = unixToDatetime($end);
