diff --git a/admin/adminMaintainerQueue.php b/admin/adminMaintainerQueue.php index 3592bf2..1ff1006 100644 --- a/admin/adminMaintainerQueue.php +++ b/admin/adminMaintainerQueue.php @@ -64,22 +64,22 @@ if ($aClean['sSub']) // Show the other maintainers of this application, if there are any echo 'Other maintainers of this app:',"\n"; - $foundMaintainers = false; + $bFoundMaintainers = false; - $firstDisplay = true; /* if false we need to fix up table rows appropriately */ + $bFirstDisplay = true; /* if false we need to fix up table rows appropriately */ $oVersion = new Version($oRow->versionId); - $other_users = $oVersion->getMaintainersUserIds(); - if($other_users) + $aOtherUsers = $oVersion->getMaintainersUserIds(); + if($aOtherUsers) { - $foundMaintainers = true; - while(list($index, $userIdValue) = each($other_users)) + $bFoundMaintainers = true; + while(list($index, $iUserId) = each($aOtherUsers)) { - $oUser = new User($userIdValue); - if($firstDisplay) + $oUser = new User($iUserId); + if($bFirstDisplay) { echo "".$oUser->sRealname."\n"; - $firstDisplay = false; + $bFirstDisplay = false; } else { echo "".$oUser->sRealname."\n"; @@ -87,17 +87,17 @@ if ($aClean['sSub']) } } - $other_users = getSuperMaintainersUserIdsFromAppId($oRow->appId); - if($other_users) + $aOtherUsers = getSuperMaintainersUserIdsFromAppId($oRow->appId); + if($aOtherUsers) { - $foundMaintainers = true; - while(list($index, $userIdValue) = each($other_users)) + $bFoundMaintainers = true; + while(list($index, $iUserId) = each($aOtherUsers)) { - $oUser = new User($userIdValue); - if($firstDisplay) + $oUser = new User($iUserId); + if($bFirstDisplay) { echo "".$oUser->sRealname."*\n"; - $firstDisplay = false; + $bFirstDisplay = false; } else { echo "".$oUser->sRealname."*\n"; @@ -105,7 +105,7 @@ if ($aClean['sSub']) } } - if(!$foundMaintainers) + if(!$bFoundMaintainers) { echo "No other maintainers\n"; } @@ -113,25 +113,25 @@ if ($aClean['sSub']) // Show which other apps the user maintains echo 'This user also maintains these apps:',"\n"; - $firstDisplay = true; + $bFirstDisplay = true; $oUser = new User($oRow->userId); - $other_apps = $oUser->getAppsMaintained(); - if($other_apps) + $aOtherApps = $oUser->getAppsMaintained(); + if($aOtherApps) { - while(list($index, list($appIdOther, $versionIdOther, $superMaintainerOther)) = each($other_apps)) + while(list($index, list($iAppIdOther, $iVersionIdOther, $bSuperMaintainerOther)) = each($aOtherApps)) { - $oApp = new Application($appIdOther); - $oVersion = new Version($versionIdOther); - if($firstDisplay) + $oApp = new Application($iAppIdOther); + $oVersion = new Version($iVersionIdOther); + if($bFirstDisplay) { - $firstDisplay = false; - if($superMaintainerOther) + $bFirstDisplay = false; + if($bSuperMaintainerOther) echo "".$oApp->sName."*\n"; else echo "".$oApp->sName." ".$oVersion->sName."\n"; } else { - if($superMaintainerOther) + if($bSuperMaintainerOther) echo "".$oApp->sName."*\n"; else echo "".$oApp->sName." ".$oVersion->sName."\n"; @@ -183,14 +183,14 @@ if ($aClean['sSub']) else if ($aClean['sAdd'] && $aClean['iQueueId']) { /* create a new user object for the maintainer */ - $maintainerUser = new User($oRow->userId); + $oMaintainerUser = new User($oRow->userId); /* add the user as a maintainer and return the statusMessage */ - $statusMessage = $maintainerUser->addAsMaintainer($oRow->appId, $oRow->versionId, + $sStatusMessage = $oMaintainerUser->addAsMaintainer($oRow->appId, $oRow->versionId, $oRow->superMaintainer, $aClean['iQueueId']); //done - addmsg("

$statusMessage

", 'green'); + addmsg("

$sStatusMessage

", 'green'); } else if (($aClean['sReject'] || ($aClean['sSub'] == 'sReject')) && $aClean['iQueueId']) { @@ -269,14 +269,14 @@ if ($aClean['sSub']) echo " Action\n"; echo "\n\n"; - $c = 1; + $iRowCount = 1; while($oRow = mysql_fetch_object($hResult)) { $oUser = new User($oRow->userId); $oApp = new Application($oRow->appId); $oVersion = new Version($oRow->versionId); - if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - echo "\n"; + if ($iRowCount % 2 == 1) { $sBGColor = 'color0'; } else { $sBGColor = 'color1'; } + echo "\n"; echo " ".print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))."  \n"; echo " ".$oApp->sName."\n"; @@ -293,7 +293,7 @@ if ($aClean['sSub']) echo " sEmail."\">".$oUser->sRealname."\n"; echo " [queueId\">answer]\n"; echo "\n\n"; - $c++; + $iRowCount++; } echo "\n\n"; echo html_frame_end(" ");