Merge branch 'dev' into feature/adminpanel-views

Author: jacques42

gallery.php

@@ -41,7 +41,7 @@
 	<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" href="vendor/PhotoSwipe/dist/photoswipe.css" />
 	<link rel="stylesheet" href="vendor/PhotoSwipe/dist/default-skin/default-skin.css" />
-	<link rel="stylesheet" href="resources/css/style.css" />
+	<link rel="stylesheet" href="resources/css/classic_style.css" />
 	<?php if ($config['gallery_bottom_bar']): ?>
 	<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
 	<?php endif; ?>

lib/services_start.php

@@ -32,7 +32,7 @@ function processIsRunning($pName, $pidFile) {
         print "\t<!-- Remote Buzzer Enabled --- server already started (port in use) -->\n";
     }
 
-    print "\t<script type=\"text/javascript\" src=\"node_modules/socket.io-client/dist/socket.io.slim.js\"></script>\n";
+    print "\t<script type=\"text/javascript\" src=\"node_modules/socket.io-client/dist/socket.io.min.js\"></script>\n";
 }
 
 if ($config['synctodrive_enabled']) {

package.json

@@ -51,16 +51,16 @@
     "npm-run-all": "^4.1.5",
     "rpio": "^2.1.1",
     "selectize": "^0.12.6",
-    "socket.io": "^2.3.0",
-    "socket.io-client": "^2.3.1",
+    "socket.io": "^3.1.0",
+    "socket.io-client": "^3.0.5",
     "waypoints": "^4.0.1",
     "whatwg-fetch": "^3.5.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
     "@prettier/plugin-php": "^0.16.1",
-    "archiver": "^5.1.0",
+    "archiver": "^5.2.0",
     "colors": "^1.4.0",
     "eslint": "^7.17.0",
     "eslint-plugin-node": "^11.1.0",

src/js/remotebuzzer_server.js

@@ -48,8 +48,7 @@ fs.writeFile(pidFilename, myPid, function (err) {
 console.log(
     'socket.io server [',
     myPid,
-    ']: Requested to start on port ',
-    config.remotebuzzer_port,
+    ']: Requested to start on http://' + config.webserver_ip + ':' + config.remotebuzzer_port,
     ', Pin ',
     config.remotebuzzer_pin
 );
@@ -99,7 +98,12 @@ function photoboothAction(type) {
     }
 }
 
-const ioServer = require('socket.io')(config.remotebuzzer_port);
+const ioServer = require('socket.io')(config.remotebuzzer_port, {
+    cors: {
+        origin: 'http://' + config.webserver_ip,
+        methods: ['GET', 'POST']
+    }
+});
 
 ioServer.on('connection', function (client) {
     console.log('socket.io server [', myPid, ']: New client connected - ID', client.id);