Update index.php

This commit is contained in:
Josh North 2014-08-25 21:59:43 -04:00
parent a6471ace85
commit 56224c4504

View File

@ -102,17 +102,12 @@
</div> </div>
</div> </div>
</form> </form>
<?php <?php
// initialize scanned files directory path // initialize scanned files directory path
$scans_dir = $app_dir . $scan_dir; $scans_dir = $app_dir . $scan_dir;
// set post variables // set post variables
if(isset($_POST['sResolution'])) { $pResolution = $_POST['sResolution']; }; if(isset($_POST['sResolution'])) { $pResolution = $_POST['sResolution']; };
if(isset($_POST['sX'])) { $pX = $_POST['sX']; }; if(isset($_POST['sX'])) { $pX = $_POST['sX']; };
// decide to use scanimage if Flatbed or scanadf if ADF // decide to use scanimage if Flatbed or scanadf if ADF
if (isset($_POST['source'])) { if (isset($_POST['source'])) {
if ($_POST['source']=="Flatbed") { if ($_POST['source']=="Flatbed") {
@ -123,7 +118,6 @@ if (isset($_POST['source'])) {
} else { } else {
$scanprog = $scanimage; $scanprog = $scanimage;
} }
// are we being called as a result of a scan or just initial page view? // are we being called as a result of a scan or just initial page view?
if (isset($_POST['scan'])) { if (isset($_POST['scan'])) {
$descriptorspec = array( $descriptorspec = array(
@ -143,7 +137,6 @@ if (isset($_POST['filenaming'])) {
} else { } else {
$filename = date($date_format); $filename = date($date_format);
} }
// do it! // do it!
$process = proc_open($scanprog . " -d " . $_POST['device'] . " --output-file " . $scans_dir . $filename . "-%04d --source " . $_POST['source'] . " --mode " . $_POST['mode'] . " --resolution " . $sResolution . " -l " . $_POST['l'] . " -t " . $_POST['t'] . " -x " . $sX . " -y " . $_POST['y'], $descriptorspec, $pipes, $cwd, $env); $process = proc_open($scanprog . " -d " . $_POST['device'] . " --output-file " . $scans_dir . $filename . "-%04d --source " . $_POST['source'] . " --mode " . $_POST['mode'] . " --resolution " . $sResolution . " -l " . $_POST['l'] . " -t " . $_POST['t'] . " -x " . $sX . " -y " . $_POST['y'], $descriptorspec, $pipes, $cwd, $env);
if (is_resource($process)) { if (is_resource($process)) {
@ -168,22 +161,16 @@ if (isset($_POST['filenaming'])) {
// make a (multi-page) pdf file from the scanned pnm files // make a (multi-page) pdf file from the scanned pnm files
// we have to set density to match the scan resolution and then calculate the width to pixels in order to make the pdf correct // we have to set density to match the scan resolution and then calculate the width to pixels in order to make the pdf correct
exec($convert . ' -density ' . $sResolution . ' -page ' . $sX . ' ' . $path . ' ' . $scans_dir . $filename . '.pdf'); exec($convert . ' -density ' . $sResolution . ' -page ' . $sX . ' ' . $path . ' ' . $scans_dir . $filename . '.pdf');
// $output = $convert . " pnm:" . $scans_dir . $firstFile . " -strip " . $scans_dir . $firstFile . ".jpg"; // $output = $convert . " pnm:" . $scans_dir . $firstFile . " -strip " . $scans_dir . $firstFile . ".jpg";
// $output .= ($convert . " " . $path . " " . $scans_dir . $filename . ".pdf"); // $output .= ($convert . " " . $path . " " . $scans_dir . $filename . ".pdf");
echo "Scan Successful!"; echo "Scan Successful!";
} else { } else {
echo "Scan Failed! No pages were scanned. Is there a document in the scanner?"; echo "Scan Failed!";
} }
ob_flush(); ob_flush();
echo ""; echo "";
} }
?> ?>
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2"> <div class="pure-u-1 pure-u-md-1-2">
<h2>Previous Document Scans (PDF)</h2> <h2>Previous Document Scans (PDF)</h2>