smeserver-phpvirtualbox/contribs10/smeserver-phpvirtualbox-5.2.1-remove_vbox_passwd.patch

diff -urN smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/accounts/defaults/phpvirtualbox/type smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/accounts/defaults/phpvirtualbox/type
--- smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/accounts/defaults/phpvirtualbox/type  2022-10-20 12:29:51.000000000 +1100
+++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/accounts/defaults/phpvirtualbox/type      2015-08-08 21:37:59.000000000 +1000
@@ -1 +1 @@
-url
+reserved
diff -urN smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/templates/opt/phpvirtualbox/config.php/config.php smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/templates/opt/phpvirtualbox/config.php/config.php
--- smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/templates/opt/phpvirtualbox/config.php/config.php        2022-10-20 12:29:51.000000000 +1100
+++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/templates/opt/phpvirtualbox/config.php/config.php    2022-10-20 15:29:49.978343497 +1100
@@ -1,13 +1,9 @@
 {
-    use esmith::AccountsDB;
-    my $adb = esmith::AccountsDB->open_ro or die "Couldn't open Accounst DB\n";
-    my $passwd = do{local(@ARGV,$/)="/home/vbox/.virtualbox/vbox.passwd";<>} or die "vbox credentials NOT found\n";
     
     $OUT .=<<_PARMS;
     
 class phpVBoxConfig {
 var \$username = 'vbox';
-var \$password = '$passwd';
 var \$location = 'http://127.0.0.1:18083/';
 var \$language = 'en';
 var \$vrdeports = '9000-9100';
@@ -20,10 +16,12 @@
 var \$nicMax = 4;
 _PARMS
 
-    my $authtype = $phpvirtualbox{'authtype'};
+    my $authtype = $phpvirtualbox{'authtype'} || 'disabled';
     if ($authtype eq 'webauth') {
        $OUT .= "var \$authLib = 'WebAuth';\n";
        $OUT .= "var \$authConfig = array('adminUser' => 'admin');\n";
+    } elsif ($authtype eq 'Builtin') {
+       $OUT .= "var \$authLib = 'Builtin';\n";
     } elsif ($authtype eq 'LDAP') {
        $OUT .= "var \$authLib = 'LDAP';\n";
        $OUT .= "var \$authConfig = array(\n";
@@ -34,10 +32,7 @@
        $OUT .= "var \$noAuth=true;\n";
     }
 
-    $OUT .=<<_EOF;
-}
-
-_EOF
+    $OUT .= "}\n";
 
 }
 
1	diff -urN smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/accounts/defaults/phpvirtualbox/type smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/accounts/defaults/phpvirtualbox/type
2	--- smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/accounts/defaults/phpvirtualbox/type 2022-10-20 12:29:51.000000000 +1100
3	+++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/accounts/defaults/phpvirtualbox/type 2015-08-08 21:37:59.000000000 +1000
4	@@ -1 +1 @@
5	-url
6	+reserved
7	diff -urN smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/templates/opt/phpvirtualbox/config.php/config.php smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/templates/opt/phpvirtualbox/config.php/config.php
8	--- smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/templates/opt/phpvirtualbox/config.php/config.php 2022-10-20 12:29:51.000000000 +1100
9	+++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/templates/opt/phpvirtualbox/config.php/config.php 2022-10-20 15:29:49.978343497 +1100
10	@@ -1,13 +1,9 @@
11	{
12	- use esmith::AccountsDB;
13	- my $adb = esmith::AccountsDB->open_ro or die "Couldn't open Accounst DB\n";
14	- my $passwd = do{local(@ARGV,$/)="/home/vbox/.virtualbox/vbox.passwd";<>} or die "vbox credentials NOT found\n";
15
16	$OUT .=<<_PARMS;
17
18	class phpVBoxConfig {
19	var \$username = 'vbox';
20	-var \$password = '$passwd';
21	var \$location = 'http://127.0.0.1:18083/';
22	var \$language = 'en';
23	var \$vrdeports = '9000-9100';
24	@@ -20,10 +16,12 @@
25	var \$nicMax = 4;
26	_PARMS
27
28	- my $authtype = $phpvirtualbox{'authtype'};
29	+ my $authtype = $phpvirtualbox{'authtype'} \|\| 'disabled';
30	if ($authtype eq 'webauth') {
31	$OUT .= "var \$authLib = 'WebAuth';\n";
32	$OUT .= "var \$authConfig = array('adminUser' => 'admin');\n";
33	+ } elsif ($authtype eq 'Builtin') {
34	+ $OUT .= "var \$authLib = 'Builtin';\n";
35	} elsif ($authtype eq 'LDAP') {
36	$OUT .= "var \$authLib = 'LDAP';\n";
37	$OUT .= "var \$authConfig = array(\n";
38	@@ -34,10 +32,7 @@
39	$OUT .= "var \$noAuth=true;\n";
40	}
41
42	- $OUT .=<<_EOF;
43	-}
44	-
45	-_EOF
46	+ $OUT .= "}\n";
47
48	}
49