Skip to content

Commit a845ace

Browse files
committed
Added quotes around JS to display programming errors. Added uploads dir to repo. Missing dir caused upload errors.
1 parent 3a44bc7 commit a845ace

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -168,3 +168,4 @@ test.php
168168
docs/build
169169
userSettings.json
170170
do_not_run_brewpi
171+
config_user.php

js/maintenance-panel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ $("#maintenance-panel" ).on( "tabsactivate", function( event, ui ) {
220220

221221
function programmingError(string){
222222
"use strict";
223-
window.alert(string);
223+
window.alert("Error while programming: " + string);
224224
}
225225

226226
function programmingDone(){

program_arduino.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
else {
3232
$error = "Unable to open required file (config.php)";
3333
?>
34-
<script type="text/javascript">window.top.window.programmingError(<?php echo $error ?>)</script>
34+
<script type="text/javascript">window.top.window.programmingError(<?php echo "\"$error\"" ?>)</script>
3535
<?php
3636
die($error);
3737
}
@@ -42,7 +42,7 @@
4242
else{
4343
$error = "boardType not specified!";
4444
?>
45-
<script type="text/javascript">window.top.window.programmingError(<?php echo $error ?>)</script>
45+
<script type="text/javascript">window.top.window.programmingError(<?php echo "\"$error\"" ?>)</script>
4646
<?php
4747
die($error);
4848
}
@@ -52,7 +52,7 @@
5252
else{
5353
$error = "restoreSettings not specified!";
5454
?>
55-
<script type="text/javascript">window.top.window.programmingError(<?php echo $error ?>)</script>
55+
<script type="text/javascript">window.top.window.programmingError(<?php echo "\"$error\"" ?>)</script>
5656
<?php
5757
die($error);
5858
}
@@ -62,15 +62,15 @@
6262
else{
6363
$error = "restoreDevices not specified!";
6464
?>
65-
<script type="text/javascript">window.top.window.programmingError(<?php echo $error ?>)</script>
65+
<script type="text/javascript">window.top.window.programmingError(<?php echo "\"$error\"" ?>)</script>
6666
<?php
6767
die($error);
6868
}
6969

7070
if ($_FILES["file"]["error"] > 0){
7171
$error = "Hex file error: " . $_FILES["file"]["error"];
7272
?>
73-
<script type="text/javascript">window.top.window.programmingError(<?php echo $error ?>)</script>
73+
<script type="text/javascript">window.top.window.programmingError(<?php echo "\"$error\"" ?>)</script>
7474
<?php
7575
die($error);
7676
}
@@ -82,7 +82,7 @@
8282
else{
8383
$error = "cannot move uploaded file";
8484
?>
85-
<script type="text/javascript">window.top.window.programmingError(<?php echo $error ?>)</script>
85+
<script type="text/javascript">window.top.window.programmingError(<?php echo "\"$error\"" ?>)</script>
8686
<?php
8787
die($error);
8888
}

uploads/.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except this file
4+
!.gitignore
5+
# Sample data is also ignored, because users can alter it and cause git conflicts.
6+
# We can still change the sample data by adding it with add -f

0 commit comments

Comments
 (0)