Prefix package functions with pkg_/pkgbase_

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>

5 files changed, 13 insertions, 13 deletions

diff --git a/web/template/actions_form.php b/web/template/actions_form.php
index c5abbb3..a69e40d 100644
--- a/web/template/actions_form.php
+++ b/web/template/actions_form.php
@@ -6,13 +6,13 @@
 			<input type="hidden" name="ID" value="<?= $row['ID'] ?>" />
 			<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
 
-		<?php if (user_voted($uid, $row['ID'])): ?>
+		<?php if (pkgbase_user_voted($uid, $row['ID'])): ?>
 			<input type="submit" class="button" name="do_UnVote" value="<?= __("UnVote") ?>" />
 		<?php else: ?>
 			<input type="submit" class="button" name="do_Vote" value="<?= __("Vote") ?>" />
 		<?php endif; ?>
 
-		<?php if (user_notify($uid, $row['ID'])): ?>
+		<?php if (pkgbase_user_notify($uid, $row['ID'])): ?>
 			<input type="submit" class="button" name="do_UnNotify" value="<?= __("UnNotify") ?>" title="<?= __("No New Comment Notification") ?>" />
 		<?php else: ?>
 			<input type="submit" class="button" name="do_Notify" value="<?= __("Notify") ?>" title="<?= __("New Comment Notification") ?>" />
diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php
index d718118..ca4abc6 100644
--- a/web/template/pkg_comments.php
+++ b/web/template/pkg_comments.php
@@ -1,7 +1,7 @@
 <?php
 $uid = uid_from_sid($SID);
 $base_id = pkgbase_from_pkgid($row['ID']);
-$count = package_comments_count($base_id);
+$count = pkgbase_comments_count($base_id);
 ?>
 <div id="news">
 	<h3>
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index ed1b030..3eaeac7 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -4,7 +4,7 @@ $uid = uid_from_sid($SID);
 
 $pkgid = intval($row['ID']);
 
-$catarr = pkg_categories();
+$catarr = pkgbase_categories();
 
 $submitter = username_from_id($row["SubmitterUID"]);
 $maintainer = username_from_id($row["MaintainerUID"]);
@@ -22,11 +22,11 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($
 
 $urlpath = URL_DIR . substr($row['BaseName'], 0, 2) . "/" . $row['BaseName'];
 
-$deps = package_dependencies($row["ID"]);
-$requiredby = package_required($row["Name"]);
+$deps = pkg_dependencies($row["ID"]);
+$requiredby = pkg_required($row["Name"]);
 
 # $sources[0] = 'src';
-$sources = package_sources($row["ID"]);
+$sources = pkg_sources($row["ID"]);
 ?>
 <div id="pkgdetails" class="box">
 	<h2><?= __('Package Details') . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></h2>
@@ -54,7 +54,7 @@ $sources = package_sources($row["ID"]);
 					</form>
 				</li>
 				<?php endif; ?>
-				<?php if (user_voted($uid, $row['ID'])): ?>
+				<?php if (pkgbase_user_voted($uid, $row['ID'])): ?>
 				<li>
 					<form action="<?= get_pkgbase_uri($row['BaseName']) . 'unvote/'; ?>" method="post">
 						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
@@ -69,7 +69,7 @@ $sources = package_sources($row["ID"]);
 					</form>
 				</li>
 				<?php endif; ?>
-				<?php if (user_notify($uid, $row['ID'])): ?>
+				<?php if (pkgbase_user_notify($uid, $row['ID'])): ?>
 				<li>
 					<form action="<?= get_pkgbase_uri($row['BaseName']) . 'unnotify/'; ?>" method="post">
 						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index d004acc..7428250 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -47,7 +47,7 @@ $per_page = array(50, 100, 250);
 			<label for="id_category"><?= __("Category"); ?></label>
 			<select name='C' id="id_category">
 				<option value='0'><?= __("Any"); ?></option>
-				<?php foreach (pkg_categories() as $id => $cat): ?>
+				<?php foreach (pkgbase_categories() as $id => $cat): ?>
 				<?php if (isset($_REQUEST['C']) && $_REQUEST['C'] == $id): ?>
 				<option value="<?= $id ?>" selected="selected"><?= $cat; ?></option>
 				<?php else: ?>
diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php
index 20d75be..83b474c 100644
--- a/web/template/pkgbase_details.php
+++ b/web/template/pkgbase_details.php
@@ -4,7 +4,7 @@ $uid = uid_from_sid($SID);
 
 $base_id = intval($row['ID']);
 
-$catarr = pkg_categories();
+$catarr = pkgbase_categories();
 
 $submitter = username_from_id($row["SubmitterUID"]);
 $maintainer = username_from_id($row["MaintainerUID"]);
@@ -49,7 +49,7 @@ $pkgs = pkgbase_get_pkgnames($base_id);
 					</form>
 				</li>
 				<?php endif; ?>
-				<?php if (user_voted($uid, $row['ID'])): ?>
+				<?php if (pkgbase_user_voted($uid, $row['ID'])): ?>
 				<li>
 					<form action="<?= get_pkgbase_uri($row['Name']) . 'unvote/'; ?>" method="post">
 						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
@@ -64,7 +64,7 @@ $pkgs = pkgbase_get_pkgnames($base_id);
 					</form>
 				</li>
 				<?php endif; ?>
-				<?php if (user_notify($uid, $row['ID'])): ?>
+				<?php if (pkgbase_user_notify($uid, $row['ID'])): ?>
 				<li>
 					<form action="<?= get_pkgbase_uri($row['Name']) . 'unnotify/'; ?>" method="post">
 						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />