? variable_cleanup.patch
Index: distributionView.php
===================================================================
RCS file: /opt/cvs-commit/appdb/distributionView.php,v
retrieving revision 1.11
diff -u -r1.11 distributionView.php
--- distributionView.php 29 Jun 2006 16:13:35 -0000 1.11
+++ distributionView.php 29 Jun 2006 19:13:56 -0000
@@ -55,10 +55,10 @@
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 "".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++;
}
Index: admin/adminAppQueue.php
===================================================================
RCS file: /opt/cvs-commit/appdb/admin/adminAppQueue.php,v
retrieving revision 1.59
diff -u -r1.59 adminAppQueue.php
--- admin/adminAppQueue.php 29 Jun 2006 16:13:36 -0000 1.59
+++ admin/adminAppQueue.php 29 Jun 2006 19:13:57 -0000
@@ -45,38 +45,38 @@
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 " ".html_ahref($ob->appName,"adminAppQueue.php?sub=duplicate&apptype=application&appId=".$currentAppId."&appIdMergeTo=".$ob->appId)." | \n";
- echo " $y->versions versions | \n";
+ echo " ".html_ahref($oRow->appName,"adminAppQueue.php?sub=duplicate&apptype=application&appId=".$currentAppId."&appIdMergeTo=".$oRow->appId)." | \n";
+ echo " $oVersionCount->versions versions | \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 " | ".$oVersion->sName." |
\n";
+ echo " | ".$oVersion->sName." |
\n";
}
$c++;
@@ -109,10 +109,10 @@
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 " ".html_ahref($oVersion->sName,"adminAppQueue.php?sub=movetest&apptype=version&versionId=".$icurrentVersionId."&versionIdMergeTo=".$oVersion->iVersionId)." | \n";
echo " ".util_trim_description($oVersion->sDescription)." | \n";
@@ -154,9 +154,9 @@
// 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')
Index: admin/adminCommentView.php
===================================================================
RCS file: /opt/cvs-commit/appdb/admin/adminCommentView.php,v
retrieving revision 1.12
diff -u -r1.12 adminCommentView.php
--- admin/adminCommentView.php 27 Jun 2006 19:16:27 -0000 1.12
+++ admin/adminCommentView.php 29 Jun 2006 19:13:57 -0000
@@ -62,15 +62,15 @@
$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 */
Index: admin/adminMaintainers.php
===================================================================
RCS file: /opt/cvs-commit/appdb/admin/adminMaintainers.php,v
retrieving revision 1.21
diff -u -r1.21 adminMaintainers.php
--- admin/adminMaintainers.php 29 Jun 2006 16:13:36 -0000 1.21
+++ admin/adminMaintainers.php 29 Jun 2006 19:13:57 -0000
@@ -69,14 +69,14 @@
$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 @@
echo "   | \n";
echo "
\n\n";
- $oldUserId = $ob->userId;
+ $oldUserId = $oRow->userId;
}
echo "\n";
- echo " ".print_date(mysqldatetime_to_unixtimestamp($ob->submitTime))." | \n";
+ echo " ".print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))." | \n";
echo " sEmail."\">".$oUser->sRealname." | \n";
- if($ob->superMaintainer)
+ if($oRow->superMaintainer)
{
- echo " ".Application::lookup_name($ob->appId)." | \n";
+ echo " ".Application::lookup_name($oRow->appId)." | \n";
echo " * | \n";
} else
{
- echo " ".Application::lookup_name($ob->appId)." | \n";
- echo " ".Version::lookup_name($ob->versionId)." | \n";
+ echo " ".Application::lookup_name($oRow->appId)." | \n";
+ echo " ".Version::lookup_name($oRow->versionId)." | \n";
}
- echo " [delete] | \n";
+ echo " [delete] | \n";
echo "
\n\n";
$c++;
}
Index: include/appdb.php
===================================================================
RCS file: /opt/cvs-commit/appdb/include/appdb.php,v
retrieving revision 1.6
diff -u -r1.6 appdb.php
--- include/appdb.php 27 Jun 2006 19:16:28 -0000 1.6
+++ include/appdb.php 29 Jun 2006 19:13:57 -0000
@@ -8,9 +8,9 @@
$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) ".
Index: include/application.php
===================================================================
RCS file: /opt/cvs-commit/appdb/include/application.php,v
retrieving revision 1.52
diff -u -r1.52 application.php
--- include/application.php 29 Jun 2006 16:13:36 -0000 1.52
+++ include/application.php 29 Jun 2006 19:13:58 -0000
@@ -573,9 +573,9 @@
if($result && mysql_num_rows($result) > 0)
{
echo " 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 " |
\n";
}
Index: include/category.php
===================================================================
RCS file: /opt/cvs-commit/appdb/include/category.php,v
retrieving revision 1.18
diff -u -r1.18 category.php
--- include/category.php 27 Jun 2006 19:16:28 -0000 1.18
+++ include/category.php 29 Jun 2006 19:13:58 -0000
@@ -161,20 +161,20 @@
*/
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 */
Index: include/session.php
===================================================================
RCS file: /opt/cvs-commit/appdb/include/session.php,v
retrieving revision 1.10
diff -u -r1.10 session.php
--- include/session.php 27 Jun 2006 19:16:28 -0000 1.10
+++ include/session.php 29 Jun 2006 19:13:58 -0000
@@ -68,8 +68,8 @@
{
$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
Index: include/testResults.php
===================================================================
RCS file: /opt/cvs-commit/appdb/include/testResults.php,v
retrieving revision 1.24
diff -u -r1.24 testResults.php
--- include/testResults.php 29 Jun 2006 15:54:29 -0000 1.24
+++ include/testResults.php 29 Jun 2006 19:13:59 -0000
@@ -681,8 +681,8 @@
$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;
}
Index: include/user.php
===================================================================
RCS file: /opt/cvs-commit/appdb/include/user.php,v
retrieving revision 1.71
diff -u -r1.71 user.php
--- include/user.php 29 Jun 2006 15:54:29 -0000 1.71
+++ include/user.php 29 Jun 2006 19:14:00 -0000
@@ -195,8 +195,8 @@
$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 @@
$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 @@
{
$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;
}
Index: include/version.php
===================================================================
RCS file: /opt/cvs-commit/appdb/include/version.php,v
retrieving revision 1.60
diff -u -r1.60 version.php
--- include/version.php 29 Jun 2006 16:13:36 -0000 1.60
+++ include/version.php 29 Jun 2006 19:14:00 -0000
@@ -667,9 +667,9 @@
if($result && mysql_num_rows($result) > 0)
{
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 " |
\n";
}