added model number, multiple fixes

PhilippMundhenk · Oct 28, 2023 · b882ee7 · b882ee7
1 parent ca2dbac
commit b882ee7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/files/api/scan.php b/files/api/scan.php
@@ -14,7 +14,7 @@
 	die("Error: No scanning function selected (try append: ?target=<file|email|image|ocr>)");
 }
 if (in_array($target, array('file','email','image','ocr'))) {
-    $output=shell_exec('sudo -u \#'.$_ENV[UID].' /opt/brother/scanner/brscan-skey/script/scanto'.$target.'.sh &');
+    $output=shell_exec('sudo -u \#'.$_ENV[UID].' /opt/brother/scanner/brscan-skey/script/scanto'.$target.'.sh');
 }
 else
 {

diff --git a/files/gui/index.php b/files/gui/index.php
@@ -2,7 +2,7 @@
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <link rel="stylesheet" href="main.css">
-<title>Brother Scanner</title>
+<title>Brother Scanner <?php echo($_ENV["MODEL"]); ?></title>
 <?php
 	if (array_key_exists('RENAME_GUI_SCANTOFILE', $_ENV)) {
 		$button_file = $_ENV["RENAME_GUI_SCANTOFILE"];

diff --git a/files/runScanner.sh b/files/runScanner.sh
@@ -16,7 +16,7 @@ chmod -R 777 /opt/brother
 su - $USERNAME -c "/usr/bin/brsaneconfig4 -a name=$NAME model=$MODEL ip=$IPADDRESS"
 su - $USERNAME -c "/usr/bin/brscan-skey"
 
-if [ "$WEBSERVER" == "true" ]
+if [ "$WEBSERVER" == "true" ]; then
 	echo "starting webserver for API & GUI..."
 	if [[ -z ${PORT} ]]; then
 		PORT=80
@@ -25,7 +25,7 @@ if [ "$WEBSERVER" == "true" ]
 	sed -i "s/server.port\W*= 80/server.port = $PORT/" /etc/lighttpd/lighttpd.conf
 	/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf
 	echo "webserver started"
-}
+fi
 
 echo "capabilities:"
 scanimage -A