external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unnecessary database connection parameter from all functions

Browse source 
All functions now have a database connection method that will use
the same database connection. This imitates the functionality of
passing a database connection as an argument and makes it redundant.

Signed-off-by: canyonknight <canyonknight@gmail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
canyonknight 2013-02-03 16:26:29 +00:00 • committed by Lukas Fleischer
parent 8e03e68d68
commit 8d6c872297
8 changed files with 132 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/html/home.php
View file

@ -80,7 +80,7 @@ $dbh = DB::connect();
<td class="pkg-name">
<?php
$userid = uid_from_sid($_COOKIE["AURSID"]);
user_table($userid, $dbh);
user_table($userid);
?>
</td>
</tr>
@ -100,10 +100,10 @@ $dbh = DB::connect();
</form>
</div>
<div id="pkg-updates" class="widget box">
<?php updates_table($dbh); ?>
<?php updates_table(); ?>
</div>
<div id="pkg-stats" class="widget box">
<?php general_stats_table($dbh); ?>
<?php general_stats_table(); ?>
</div>
</div>

4
web/html/logout.php
View file

@ -13,11 +13,11 @@ if (isset($_COOKIE["AURSID"])) {
if (!isset($dbh)) {
$dbh = DB::connect();
}
delete_session_id($_COOKIE["AURSID"], $dbh);
delete_session_id($_COOKIE["AURSID"]);
# setting expiration to 1 means '1 second after midnight January 1, 1970'
setcookie("AURSID", "", 1, "/", null, !empty($_SERVER['HTTPS']), true);
unset($_COOKIE['AURSID']);
clear_expired_sessions($dbh);
clear_expired_sessions();
}
header('Location: /');

22
web/html/pkgsubmit.php
View file

@ -357,9 +357,9 @@ if ($uid):
# Update the backend database
if (!$error) {
$dbh = DB::connect();
begin_atomic_commit($dbh);
begin_atomic_commit();
$pdata = pkgdetails_by_pkgname($new_pkgbuild['pkgname'], $dbh);
$pdata = pkgdetails_by_pkgname($new_pkgbuild['pkgname']);
# Check the category to use, "1" meaning "none" (or "keep category" for
# existing packages).
@ -380,8 +380,8 @@ if ($uid):
$packageID = $pdata["ID"];
# Flush out old data that will be replaced with new data
remove_pkg_deps($packageID, $dbh);
remove_pkg_sources($packageID, $dbh);
remove_pkg_deps($packageID);
remove_pkg_sources($packageID);
# If a new category was chosen, change it to that
if ($category_id > 1) {
@ -389,11 +389,11 @@ if ($uid):
}
# Update package data
update_pkgdetails($new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], $uid, $packageID, $dbh);
update_pkgdetails($new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], $uid, $packageID);
} else {
# This is a brand new package
new_pkgdetails($new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, $category_id, $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], $uid, $dbh);
$packageID = last_insert_id($dbh);
new_pkgdetails($new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, $category_id, $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], $uid);
$packageID = last_insert_id();
}
@ -410,7 +410,7 @@ if ($uid):
else if ($deppkgname == "#") {
break;
}
add_pkg_dep($packageID, $deppkgname, $depcondition, $dbh);
add_pkg_dep($packageID, $deppkgname, $depcondition);
}
}
@ -418,18 +418,18 @@ if ($uid):
if (!empty($new_pkgbuild['source'])) {
$sources = explode(" ", $new_pkgbuild['source']);
foreach ($sources as $src) {
add_pkg_src($packageID, $src, $dbh);
add_pkg_src($packageID, $src);
}
}
# If we just created this package, or it was an orphan and we
# auto-adopted, add submitting user to the notification list.
if (!$pdata || $pdata["MaintainerUID"] === NULL) {
pkg_notify(account_from_sid($_COOKIE["AURSID"], $dbh), array($packageID), true, $dbh);
pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($packageID), true);
}
# Entire package creation process is atomic
end_atomic_commit($dbh);
end_atomic_commit();
header('Location: ' . get_pkg_uri($pkg_name));
}