- use superglobals instead of registered parameter vars

- move functions to include/category.php, include/application.php
This commit is contained in:
Jonathan Ernst
2004-12-25 20:03:34 +00:00
committed by WineHQ
parent 65dad05ed7
commit 5cea0f68f3
3 changed files with 58 additions and 58 deletions

View File

@@ -1,8 +1,15 @@
<?php <?php
/****************************************************/
/* code to delete versions, families and categories */
/****************************************************/
/*
* application environment
*/
include("path.php"); include("path.php");
include(BASE."include/"."incl.php"); include(BASE."include/incl.php");
include(BASE."include/category.php");
include(BASE."include/application.php");
if(!loggedin() || !havepriv("admin")) if(!loggedin() || !havepriv("admin"))
@@ -11,7 +18,7 @@ if(!loggedin() || !havepriv("admin"))
exit; exit;
} }
if($confirmed != "yes") if($_REQUEST['confirmed'] != "yes")
{ {
// ask for confirmation // ask for confirmation
// could do some Real Damage if someone accidently hits the delete button on the main category :) // could do some Real Damage if someone accidently hits the delete button on the main category :)
@@ -21,57 +28,9 @@ if($confirmed != "yes")
errorpage("Not confirmed"); errorpage("Not confirmed");
} }
if($_REQUEST['what'])
function deleteCategory($catId)
{ {
$r = mysql_query("SELECT appId FROM appFamily WHERE catId = $catId"); switch($_REQUEST['what'])
if($r)
{
while($ob = mysql_fetch_object($r))
deleteAppFamily($ob->appId);
$r = mysql_query("DELETE FROM appCategory WHERE catId = $catId");
if($r)
addmsg("Category $catId deleted", "green");
else
addmsg("Failed to delete category $catId:".mysql_error(), "red");
}
else
{
addmsg("Failed to delete category $catId: ".mysql_error(), "red");
}
}
function deleteAppFamily($appId)
{
$r = mysql_query("DELETE FROM appFamily WHERE appId = $appId");
if($r)
{
$r = mysql_query("DELETE FROM appVersion WHERE appId = $appId");
if($r)
addmsg("Application and versions deleted", "green");
else
addmsg("Failed to delete appVersions: " . mysql_error(), "red");
}
else
addmsg("Failed to delete appFamily $appId: " . mysql_error(), "red");
}
function deleteAppVersion($versionId)
{
$r = mysql_query("DELETE FROM appVersion WHERE versionId = $versionId");
if($r)
addmsg("Application Version $versionId deleted", "green");
else
addmsg("Failed to delete appVersion $versionId: " . mysql_error(), "red");
}
if($what)
{
switch($what)
{ {
case "comment": case "comment":
// delete a comment // delete a comment
@@ -79,21 +38,19 @@ if($what)
break; break;
case "category": case "category":
// delete category and the apps in it // delete category and the apps in it
deleteCategory($catId); deleteCategory($_REQUEST['catId']);
break; break;
case "appFamily": case "appFamily":
// delete app family & all its versions // delete app family & all its versions
deleteAppFamily($appId); deleteAppFamily($_REQUEST['appId']);
break; break;
case "appVersion": case "appVersion":
// delete a version // delete a version
deleteAppVersion($versionId); deleteAppVersion($_REQUEST['versionId']);
break; break;
} }
//FIXME need to redirect to the page before the confirmation page //FIXME need to redirect to the page before the confirmation page
redirect(BASE."appbrowse.php"); redirect(BASE."appbrowse.php");
} }
?> ?>

View File

@@ -79,6 +79,31 @@ class Application {
} }
} }
function deleteAppFamily($appId)
{
$r = mysql_query("DELETE FROM appFamily WHERE appId = $appId");
if($r)
{
$r = mysql_query("DELETE FROM appVersion WHERE appId = $appId");
if($r)
addmsg("Application and versions deleted", "green");
else
addmsg("Failed to delete appVersions: " . mysql_error(), "red");
}
else
addmsg("Failed to delete appFamily $appId: " . mysql_error(), "red");
}
function deleteAppVersion($versionId)
{
$r = mysql_query("DELETE FROM appVersion WHERE versionId = $versionId");
if($r)
addmsg("Application Version $versionId deleted", "green");
else
addmsg("Failed to delete appVersion $versionId: " . mysql_error(), "red");
}
function lookupVersionName($appId, $versionId) function lookupVersionName($appId, $versionId)
{ {
$result = mysql_query("SELECT versionName FROM appVersion WHERE versionId = $versionId and appId = $appId"); $result = mysql_query("SELECT versionName FROM appVersion WHERE versionId = $versionId and appId = $appId");

View File

@@ -207,4 +207,22 @@ function make_cat_path($path)
return $str; return $str;
} }
function deleteCategory($catId)
{
$r = mysql_query("SELECT appId FROM appFamily WHERE catId = $catId");
if($r)
{
while($ob = mysql_fetch_object($r))
deleteAppFamily($ob->appId);
$r = mysql_query("DELETE FROM appCategory WHERE catId = $catId");
if($r)
addmsg("Category $catId deleted", "green");
else
addmsg("Failed to delete category $catId:".mysql_error(), "red");
} else
{
addmsg("Failed to delete category $catId: ".mysql_error(), "red");
}
}
?> ?>