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

category: Move code from appbrowse.php to the category class

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2009-08-05 02:34:02 +02:00
committed by Alexander Nicolaysen Sørnes
parent db87518ddc
commit 3f17cf52d3
6 changed files with 193 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
appbrowse.php
View File

@@ -9,170 +9,9 @@
// application environment
require("path.php");
require(BASE."include/"."incl.php");
require_once(BASE."include/"."appdb.php");
require_once(BASE."include/"."category.php");
function admin_menu()
{
global $aClean;
$iId = getInput('iCatId', $aClean);
$m = new htmlmenu("Admin");
$m->add('Edit this Category', BASE."objectManager.php?iId=${aClean[iCatId]}&sClass=category&sAction=edit");
/* We only allow deletion of the category if it is empty */
$oCat = new category($aClean['iCatId']);
if(!sizeof($oCat->aApplicationsIds))
$m->add('Delete this Category', BASE."objectManager.php?iId=${aClean[iCatId]}&sClass=category&sAction=delete");
$m->done();
}
$iCatId = isset($aClean['iCatId']) ? $aClean['iCatId'] : 0;
// list sub categories
$oCat = new Category( $iCatId );
$sCatFullPath = Category::make_cat_path($oCat->getCategoryPath());
$subs = $oCat->aSubcatsIds;
//display admin box
if($_SESSION['current']->hasPriv("admin") && isset($aClean['iCatId']) && $aClean['iCatId'] != 0 )
apidb_sidebar_add("admin_menu");
//output header
apidb_header("Browse Applications");
echo "<div class='default_container'>\n";
if($subs)
{
echo html_frame_start("",'98%','',2);
echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
echo html_frame_end();
echo html_frame_start("","98%","",0);
$oTable = new Table();
$oTable->SetWidth("100%");
$oTable->SetBorder(0);
$oTable->SetCellPadding(3);
$oTable->SetCellSpacing(1);
$oTableRow = new TableRow();
$oTableRow->SetClass("color4");
$oTableRow->AddTextCell("Sub Category");
$oTableRow->AddTextCell("Description");
$oTableRow->AddTextCell("No. Apps");
$oTable->SetHeader($oTableRow);
while(list($i,$iSubcatId) = each($subs))
{
$oSubCat= new Category($iSubcatId);
//set row color
$sColor = ($i % 2) ? "color0" : "color1";
$oTableRowHighlight = GetStandardRowHighlight($i);
$sUrl = "appbrowse.php?iCatId=$iSubcatId";
$oTableRowClick = new TableRowClick($sUrl);
$oTableRowClick->SetHighlight($oTableRowHighlight);
//get number of apps in this sub-category
$iAppcount = $oSubCat->getApplicationCount();
//format desc
$sDesc = substr(stripslashes($oSubCat->sDescription),0,70);
//display row
$oTableRow = new TableRow();
$oTableRow->SetClass($sColor);
$oTableRow->SetRowClick($oTableRowClick);
$oTableCell = new TableCell($oSubCat->sName);
$oTableCell->SetCellLink($sUrl);
$oTableRow->AddCell($oTableCell);
$oTableRow->AddTextCell("$sDesc &nbsp;");
$oTableRow->AddTextCell("$iAppcount &nbsp;");
$oTable->AddRow($oTableRow);
}
// output the table
echo $oTable->GetString();
echo html_frame_end( count($subs) . ' categories');
}
// list applications in this category
$apps = $oCat->aApplicationsIds;
if($apps)
{
echo html_frame_start("",'98%','',2);
echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
echo html_frame_end();
echo html_frame_start("","98%","",0);
$oTable = new Table();
$oTable->SetWidth("100%");
$oTable->SetBorder(0);
$oTable->SetCellPadding(3);
$oTable->SetCellSpacing(1);
$oTableRow = new TableRow();
$oTableRow->SetClass("color4");
$oTableRow->AddTextCell("Application name");
$oTableRow->AddTextCell("Description");
$oTableRow->AddTextCell("No. Versions");
$oTable->SetHeader($oTableRow);
while(list($i, $iAppId) = each($apps))
{
$oApp = new Application($iAppId);
//set row color
$sColor = ($i % 2) ? "color0" : "color1";
$oTableRowHighlight = GetStandardRowHighlight($i);
$sUrl = $oApp->objectMakeUrl();
$oTableRowClick = new TableRowClick($sUrl);
$oTableRowClick->SetHighlight($oTableRowHighlight);
//format desc
$sDesc = util_trim_description($oApp->sDescription);
//display row
$oTableRow = new TableRow();
$oTableRow->SetRowClick($oTableRowClick);
$oTableRow->SetClass($sColor);
$oTableRow->AddTextCell($oApp->objectMakeLink());
$oTableRow->AddTextCell("$sDesc &nbsp;");
$oTableRow->AddTextCell(sizeof($oApp->aVersionsIds));
$oTable->AddRow($oTableRow);
}
// output table
echo $oTable->GetString();
echo html_frame_end( count($apps) . " applications in this category");
}
// Disabled for now
//if ($aClean['iCatId'] != 0)
//{
// log_category_visit($cat->id);
//}
echo p();
echo "</div>\n";
apidb_footer();
util_redirect_and_exit(BASE."objectManager.php?sClass=category&iId=$iId&sAction=view&sTitle=Browse+Applications");
?>

2
include/application.php
View File

@@ -761,7 +761,7 @@ class Application {
// cat display
$oCategory = new Category($this->iCatId);
$oCategory->display($this->iAppId);
$oCategory->displayPath($this->iAppId);
// set developer
$oVendor = new Vendor($this->iVendorId);

177
include/category.php
View File

@@ -274,11 +274,39 @@ class Category {
return $str;
}
public function objectGetState()
{
// We currenly don't queue categories
return 'accepted';
}
function objectGetId()
{
return $this->iCatId;
}
public function objectMakeLink()
{
return '<a href="'.$this->objectMakeUrl()."\">{$this->sName}</a>'";
}
public function objectMakeUrl()
{
return BASE."objectManager.php?sClass=category&sAction=view&iId={$this->iCatId}&sTitle=Browse+Applications";
}
public function objectAllowNullId($sAction)
{
switch($sAction)
{
case 'view':
return true;
default:
return false;
}
}
function objectGetSubmitterId()
{
/* We don't log that */
@@ -344,13 +372,160 @@ class Category {
/**
* display the full path of the Category we are looking at
*/
function display($appId, $versionId = '')
function displayPath($appId, $versionId = '')
{
$sCatFullPath = Category::make_cat_path($this->getCategoryPath(), $appId, $versionId);
echo html_frame_start("",'98%','',2);
echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
echo html_frame_end();
}
public function display()
{
// list sub categories
$sCatFullPath = Category::make_cat_path($this->getCategoryPath());
$aSubs = $this->aSubcatsIds;
echo "<div class='default_container'>\n";
// Allow editing categories
if($this->canEdit())
{
$oM = new objectManager('category', '', $this->iCatId);
$oM->setReturnTo($this->objectMakeUrl());
echo "<p>\n";
echo '<a href="'.$oM->makeUrl('add', null, 'Add Category').'">Add</a>';
if($this->iCatId) // We can't edit the 'Main' category
{
echo ' &nbsp; &nbsp; ';
echo '<a href="'.$oM->makeUrl('edit', $this->iCatId, 'Edit Category').'">Edit</a>';
echo ' &nbsp; &nbsp; ';
echo '<a href="'.$oM->makeUrl('delete', $this->iCatId, 'Delete Category').'">Delete</a>';
}
echo "</p>\n";
}
if($aSubs)
{
echo html_frame_start("",'98%','',2);
echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
echo html_frame_end();
echo html_frame_start("","98%","",0);
$oTable = new Table();
$oTable->SetWidth("100%");
$oTable->SetBorder(0);
$oTable->SetCellPadding(3);
$oTable->SetCellSpacing(1);
$oTableRow = new TableRow();
$oTableRow->SetClass("color4");
$oTableRow->AddTextCell("Sub Category");
$oTableRow->AddTextCell("Description");
$oTableRow->AddTextCell("No. Apps");
$oTable->SetHeader($oTableRow);
while(list($i,$iSubcatId) = each($aSubs))
{
$oSubCat= new Category($iSubcatId);
//set row color
$sColor = ($i % 2) ? "color0" : "color1";
$oTableRowHighlight = GetStandardRowHighlight($i);
$sUrl = $oSubCat->objectMakeUrl();
$oTableRowClick = new TableRowClick($sUrl);
$oTableRowClick->SetHighlight($oTableRowHighlight);
//get number of apps in this sub-category
$iAppcount = $oSubCat->getApplicationCount();
//format desc
$sDesc = substr(stripslashes($oSubCat->sDescription),0,70);
//display row
$oTableRow = new TableRow();
$oTableRow->SetClass($sColor);
$oTableRow->SetRowClick($oTableRowClick);
$oTableCell = new TableCell($oSubCat->sName);
$oTableCell->SetCellLink($sUrl);
$oTableRow->AddCell($oTableCell);
$oTableRow->AddTextCell("$sDesc &nbsp;");
$oTableRow->AddTextCell("$iAppcount &nbsp;");
$oTable->AddRow($oTableRow);
}
// output the table
echo $oTable->GetString();
echo html_frame_end( count($aSubs) . ' categories');
}
// list applications in this category
$aApps = $this->aApplicationsIds;
if($aApps)
{
echo html_frame_start("",'98%','',2);
echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
echo html_frame_end();
echo html_frame_start("","98%","",0);
$oTable = new Table();
$oTable->SetWidth("100%");
$oTable->SetBorder(0);
$oTable->SetCellPadding(3);
$oTable->SetCellSpacing(1);
$oTableRow = new TableRow();
$oTableRow->SetClass("color4");
$oTableRow->AddTextCell("Application name");
$oTableRow->AddTextCell("Description");
$oTableRow->AddTextCell("No. Versions");
$oTable->SetHeader($oTableRow);
while(list($i, $iAppId) = each($aApps))
{
$oApp = new Application($iAppId);
//set row color
$sColor = ($i % 2) ? "color0" : "color1";
$oTableRowHighlight = GetStandardRowHighlight($i);
$sUrl = $oApp->objectMakeUrl();
$oTableRowClick = new TableRowClick($sUrl);
$oTableRowClick->SetHighlight($oTableRowHighlight);
//format desc
$sDesc = util_trim_description($oApp->sDescription);
//display row
$oTableRow = new TableRow();
$oTableRow->SetRowClick($oTableRowClick);
$oTableRow->SetClass($sColor);
$oTableRow->AddTextCell($oApp->objectMakeLink());
$oTableRow->AddTextCell("$sDesc &nbsp;");
$oTableRow->AddTextCell(sizeof($oApp->aVersionsIds));
$oTable->AddRow($oTableRow);
}
// output table
echo $oTable->GetString();
echo html_frame_end( count($aApps) . " applications in this category");
}
}
}
?>

13
include/objectManager.php
View File

@@ -188,6 +188,17 @@ class ObjectManager
return TRUE;
}
public function IsNullIdAllowed($sAction)
{
$oObject = new $this->sClass();
$bAllowed = method_exists($oObject, 'objectAllowNullId');
if($bAllowed)
$bAllowed = $oObject->objectAllowNullId($sAction);
return $bAllowed;
}
public static function error_exit($shMessage)
{
echo '<div align="center"><p><font color="red"><b>'.$shMessage.'</b></font></p></div';
@@ -1313,7 +1324,7 @@ class ObjectManager
$oObject = new $this->sClass($this->iId);
/* Check that the entry exists */
if(!$oObject->objectGetId())
if(!$oObject->objectGetId() && !$this->isNullIdAllowed('view'))
$this->error_exit("Entry not found (class: {$this->sClass}, id: {$this->iId})");
/* Check if the entry has been deleted */

2
include/version.php
View File

@@ -840,7 +840,7 @@ class version {
// cat
$oCategory = new Category($oApp->iCatId);
$oCategory->display($oApp->iAppId, $this->iVersionId);
$oCategory->displayPath($oApp->iAppId, $this->iVersionId);
// set URL
$appLinkURL = ($oApp->sWebpage) ? trimmed_link($oApp->sWebpage,30) : "&nbsp;";

2
objectManager.php
View File

@@ -116,7 +116,7 @@ if(!$sAction)
apidb_header($oObject->get_title($sAction));
/* display a particular element */
if($oObject->getId() && $sAction != "add")
if(($oObject->getId() || $oObject->IsNullIdAllowed($sAction)) && $sAction != "add")
{
switch($sAction)
{