claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- renamed lookupVersionName and lookupAppName into lookup_version_name and lookup_app_name in respect to CODING_STANDARD

Browse Source 
- removed appIdToName($appId) and versionIdToName($appId) from category.php
- replaced every occurence of appIdToName and versionIdToName with lookup_app_name and lookup_version_name
This commit is contained in:
Jonathan Ernst
2005-02-04 02:59:05 +00:00
committed by WineHQ
parent 3ebdbc9af5
commit cfd1d1ac09
13 changed files with 47 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/adminAppQueue.php
View File

@@ -309,11 +309,11 @@ if ($_REQUEST['sub'])
//Send Status Email
if($_REQUEST['type'] == 'ver')
{
$sFullAppName = lookupAppName($_REQUEST['appParent'])." ".lookupVersionName($_REQUEST['appVersion']);
$sFullAppName = lookup_app_name($_REQUEST['appParent'])." ".lookup_version_name($_REQUEST['appVersion']);
$sUrl = APPDB_ROOT."appview.php?versionId=".$_REQUEST['appVersion'];
} else
{
$sFullAppName = lookupAppName($_REQUEST['appParent']);
$sFullAppName = lookup_app_name($_REQUEST['appParent']);
$sUrl = APPDB_ROOT."appview.php?appId=".$_REQUEST['appParent'];
}
$sSubject = $sFullAppName." has been added into the AppDB";
@@ -350,10 +350,10 @@ if ($_REQUEST['sub'])
//Send Status Email
if($_REQUEST['type'] == 'ver')
{
$sFullAppName = lookupAppName($_REQUEST['appParent'])." ".lookupVersionName($_REQUEST['appVersion']);
$sFullAppName = lookup_app_name($_REQUEST['appParent'])." ".lookup_version_name($_REQUEST['appVersion']);
} else
{
$sFullAppName = lookupAppName($_REQUEST['appParent']);
$sFullAppName = lookup_app_name($_REQUEST['appParent']);
}
$sSubject = $sFullAppName." has not been added into the AppDB";
if ($ob->queueEmail)

20
admin/adminMaintainerQueue.php
View File

@@ -115,15 +115,15 @@ if ($_REQUEST['sub'])
{
$firstDisplay = false;
if($superMaintainerOther)
echo "<td>".appIdToName($appIdOther)."*</td></tr>\n";
echo "<td>".lookup_app_name($appIdOther)."*</td></tr>\n";
else
echo "<td>".appIdToName($appIdOther).versionIdToName($versionIdOther)."</td></tr>\n";
echo "<td>".lookup_app_name($appIdOther).lookup_version_name($versionIdOther)."</td></tr>\n";
} else
{
if($superMaintainerOther)
echo "<td class=color0></td><td>".appIdToName($appIdOther)."*</td></tr>\n";
echo "<td class=color0></td><td>".lookup_app_name($appIdOther)."*</td></tr>\n";
else
echo "<td class=color0></td><td>".appIdToName($appIdOther).versionIdToName($versionIdOther)."</td></tr>\n";
echo "<td class=color0></td><td>".lookup_app_name($appIdOther).lookup_version_name($versionIdOther)."</td></tr>\n";
}
}
} else
@@ -133,11 +133,11 @@ if ($_REQUEST['sub'])
//app name
echo '<tr valign=top><td class=color0><b>App Name</b></td>',"\n";
echo "<td>".appIdToName($ob->appId)."</td></tr>\n";
echo "<td>".lookup_app_name($ob->appId)."</td></tr>\n";
//version
echo '<tr valign=top><td class=color0><b>App Version</b></td>',"\n";
echo "<td>".versionIdToName($ob->versionId)."</td></tr>\n";
echo "<td>".lookup_version_name($ob->versionId)."</td></tr>\n";
//maintainReason
echo '<tr valign=top><td class=color0><b>Maintainer request reason</b></td>',"\n";
@@ -188,7 +188,7 @@ if ($_REQUEST['sub'])
if ($sEmail)
{
$sSubject = "Application Maintainer Request Report";
$sMsg = "Your application to be the maintainer of ".appIdToName($ob->appId).versionIdToName($ob->versionId)." has been accepted. ";
$sMsg = "Your application to be the maintainer of ".lookup_app_name($ob->appId).lookup_version_name($ob->versionId)." has been accepted. ";
$sMsg .= $_REQUEST['replyText'];
$sMsg .= "We appreciate your help in making the Application Database better for all users.\n\n";
@@ -205,7 +205,7 @@ if ($_REQUEST['sub'])
if ($sEmail)
{
$sSubject = "Application Maintainer Request Report";
$sMsg = "Your application to be the maintainer of ".appIdToName($ob->appId).versionIdToName($ob->versionId)." was rejected. ";
$sMsg = "Your application to be the maintainer of ".lookup_app_name($ob->appId).lookup_version_name($ob->versionId)." was rejected. ";
$sMsg .= $_REQUEST['replyText'];
$sMsg .= "";
$sMsg .= "-The AppDB admins\n";
@@ -284,7 +284,7 @@ if ($_REQUEST['sub'])
echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." &nbsp;</td>\n";
echo " <td><a href='adminMaintainerQueue.php?sub=view&queueId=$ob->queueId'>$ob->queueId</a></td>\n";
echo " <td>".$oUser->sRealName."</td>\n";
echo " <td>".appIdToName($ob->appId)."</td>\n";
echo " <td>".lookup_app_name($ob->appId)."</td>\n";
if($ob->superMaintainer)
{
@@ -292,7 +292,7 @@ if ($_REQUEST['sub'])
echo "<td>Yes</td>\n";
} else
{
echo "<td>".versionIdToName($ob->versionId)." &nbsp;</td>\n";
echo "<td>".lookup_version_name($ob->versionId)." &nbsp;</td>\n";
echo "<td>No</td>\n";
}

8
admin/adminMaintainers.php
View File

@@ -76,13 +76,13 @@ if ($_REQUEST['sub'])
if($ob->superMaintainer)
{
echo " <td><a href='".BASE."appview.php?appId=$ob->appId'>".appIdToName($ob->appId)."</a></td>\n";
echo " <td>".versionIdToName($ob->versionId)."&nbsp;</td>\n";
echo " <td><a href='".BASE."appview.php?appId=$ob->appId'>".lookup_app_name($ob->appId)."</a></td>\n";
echo " <td>".lookup_version_name($ob->versionId)."&nbsp;</td>\n";
echo " <td>Yes</td>\n";
} else
{
echo " <td>".appIdToName($ob->appId)."</td>\n";
echo " <td><a href='".BASE."appview.php?appId=$ob->appId&versionId=$ob->versionId'>".versionIdToName($ob->versionId)."</a>&nbsp;</td>\n";
echo " <td>".lookup_app_name($ob->appId)."</td>\n";
echo " <td><a href='".BASE."appview.php?appId=$ob->appId&versionId=$ob->versionId'>".lookup_version_name($ob->versionId)."</a>&nbsp;</td>\n";
echo " <td>No</td>\n";
}
echo " <td>".$oUser->sEmail." &nbsp;</td>\n";

2
admin/editAppFamily.php
View File

@@ -106,7 +106,7 @@ if(isset($_REQUEST['submit']))
$sEmail = get_notify_email_address_list($_REQUEST['appId']);
if($sEmail)
{
$sSubject = lookupAppName($_REQUEST['appId'])." has been modified by ".$_SESSION['current']->sRealname;
$sSubject = lookup_app_name($_REQUEST['appId'])." has been modified by ".$_SESSION['current']->sRealname;
$sMsg .= APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."\n";
$sMsg .= "\n";
$sMsg .= "The following changes have been made:";

6
admin/editAppVersion.php
View File

@@ -89,7 +89,7 @@ if(isset($_REQUEST['submit1']))
$sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']);
if($sEmail)
{
$sSubject = lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['versionId'])." has been modified by".$_SESSION['current']->sRealname;
$sSubject = lookup_app_name($_REQUEST['appId'])." ".lookup_version_name($_REQUEST['versionId'])." has been modified by".$_SESSION['current']->sRealname;
$sMsg .= APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
$sMsg .= "\n";
$sMsg .= "The following changes have been made:";
@@ -180,7 +180,7 @@ if(isset($_REQUEST['submit1']))
$sEmail = get_notify_email_address_list($_REQUEST['appId']);
if($sEmail)
{
$sSubject = "Links for ".lookupAppName($_REQUEST['appId'])." ".lookupAppName($_REQUEST['versionId'])." have been updated by ".$_SESSION['current']->sRealname;
$sSubject = "Links for ".lookup_app_name($_REQUEST['appId'])." ".lookup_app_name($_REQUEST['versionId'])." have been updated by ".$_SESSION['current']->sRealname;
$sMsg = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."\n";
$sMsg .= "\n";
$sMsg .= "The following changes have been made:";
@@ -212,7 +212,7 @@ if(isset($_REQUEST['submit1']))
echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'");
echo '<input type="hidden" name="appId" value='.$_REQUEST['appId'].' />';
echo '<input type="hidden" name="versionId" value='.$_REQUEST['versionId'].' />';
echo '<tr><td class=color1>Name</td><td class=color0>'.lookupAppName($_REQUEST['appId']).'</td></tr>',"\n";
echo '<tr><td class=color1>Name</td><td class=color0>'.lookup_app_name($_REQUEST['appId']).'</td></tr>',"\n";
echo '<tr><td class=color4>Version</td><td class=color0><input size=80% type="text" name="versionName" type="text" value="'.$oRow->versionName.'" /></td></tr>',"\n";
echo '<tr><td class="color4">Version specific description</td><td class="color0">', "\n";
if(trim(strip_tags($oRow->description))=="")

6
include/application.php
View File

@@ -97,8 +97,9 @@ function deleteAppVersion($versionId)
addmsg("Application Version $versionId deleted", "green");
}
function lookupVersionName($versionId)
function lookup_version_name($versionId)
{
if(!$versionId) return null;
$result = query_appdb("SELECT versionName FROM appVersion WHERE versionId = $versionId");
if(!$result || mysql_num_rows($result) != 1)
return null;
@@ -107,8 +108,9 @@ function lookupVersionName($versionId)
}
function lookupAppName($appId)
function lookup_app_name($appId)
{
if(!$appId) return null;
$result = query_appdb("SELECT appName FROM appFamily WHERE appId = $appId");
if(!$result || mysql_num_rows($result) != 1)
return null;

24
include/category.php
View File

@@ -161,24 +161,6 @@ class Category {
};
function appIdToName($appId)
{
$result = query_appdb("SELECT appName FROM appFamily WHERE appId = $appId");
if(!$result || !mysql_num_rows($result))
return "<unknown>"; // shouldn't normally happen
$ob = mysql_fetch_object($result);
return $ob->appName;
}
function versionIdToName($versionId)
{
$result = query_appdb("SELECT versionName FROM appVersion WHERE versionId = $versionId");
if(!$result || !mysql_num_rows($result))
return "<unknown>"; // shouldn't normally happen
$ob = mysql_fetch_object($result);
return $ob->versionName;
}
/**
* create the Category: line at the top of appdb pages$
*/
@@ -202,12 +184,12 @@ function make_cat_path($path, $appId = '', $versionId = '')
{
if(!empty($versionId))
{
$str .= " &gt; ".html_ahref(appIdToName($appId),"appview.php?appId=$appId");
$str .= " &gt; ".versionIdToName($versionId);
$str .= " &gt; ".html_ahref(lookup_app_name($appId),"appview.php?appId=$appId");
$str .= " &gt; ".lookup_version_name($versionId);
}
else
{
$str .= " &gt; ".appIdToName($appId);
$str .= " &gt; ".lookup_app_name($appId);
}
}

4
include/comment.php
View File

@@ -76,7 +76,7 @@ class Comment {
}
if($sEmail)
{
$sSubject = "Comment for ".lookupAppName($this->iAppId)." ".lookupVersionName($this->iVersionId)." added by ".$_SESSION['current']->sRealname;
$sSubject = "Comment for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." added by ".$_SESSION['current']->sRealname;
$sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."&versionId=".$this->iVersionId."\n";
$sMsg .= "\n";
$sMsg .= "Subject: ".$this->sSubject."\r\n";
@@ -147,7 +147,7 @@ class Comment {
$sEmail .= $this->oOwner->sEmail;
if($sEmail)
{
$sSubject = "Comment for ".lookupAppName($this->iAppId)." ".lookupVersionName($this->iVersionId)." deleted by ".$_SESSION['current']->sRealname;
$sSubject = "Comment for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." deleted by ".$_SESSION['current']->sRealname;
$sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."&versionId=".$this->iVersionId."\n";
$sMsg .= "\n";
$sMsg .= "This comment was made on ".substr($this->sDateCreated,0,10)." by ".$this->oOwner->sRealname."\n";

4
include/note.php
View File

@@ -57,7 +57,7 @@ class Note {
$sEmail = get_notify_email_address_list($this->iAppId, $this->iVersionId);
if($sEmail)
{
$sSubject = "Note for ".lookupAppName($this->iAppId)." ".lookupVersionName($this->iVersionId)." added by ".$_SESSION['current']->sRealname;
$sSubject = "Note for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." added by ".$_SESSION['current']->sRealname;
$sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."&versionId=".$this->iVersionId."\n";
$sMsg .= "\n";
$sMsg .= "Title: ".$this->sTitle."\r\n";
@@ -119,7 +119,7 @@ class Note {
$sEmail = get_notify_email_address_list($this->iAppId, $this->iVersionId);
if($sEmail)
{
$sSubject = "Note for ".lookupAppName($this->iAppId)." ".lookupVersionName($this->iVersionId)." deleted by ".$_SESSION['current']->sRealname;
$sSubject = "Note for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." deleted by ".$_SESSION['current']->sRealname;
$sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."&versionId=".$this->iVersionId."\n";
$sMsg .= "\n";
$sMsg .= "This note was made on ".substr($this->sDateCreated,0,10)." by ".$this->oOwner->sRealname."\n";

6
include/sidebar_login.php
View File

@@ -4,7 +4,7 @@
/*****************/
require_once(BASE."include/maintainer.php");
require_once(BASE."include/category.php");
require_once(BASE."include/application.php");
function global_sidebar_login() {
@@ -27,9 +27,9 @@ function global_sidebar_login() {
while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains))
{
if($superMaintainer)
$g->addmisc("<a href='".BASE."appview.php?appId=$appId'>".appIdToName($appId)."*</a>", "center");
$g->addmisc("<a href='".BASE."appview.php?appId=$appId'>".lookup_app_name($appId)."*</a>", "center");
else
$g->addmisc("<a href='".BASE."appview.php?versionId=$versionId'>".appIdToName($appId)." ".versionIdToName($versionId)."</a>", "center");
$g->addmisc("<a href='".BASE."appview.php?versionId=$versionId'>".lookup_app_name($appId)." ".lookup_version_name($versionId)."</a>", "center");
}
}
}

2
include/vote.php
View File

@@ -117,7 +117,7 @@ function vote_menu()
{
if(isset($votes[$i]))
{
$appName = lookupAppName($votes[$i]->appId);
$appName = lookup_app_name($votes[$i]->appId);
$str = "<a href='appview.php?appId=".$votes[$i]->appId."'> $appName</a>";
$m->add("<input type=radio name=slot value='$i'> ".$str);
}

12
maintainerdelete.php
View File

@@ -27,12 +27,12 @@ if($confirmed)
if($superMaintainer)
{
apidb_header("You have resigned as supermaintainer of ".appIdToName($appId));
apidb_header("You have resigned as supermaintainer of ".lookup_app_name($appId));
$query = "DELETE FROM appMaintainers WHERE userId = ".$_SESSION['current']->userid.
" AND appId = ".$appId." AND superMaintainer = ".$superMaintainer.";";
} else
{
apidb_header("You have resigned as maintainer of ".appIdToName($appId));
apidb_header("You have resigned as maintainer of ".lookup_app_name($appId));
$query = "DELETE FROM appMaintainers WHERE userId = ".$_SESSION['current']->userid.
" AND appId = ".$appId." AND versionId = ".$versionId." AND superMaintainer = ".$superMaintainer.";";
}
@@ -41,16 +41,16 @@ if($confirmed)
if($result = query_appdb($query))
{
if($superMaintainer)
echo "You were removed as a supermaintainer of ".appIdToName($appId);
echo "You were removed as a supermaintainer of ".lookup_app_name($appId);
else
echo "You were removed as a maintainer of ".appIdToName($appId).versionIdToName($versionId);
echo "You were removed as a maintainer of ".lookup_app_name($appId).lookup_version_name($versionId);
}
} else
{
if($superMaintainer)
apidb_header("Confirm supermaintainer resignation of ".appIdToName($appId));
apidb_header("Confirm supermaintainer resignation of ".lookup_app_name($appId));
else
apidb_header("Confirm maintainer resignation of ".appIdToName($appId).versionIdToName($versionId));
apidb_header("Confirm maintainer resignation of ".lookup_app_name($appId).lookup_version_name ($versionId));
echo '<form name="deleteMaintainer" action="maintainerdelete.php" method="post" enctype="multipart/form-data">',"\n";

8
maintainersubmit.php
View File

@@ -93,9 +93,9 @@ if($_REQUEST['maintainReason'])
{
// header
if($versionId)
apidb_header("Request to become an application maintainer of ".appIdToName($appId)." ".versionIdToName($versionId));
apidb_header("Request to become an application maintainer of ".lookup_app_name($appId)." ".lookup_version_name($versionId));
else
apidb_header("Request to become an application super maintainer of ".appIdToName($appId));
apidb_header("Request to become an application super maintainer of ".lookup_app_name($appId));
// show add to queue form
@@ -138,12 +138,12 @@ if($_REQUEST['maintainReason'])
echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
echo "<tr valign=top><td class=color0>";
echo '<b>Application</b></td><td>'.appIdToName($appId);
echo '<b>Application</b></td><td>'.lookup_app_name($appId);
echo '</td></tr>',"\n";
if($versionId)
{
echo "<tr valign=top><td class=color0>";
echo '<b>Version</b></td><td>'.versionIdToName($versionId);
echo '<b>Version</b></td><td>'.lookup_version_name($versionId);
echo '</td></tr>',"\n";
}
echo "<input type=hidden name='appId' value=$appId>";