- use queued screenshot directory instead of mysql to store queued data
- use the config file to determine thumbnail size
This commit is contained in:
@@ -22,12 +22,8 @@ if(!loggedin())
|
||||
if (!$_REQUEST['queueId'])
|
||||
{
|
||||
//get available appData
|
||||
$query = "SELECT queueId, queueappId, queueversionId,".
|
||||
"queuetype, queuedescription,".
|
||||
"queueurl,queuecontent,queueuserId,".
|
||||
"UNIX_TIMESTAMP(submitTime) as submitTime ".
|
||||
"from appDataQueue;";
|
||||
$result = mysql_query($query);
|
||||
$str_query = "SELECT * from appDataQueue;";
|
||||
$result = mysql_query($str_query);
|
||||
|
||||
if(!$result || !mysql_num_rows($result))
|
||||
{
|
||||
@@ -68,14 +64,14 @@ if (!$_REQUEST['queueId'])
|
||||
if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
|
||||
echo "<tr class=$bgcolor>\n";
|
||||
echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." </td>\n";
|
||||
echo " <td><a href='adminAppDataQueue.php?queueId=$ob->queueId'>$ob->queueId</a></td>\n";
|
||||
if($ob->queueuserId)
|
||||
echo " <td>".lookupUsername($ob->queueuserId)." (".lookupEmail($ob->queueuserId).")</td>\n";
|
||||
echo " <td><a href='adminAppDataQueue.php?queueId=$ob->queueId'>".$ob->queueId."</a></td>\n";
|
||||
if($ob->userId)
|
||||
echo " <td>".lookupUsername($ob->userId)." (".lookupEmail($ob->userId).")</td>\n";
|
||||
else
|
||||
echo " <td>Anonymous</td>\n";
|
||||
echo "<td>".appIdToName($ob->queueappId)."</td>\n";
|
||||
echo "<td>".versionIdToName($ob->queueversionId)."</td>\n";
|
||||
echo "<td>".$ob->queuetype."</td>\n";
|
||||
echo "<td>".appIdToName($ob->appId)."</td>\n";
|
||||
echo "<td>".versionIdToName($ob->versionId)."</td>\n";
|
||||
echo "<td>".$ob->type."</td>\n";
|
||||
echo "</tr>\n\n";
|
||||
$c++;
|
||||
}
|
||||
@@ -101,7 +97,7 @@ if (!$_REQUEST['queueId'])
|
||||
if(!$_REQUEST['sub']=="inside_form")
|
||||
{
|
||||
|
||||
echo '<form name="qform" action="adminAppDataQueue.php" method="get">',"\n";
|
||||
echo '<form name="qform" action="adminAppDataQueue.php" method="post">',"\n";
|
||||
// help
|
||||
echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n";
|
||||
echo "Please enter an accurate and personalized reply anytime a submitted scrrenshot is rejected.\n";
|
||||
@@ -114,29 +110,39 @@ if (!$_REQUEST['queueId'])
|
||||
|
||||
// app name
|
||||
echo '<tr valign=top><td class=color0><b>App Name</b></td>',"\n";
|
||||
echo "<td>".appIdToName($obj_row->queueappId)."</td></tr>\n";
|
||||
echo "<td>".appIdToName($obj_row->appId)."</td></tr>\n";
|
||||
|
||||
// version
|
||||
echo '<tr valign=top><td class=color0><b>App Version</b></td>',"\n";
|
||||
echo "<td>".versionIdToName($obj_row->queueversionId)."</td></tr>\n";
|
||||
echo "<td>".versionIdToName($obj_row->versionId)."</td></tr>\n";
|
||||
|
||||
//dataDescription
|
||||
echo '<tr valign=top><td class=color0><b>Description</b></td>',"\n";
|
||||
echo '<td><textarea name="description" rows=10 cols=35>'.stripslashes($obj_row->queuedescription).'</textarea></td></tr>',"\n";
|
||||
echo '<td><textarea name="description" rows=10 cols=35>'.stripslashes($obj_row->description).'</textarea></td></tr>',"\n";
|
||||
|
||||
//data
|
||||
if($obj_row->queuetype == "image")
|
||||
if($obj_row->type == "image")
|
||||
{
|
||||
$tmpfname = rand()."screenshotQueue".$obj_row->queueId;
|
||||
$handle = fopen("../data/screenshots/".$tmpfname, "wb");
|
||||
fwrite($handle, $obj_row->queuecontent);
|
||||
fclose($handle);
|
||||
echo '<tr valign=top><td class=color0><b>Submited image</b></td>',"\n";
|
||||
echo '<td><img src="screenshotQueue.php?file='.$tmpfname.'" title="'.stripslashes($obj_row->queueurl).'" /></td></tr>',"\n";
|
||||
} elseif($obj_row->queuetype == "url")
|
||||
echo '<td>';
|
||||
$imgSRC = '<img width="'.APPDB_THUMBNAIL_WIDTH.'" height="'.APPDB_THUMBNAIL_HEIGHT.'" src="screenshotQueue.php?queueId='.$obj_row->queueId.'" />';
|
||||
// generate random tag for popup window
|
||||
$randName = generate_passwd(5);
|
||||
// set image link based on user pref
|
||||
$img = '<a href="javascript:openWin(\'screenshotQueue.php?queueId='.$obj_row->queueId.'\',\''.$randName.'\','.APPDB_SCREENSHOT_MAXWIDTH.','.APPDB_SCREENSHOT_MAXHEIGHT.');">'.$imgSRC.'</a>';
|
||||
if (loggedin())
|
||||
{
|
||||
if ($_SESSION['current']->getpref("window:screenshot") == "no")
|
||||
{
|
||||
$img = '<a href="screenshotQueue.php?queueId='.$obj_row->queueId.'">'.$imgSRC.'</a>';
|
||||
}
|
||||
}
|
||||
echo $img;
|
||||
echo '</td></tr>',"\n";
|
||||
} elseif($obj_row->type == "url")
|
||||
{
|
||||
echo '<tr valign=top><td class=color0><b>Submitted link</b></td>',"\n";
|
||||
echo '<td><textarea name="content" rows=10 cols=35>'.stripslashes($obj_row->queueurl).'</textarea></td></tr>',"\n";
|
||||
echo '<td><textarea name="content" rows=10 cols=35>'.stripslashes($obj_row->url).'</textarea></td></tr>',"\n";
|
||||
}
|
||||
|
||||
//email response
|
||||
@@ -160,30 +166,33 @@ if (!$_REQUEST['queueId'])
|
||||
$statusMessage = "";
|
||||
$goodtogo = 0;
|
||||
|
||||
if($obj_row->queuetype == "image")
|
||||
if($obj_row->type == "image")
|
||||
{
|
||||
// we write the content in a realfile
|
||||
$fname = $obj_row->queuappId."-".$obj_row->queueversionId."-".$obj_row->queueurl;
|
||||
$handle = fopen("../data/screenshots/".$fname, "wb");
|
||||
fwrite($handle, $obj_row->queuecontent);
|
||||
fclose($handle);
|
||||
|
||||
$query = "INSERT INTO appData VALUES (null, ".$obj_row->queueappId.", ".$obj_row->queueversionId.", 'image', ".
|
||||
"'".addslashes($_REQUEST['description'])."', '".$fname."')";
|
||||
$str_query = "INSERT INTO appData VALUES (null, ".$obj_row->appId.", ".$obj_row->versionId.", 'image', ".
|
||||
"'".addslashes($_REQUEST['description'])."', '')";
|
||||
mysql_query($str_query);
|
||||
$int_id = mysql_insert_id();
|
||||
|
||||
// we move the content in the live directory
|
||||
rename("../data/queued/screenshots/".$obj_row->queueId, "../data/screenshots/".$int_id);
|
||||
|
||||
// we have to update the entry now that we know its name
|
||||
$str_query = "UPDATE appData SET url = '".$int_id."' WHERE id = '".$int_id."'";
|
||||
|
||||
}
|
||||
elseif ($obj_row->queuetype == "url") {
|
||||
$query = "INSERT INTO appData VALUES (null, ".$obj_row->queueappId.", ".$obj_row->queueversionId.", 'url', ".
|
||||
elseif ($obj_row->type == "url") {
|
||||
$query = "INSERT INTO appData VALUES (null, ".$obj_row->appId.", ".$obj_row->versionId.", 'url', ".
|
||||
"'".addslashes($_REQUEST['description'])."', '".$obj_row->url."')";
|
||||
}
|
||||
|
||||
if(debugging()) addmsg("<p align=center><b>query:</b> $query </p>","green");
|
||||
|
||||
if (mysql_query($query))
|
||||
if (mysql_query($str_query))
|
||||
{
|
||||
$statusMessage = "<p>The application data was successfully added into the database</p>\n";
|
||||
|
||||
//delete the item from the queue
|
||||
mysql_query("DELETE from appDataQueue where queueId = ".$_REQUEST['queueId'].";");
|
||||
mysql_query("DELETE from appDataQueue where queueId = ".$obj_row->queueId.";");
|
||||
|
||||
$goodtogo = 1; /* set to 1 so we send the response email */
|
||||
} else
|
||||
@@ -193,17 +202,17 @@ if (!$_REQUEST['queueId'])
|
||||
}
|
||||
|
||||
//Send Status Email
|
||||
if (lookupEmail($obj_row->queueuserId) && $goodtogo)
|
||||
if (lookupEmail($obj_row->userId) && $goodtogo)
|
||||
{
|
||||
$ms = "Application Data Request Report\n";
|
||||
$ms .= "----------------------------------\n\n";
|
||||
$ms .= "Your submission of an application data for ".appIdToName($obj_row->queueappId).versionIdToName($obj_row->queueversionId)." has been accepted. ";
|
||||
$ms .= "Your submission of an application data for ".appIdToName($obj_row->appId).versionIdToName($obj_row->versionId)." has been accepted. ";
|
||||
$ms .= $_REQUEST['replyText'];
|
||||
$ms .= "We appreciate your help in making the Application Database better for all users.\n\n";
|
||||
$ms .= "Thanks!\n";
|
||||
$ms .= "-The AppDB admins\n";
|
||||
|
||||
mail(stripslashes(lookupEmail($obj_row->queueuserId)),'[AppDB] Application Data Request Report',$ms);
|
||||
mail(stripslashes(lookupEmail($obj_row->userId)),'[AppDB] Application Data Request Report',$ms);
|
||||
}
|
||||
|
||||
//done
|
||||
@@ -220,12 +229,14 @@ if (!$_REQUEST['queueId'])
|
||||
$ms .= "";
|
||||
$ms .= "-The AppDB admins\n";
|
||||
|
||||
mail(stripslashes(lookupEmail($obj_row->queueuserId)),'[AppDB] Application Data Request Report',$ms);
|
||||
mail(stripslashes(lookupEmail($obj_row->userId)),'[AppDB] Application Data Request Report',$ms);
|
||||
}
|
||||
|
||||
//delete main item
|
||||
$query = "DELETE from appDataQueue where queueId = ".$_REQUEST['queueId'].";";
|
||||
$result = mysql_query($query);
|
||||
$str_query = "DELETE from appDataQueue where queueId = ".$obj_row->queueId.";";
|
||||
unlink("../data/queued/screenshots/".$obj_row->queueId);
|
||||
|
||||
$result = mysql_query($str_query);
|
||||
echo html_frame_start("Delete application data submission",400,"",0);
|
||||
if(!$result)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user