appData: Some cleanup in SQL code
This commit is contained in:
committed by
Chris Morgan
parent
31750b9de0
commit
6d9aa68e0e
@@ -214,7 +214,6 @@ class appData
|
|||||||
$sQueued = "false";
|
$sQueued = "false";
|
||||||
|
|
||||||
$sSelectType = "";
|
$sSelectType = "";
|
||||||
$sLimit = "";
|
|
||||||
|
|
||||||
if(($sQueued == "true" || $sQueued == "all") &&
|
if(($sQueued == "true" || $sQueued == "all") &&
|
||||||
!$_SESSION['current']->hasPriv("admin"))
|
!$_SESSION['current']->hasPriv("admin"))
|
||||||
@@ -280,17 +279,13 @@ class appData
|
|||||||
$sSelectType = " AND type = '?'";
|
$sSelectType = " AND type = '?'";
|
||||||
|
|
||||||
$sQuery = "(SELECT COUNT(DISTINCT appData.id) as count FROM appData,
|
$sQuery = "(SELECT COUNT(DISTINCT appData.id) as count FROM appData,
|
||||||
appFamily, appVersion WHERE
|
appFamily WHERE
|
||||||
appFamily.appId = appVersion.appId
|
|
||||||
AND
|
|
||||||
(
|
(
|
||||||
appData.appId = appFamily.appId
|
appData.appId = appFamily.appId
|
||||||
AND
|
AND
|
||||||
appData.versionId = '0'
|
appData.versionId = '0'
|
||||||
)
|
)
|
||||||
AND
|
AND
|
||||||
appVersion.queued = 'false'
|
|
||||||
AND
|
|
||||||
appFamily.queued = 'false'$sAppDataQueued$sSelectType) UNION
|
appFamily.queued = 'false'$sAppDataQueued$sSelectType) UNION
|
||||||
(
|
(
|
||||||
SELECT COUNT(DISTINCT appData.id) as count FROM appData,
|
SELECT COUNT(DISTINCT appData.id) as count FROM appData,
|
||||||
@@ -407,17 +402,13 @@ class appData
|
|||||||
$sQuery =
|
$sQuery =
|
||||||
"(
|
"(
|
||||||
SELECT DISTINCT appData.* FROM appData,
|
SELECT DISTINCT appData.* FROM appData,
|
||||||
appFamily, appVersion WHERE
|
appFamily WHERE
|
||||||
appFamily.appId = appVersion.appId
|
|
||||||
AND
|
|
||||||
(
|
(
|
||||||
appData.appId = appFamily.appId
|
appData.appId = appFamily.appId
|
||||||
AND
|
AND
|
||||||
appData.versionId = '0'
|
appData.versionId = '0'
|
||||||
)
|
)
|
||||||
AND
|
AND
|
||||||
appVersion.queued = 'false'
|
|
||||||
AND
|
|
||||||
appFamily.queued = 'false'
|
appFamily.queued = 'false'
|
||||||
AND
|
AND
|
||||||
appData.queued = '?'
|
appData.queued = '?'
|
||||||
|
|||||||
Reference in New Issue
Block a user