diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php
index 16dae02..a24d58b 100644
--- a/admin/adminAppQueue.php
+++ b/admin/adminAppQueue.php
@@ -1,7 +1,6 @@
Application Not Found! ',"\n";
- echo html_frame_end(" ");
+ echo html_frame_start("Error","300");
+ echo 'Application Not Found!
',"\n";
+ echo html_frame_end(" ");
}
//process according to sub flag
if ($sub == 'view' && $queueId)
{
- $x = new TableVE("view");
+ $x = new TableVE("view");
//help
- echo "\n\n";
- echo "This is the full view of the application waiting to be approved. You need to pick a category before submitting \n";
- echo "it into the database. If you approve this application, an email will be sent to the author of the submission.
\n";
- echo "
There are two kinds of applications in this database:
\n";
- echo "\n";
- echo " App Family This is a parent group application, that will have multiple versions under it.\n";
- echo "
App Version This type of application will be nested under the selected application parent. The category,\n";
- echo " name, and vendor fields will be ignored.
\n\n";
+ echo "This is the full view of the application waiting to be approved. \n";
+ echo "You need to pick a category before submitting \n";
+ echo "it into the database. If you approve this application,\n";
+ echo "an email will be sent to the author of the submission.
\n";
+ echo "
There are two kinds of applications in this database:
\n";
+ echo "\n";
+ echo " App Family This is a parent group application, that will have multiple versions under it.\n";
+ echo "
App Version This type of application will be nested under the selected application parent.\n";
+ echo " The category, name, and vendor fields will be ignored.
\n";
-
- //type
- echo 'Type ',"\n";
- echo 'Application Version Category ',"\n";
- $x->make_option_list("cat","","appCategory","catId","catName");
- echo ' App Parent ',"\n";
- $x->make_option_list("appParent","","appFamily","appId","appName");
- echo ' App Name \n";
+
+ //type
+ echo 'Type ',"\n";
+ echo 'Application Version App Version App Vendor ',"\n";
- $x->make_option_list("altvendor","$ob2->vendorId","vendor","vendorId","vendorName");
+ if($result)
+ {
+
+ $ob2 = mysql_fetch_object($result);
+
+ echo ' Category ',"\n";
+ $x->make_option_list("cat",stripslashes($ob2->catId),"appCategory","catId","catName");
+ echo ' Category ',"\n";
+ $x->make_option_list("cat","","appCategory","catId","catName");
+ echo ' App Parent ',"\n";
+ $x->make_option_list("appParent","","appFamily","appId","appName");
echo ' App Vendor ',"\n";
- $x->make_option_list("altvendor","","vendor","vendorId","vendorName");
- echo ' App Name App Version App URL App Desc Email Image
',"\n";
- echo 'App Vendor ',"\n";
+ $x->make_option_list("altvendor", $checkvendor ,"vendor","vendorId","vendorName");
+ echo ' App Vendor ',"\n";
+ $x->make_option_list("altvendor","","vendor","vendorId","vendorName");
+ echo ' App URL App Desc Email Image ' ,"\n";
+ echo '
',"\n";
+ echo 'The application $queueName was successfully added into the database
\n";
- $goodtogo = 1;
- }
- else
- {
- //error
- $statusMessage = "Database Error!
\n";
- $statusMessage .= "Note: The application family was successfully added.
\n";
- }
-
- }
- else
- {
- //error
- $statusMessage = "Database Error!
\n";
- }
- }
- else if ($type == 'ver')
- {
- //process as application version
- if ($appParent)
- {
- $query = "INSERT into appVersion VALUES (null, $appParent, '".
- addslashes($queueVersion)."', '', '".
- addslashes($queueDesc)."', '".
- addslashes($queueURL)."', 0.0, 0.0);";
-
- if (mysql_query($query))
- {
- //successful
- $statusMessage = "The application $queueName was successfully added into the database
\n";
- mysql_query("DELETE from appQueue where queueId = $queueId;");
- $goodtogo = 1;
-
- }
- else
- {
- //error
- $statusMessage = "Database Error!
\n";
- }
- }
- else
- {
- $statusMessage = "Error
\n";
- }
-
- }
-
- //Send Status Email
- if ($ob->queueEmail && $goodtogo)
- {
- $ms = "Application Database Status Report\n";
- $ms .= "----------------------------------\n\n";
- $ms .= "Your application ".stripslashes($ob->queueName)." has been entered ";
- $ms .= "into the application database.\n\n";
- $ms .= "Thanks!\n";
-
- mail(stripslashes($ob->queueEmail),'[AppDB] Status Report',$ms);
- }
-
+ //delete queue item
+ mysql_query("DELETE from appQueue where queueId = $queueId;");
+
+ //set ver if not set
+ if (!$queueVersion)
+ $queueVersion = '1.0';
+ if (!$queueDesc)
+ $queueDesc = 'released version';
+
+ $verQuery = "INSERT into appVersion VALUES (null, $appParent, '".
+ addslashes($queueVersion)."', '', '".
+ addslashes($queueDesc)."', '".
+ addslashes($queueURL)."', 0.0, 0.0);";
+
+ //Now add a version
+ if (mysql_query($verQuery))
+ {
+ //successful
+ $statusMessage = "The application $queueName was successfully added into the database
\n";
+ $goodtogo = 1;
+ }
+ else
+ {
+ //error
+ $statusMessage = "Database Error!
\n";
+ $statusMessage .= "Note: The application family was successfully added.
\n";
+ }
+
+ }
+ else
+ {
+ //error
+ $statusMessage = "Database Error!
\n";
+ }
+ }
+ else if ($type == 'ver')
+ {
+ //process as application version
+ if ($appParent)
+ {
+ $query = "INSERT into appVersion VALUES (null, $appParent, '".
+ addslashes($queueVersion)."', '', '".
+ addslashes($queueDesc)."', '".
+ addslashes($queueURL)."', 0.0, 0.0);";
+
+ if (mysql_query($query))
+ {
+ //successful
+ $statusMessage = "The application $queueName was successfully added into the database
\n";
+ mysql_query("DELETE from appQueue where queueId = $queueId;");
+ $goodtogo = 1;
+
+ }
+ else
+ {
+ //error
+ $statusMessage = "Database Error!
\n";
+ }
+ }
+ else
+ {
+ $statusMessage = "Error
\n";
+ }
+
+ }
+
+ //Send Status Email
+ if ($ob->queueEmail && $goodtogo)
+ {
+ $ms = "Application Database Status Report\n";
+ $ms .= "----------------------------------\n\n";
+ $ms .= "Your application ".stripslashes($ob->queueName)." has been entered ";
+ $ms .= "into the application database.\n\n";
+ $ms .= "Thanks!\n";
+
+ mail(stripslashes($ob->queueEmail),'[AppDB] Status Report',$ms);
+ }
+
//done
- echo html_frame_start("Submit Application","300");
- echo "$statusMessage
\n";
- echo html_frame_end(" ");
- echo html_back_link(1,'adminAppQueue.php');
+ echo html_frame_start("Submit Application","300");
+ echo "$statusMessage
\n";
+ echo html_frame_end(" ");
+ echo html_back_link(1,'adminAppQueue.php');
}
else if ($sub == 'delete' && $queueId)
{
@@ -255,12 +286,12 @@ if ($sub)
if(!$result)
{
//error
- echo "Internal Error: unable to delete selected application!
\n";
+ echo "Internal Error: unable to delete selected application!
\n";
}
else
{
//success
- echo "Application was successfully deleted from the Queue.
\n";
+ echo "Application was successfully deleted from the Queue.
\n";
}
echo html_frame_end(" ");
echo html_back_link(1,'adminAppQueue.php');
@@ -268,17 +299,17 @@ if ($sub)
else
{
//error no sub!
- echo html_frame_start("Error","300");
- echo 'Internal Routine Not Found!
',"\n";
- echo html_frame_end(" ");
- echo html_back_link(1,'adminAppQueue.php');
+ echo html_frame_start("Error","300");
+ echo 'Internal Routine Not Found!
',"\n";
+ echo html_frame_end(" ");
+ echo html_back_link(1,'adminAppQueue.php');
}
}
else
{
//get available apps
$query = "SELECT queueId, queueName, queueVendor,".
- "queueEmail,".
+ "queueVersion, queueEmail,".
"UNIX_TIMESTAMP(submitTime) as submitTime ".
"from appQueue;";
$result = mysql_query($query);
@@ -286,52 +317,52 @@ else
if(!$result || !mysql_num_rows($result))
{
//no apps in queue
- echo html_frame_start("","90%");
- echo 'The Application Queue is empty.
',"\n";
- echo 'There is nothing for you to do. Check back later.
',"\n";
- echo html_frame_end(" ");
+ echo html_frame_start("","90%");
+ echo 'The Application Queue is empty.
',"\n";
+ echo 'There is nothing for you to do. Check back later.
',"\n";
+ echo html_frame_end(" ");
}
else
{
//help
- echo "\n\n";
+ echo "\n\n";
echo "This is the list of applications waiting for your approval, or to be annihilated from existence.
\n";
echo "To view a submission, click on its name. From that page you can edit, and approve it into the AppDB.
\n";
- echo "
\n\n";
-
- echo "\n";
- echo " Submission Date Application Name Version Vendor Submitter Email \n";
- echo " \n\n";
+ echo html_frame_start("","90%","",0);
+ echo "\n\n";
- $c = 1;
- while($ob = mysql_fetch_object($result))
+ echo "\n";
+ echo " Submission Date Application Name Version Vendor Submitter Email \n";
+ echo " \n\n";
+
+ $c = 1;
+ while($ob = mysql_fetch_object($result))
{
- if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
- echo "\n";
- echo " ".date("Y-n-t h:i:sa", $ob->submitTime)." \n";
- echo " $ob->queueName ".stripslashes($ob->queueVersion)." \n";
- echo " ".stripslashes($ob->queueVendor)." \n";
- echo " ".stripslashes($ob->queueEmail)." \n";
- echo " [delete ] \n";
- echo " \n\n";
- $c++;
- }
- echo "
\n\n";
- echo html_frame_end(" ");
+ if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
+ echo "\n";
+ echo " ".date("Y-n-t h:i:sa", $ob->submitTime)." \n";
+ echo " $ob->queueName ".stripslashes($ob->queueVersion)." \n";
+ echo " ".stripslashes($ob->queueVendor)." \n";
+ echo " ".stripslashes($ob->queueEmail)." \n";
+ echo " [delete ] \n";
+ echo " \n\n";
+ $c++;
+ }
+ echo "
\n\n";
+ echo html_frame_end(" ");
}
-
+
}
echo "";
diff --git a/appsubmit.php b/appsubmit.php
index 59720ce..7700eb6 100644
--- a/appsubmit.php
+++ b/appsubmit.php
@@ -91,7 +91,9 @@ if ($_REQUEST['queueName'])
addslashes($_REQUEST['queueEmail'])."', '".
addslashes($_REQUEST['queueURL'])."', '".
addslashes($_REQUEST['queueImage'])."',".
- "NOW());";
+ "NOW()".",".
+ addslashes($_REQUEST['queueCatId']).");";
+
mysql_query($query);
if ($error = mysql_error())
@@ -136,8 +138,17 @@ else
echo "\n";
echo 'App Name App Version Category ',"\n";
+ $w->make_option_list("queueCatId","","appCategory","catId","catName");
+ echo ' App Vendor ',"\n";
diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql
index 922c601..e392c35 100644
--- a/tables/appdb_tables.sql
+++ b/tables/appdb_tables.sql
@@ -73,6 +73,7 @@ create table appQueue (
queueURL varchar(100),
queueImage varchar(100) not null,
submitTime timestamp,
+ queueCatId int,
key(queueId)
);