Use snake case for all package functions

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-04-05 15:13:01 +02:00
parent f461344211
commit d16f7cf712
6 changed files with 13 additions and 13 deletions

View file

@ -259,7 +259,7 @@ if ($uid):
}
/* Check if package name is blacklisted. */
if (!$base_id && pkgname_is_blacklisted($pi['pkgname']) && !canSubmitBlacklisted(account_from_sid($_COOKIE["AURSID"]))) {
if (!$base_id && pkgname_is_blacklisted($pi['pkgname']) && !can_submit_blacklisted(account_from_sid($_COOKIE["AURSID"]))) {
$error = __( "%s is on the package blacklist, please check if it's available in the official repos.", $pi['pkgname']);
break;
}
@ -387,7 +387,7 @@ html_header("Submit");
# give the visitor the default upload form
if (ini_get("file_uploads")):
$pkg_categories = pkgCategories();
$pkg_categories = pkg_categories();
?>
<?php if ($error): ?>

View file

@ -13,7 +13,7 @@ include_once("config.inc.php");
*
* @return bool True if the user can delete the comment, otherwise false
*/
function canDeleteComment($comment_id=0, $atype="", $uid=0) {
function can_delete_comment($comment_id=0, $atype="", $uid=0) {
if (!$uid) {
/* Unauthenticated users cannot delete anything. */
return false;
@ -49,7 +49,7 @@ function canDeleteComment($comment_id=0, $atype="", $uid=0) {
*
* @return bool True if the user can delete the comment, otherwise false
*/
function canDeleteCommentArray($comment, $atype="", $uid=0) {
function can_delete_comment_array($comment, $atype="", $uid=0) {
if (!$uid) {
/* Unauthenticated users cannot delete anything. */
return false;
@ -73,7 +73,7 @@ function canDeleteCommentArray($comment, $atype="", $uid=0) {
*
* @return bool True if the user can submit blacklisted packages, otherwise false
*/
function canSubmitBlacklisted($atype = "") {
function can_submit_blacklisted($atype = "") {
if ($atype == "Trusted User" || $atype == "Developer") {
/* Only TUs and developers can submit blacklisted packages. */
return true;
@ -90,7 +90,7 @@ function canSubmitBlacklisted($atype = "") {
*
* @return array All package categories
*/
function pkgCategories() {
function pkg_categories() {
$cats = array();
$dbh = DB::connect();
$q = "SELECT * FROM PackageCategories WHERE ID != 1 ";
@ -608,7 +608,7 @@ function pkg_search_page($SID="") {
*/
if ($SID)
$myuid = uid_from_sid($SID);
$cats = pkgCategories($dbh);
$cats = pkg_categories($dbh);
/* Sanitize paging variables. */
if (isset($_GET['O'])) {
@ -1455,7 +1455,7 @@ function pkg_delete_comment($atype) {
$dbh = DB::connect();
$uid = uid_from_sid($_COOKIE["AURSID"]);
if (canDeleteComment($comment_id, $atype, $uid)) {
if (can_delete_comment($comment_id, $atype, $uid)) {
$q = "UPDATE PackageComments ";
$q.= "SET DelUsersID = ".$uid." ";
$q.= "WHERE ID = ".intval($comment_id);
@ -1485,7 +1485,7 @@ function pkg_change_category($pid, $atype) {
}
$dbh = DB::connect();
$catArray = pkgCategories($dbh);
$catArray = pkg_categories($dbh);
if (!array_key_exists($category_id, $catArray)) {
return array(false, __("Invalid category ID."));
}

View file

@ -14,7 +14,7 @@ $count = package_comments_count($base_id);
$row['UserName'] = "<a href=\"" . get_user_uri($row['UserName']) . "\">{$row['UserName']}</a>";
endif; ?>
<h4>
<?php if (canDeleteCommentArray($row, $atype, $uid)): ?>
<?php if (can_delete_comment_array($row, $atype, $uid)): ?>
<form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>">
<fieldset style="display:inline;">
<input type="hidden" name="action" value="do_DeleteComment" />

View file

@ -4,7 +4,7 @@ $uid = uid_from_sid($SID);
$pkgid = intval($row['ID']);
$catarr = pkgCategories();
$catarr = pkg_categories();
$submitter = username_from_id($row["SubmitterUID"]);
$maintainer = username_from_id($row["MaintainerUID"]);

View file

@ -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 (pkgCategories() as $id => $cat): ?>
<?php foreach (pkg_categories() as $id => $cat): ?>
<?php if (isset($_REQUEST['C']) && $_REQUEST['C'] == $id): ?>
<option value="<?= $id ?>" selected="selected"><?= $cat; ?></option>
<?php else: ?>

View file

@ -4,7 +4,7 @@ $uid = uid_from_sid($SID);
$base_id = intval($row['ID']);
$catarr = pkgCategories();
$catarr = pkg_categories();
$submitter = username_from_id($row["SubmitterUID"]);
$maintainer = username_from_id($row["MaintainerUID"]);