Rename get_pkg_id() to get_package_id() and get_pkg_internal_name() to get_package_internal_name(). Try to use more standard parameter names and simplify logic while here

2 files changed, 2 insertions, 2 deletions

diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php
index c88bb87..5a64227 100755
--- a/usr/local/www/diag_pkglogs.php
+++ b/usr/local/www/diag_pkglogs.php
@@ -78,7 +78,7 @@ if (!$apkg) { // If we aren't looking for a specific package, locate the first p
 		}
 	}
 } elseif ($apkg) {
-	$apkgid = get_pkg_id($apkg);
+	$apkgid = get_package_id($apkg);
 	if ($apkgid != -1) {
 		$pkgwithlogging = true;
 		$i = $apkgid;
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index 3552dab..7a9d717 100644
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -204,7 +204,7 @@ include("head.inc");
 			if(is_array($pkg_keys)) {
 				foreach($pkg_keys as $key):
 					$index = &$pkg_info[$key];
-					if(get_pkg_id($index['name']) >= 0 )
+					if(get_package_id($index['name']) >= 0 )
 						continue;
 
 					if (package_skip_tests($index,$requested_version))