Allow people to choose the type when submitting app.
This commit is contained in:
committed by
Jeremy Newman
parent
4ffd2190bf
commit
d3803fa29c
@@ -43,6 +43,51 @@ if ($sub)
|
|||||||
if ($sub == 'view' && $queueId)
|
if ($sub == 'view' && $queueId)
|
||||||
{
|
{
|
||||||
$x = new TableVE("view");
|
$x = new TableVE("view");
|
||||||
|
If ($ob->queueCatId == -1)
|
||||||
|
{
|
||||||
|
//help
|
||||||
|
echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
|
||||||
|
echo "<p>This is the full view of the application waiting to be approved. \n";
|
||||||
|
echo "If you approve this application,\n";
|
||||||
|
echo "an email will be sent to the author of the submission.<p>\n";
|
||||||
|
|
||||||
|
echo " <b>App Version</b> This type of application will be nested under the selected application parent.\n";
|
||||||
|
echo "</td></tr></table></div>\n\n";
|
||||||
|
|
||||||
|
echo '<input type=hidden name=type value="ver">',"\n";
|
||||||
|
|
||||||
|
echo html_frame_start("New Application Form",400,"",0);
|
||||||
|
echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
|
||||||
|
|
||||||
|
//app parent
|
||||||
|
echo '<tr valign=top><td class=color0><b>App Parent</b></td><td>',"\n";
|
||||||
|
$x->make_option_list("appParent",stripslashes($ob->queueName),"appFamily","appId","appName");
|
||||||
|
echo '</td></tr>',"\n";
|
||||||
|
|
||||||
|
//version
|
||||||
|
echo '<tr valign=top><td class=color0><b>App Version</b></td>',"\n";
|
||||||
|
echo '<td><input type=text name="queueVersion" value="'.stripslashes($ob->queueVersion).'" size=20></td></tr>',"\n";
|
||||||
|
|
||||||
|
//url
|
||||||
|
echo '<tr valign=top><td class=color0><b>App URL</b></td>',"\n";
|
||||||
|
echo '<td><input type=text name="queueURL" value="'.stripslashes($ob->queueURL).'" size=20></td></tr>',"\n";
|
||||||
|
|
||||||
|
//desc
|
||||||
|
echo '<tr valign=top><td class=color0><b>App Desc</b></td>',"\n";
|
||||||
|
echo '<td><textarea name="queueDesc" rows=10 cols=35>'.stripslashes($ob->queueDesc).'</textarea></td></tr>',"\n";
|
||||||
|
|
||||||
|
//echo '<tr valign=top><td bgcolor=class=color0><b>Email</b></td>,"\n";
|
||||||
|
//echo '<td><input type=text name="queueEmail" value="'.$ob->queueEmail.'" size=20></td></tr>',"\n";
|
||||||
|
//echo '<tr valign=top><td bgcolor=class=color0><b>Image</b></td>,"\n";
|
||||||
|
//echo '<td><input type=file name="queueImage" value="'.$ob->.'" size=15></td></tr>',"\n";
|
||||||
|
|
||||||
|
echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n";
|
||||||
|
echo '<input type=submit value=" Submit App Into Database " class=button> </td></tr>',"\n";
|
||||||
|
echo '</table>',"\n";
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
//help
|
//help
|
||||||
echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
|
echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
|
||||||
@@ -75,7 +120,6 @@ if ($sub)
|
|||||||
$result = mysql_query($query);
|
$result = mysql_query($query);
|
||||||
if($result)
|
if($result)
|
||||||
{
|
{
|
||||||
|
|
||||||
$ob2 = mysql_fetch_object($result);
|
$ob2 = mysql_fetch_object($result);
|
||||||
|
|
||||||
echo '<tr valign=top><td class=color0><b>Category</b></td><td>',"\n";
|
echo '<tr valign=top><td class=color0><b>Category</b></td><td>',"\n";
|
||||||
@@ -162,6 +206,7 @@ if ($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";
|
||||||
echo '<input type=submit value=" Submit App Into Database " class=button> </td></tr>',"\n";
|
echo '<input type=submit value=" Submit App Into Database " class=button> </td></tr>',"\n";
|
||||||
echo '</table>',"\n";
|
echo '</table>',"\n";
|
||||||
|
}
|
||||||
echo '<input type=hidden name="sub" value="add">',"\n";
|
echo '<input type=hidden name="sub" value="add">',"\n";
|
||||||
echo '<input type=hidden name="queueId" value="'.$queueId.'">',"\n";
|
echo '<input type=hidden name="queueId" value="'.$queueId.'">',"\n";
|
||||||
|
|
||||||
@@ -309,7 +354,7 @@ else
|
|||||||
{
|
{
|
||||||
//get available apps
|
//get available apps
|
||||||
$query = "SELECT queueId, queueName, queueVendor,".
|
$query = "SELECT queueId, queueName, queueVendor,".
|
||||||
"queueVersion, queueEmail,".
|
"queueVersion, queueEmail, queueCatId,".
|
||||||
"UNIX_TIMESTAMP(submitTime) as submitTime ".
|
"UNIX_TIMESTAMP(submitTime) as submitTime ".
|
||||||
"from appQueue;";
|
"from appQueue;";
|
||||||
$result = mysql_query($query);
|
$result = mysql_query($query);
|
||||||
@@ -351,7 +396,22 @@ else
|
|||||||
if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
|
if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
|
||||||
echo "<tr class=$bgcolor>\n";
|
echo "<tr class=$bgcolor>\n";
|
||||||
echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." </td>\n";
|
echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." </td>\n";
|
||||||
|
if ($ob->queueCatId == -1)
|
||||||
|
{
|
||||||
|
$query2 = "select * from appFamily where appId = '$ob->queueName';";
|
||||||
|
$result2 = mysql_query($query2);
|
||||||
|
if($result2)
|
||||||
|
{
|
||||||
|
$ob2 = mysql_fetch_object($result2);
|
||||||
|
echo " <td><a href='adminAppQueue.php?sub=view&queueId=$ob->queueId'>$ob2->appName</a></td>\n";
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
echo " <td><a href='adminAppQueue.php?sub=view&queueId=$ob->queueId'>App not found</a></td>\n";
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
{
|
||||||
echo " <td><a href='adminAppQueue.php?sub=view&queueId=$ob->queueId'>$ob->queueName</a></td>\n";
|
echo " <td><a href='adminAppQueue.php?sub=view&queueId=$ob->queueId'>$ob->queueName</a></td>\n";
|
||||||
|
}
|
||||||
echo " <td>".stripslashes($ob->queueVersion)." </td>\n";
|
echo " <td>".stripslashes($ob->queueVersion)." </td>\n";
|
||||||
echo " <td>".stripslashes($ob->queueVendor)." </td>\n";
|
echo " <td>".stripslashes($ob->queueVendor)." </td>\n";
|
||||||
echo " <td>".stripslashes($ob->queueEmail)." </td>\n";
|
echo " <td>".stripslashes($ob->queueEmail)." </td>\n";
|
||||||
|
|||||||
@@ -35,7 +35,9 @@ function checkInput( $fields )
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Not empty and an invalid e-mail address
|
// Not empty and an invalid e-mail address
|
||||||
if ( !empty( $fields['queueEmail']) AND !preg_match('/^[A-Za-z0-9\._-]+[@][A-Za-z0-9_-]+([.][A-Za-z0-9_-]+)+[A-Za-z]$/',$fields['queueEmail']) )
|
if ( !empty( $fields['queueEmail'])
|
||||||
|
AND !preg_match('/^[A-Za-z0-9\._-]+[@][A-Za-z0-9_-]+([.][A-Za-z0-9_-]+)+[A-Za-z]$/',
|
||||||
|
$fields['queueEmail']) )
|
||||||
{
|
{
|
||||||
$errors .= "<li>Please enter a valid e-mail address.</li>\n";
|
$errors .= "<li>Please enter a valid e-mail address.</li>\n";
|
||||||
}
|
}
|
||||||
@@ -107,7 +109,7 @@ if ($_REQUEST['queueName'])
|
|||||||
echo "soon about the status of your submission</p>\n";
|
echo "soon about the status of your submission</p>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else if ($_REQUEST['apptype'])
|
||||||
{
|
{
|
||||||
// set email field if logged in
|
// set email field if logged in
|
||||||
if ($current && loggedin())
|
if ($current && loggedin())
|
||||||
@@ -133,11 +135,17 @@ else
|
|||||||
echo "<p>To submit screenshots, please email them to ";
|
echo "<p>To submit screenshots, please email them to ";
|
||||||
echo "<a href='mailto:appdb@winehq.org'>appdb@winehq.org</a></p>\n";
|
echo "<a href='mailto:appdb@winehq.org'>appdb@winehq.org</a></p>\n";
|
||||||
|
|
||||||
|
if ($apptype == 1)
|
||||||
|
{
|
||||||
echo html_frame_start("New Application Form",400,"",0);
|
echo html_frame_start("New Application Form",400,"",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>App Name</b></td><td><input type=text name="queueName" value="" size=20></td></tr>',"\n";
|
|
||||||
echo '<tr valign=top><td class=color0><b>App Version</b></td><td><input type=text name="queueVersion" value="" size=20></td></tr>',"\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";
|
||||||
|
|
||||||
// app Category
|
// app Category
|
||||||
$w = new TableVE("view");
|
$w = new TableVE("view");
|
||||||
@@ -146,7 +154,8 @@ else
|
|||||||
echo '</td></tr>',"\n";
|
echo '</td></tr>',"\n";
|
||||||
|
|
||||||
|
|
||||||
echo '<tr valign=top><td class=color0><b>App Vendor</b></td><td><input type=text name="queueVendor" value="" size=20></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
|
//alt vendor
|
||||||
@@ -155,16 +164,78 @@ else
|
|||||||
$x->make_option_list("altvendor","","vendor","vendorId","vendorName");
|
$x->make_option_list("altvendor","","vendor","vendorId","vendorName");
|
||||||
echo '</td></tr>',"\n";
|
echo '</td></tr>',"\n";
|
||||||
|
|
||||||
echo '<tr valign=top><td class=color0><b>App URL</b></td><td><input type=text name="queueURL" value="" size=20></td></tr>',"\n";
|
echo '<tr valign=top><td class=color0><b>App URL</b></td>',"\n";
|
||||||
echo '<tr valign=top><td class=color0><b>App Desc</b></td><td><textarea name="queueDesc" rows=10 cols=35></textarea></td></tr>',"\n";
|
echo '<td><input type=text name="queueURL" value="" size=20></td></tr>',"\n";
|
||||||
echo '<tr valign=top><td class=color0><b>Email</b></td><td><input type=text name="queueEmail" value="'.$email.'" size=20></td></tr>',"\n";
|
|
||||||
echo '<tr valign=top><td class=color3 align=center colspan=2> <input type=submit value=" Submit New Application " class=button> </td></tr>',"\n";
|
echo '<tr valign=top><td class=color0><b>App Desc</b></td>',"\n";
|
||||||
|
echo '<td><textarea name="queueDesc" rows=10 cols=35></textarea></td></tr>',"\n";
|
||||||
|
|
||||||
|
echo '<tr valign=top><td class=color0><b>Email</b></td>',"\n";
|
||||||
|
echo '<td><input type=text name="queueEmail" value="'.$email.'" size=20></td></tr>',"\n";
|
||||||
|
|
||||||
|
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 '</table>',"\n";
|
||||||
|
|
||||||
echo html_frame_end();
|
echo html_frame_end();
|
||||||
|
|
||||||
echo "</form>";
|
echo "</form>";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
echo html_frame_start("New Version Form",400,"",0);
|
||||||
|
|
||||||
|
echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
|
||||||
|
|
||||||
|
//app parent
|
||||||
|
$x = new TableVE("view");
|
||||||
|
echo '<tr valign=top><td class=color0><b>App Parent</b></td><td>',"\n";
|
||||||
|
$x->make_option_list("queueName","","appFamily","appId","appName");
|
||||||
|
echo '</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";
|
||||||
|
|
||||||
|
echo '<tr valign=top><td class=color0><b>App URL</b></td>',"\n";
|
||||||
|
echo '<td><input type=text name="queueURL" value="" size=20></td></tr>',"\n";
|
||||||
|
|
||||||
|
echo '<tr valign=top><td class=color0><b>App Desc</b></td>',"\n";
|
||||||
|
echo '<td><textarea name="queueDesc" rows=10 cols=35></textarea></td></tr>',"\n";
|
||||||
|
|
||||||
|
echo '<tr valign=top><td class=color0><b>Email</b></td>',"\n";
|
||||||
|
echo '<td><input type=text name="queueEmail" value="'.$email.'" size=20></td></tr>',"\n";
|
||||||
|
|
||||||
|
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();
|
||||||
|
|
||||||
|
echo "</form>";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
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";
|
||||||
|
echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
|
||||||
|
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();
|
apidb_footer();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user