summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2014-06-30 08:49:46 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2014-06-30 08:49:46 +0200
commit74a82bb2fbee234173df44ef7ba5f5a17b809cf1 (patch)
tree7863c470821a1409dd50976fcdbb53192b52ef6c
parentdde0482d103d19dbfeb248052f043718f65241a0 (diff)
downloadaurweb-74a82bb2fbee234173df44ef7ba5f5a17b809cf1.tar.xz
Rename package request functions to pkgreq_*()
Since these functions now reside in a separate module, use the module name as function name prefix. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
-rw-r--r--web/html/pkgbase.php4
-rw-r--r--web/html/pkgreq.php2
-rw-r--r--web/lib/pkgbasefuncs.inc.php4
-rw-r--r--web/lib/pkgreqfuncs.inc.php6
4 files changed, 8 insertions, 8 deletions
diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php
index 0b0f6ef..6fdaf40 100644
--- a/web/html/pkgbase.php
+++ b/web/html/pkgbase.php
@@ -97,9 +97,9 @@ if (check_token()) {
} elseif (current_action("do_ChangeCategory")) {
list($ret, $output) = pkgbase_change_category($base_id, $atype);
} elseif (current_action("do_FileRequest")) {
- list($ret, $output) = pkgbase_file_request($ids, $_POST['type'], $_POST['merge_into'], $_POST['comments']);
+ list($ret, $output) = pkgreq_file($ids, $_POST['type'], $_POST['merge_into'], $_POST['comments']);
} elseif (current_action("do_CloseRequest")) {
- list($ret, $output) = pkgbase_close_request($_POST['reqid']);
+ list($ret, $output) = pkgreq_close($_POST['reqid']);
}
if (isset($_REQUEST['comment'])) {
diff --git a/web/html/pkgreq.php b/web/html/pkgreq.php
index 5d708fc..156645a 100644
--- a/web/html/pkgreq.php
+++ b/web/html/pkgreq.php
@@ -16,7 +16,7 @@ if (!isset($base_id)) {
exit();
}
- $results = pkgbase_request_list();
+ $results = pkgreq_list();
$total = count($results);
/* Sanitize paging variables. */
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index c597911..ec48314 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -540,7 +540,7 @@ function pkgbase_delete ($atype, $base_ids, $merge_base_id, $via) {
$dbh->exec($q);
if ($via) {
- pkgbase_close_request(intval($via));
+ pkgreq_close(intval($via));
}
return array(true, __("The selected packages have been deleted."));
@@ -598,7 +598,7 @@ function pkgbase_adopt ($atype, $base_ids, $action=true, $via) {
$dbh->exec($q);
if ($via) {
- pkgbase_close_request(intval($via));
+ pkgreq_close(intval($via));
}
if ($action) {
diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php
index 7ba596a..47758c3 100644
--- a/web/lib/pkgreqfuncs.inc.php
+++ b/web/lib/pkgreqfuncs.inc.php
@@ -7,7 +7,7 @@ include_once("pkgbasefuncs.inc.php");
*
* @return array List of pacakge requests with details
*/
-function pkgbase_request_list() {
+function pkgreq_list() {
$dbh = DB::connect();
$q = "SELECT PackageRequests.ID, ";
@@ -37,7 +37,7 @@ function pkgbase_request_list() {
*
* @return void
*/
-function pkgbase_file_request($ids, $type, $merge_into, $comments) {
+function pkgreq_file($ids, $type, $merge_into, $comments) {
global $AUR_LOCATION;
global $AUR_REQUEST_ML;
@@ -129,7 +129,7 @@ function pkgbase_file_request($ids, $type, $merge_into, $comments) {
*
* @return void
*/
-function pkgbase_close_request($id) {
+function pkgreq_close($id) {
global $AUR_LOCATION;
global $AUR_REQUEST_ML;