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

Move hidden fields used by application and version class into their OutputEditor() member functions. Fix broken old style calls to application and version update() functions that were passing parameters in. Fix broken application::CheckOutputEditorInput()

Browse Source
This commit is contained in:
Chris Morgan
2005-10-16 04:24:37 +00:00
committed by WineHQ
parent 93ab2587ef
commit 657167e8a5
7 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
admin/adminAppQueue.php
View File

@@ -224,10 +224,10 @@ if ($_REQUEST['sub'])
if($oApp) if($oApp)
{ {
$oApp->OutputEditor($sVendor); $oApp->OutputEditor($sVendor);
$oVersion->OutputEditor(false); $oVersion->OutputEditor(false, false);
} else } else
{ {
$oVersion->OutputEditor(true); $oVersion->OutputEditor(false, false);
} }
echo html_frame_start("Reply text", "90%", "", 0); echo html_frame_start("Reply text", "90%", "", 0);
@@ -238,11 +238,11 @@ if ($_REQUEST['sub'])
echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n"; echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n";
if ($oApp) //application if ($oApp) //application
{ {
echo '<input type="hidden" name="appId" value="'.$oApp->iAppId.'" />'; echo '<input type="hidden" name="apptype" value="application" />';
echo '<input type=submit value=" Submit App Into Database " class=button>&nbsp',"\n"; echo '<input type=submit value=" Submit App Into Database " class=button>&nbsp',"\n";
} else // app version } else // app version
{ {
echo '<input type="hidden" name="versionId" value="'.$oVersion->iVersionId.'" />'; echo '<input type="hidden" name="apptype" value="version" />';
echo '<input type="submit" value=" Submit Version Into Database " class="button">&nbsp',"\n"; echo '<input type="submit" value=" Submit Version Into Database " class="button">&nbsp',"\n";
} }
@@ -256,7 +256,7 @@ if ($_REQUEST['sub'])
} }
else if ($_REQUEST['sub'] == 'add') else if ($_REQUEST['sub'] == 'add')
{ {
if (is_numeric($_REQUEST['appId']) && !is_numeric($_REQUEST['versionId'])) // application if (($_REQUEST['apptype'] == "application") && is_numeric($_REQUEST['appId'])) // application
{ {
// add new vendor // add new vendor
if($_REQUEST['appVendorName']) if($_REQUEST['appVendorName'])
@@ -269,14 +269,14 @@ if ($_REQUEST['sub'])
$oApp->GetOutputEditorValues(); $oApp->GetOutputEditorValues();
$oApp->update(); $oApp->update();
$oApp->unQueue(); $oApp->unQueue();
} else if(is_numeric($_REQUEST['versionId']) && is_numeric($_REQUEST['appId'])) // version } else if(($_REQUEST['apptype'] == "version") && is_numeric($_REQUEST['versionId'])) // version
{ {
$oVersion = new Version($_REQUEST['versionId']); $oVersion = new Version($_REQUEST['versionId']);
$oVersion->GetOutputEditorValues(); $oVersion->GetOutputEditorValues();
$oVersion->update(); $oVersion->update();
$oVersion->unQueue(); $oVersion->unQueue();
} }
redirect(apidb_fullurl("admin/adminAppQueue.php")); redirect(apidb_fullurl("admin/adminAppQueue.php"));
} }
else if ($_REQUEST['sub'] == 'duplicate') else if ($_REQUEST['sub'] == 'duplicate')
@@ -296,7 +296,7 @@ if ($_REQUEST['sub'])
} }
else if ($_REQUEST['sub'] == 'Delete') else if ($_REQUEST['sub'] == 'Delete')
{ {
if (is_numeric($_REQUEST['appId']) && !is_numeric($_REQUEST['versionId'])) // application if (($_REQUEST['apptype'] == "application") && is_numeric($_REQUEST['appId'])) // application
{ {
// get the queued versions that refers to the application entry we just removed // get the queued versions that refers to the application entry we just removed
// and delete them as we implicitly added a version entry when adding a new application // and delete them as we implicitly added a version entry when adding a new application
@@ -314,7 +314,7 @@ if ($_REQUEST['sub'])
// delete the application entry // delete the application entry
$oApp = new Application($_REQUEST['appId']); $oApp = new Application($_REQUEST['appId']);
$oApp->delete(); $oApp->delete();
} else if(is_numeric($_REQUEST['versionId'])) // version } else if(($_REQUEST['apptype'] == "version") && is_numeric($_REQUEST['versionId'])) // version
{ {
$oVersion = new Version($_REQUEST['versionId']); $oVersion = new Version($_REQUEST['versionId']);
$oVersion->delete(); $oVersion->delete();
@@ -324,7 +324,7 @@ if ($_REQUEST['sub'])
} }
else if ($_REQUEST['sub'] == 'Reject') else if ($_REQUEST['sub'] == 'Reject')
{ {
if (is_numeric($_REQUEST['appId']) && !is_numeric($_REQUEST['versionId'])) // application if (($_REQUEST['apptype'] == "application") && is_numeric($_REQUEST['appId'])) // application
{ {
// get the queued versions that refers to the application entry we just removed // get the queued versions that refers to the application entry we just removed
// and delete them as we implicitly added a version entry when adding a new application // and delete them as we implicitly added a version entry when adding a new application
@@ -342,7 +342,7 @@ if ($_REQUEST['sub'])
// delete the application entry // delete the application entry
$oApp = new Application($_REQUEST['appId']); $oApp = new Application($_REQUEST['appId']);
$oApp->reject(); $oApp->reject();
} else if(is_numeric($_REQUEST['versionId'])) // version } else if(($_REQUEST['apptype'] == "version") && is_numeric($_REQUEST['versionId'])) // version
{ {
$oVersion = new Version($_REQUEST['versionId']); $oVersion = new Version($_REQUEST['versionId']);
$oVersion->reject(); $oVersion->reject();
@@ -474,7 +474,7 @@ else /* if ($_REQUEST['sub']) is not defined, display the main app queue page */
echo " <td>".$sVendor."</td>\n"; echo " <td>".$sVendor."</td>\n";
echo " <td>".$oApp->sName."</td>\n"; echo " <td>".$oApp->sName."</td>\n";
echo " <td>".$oVersion->sName."</td>\n"; echo " <td>".$oVersion->sName."</td>\n";
echo " <td align=\"center\">[<a href=\"adminAppQueue.php?sub=view&versionId=".$oVersion->iVersionId."\">process</a>]</td>\n"; echo " <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sub=view&versionId=".$oVersion->iVersionId.">process</a>]</td>\n";
echo "</tr>\n\n"; echo "</tr>\n\n";
$c++; $c++;
} }

2
admin/editAppFamily.php
View File

@@ -46,8 +46,6 @@ else
echo "<form method=\"post\" action=\"editAppFamily.php\">\n"; echo "<form method=\"post\" action=\"editAppFamily.php\">\n";
echo '<input type="hidden" name="appId" value="'.$oApp->iAppId.'">';
$oApp->OutputEditor(""); $oApp->OutputEditor("");
echo '<table border=0 cellpadding=6 cellspacing=0 width="100%">', "\n"; echo '<table border=0 cellpadding=6 cellspacing=0 width="100%">', "\n";

27
admin/editAppVersion.php
View File

@@ -36,26 +36,19 @@ if(isset($_REQUEST['submit']))
echo "<form method=post action='editAppVersion.php'>\n"; echo "<form method=post action='editAppVersion.php'>\n";
$oVersion->OutputEditor(false); /* false = not allowing the user to modify the parent application */ if($_SESSION['current']->hasPriv("admin"))
$oVersion->OutputEditor(true, true); /* false = not allowing the user to modify the parent application */
echo '<input type="hidden" name="appId" value='.$oVersion->iAppId.' />'; else
echo '<input type="hidden" name="versionId" value='.$oVersion->iVersionId.' />'; $oVersion->OutputEditor(false, true); /* false = not allowing the user to modify the parent application */
echo html_frame_start("Info", "90%", "", 0); echo '<table border=0 cellpadding=2 cellspacing=0 width="100%">',"\n";
echo "<table border=0 cellpadding=2 cellspacing=0>\n"; echo '<tr><td colspan=2 align=center class=color2><input type="submit" name="submit" value="Update Database" /></td></tr>',"\n";
echo '<tr><td class="color4">Rating</td><td class="color0">',"\n";
make_maintainer_rating_list("maintainer_rating", $oVersion->sTestedRating);
echo '</td></tr>',"\n";
echo '<tr><td class=color1>Release</td><td class=color0>',"\n";
make_bugzilla_version_list("maintainer_release", $oVersion->sTestedRelease);
echo '</td></tr>',"\n";
echo '<tr><td colspan=2 align=center class=color3><input type="submit" name="submit" value="Update Database" /></td></tr>',"\n";
echo html_table_end(); echo html_table_end();
echo html_frame_end();
echo "</form>"; echo "</form>";
echo "<br/><br/>\n";
// url edit form // url edit form
echo '<form enctype="multipart/form-data" action="editAppVersion.php" method="post">',"\n"; echo '<form enctype="multipart/form-data" action="editAppVersion.php" method="post">',"\n";
echo '<input type=hidden name="appId" value='.$oVersion->iAppId.'>'; echo '<input type=hidden name="appId" value='.$oVersion->iAppId.'>';

35
admin/resubmitRejectedApps.php
View File

@@ -75,8 +75,8 @@ if ($_REQUEST['sub'])
if (!$oApp) //app version if (!$oApp) //app version
{ {
echo html_frame_start("Potential duplicate versions in the database","90%","",0); echo html_frame_start("Potential duplicate versions in the database","90%","",0);
$oApp = new Application($oVersion->iAppId); $oAppForVersion = new Application($oVersion->iAppId);
display_versions($oApp->iAppId, $oApp->aVersionsIds); display_versions($oAppForVersion->iAppId, $oAppForVersion->aVersionsIds);
echo html_frame_end("&nbsp;"); echo html_frame_end("&nbsp;");
//help //help
@@ -142,27 +142,26 @@ if ($_REQUEST['sub'])
if($oApp) if($oApp)
{ {
$oApp->OutputEditor($sVendor); $oApp->OutputEditor($sVendor);
$oVersion->OutputEditor(false); $oVersion->OutputEditor(false, false);
} else } else
{ {
$oVersion->OutputEditor(true); $oVersion->OutputEditor(false, false);
} }
echo '<tr valign=top><td class="color0"><b>email Text</b></td>',"\n"; echo "<table width='100%' border=0 cellpadding=2 cellspacing=2>\n";
echo '<td><textarea name="replyText" style="width: 100%" rows="10" cols="35"></textarea></td></tr>',"\n";
if($oApp) // application if($oApp) // application
{ {
echo '<input type="hidden" name="apptype" value="application" />';
echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n"; echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n";
echo '<input type="hidden" name="appId" value="'.$oApp->iAppId.'" />';
echo '<input type=submit value=" Re-Submit App Into Database " class=button>&nbsp',"\n"; echo '<input type=submit value=" Re-Submit App Into Database " class=button>&nbsp',"\n";
echo '<input name="sub" type="submit" value="Delete" class="button" />',"\n"; echo '<input name="sub" type="submit" value="Delete" class="button" />',"\n";
echo '</td></tr>',"\n"; echo '</td></tr>',"\n";
echo '</table></form>',"\n"; echo '</table></form>',"\n";
} else // version } else // version
{ {
echo '<input type="hidden" name="apptype" value="version" />';
echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n"; echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n";
echo '<input type="hidden" name="versionId" value="'.$oVersion->iVersionId.'" />';
echo '<input type="submit" value="Re-Submit Version Into Database " class="button">&nbsp',"\n"; echo '<input type="submit" value="Re-Submit Version Into Database " class="button">&nbsp',"\n";
echo '<input name="sub" type=submit value="Delete" class="button"></td></tr>',"\n"; echo '<input name="sub" type=submit value="Delete" class="button"></td></tr>',"\n";
echo '</table></form>',"\n"; echo '</table></form>',"\n";
@@ -173,7 +172,7 @@ if ($_REQUEST['sub'])
} }
else if ($_REQUEST['sub'] == 'ReQueue') else if ($_REQUEST['sub'] == 'ReQueue')
{ {
if (is_numeric($_REQUEST['appId']) && !is_numeric($_REQUEST['versionId'])) // application if (($_REQUEST['apptype'] == "application") && is_numeric($_REQUEST['appId'])) // application
{ {
// get the queued versions that refers to the application entry we just removed // get the queued versions that refers to the application entry we just removed
// and delete them as we implicitly added a version entry when adding a new application // and delete them as we implicitly added a version entry when adding a new application
@@ -184,19 +183,21 @@ if ($_REQUEST['sub'])
while($oRow = mysql_fetch_object($hResult)) while($oRow = mysql_fetch_object($hResult))
{ {
$oVersion = new Version($oRow->versionId); $oVersion = new Version($oRow->versionId);
$oVersion->update($_REQUEST['versionName'], $_REQUEST['versionDescription'],null,null,$_REQUEST['appId']); $oVersion->GetOutputEditorValues();
$oVersion->update();
$oVersion->ReQueue(); $oVersion->ReQueue();
} }
} }
// delete the application entry
$oApp = new Application($_REQUEST['appId']); $oApp = new Application($_REQUEST['appId']);
$oApp->update($_REQUEST['appName'], $_REQUEST['applicationDescription'], $_REQUEST['keywords'], $_REQUEST['webpage'], $_REQUEST['vendorId'], $_REQUEST['catId']); $oApp->GetOutputEditorValues();
$oApp->update();
$oApp->ReQueue(); $oApp->ReQueue();
} else if(is_numeric($_REQUEST['versionId'])) // version } else if(($_REQUEST['apptype'] == "version") && is_numeric($_REQUEST['versionId'])) // version
{ {
$oVersion = new Version($_REQUEST['versionId']); $oVersion = new Version($_REQUEST['versionId']);
$oVersion->update($_REQUEST['versionName'], $_REQUEST['versionDescription'],null,null,$_REQUEST['appId']); $oVersion->GetOutputEditorValues();
$oVersion->update();
$oVersion->ReQueue(); $oVersion->ReQueue();
} }
@@ -204,7 +205,7 @@ if ($_REQUEST['sub'])
} }
else if ($_REQUEST['sub'] == 'Delete') else if ($_REQUEST['sub'] == 'Delete')
{ {
if (is_numeric($_REQUEST['appId']) && !is_numeric($_REQUEST['versionId'])) // application if (($_REQUEST['apptype'] == "application") && is_numeric($_REQUEST['appId'])) // application
{ {
// get the queued versions that refers to the application entry we just removed // get the queued versions that refers to the application entry we just removed
// and delete them as we implicitly added a version entry when adding a new application // and delete them as we implicitly added a version entry when adding a new application
@@ -222,7 +223,7 @@ if ($_REQUEST['sub'])
// delete the application entry // delete the application entry
$oApp = new Application($_REQUEST['appId']); $oApp = new Application($_REQUEST['appId']);
$oApp->delete(); $oApp->delete();
} else if(is_numeric($_REQUEST['versionId'])) // version } else if(($_REQUEST['apptype'] == "version") && is_numeric($_REQUEST['versionId'])) // version
{ {
$oVersion = new Version($_REQUEST['versionId']); $oVersion = new Version($_REQUEST['versionId']);
$oVersion->delete(); $oVersion->delete();
@@ -363,5 +364,5 @@ else // if ($_REQUEST['sub']) is not defined, display the main app queue page
} }
} }
apidb_footer(); apidb_footer();
?> ?>

3
appsubmit.php
View File

@@ -144,7 +144,8 @@ if (isset($_REQUEST['apptype']))
$oApp->OutputEditor($_REQUEST['appVendorName']); $oApp->OutputEditor($_REQUEST['appVendorName']);
} }
$oVersion->OutputEditor(false); /* don't let the user change the parent application */ $oVersion->OutputEditor(false, false); /* don't let the user change the parent application,
don't display the rating and distribution dropdowns */
echo '<input type="hidden" name="apptype" value="'.$_REQUEST['apptype'].'">',"\n"; echo '<input type="hidden" name="apptype" value="'.$_REQUEST['apptype'].'">',"\n";

12
include/application.php
View File

@@ -419,6 +419,8 @@ class Application {
{ {
HtmlAreaLoaderScript(array("app_editor")); HtmlAreaLoaderScript(array("app_editor"));
echo '<input type="hidden" name="appId" value="'.$this->iAppId.'">';
echo html_frame_start("Application Form", "90%", "", 0); echo html_frame_start("Application Form", "90%", "", 0);
echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
echo '<tr valign=top><td class="color0"><b>Application name</b></td>',"\n"; echo '<tr valign=top><td class="color0"><b>Application name</b></td>',"\n";
@@ -464,20 +466,20 @@ class Application {
{ {
$errors = ""; $errors = "";
if (empty($_REQUEST['appCatId']) && !$_REQUEST['appId']) if (empty($_REQUEST['appCatId']))
$errors .= "<li>Please enter a category for your application.</li>\n"; $errors .= "<li>Please enter a category for your application.</li>\n";
if (strlen($_REQUEST['appName']) > 200 ) if (strlen($_REQUEST['appName']) > 200 )
$errors .= "<li>Your application name is too long.</li>\n"; $errors .= "<li>Your application name is too long.</li>\n";
if (empty($_REQUEST['appName']) && !$_REQUEST['appId']) if (empty($_REQUEST['appName']))
$errors .= "<li>Please enter an application name.</li>\n"; $errors .= "<li>Please enter an application name.</li>\n";
// No vendor entered, and nothing in the list is selected // No vendor entered, and nothing in the list is selected
if (empty($_REQUEST['appVendorName']) && !$_REQUEST['appVendorId'] && !$_REQUEST['appId']) if (empty($_REQUEST['appVendorName']) && !$_REQUEST['appVendorId'])
$errors .= "<li>Please enter a vendor.</li>\n"; $errors .= "<li>Please enter a vendor.</li>\n";
if (empty($_REQUEST['appDescription']) && !$_REQUEST['appId']) if (empty($_REQUEST['appDescription']))
$errors .= "<li>Please enter a description of your application.</li>\n"; $errors .= "<li>Please enter a description of your application.</li>\n";
return $errors; return $errors;
@@ -488,6 +490,7 @@ class Application {
{ {
if(get_magic_quotes_gpc()) if(get_magic_quotes_gpc())
{ {
$this->iAppId = stripslashes($_REQUEST['appId']);
$this->sName = stripslashes($_REQUEST['appName']); $this->sName = stripslashes($_REQUEST['appName']);
$this->sDescription = stripslashes($_REQUEST['appDescription']); $this->sDescription = stripslashes($_REQUEST['appDescription']);
$this->iCatId = stripslashes($_REQUEST['appCatId']); $this->iCatId = stripslashes($_REQUEST['appCatId']);
@@ -496,6 +499,7 @@ class Application {
$this->sKeywords = stripslashes($_REQUEST['appKeywords']); $this->sKeywords = stripslashes($_REQUEST['appKeywords']);
} else } else
{ {
$this->iAppId = $_REQUEST['appId'];
$this->sName = $_REQUEST['appName']; $this->sName = $_REQUEST['appName'];
$this->sDescription = $_REQUEST['appDescription']; $this->sDescription = $_REQUEST['appDescription'];
$this->iCatId = $_REQUEST['appCatId']; $this->iCatId = $_REQUEST['appCatId'];

37
include/version.php
View File

@@ -215,7 +215,7 @@ class Version {
if ($this->sTestedRating && ($this->sTestedRating!=$oVersion->sTestedRating)) if ($this->sTestedRating && ($this->sTestedRating!=$oVersion->sTestedRating))
{ {
$sUpdate = compile_update_string(array('maintainer_rating' => $this->sTestedRating)); $sUpdate = compile_update_string(array('maintainer_rating' => $this->sTestedRating));
if (!query_appdb("UPDATE appVersion SET ".$sUpdate."' WHERE versionId = ".$this->iVersionId)) if (!query_appdb("UPDATE appVersion SET ".$sUpdate." WHERE versionId = ".$this->iVersionId))
return false; return false;
if($this->sTestedRating != "") if($this->sTestedRating != "")
@@ -491,12 +491,14 @@ class Version {
/* if $editParentApplication is true that means we need to display fields */ /* if $editParentApplication is true that means we need to display fields */
/* to let the user change the parent application of this version */ /* to let the user change the parent application of this version */
/* otherwise, if $editParentAppliation is false, we leave them out */ /* otherwise, if $editParentAppliation is false, we leave them out */
function OutputEditor($editParentApplication) function OutputEditor($editParentApplication, $editRatingAndRelease)
{ {
HtmlAreaLoaderScript(array("version_editor")); HtmlAreaLoaderScript(array("version_editor"));
echo html_frame_start("Version Form", "90%", "", 0); echo html_frame_start("Version Form", "90%", "", 0);
echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
echo '<input type="hidden" name="versionId" value='.$this->iVersionId.' />';
if($editParentApplication) if($editParentApplication)
{ {
// app parent // app parent
@@ -505,6 +507,9 @@ class Version {
echo '<td>',"\n"; echo '<td>',"\n";
$x->make_option_list("appId",$this->iAppId,"appFamily","appId","appName"); $x->make_option_list("appId",$this->iAppId,"appFamily","appId","appName");
echo '</td></tr>',"\n"; echo '</td></tr>',"\n";
} else
{
echo '<input type="hidden" name="appId" value='.$this->iAppId.' />';
} }
// version name // version name
@@ -526,6 +531,24 @@ class Version {
echo '</table>',"\n"; echo '</table>',"\n";
echo html_frame_end(); echo html_frame_end();
if($editRatingAndRelease)
{
echo html_frame_start("Info", "90%", "", 0);
echo "<table border=0 cellpadding=2 cellspacing=0>\n";
echo '<tr><td class="color4">Rating</td><td class="color0">',"\n";
make_maintainer_rating_list("maintainer_rating", $this->sTestedRating);
echo '</td></tr>',"\n";
echo '<tr><td class=color1>Release</td><td class=color0>',"\n";
make_bugzilla_version_list("maintainer_release", $this->sTestedRelease);
echo '</td></tr>',"\n";
echo html_table_end();
echo html_frame_end();
} else
{
echo '<input type="hidden" name="maintainer_rating" value='.$this->sTestedRating.' />';
echo '<input type="hidden" name="maintainer_release" value='.$this->sTestedRelease.' />';
}
} }
function CheckOutputEditorInput() function CheckOutputEditorInput()
@@ -546,12 +569,22 @@ class Version {
{ {
if(get_magic_quotes_gpc()) if(get_magic_quotes_gpc())
{ {
$this->iAppId = stripslashes($_REQUEST['appId']);
$this->iVersionId = stripslashes($_REQUEST['versionId']);
$this->sName = stripslashes($_REQUEST['versionName']); $this->sName = stripslashes($_REQUEST['versionName']);
$this->sDescription = stripslashes($_REQUEST['versionDescription']); $this->sDescription = stripslashes($_REQUEST['versionDescription']);
$this->sTestedRating = stripslashes($_REQUEST['maintainer_rating']);
$this->sTestedRelease = stripslashes($_REQUEST['maintainer_release']);
} else } else
{ {
$this->iAppId = $_REQUEST['appId'];
$this->iVersionId = $_REQUEST['versionId'];
$this->sName = $_REQUEST['versionName']; $this->sName = $_REQUEST['versionName'];
$this->sDescription = $_REQUEST['versionDescription']; $this->sDescription = $_REQUEST['versionDescription'];
$this->sTestedRating = $_REQUEST['maintainer_rating'];
$this->sTestedRelease = $_REQUEST['maintainer_release'];
} }
} }
} }