claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Object constructors shouldn't require an id if passed a $oRow object. Gets rid of

Browse Source 
objectGetInstanceFromRow() since we can pass the row into the constructor instead.
This commit is contained in:
Alexander Nicolaysen Sørnes
2007-06-10 18:51:33 +00:00
committed by WineHQ
parent d0022decd4
commit f7b24fab9a
14 changed files with 411 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
include/application.php
View File

@@ -46,51 +46,51 @@ class Application {
function Application($iAppId = null, $oRow = null)
{
// we are working on an existing application
if(is_numeric($iAppId))
if(!$iAppId && !$oRow)
return;
if(!$oRow)
{
if(!$oRow)
{
/* fetch this applications information */
$sQuery = "SELECT *
FROM appFamily
WHERE appId = '?'";
if($hResult = query_parameters($sQuery, $iAppId))
$oRow = mysql_fetch_object($hResult);
}
/* fetch this applications information */
$sQuery = "SELECT *
FROM appFamily
WHERE appId = '?'";
if($hResult = query_parameters($sQuery, $iAppId))
$oRow = mysql_fetch_object($hResult);
}
if($oRow)
{
$this->iAppId = $iAppId;
$this->iVendorId = $oRow->vendorId;
$this->iCatId = $oRow->catId;
$this->iSubmitterId = $oRow->submitterId;
$this->sSubmitTime = $oRow->submitTime;
$this->sDate = $oRow->submitTime;
$this->sName = $oRow->appName;
$this->sKeywords = $oRow->keywords;
$this->sDescription = $oRow->description;
$this->sWebpage = $oRow->webPage;
$this->sQueued = $oRow->queued;
}
if($oRow)
{
$this->iAppId = $oRow->appId;
$this->iVendorId = $oRow->vendorId;
$this->iCatId = $oRow->catId;
$this->iSubmitterId = $oRow->submitterId;
$this->sSubmitTime = $oRow->submitTime;
$this->sDate = $oRow->submitTime;
$this->sName = $oRow->appName;
$this->sKeywords = $oRow->keywords;
$this->sDescription = $oRow->description;
$this->sWebpage = $oRow->webPage;
$this->sQueued = $oRow->queued;
}
/* fetch versions of this application, if there are any */
$this->aVersionsIds = array();
/* fetch versions of this application, if there are any */
$this->aVersionsIds = array();
/* only admins can view all versions */
//FIXME: it would be nice to move this permission into the user class as well as keep it generic
if($_SESSION['current']->hasPriv("admin"))
/* only admins can view all versions */
//FIXME: it would be nice to move this permission into the user class as well as keep it generic
if($_SESSION['current']->hasPriv("admin"))
{
$hResult = $this->_internal_retrieve_all_versions();
} else
{
$hResult = $this->_internal_retrieve_unqueued_versions();
}
if($hResult)
{
while($oRow = mysql_fetch_object($hResult))
{
$hResult = $this->_internal_retrieve_all_versions();
} else
{
$hResult = $this->_internal_retrieve_unqueued_versions();
}
if($hResult)
{
while($oRow = mysql_fetch_object($hResult))
{
$this->aVersionsIds[] = $oRow->versionId;
}
$this->aVersionsIds[] = $oRow->versionId;
}
}
}
@@ -847,11 +847,6 @@ class Application {
return $aCells;
}
function objectGetInstanceFromRow($oRow)
{
return new application($oRow->appId, $oRow);
}
function objectOutputTableRow($oObject, $sClass, $sEditLinkLabel)
{
$oUser = new user($this->iSubmitterId);