diff --git a/admin/adminAppDataQueue.php b/admin/adminAppDataQueue.php index 1f47143..37570ce 100644 --- a/admin/adminAppDataQueue.php +++ b/admin/adminAppDataQueue.php @@ -62,21 +62,21 @@ if (!$aClean['id']) echo "\n\n"; $c = 1; - while($ob = mysql_fetch_object($hResult)) + while($oRow = mysql_fetch_object($hResult)) { if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } echo "\n"; - echo "".print_date(mysqltimestamp_to_unixtimestamp($ob->submitTime))."\n"; - $oUser = new User($ob->submitterId); + echo "".print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))."\n"; + $oUser = new User($oRow->submitterId); echo ""; echo $oUser->sEmail ? "sEmail."\">":""; echo $oUser->sRealname; echo $oUser->sEmail ? "":""; echo "\n"; - echo "".Application::lookup_name($ob->appId)."\n"; - echo "".Version::lookup_name($ob->versionId)."\n"; - echo "".$ob->type."\n"; - echo "[process]\n"; + echo "".Application::lookup_name($oRow->appId)."\n"; + echo "".Version::lookup_name($oRow->versionId)."\n"; + echo "".$oRow->type."\n"; + echo "[process]\n"; echo "\n\n"; $c++; } diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php index c3e06b0..53c40be 100644 --- a/admin/adminAppQueue.php +++ b/admin/adminAppQueue.php @@ -45,38 +45,38 @@ function outputSearchTableForDuplicateFlagging($currentAppId, $hResult) echo "\n\n"; $c = 0; - while($ob = mysql_fetch_object($hResult)) + while($oRow = mysql_fetch_object($hResult)) { //skip if a NONAME - if ($ob->appName == "NONAME") { continue; } + if ($oRow->appName == "NONAME") { continue; } //set row color - $bgcolor = ($c % 2) ? 'color0' : 'color1'; + $sBgColor = ($c % 2) ? 'color0' : 'color1'; //count versions $query = query_parameters("SELECT count(*) as versions FROM appVersion WHERE ". "appId = '?' AND versionName != 'NONAME'", - $ob->appId); - $y = mysql_fetch_object($query); + $oRow->appId); + $oVersionCount = mysql_fetch_object($query); //display row - echo "\n"; + echo "\n"; /* map the merging of the current app to the app we are displaying in the table */ - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo "\n\n"; $c++; //set row color - $bgcolor = ($c % 2) ? 'color0' : 'color1'; + $sBgColor = ($c % 2) ? 'color0' : 'color1'; /* add the versions to the table */ - $oApp = new Application($ob->appId); + $oApp = new Application($oRow->appId); foreach($oApp->aVersionsIds as $iVersionId) { $oVersion = new Version($iVersionId); - echo "\n"; + echo "\n"; } $c++; @@ -109,10 +109,10 @@ function display_move_test_to_versions_table($aVersionsIds,$icurrentVersionId) if ($oVersion->sQueued == 'false') { // set row color - $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; + $sBgColor = ($c % 2 == 0) ? "color0" : "color1"; //display row - echo "\n"; + echo "\n"; echo " \n"; echo " \n"; @@ -154,9 +154,9 @@ if ($aClean['sub']) // if we are processing a queued application there MUST be an implicitly queued // version to go along with it. $hResult = query_parameters("SELECT versionId from appVersion where appId='?';", $aClean['appId']); - $oRow = mysql_fetch_object($hResult); + $oVersionRow = mysql_fetch_object($hResult); - $oVersion = new Version($oRow->versionId); + $oVersion = new Version($oVersionRow->versionId); } else if($aClean['apptype'] == 'version') diff --git a/admin/adminCommentView.php b/admin/adminCommentView.php index ce15aaf..32b077e 100644 --- a/admin/adminCommentView.php +++ b/admin/adminCommentView.php @@ -62,15 +62,15 @@ echo ""; $offset = (($currentPage-1) * $ItemsPerPage); $commentIds = query_parameters("SELECT commentId from appComments ORDER BY ". "appComments.time ASC LIMIT ?, ?", $offset, $ItemsPerPage); -while ($ob = mysql_fetch_object($commentIds)) +while ($oRow = mysql_fetch_object($commentIds)) { $sQuery = "SELECT from_unixtime(unix_timestamp(time), \"%W %M %D %Y, %k:%i\") as time, ". "commentId, parentId, versionId, userid, subject, body ". "FROM appComments WHERE commentId = '?'"; - $hResult = query_parameters($sQuery, $ob->commentId); + $hResult = query_parameters($sQuery, $oRow->commentId); /* call view_app_comment to display the comment */ - $comment_ob = mysql_fetch_object($hResult); - view_app_comment($comment_ob); + $oComment_row = mysql_fetch_object($hResult); + view_app_comment($oComment_row); } /* display page selection links */ diff --git a/admin/adminMaintainers.php b/admin/adminMaintainers.php index 87912b7..b58737b 100644 --- a/admin/adminMaintainers.php +++ b/admin/adminMaintainers.php @@ -69,14 +69,14 @@ if ($aClean['sub']) $c = 1; $oldUserId = 0; - while($ob = mysql_fetch_object($hResult)) + while($oRow = mysql_fetch_object($hResult)) { - $oUser = new User($ob->userId); + $oUser = new User($oRow->userId); if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } /* if this is a new user we should print a header that has the aggregate of the applications */ /* the user super maintains and versions they maintain */ - if($ob->userId != $oldUserId) + if($oRow->userId != $oldUserId) { $style = "border-top:thin solid;border-bottom:thin solid"; @@ -107,22 +107,22 @@ if ($aClean['sub']) echo " \n"; echo "\n\n"; - $oldUserId = $ob->userId; + $oldUserId = $oRow->userId; } echo "\n"; - echo " \n"; + echo " \n"; echo " \n"; - if($ob->superMaintainer) + if($oRow->superMaintainer) { - echo " \n"; + echo " \n"; echo " \n"; } else { - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; } - echo " \n"; + echo " \n"; echo "\n\n"; $c++; } diff --git a/distributionView.php b/distributionView.php index 39fe5ab..963a896 100644 --- a/distributionView.php +++ b/distributionView.php @@ -55,10 +55,10 @@ if(!$oDistribution->iDistributionId) echo "\n\n"; $c = 1; - while($ob = mysql_fetch_object($hResult)) + while($oRow = mysql_fetch_object($hResult)) { if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - $oDistribution = new distribution($ob->distributionId); + $oDistribution = new distribution($oRow->distributionId); echo "\n"; echo " \n"; diff --git a/include/appdb.php b/include/appdb.php index a4eecf5..532cb8c 100644 --- a/include/appdb.php +++ b/include/appdb.php @@ -8,9 +8,9 @@ function log_category_visit($catId) $REMOTE_ADDR, $catId); if($result && mysql_num_rows($result) == 1) { - $stats = mysql_fetch_object($result); + $oStatsRow = mysql_fetch_object($result); query_parameters("UPDATE catHitStats SET count = count + 1 WHERE catHitId = '?'", - $stats->catHitId); + $oStatsRow->catHitId); } else { query_parameters("INSERT INTO catHitStats (appHitId, time, ip, catId, count) ". diff --git a/include/application.php b/include/application.php index 99aef8d..8830185 100644 --- a/include/application.php +++ b/include/application.php @@ -573,9 +573,9 @@ class Application { if($result && mysql_num_rows($result) > 0) { echo " \n"; } diff --git a/include/category.php b/include/category.php index 8c54dac..dd04515 100644 --- a/include/category.php +++ b/include/category.php @@ -161,20 +161,20 @@ class Category { */ function getCategoryPath() { - $path = array(); + $aPath = array(); $iCatId = $this->iCatId; while($iCatId != 0) { - $result = query_parameters("SELECT catName, catId, catParent FROM appCategory WHERE catId = '?'", + $hResult = query_parameters("SELECT catName, catId, catParent FROM appCategory WHERE catId = '?'", $iCatId); - if(!$result || mysql_num_rows($result) != 1) + if(!$hResult || mysql_num_rows($hResult) != 1) break; - $cat = mysql_fetch_object($result); - $path[] = array($cat->catId, $cat->catName); - $iCatId = $cat->catParent; + $oCatRow = mysql_fetch_object($hResult); + $aPath[] = array($oCatRow->catId, $oCatRow->catName); + $iCatId = $oCatRow->catParent; } - $path[] = array(0, "ROOT"); - return array_reverse($path); + $aPath[] = array(0, "ROOT"); + return array_reverse($aPath); } /* return the total number of applications in this category */ diff --git a/include/session.php b/include/session.php index a887d59..b68843c 100644 --- a/include/session.php +++ b/include/session.php @@ -68,8 +68,8 @@ class session { $result = query_parameters("SELECT data FROM session_list WHERE session_id = '?'", $key); if (!$result) { return null; } - $r = mysql_fetch_object($result); - return $r->data; + $oRow = mysql_fetch_object($result); + return $oRow->data; } // write session to DB diff --git a/include/testResults.php b/include/testResults.php index 5b86288..01c6e63 100644 --- a/include/testResults.php +++ b/include/testResults.php @@ -681,8 +681,8 @@ function getNumberOfQueuedTests() $hResult = query_parameters($sQuery); if($hResult) { - $row = mysql_fetch_object($hResult); - return $row->num_tests; + $oRow = mysql_fetch_object($hResult); + return $oRow->num_tests; } return 0; } diff --git a/include/user.php b/include/user.php index 06f0e76..f61de98 100644 --- a/include/user.php +++ b/include/user.php @@ -195,8 +195,8 @@ class User { $this->iUserId, $sKey); if(!$hResult || mysql_num_rows($hResult) == 0) return $sDef; - $ob = mysql_fetch_object($hResult); - return $ob->value; + $oRow = mysql_fetch_object($hResult); + return $oRow->value; } @@ -290,8 +290,8 @@ class User { $hResult = query_parameters($sQuery, $this->iUserId, $bSuperMaintainer); if(!$hResult) return 0; - $ob = mysql_fetch_object($hResult); - return $ob->cnt; + $oRow = mysql_fetch_object($hResult); + return $oRow->cnt; } @@ -676,18 +676,18 @@ class User { { $hResult = query_parameters("SELECT count(userId) as c FROM appComments WHERE userId = '?'", $this->iUserId); - $ob = mysql_fetch_object($hResult); - if($ob->c != 0) return true; + $oRow = mysql_fetch_object($hResult); + if($oRow->c != 0) return true; $hResult = query_parameters("SELECT count(userId) as c FROM appMaintainers WHERE userId = '?'", $this->iUserId); - $ob = mysql_fetch_object($hResult); - if($ob->c != 0) return true; + $oRow = mysql_fetch_object($hResult); + if($oRow->c != 0) return true; $hResult = query_parameters("SELECT count(userId) as c FROM appVotes WHERE userId = '?'", $this->iUserId); - $ob = mysql_fetch_object($hResult); - if($ob->c != 0) return true; + $oRow = mysql_fetch_object($hResult); + if($oRow->c != 0) return true; return false; } diff --git a/include/version.php b/include/version.php index fe48b21..5d2438e 100644 --- a/include/version.php +++ b/include/version.php @@ -667,9 +667,9 @@ class Version { if($result && mysql_num_rows($result) > 0) { echo " \n"; } diff --git a/vendorview.php b/vendorview.php index a1d53cb..0e329a4 100644 --- a/vendorview.php +++ b/vendorview.php @@ -89,10 +89,10 @@ else echo '',"\n"; $c = 1; - while($ob = mysql_fetch_object($hResult)) + while($oRow = mysql_fetch_object($hResult)) { if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - $oVendor = new Vendor($ob->vendorId); + $oVendor = new Vendor($oRow->vendorId); echo '',"\n"; echo '',"\n"; echo '',"\n"; diff --git a/votestats.php b/votestats.php index 4d21e70..406f44b 100644 --- a/votestats.php +++ b/votestats.php @@ -65,17 +65,17 @@ if($catId != 0) do { - $catQuery = "SELECT appCategory.catName, appCategory.catParent ". + $sCatQuery = "SELECT appCategory.catName, appCategory.catParent ". "FROM appCategory WHERE appCategory.catId = '?'"; - $hResult = query_parameters($catQuery, $currentCatId); + $hResult = query_parameters($sCatQuery, $currentCatId); if($hResult) { - $row = mysql_fetch_object($hResult); - $catParent = $row->catParent; + $oRow = mysql_fetch_object($hResult); + $catParent = $oRow->catParent; array_push($cat_array, "$currentCatId"); - array_push($cat_name_array, "$row->catName"); + array_push($cat_name_array, "$oRow->catName"); } $currentCatId = $catParent;
".html_ahref($ob->appName,"adminAppQueue.php?sub=duplicate&apptype=application&appId=".$currentAppId."&appIdMergeTo=".$ob->appId)."$y->versions versions  ".html_ahref($oRow->appName,"adminAppQueue.php?sub=duplicate&apptype=application&appId=".$currentAppId."&appIdMergeTo=".$oRow->appId)."$oVersionCount->versions versions  
".$oVersion->sName."
".$oVersion->sName."
".html_ahref($oVersion->sName,"adminAppQueue.php?sub=movetest&apptype=version&versionId=".$icurrentVersionId."&versionIdMergeTo=".$oVersion->iVersionId)."".util_trim_description($oVersion->sDescription)." 
".print_date(mysqldatetime_to_unixtimestamp($ob->submitTime))."  ".print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))."  sEmail."\">".$oUser->sRealname."".Application::lookup_name($ob->appId)."".Application::lookup_name($oRow->appId)."*".Application::lookup_name($ob->appId)."".Version::lookup_name($ob->versionId)." ".Application::lookup_name($oRow->appId)."".Version::lookup_name($oRow->versionId)." [delete][delete]
iDistributionId."\">","\n"; echo $oDistribution->sName."
Links\n"; - while($ob = mysql_fetch_object($result)) + while($oRow = mysql_fetch_object($result)) { - echo " ".substr(stripslashes($ob->description),0,30)."
\n"; + echo " ".substr(stripslashes($oRow->description),0,30)."
\n"; } echo "
Links\n"; - while($ob = mysql_fetch_object($result)) + while($oRow = mysql_fetch_object($result)) { - echo " url\">".substr(stripslashes($ob->description),0,30)."
\n"; + echo " url\">".substr(stripslashes($oRow->description),0,30)."
\n"; } echo "
'.$oVendor->sName.''.substr($oVendor->sWebpage,0,30).'