remove all mysql_error() instances as errors are handled by query_appdb()

This commit is contained in:
Jonathan Ernst
2005-01-14 05:34:25 +00:00
committed by WineHQ
parent c233396669
commit caf91fded2
11 changed files with 16 additions and 90 deletions

View File

@@ -65,13 +65,6 @@ if($_REQUEST['sub'] == "Submit")
$statusMessage = "<p>Note added into the database</p>\n"; $statusMessage = "<p>Note added into the database</p>\n";
addmsg($statusMessage,Green); addmsg($statusMessage,Green);
} }
else
{
// error
addmsg($query,red);
$statusMessage = "<p><b>Database Error!<br>".mysql_error()."</b></p>\n";
addmsg($statusMessage,red);
}
redirect(apidb_fullurl("appview.php?appId=".$_REQUEST['appId'].$versionLink)); redirect(apidb_fullurl("appview.php?appId=".$_REQUEST['appId'].$versionLink));
exit; exit;
} }

View File

@@ -262,18 +262,11 @@ if ($_REQUEST['sub'])
else else
{ {
//error //error
$statusMessage = "<p><b>Database Error!<br>".mysql_error()."</b></p>\n"; $statusMessage = "<p><b>Note:</b> The application family was successfully added.</p>\n";
$statusMessage .= "<p><b>Note:</b> The application family was successfully added.</p>\n";
addmsg($statusMessage, "red"); addmsg($statusMessage, "red");
} }
} }
else
{
//error
$statusMessage = "<p><b>Database Error!<br>".mysql_error()."</b></p>\n";
addmsg($statusMessage, "red");
}
} }
else if ($_REQUEST['type'] == 'ver') else if ($_REQUEST['type'] == 'ver')
{ {
@@ -298,12 +291,6 @@ if ($_REQUEST['sub'])
$goodtogo = 1; $goodtogo = 1;
} }
else
{
//error
$statusMessage = "<p><b>Database Error!<br>".mysql_error()."</b></p>\n";
addmsg($statusMessage,"red");
}
} }
else else
{ {

View File

@@ -130,8 +130,6 @@ if(isset($_REQUEST['submit1']))
else else
{ {
//error //error
$statusMessage = "<p><b>Database Error!<br />".mysql_error()."</b></p>\n";
addmsg($statusMessage, "red");
redirect(apidb_fullurl("admin/editAppVersion.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); redirect(apidb_fullurl("admin/editAppVersion.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
} }

View File

@@ -29,16 +29,12 @@ if($cmd)
$result = query_appdb("DELETE FROM appBundle WHERE appId = $appId AND bundleId = $bundleId"); $result = query_appdb("DELETE FROM appBundle WHERE appId = $appId AND bundleId = $bundleId");
if($result) if($result)
addmsg("App deleted from bundle", "green"); addmsg("App deleted from bundle", "green");
else
addmsg("Failed: " . mysql_error(), "red");
} }
if($cmd == "add") if($cmd == "add")
{ {
$result = query_appdb("INSERT INTO appBundle VALUES ($bundleId, $appId)"); $result = query_appdb("INSERT INTO appBundle VALUES ($bundleId, $appId)");
if($result) if($result)
addmsg("App $appId added to Bundle $bundleId", "green"); addmsg("App $appId added to Bundle $bundleId", "green");
else
addmsg("Failed: " . mysql_error(), "red");
} }
redirectref(); redirectref();
exit; exit;

View File

@@ -81,27 +81,20 @@ class Application {
function deleteAppFamily($appId) function deleteAppFamily($appId)
{ {
$r = query_appdb("DELETE FROM appFamily WHERE appId = $appId"); $r = query_appdb("DELETE FROM appFamily WHERE appId = $appId", "Failed to delete appFamily $appId");
if($r) if($r)
{ {
$r = query_appdb("DELETE FROM appVersion WHERE appId = $appId"); $r = query_appdb("DELETE FROM appVersion WHERE appId = $appId", "Failed to delete appVersions");
if($r) if($r)
addmsg("Application and versions deleted", "green"); 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) function deleteAppVersion($versionId)
{ {
$r = query_appdb("DELETE FROM appVersion WHERE versionId = $versionId"); $r = query_appdb("DELETE FROM appVersion WHERE versionId = $versionId","Failed to delete appVersion $versionId");
if($r) if($r)
addmsg("Application Version $versionId deleted", "green"); addmsg("Application Version $versionId deleted", "green");
else
addmsg("Failed to delete appVersion $versionId: " . mysql_error(), "red");
} }
function lookupVersionName($appId, $versionId) function lookupVersionName($appId, $versionId)

View File

@@ -211,20 +211,15 @@ function make_cat_path($path, $appId = '', $versionId = '')
function deleteCategory($catId) function deleteCategory($catId)
{ {
$r = query_appdb("SELECT appId FROM appFamily WHERE catId = $catId"); $r = query_appdb("SELECT appId FROM appFamily WHERE catId = $catId","Failed to delete category $catId");
if($r) if($r)
{ {
while($ob = mysql_fetch_object($r)) while($ob = mysql_fetch_object($r))
deleteAppFamily($ob->appId); deleteAppFamily($ob->appId);
$r = query_appdb("DELETE FROM appCategory WHERE catId = $catId"); $r = query_appdb("DELETE FROM appCategory WHERE catId = $catId","Failed to delete category $catId");
if($r) if($r)
addmsg("Category $catId deleted", "green"); 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");
} }
} }

View File

@@ -126,8 +126,6 @@ class TableVE {
function edit($query) function edit($query)
{ {
$result = query_appdb($query); $result = query_appdb($query);
if(!$result)
echo "Oops: ".mysql_error()."<br>$query<br>\n";
$nrows = mysql_num_rows($result); $nrows = mysql_num_rows($result);
echo "<form method=post action='".$_SERVER['PHP_SELF']."'>\n"; echo "<form method=post action='".$_SERVER['PHP_SELF']."'>\n";
@@ -457,13 +455,7 @@ class TableVE {
$update .= " WHERE ".$this->get_id($table)." = $value"; $update .= " WHERE ".$this->get_id($table)." = $value";
if(!query_appdb($update)) if(query_appdb($update))
{
$thisError = "<p><font color=black><b>Query:</b>: $update</font></p>\n";
$thisError .= "<p><font color=red>".mysql_error()."</font></p>";
addmsg($thisError,"red");
}
else
{ {
addmsg("Database Operation Complete!","green"); addmsg("Database Operation Complete!","green");
} }

View File

@@ -79,7 +79,7 @@ class User {
"email = '$sEmail' AND ". "email = '$sEmail' AND ".
"password = password('$sPassword')"); "password = password('$sPassword')");
if(!$result) if(!$result)
return "Error: ".mysql_error(); return "A database error occured";
if(mysql_num_rows($result) == 0) if(mysql_num_rows($result) == 0)
return "Invalid e-mail or password"; return "Invalid e-mail or password";
@@ -122,11 +122,8 @@ class User {
$sFields = "({$aInsert['FIELDS']}, `password`, `stamp`, `created`)"; $sFields = "({$aInsert['FIELDS']}, `password`, `stamp`, `created`)";
$sValues = "({$aInsert['VALUES']}, password('".$sPassword."'), NOW(), NOW() )"; $sValues = "({$aInsert['VALUES']}, password('".$sPassword."'), NOW(), NOW() )";
if (!query_appdb("INSERT INTO user_list $sFields VALUES $sValues")) query_appdb("INSERT INTO user_list $sFields VALUES $sValues", "Error while creating a new user.");
{ $this->restore($sEmail, $sPassword);
return mysql_error();
}
return $this->restore($sEmail, $sPassword);
} }
@@ -176,7 +173,7 @@ class User {
$result = query_appdb("DELETE FROM user_list WHERE email = '$sEmail'"); $result = query_appdb("DELETE FROM user_list WHERE email = '$sEmail'");
if(!$result) if(!$result)
return mysql_error(); return "A database error occured";
if(mysql_affected_rows($result) == 0) if(mysql_affected_rows($result) == 0)
return "No such user."; return "No such user.";
return 0; return 0;

View File

@@ -38,19 +38,13 @@ if($confirmed)
} }
/* echo html_frame_start("Removing",400,"",0); /* echo html_frame_start("Removing",400,"",0);
*/ */
$result = query_appdb($query); if($result = query_appdb($query))
if($result)
{ {
if($superMaintainer) if($superMaintainer)
echo "You were removed as a supermaintainer of ".appIdToName($appId); echo "You were removed as a supermaintainer of ".appIdToName($appId);
else else
echo "You were removed as a maintainer of ".appIdToName($appId).versionIdToName($versionId); echo "You were removed as a maintainer of ".appIdToName($appId).versionIdToName($versionId);
} else
{
//error
echo "<p><b>Database Error!<br />".mysql_error()."</b></p>\n";
} }
} else } else
{ {
if($superMaintainer) if($superMaintainer)

View File

@@ -64,12 +64,6 @@ if($_REQUEST['cmd'])
addmsg("The image was successfully added into the database", "green"); addmsg("The image was successfully added into the database", "green");
redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
} }
else
{
//error
$statusMessage = "<p><b>Database Error!<br />".mysql_error()."</b></p>\n";
addmsg($statusMessage, "red");
}
} }
} }
} else // we are a normal user or an anonymous and submitted a screenshot } else // we are a normal user or an anonymous and submitted a screenshot
@@ -118,12 +112,6 @@ if($_REQUEST['cmd'])
addmsg("The image you submitted will be added to the database database after being reviewed", "green"); addmsg("The image you submitted will be added to the database database after being reviewed", "green");
redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
} }
else
{
//error
$statusMessage = "<p><b>Database Error!<br />".mysql_error()."</b></p>\n";
addmsg($statusMessage, "red");
}
} }
} }
} }
@@ -157,7 +145,6 @@ if($_REQUEST['cmd'])
redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
} else } else
{ {
addmsg("Failed to delete image: ".mysql_error(), "red");
redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
} }
} }

View File

@@ -161,9 +161,7 @@ if(strcasecmp($categoryId, "any") == 0)
ORDER BY count DESC LIMIT $topNumber"; ORDER BY count DESC LIMIT $topNumber";
} }
$result = query_appdb($sVoteQuery); if($result = query_appdb($sVoteQuery))
if($result)
{ {
echo html_frame_start("", "90%", '', 0); echo html_frame_start("", "90%", '', 0);
echo html_table_begin("width='100%' align=center"); echo html_table_begin("width='100%' align=center");
@@ -192,10 +190,6 @@ if($result)
echo "<center><a href='help/?topic=voting'>What does this screen mean?</a></center>\n"; echo "<center><a href='help/?topic=voting'>What does this screen mean?</a></center>\n";
} }
else
{
echo "Error: " . mysql_error();
}
apidb_footer(); apidb_footer();