Authors: Jonathan Ernst <Jonathan@ernstfamily.ch>, Chris Morgan <cmorgan@alum.wpi.edu>
- stop annoymous applications submitions - code cleanup (more php style than c style + correct indentation + comments + replaced globally registered vars)
This commit is contained in:
WineHQ
@@ -1,6 +1,20 @@
|
||||
<?
|
||||
|
||||
/************************************/
|
||||
/* code to Submit a new application */
|
||||
/************************************/
|
||||
|
||||
# ENVIRONMENT AND HEADER
|
||||
include("path.php");
|
||||
require(BASE."include/"."incl.php");
|
||||
require(BASE."include/"."tableve.php");
|
||||
|
||||
// Send user to the correct branch of code even if they try to bypass
|
||||
// the first page (appsubmit.php without parameters)
|
||||
if(!loggedin())
|
||||
{
|
||||
unset($_REQUEST['queueName']);
|
||||
unset($_REQUEST['apptype']);
|
||||
}
|
||||
|
||||
// Check the input of a submitted form. And output with a list
|
||||
// of errors. (<ul></ul>)
|
||||
@@ -9,30 +23,20 @@ function checkInput( $fields )
|
||||
$errors = "";
|
||||
|
||||
if (strlen($fields['queueName']) > 200 )
|
||||
{
|
||||
$errors .= "<li>Your application name is too long.</li>\n";
|
||||
}
|
||||
|
||||
if (empty( $fields['queueName']))
|
||||
{
|
||||
$errors .= "<li>Please enter an application name.</li>\n";
|
||||
}
|
||||
|
||||
if (empty( $fields['queueVersion']))
|
||||
{
|
||||
$errors .= "<li>Please enter an application version.</li>\n";
|
||||
}
|
||||
|
||||
// No vendor entered, and nothing in the list is selected
|
||||
if (empty( $fields['queueVendor']) and $fields['altvendor'] == '0')
|
||||
{
|
||||
$errors .= "<li>Please enter a vendor.</li>\n";
|
||||
}
|
||||
|
||||
if (empty( $fields['queueDesc']))
|
||||
{
|
||||
$errors .= "<li>Please enter a description of your application.</li>\n";
|
||||
}
|
||||
|
||||
// Not empty and an invalid e-mail address
|
||||
if (!empty( $fields['queueEmail'])
|
||||
@@ -43,21 +47,15 @@ function checkInput( $fields )
|
||||
}
|
||||
|
||||
if (empty($errors))
|
||||
{
|
||||
return "";
|
||||
}
|
||||
else
|
||||
{
|
||||
return $errors;
|
||||
}
|
||||
}
|
||||
|
||||
include("path.php");
|
||||
require(BASE."include/"."incl.php");
|
||||
require(BASE."include/"."tableve.php");
|
||||
global $current;
|
||||
|
||||
if ($_REQUEST['queueName'])
|
||||
#################################
|
||||
# USER SUBMITTED APP OR VERSION #
|
||||
#################################
|
||||
if (isset($_REQUEST['queueName']))
|
||||
{
|
||||
// Check input and exit if we found errors
|
||||
$errors = checkInput($_REQUEST);
|
||||
@@ -103,28 +101,26 @@ if ($_REQUEST['queueName'])
|
||||
{
|
||||
echo "<p><font color=red><b>Error:</b></font></p>\n";
|
||||
echo "<p>$error</p>\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<p>Your application has been submitted for Review. You should hear back\n";
|
||||
echo "soon about the status of your submission</p>\n";
|
||||
}
|
||||
}
|
||||
else if ($_REQUEST['apptype'])
|
||||
|
||||
#######################################
|
||||
# USER WANTS TO SUBMIT APP OR VERSION #
|
||||
#######################################
|
||||
else if (isset($_REQUEST['apptype']))
|
||||
{
|
||||
// set email field if logged in
|
||||
if ($current && loggedin())
|
||||
{
|
||||
$email = $current->lookup_email($current->userid);
|
||||
}
|
||||
if (loggedin())
|
||||
$email = $_SESSION[current]->lookup_email($_SESSION[current]->userid);
|
||||
|
||||
// header
|
||||
apidb_header("Submit Application");
|
||||
|
||||
// show add to queue form
|
||||
|
||||
echo '<form name="newApp" action="appsubmit.php" method="post" enctype="multipart/form-data">',"\n";
|
||||
|
||||
echo "<p>This page is for submitting new applications to be added to this\n";
|
||||
echo "database. The application will be reviewed by the AppDB Administrator\n";
|
||||
echo "and you will be notified via email if this application will be added to\n";
|
||||
@@ -136,15 +132,13 @@ else if ($_REQUEST['apptype'])
|
||||
echo "<p>To submit screenshots, please email them to ";
|
||||
echo "<a href='mailto:appdb@winehq.org'>appdb@winehq.org</a></p>\n";
|
||||
|
||||
if ($apptype == 1)
|
||||
# NEW APPLICATION
|
||||
if ($_REQUEST[apptype] == 1)
|
||||
{
|
||||
echo html_frame_start("New Application Form",400,"",0);
|
||||
echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
|
||||
|
||||
echo '<tr valign=top><td class=color0><b>App Name</b></td>',"\n";
|
||||
echo '<td><input type=text name="queueName" value="" size=20></td></tr>',"\n";
|
||||
|
||||
|
||||
echo '<tr valign=top><td class=color0><b>App Version</b></td>',"\n";
|
||||
echo '<td><input type=text name="queueVersion" value="" size=20></td></tr>',"\n";
|
||||
|
||||
@@ -154,11 +148,9 @@ else if ($_REQUEST['apptype'])
|
||||
$w->make_option_list("queueCatId","","appCategory","catId","catName");
|
||||
echo '</td></tr>',"\n";
|
||||
|
||||
|
||||
echo '<tr valign=top><td class=color0><b>App Vendor</b></td>',"\n";
|
||||
echo '<td><input type=text name="queueVendor" value="" size=20></td></tr>',"\n";
|
||||
|
||||
|
||||
// alt vendor
|
||||
$x = new TableVE("view");
|
||||
echo '<tr valign=top><td class=color0> </td><td>',"\n";
|
||||
@@ -176,12 +168,16 @@ else if ($_REQUEST['apptype'])
|
||||
|
||||
echo '<tr valign=top><td class=color3 align=center colspan=2>',"\n";
|
||||
echo '<input type=submit value=" Submit New Application " class=button> </td></tr>',"\n";
|
||||
|
||||
|
||||
echo '</table>',"\n";
|
||||
|
||||
echo html_frame_end();
|
||||
|
||||
echo "</form>";
|
||||
}
|
||||
|
||||
# NEW VERSION
|
||||
else
|
||||
{
|
||||
echo html_frame_start("New Version Form",400,"",0);
|
||||
@@ -209,9 +205,9 @@ else if ($_REQUEST['apptype'])
|
||||
echo '<input type=hidden name="queueVendor" value="">',"\n";
|
||||
echo '<input type=hidden name="queueCatId" value=-1>',"\n";
|
||||
|
||||
|
||||
echo '<tr valign=top><td class=color3 align=center colspan=2>',"\n";
|
||||
echo '<input type=submit value=" Submit New Version" class=button> </td></tr>',"\n";
|
||||
|
||||
echo '</table>',"\n";
|
||||
|
||||
echo html_frame_end();
|
||||
@@ -219,12 +215,22 @@ else if ($_REQUEST['apptype'])
|
||||
echo "</form>";
|
||||
}
|
||||
}
|
||||
|
||||
##########################
|
||||
# HOME PAGE OF APPSUBMIT #
|
||||
##########################
|
||||
else
|
||||
{
|
||||
if(!loggedin())
|
||||
{
|
||||
// you must be logged in to submit app
|
||||
apidb_header("Please login");
|
||||
echo "To submit an application to the database you must be logged in. Please <a href=\"account.php?cmd=login\">login now</a> or create a <a href=\"account.php?cmd=new\">new account</a>.","\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
// choose type of app
|
||||
apidb_header("Choose Application Type");
|
||||
|
||||
echo '<form name="ChooseApp" >',"\n";
|
||||
echo "Please search through the database first. If you cannot find your application in the database select ","\n";
|
||||
echo "<b>New Application</b>.","\n";
|
||||
echo "If you have found your application but have not found your version then choose <b>New Version</b>.","\n";
|
||||
@@ -232,12 +238,8 @@ else
|
||||
echo "<tr valign=top><td class=color0 align=center><a href='appsubmit.php?apptype=1'>New Application</a></td>","\n";
|
||||
echo "<td class=color0 align=center><a href='appsubmit.php?apptype=2'>New Version</a></td></tr>","\n";
|
||||
echo '</table>',"\n";
|
||||
|
||||
|
||||
echo "</form>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
apidb_footer();
|
||||
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user