smeserver-mysql55/contribs9/smeserver-mysql55-2.0.0-SME10095-phpmyadmin.patch

diff -Nur smeserver-mysql55-2.0.0.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config smeserver-mysql55-2.0.0/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config
--- smeserver-mysql55-2.0.0.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql55-2.0.0/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config   2017-02-16 00:51:43.885000000 -0500
@@ -0,0 +1,85 @@
+
+/* Server MYSQL55 localhost (config:root) [1] */
+$i++;
+$cfg['Servers'][$i]['host'] = 'localhost';
+$cfg['Servers'][$i]['extension'] = 'mysql';
+$cfg['Servers'][$i]['connect_type'] = 'socket';
+$cfg['Servers'][$i]['socket'] = '/var/lib/mysql/mysql55.sock';
+$cfg['Servers'][$i]['compress'] = false;
+# standalone or login mode
+$scriptname=end(explode('/',$_SERVER['PHP_SELF']));
+$scriptpath=str_replace($scriptname,"",$_SERVER['PHP_SELF']);
+# standalone login part
+{
+my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
+my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
+if (("$adminaccess" eq "enabled"))
+ {
+ $OUT .="if (\$scriptpath==\"/phpmyadmin/\" && \$_SERVER['PHP_AUTH_USER']=='admin')\n";
+ $OUT .="{\n";
+ $OUT .="\$cfg['Servers'][\$i]['auth_type'] = 'config';\n";
+ $OUT .="\$cfg['Servers'][\$i]['user'] = 'root';\n";
+ open (PW, "/etc/openldap/ldap.pw")
+       || die "Could not read LDAP password.\n";
+ my $pw = <PW>;
+ chomp ($pw);
+ close PW;
+ $OUT .="\$cfg['Servers'][\$i]['password']  = '$pw';\n";
+ $OUT .="}";
+ }
+else
+ {
+ $OUT .="# standelaone admin configuration disabled";
+ }
+}
+# end of  standalone login part
+# multiuser login part
+{
+my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
+my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
+ $OUT .="\n";
+if (("$multiaccess" eq "enabled") && ("$adminaccess" eq "enabled"))
+ {
+ $OUT .="if (\$scriptpath==\"/phpmyadmin-multi/\")\n";
+ $OUT .="{\n";
+ }
+if (("$multiaccess" eq "enabled"))
+ {
+ $OUT .="\$cfg['Servers'][\$i]['auth_type'] = 'cookie';\n";
+ my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
+ $OUT .="\$cfg['blowfish_secret'] = '$secret';\n";
+ }
+else
+ {
+  $OUT .="# multiuser disabled\n";
+ }
+if (("$multiaccess" eq "enabled") && ("$adminaccess" eq "enabled"))
+ {
+ $OUT .="}\n";
+ }
+}
+# end of multiuser login part
+$cfg['Servers'][$i]['controluser']   = "";
+$cfg['Servers'][$i]['controlpass']   = "";
+$cfg['Servers'][$i]['only_db']       = "";
+$cfg['Servers'][$i]['hide_db']       = "";
+$cfg['Servers'][$i]['verbose']       = 'Mysql55';// here is the name as it appears in phpmyadmin
+$cfg['Servers'][$i]['pmadb']         = "";
+$cfg['Servers'][$i]['bookmarktable'] = "";
+$cfg['Servers'][$i]['relation']      = "";
+$cfg['Servers'][$i]['table_info']    = "";
+$cfg['Servers'][$i]['table_coords']  = "";
+$cfg['Servers'][$i]['pdf_pages']     = "";
+$cfg['Servers'][$i]['column_info']   = "";
+$cfg['Servers'][$i]['history']       = "";
+$cfg['Servers'][$i]['verbose_check'] = TRUE; 
+$cfg['Servers'][$i]['AllowRoot']     = TRUE;
+$cfg['Servers'][$i]['AllowDeny']['order']="";
+$cfg['Servers'][$i]['AllowDeny']['rules']= array();
+$cfg['Servers'][$i]['AllowNoPassword']= FALSE; 
+$cfg['Servers'][$i]['designer_coords']= "";  
+$cfg['Servers'][$i]['bs_garbage_threshold']= 50;   
+$cfg['Servers'][$i]['bs_repository_threshold']= '32M'; 
+$cfg['Servers'][$i]['bs_temp_blob_timeout']= 600;  
+$cfg['Servers'][$i]['bs_temp_log_threshold']= '32M';
+
1	diff -Nur smeserver-mysql55-2.0.0.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config smeserver-mysql55-2.0.0/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config
2	--- smeserver-mysql55-2.0.0.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config 1969-12-31 19:00:00.000000000 -0500
3	+++ smeserver-mysql55-2.0.0/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11config 2017-02-16 00:51:43.885000000 -0500
4	@@ -0,0 +1,85 @@
5	+
6	+/* Server MYSQL55 localhost (config:root) [1] */
7	+$i++;
8	+$cfg['Servers'][$i]['host'] = 'localhost';
9	+$cfg['Servers'][$i]['extension'] = 'mysql';
10	+$cfg['Servers'][$i]['connect_type'] = 'socket';
11	+$cfg['Servers'][$i]['socket'] = '/var/lib/mysql/mysql55.sock';
12	+$cfg['Servers'][$i]['compress'] = false;
13	+# standalone or login mode
14	+$scriptname=end(explode('/',$_SERVER['PHP_SELF']));
15	+$scriptpath=str_replace($scriptname,"",$_SERVER['PHP_SELF']);
16	+# standalone login part
17	+{
18	+my $adminaccess = ($phpmyadmin{'adminaccess'} \|\| 'enabled');
19	+my $multiaccess = ($phpmyadmin{'multiaccess'} \|\| 'disabled');
20	+if (("$adminaccess" eq "enabled"))
21	+ {
22	+ $OUT .="if (\$scriptpath==\"/phpmyadmin/\" && \$_SERVER['PHP_AUTH_USER']=='admin')\n";
23	+ $OUT .="{\n";
24	+ $OUT .="\$cfg['Servers'][\$i]['auth_type'] = 'config';\n";
25	+ $OUT .="\$cfg['Servers'][\$i]['user'] = 'root';\n";
26	+ open (PW, "/etc/openldap/ldap.pw")
27	+ \|\| die "Could not read LDAP password.\n";
28	+ my $pw = <PW>;
29	+ chomp ($pw);
30	+ close PW;
31	+ $OUT .="\$cfg['Servers'][\$i]['password'] = '$pw';\n";
32	+ $OUT .="}";
33	+ }
34	+else
35	+ {
36	+ $OUT .="# standelaone admin configuration disabled";
37	+ }
38	+}
39	+# end of standalone login part
40	+# multiuser login part
41	+{
42	+my $adminaccess = ($phpmyadmin{'adminaccess'} \|\| 'enabled');
43	+my $multiaccess = ($phpmyadmin{'multiaccess'} \|\| 'disabled');
44	+ $OUT .="\n";
45	+if (("$multiaccess" eq "enabled") && ("$adminaccess" eq "enabled"))
46	+ {
47	+ $OUT .="if (\$scriptpath==\"/phpmyadmin-multi/\")\n";
48	+ $OUT .="{\n";
49	+ }
50	+if (("$multiaccess" eq "enabled"))
51	+ {
52	+ $OUT .="\$cfg['Servers'][\$i]['auth_type'] = 'cookie';\n";
53	+ my $secret = ${'httpd-admin'}{TKTAuthSecret} \|\| "34322500-7330-4400-423A-3A00434F5245";
54	+ $OUT .="\$cfg['blowfish_secret'] = '$secret';\n";
55	+ }
56	+else
57	+ {
58	+ $OUT .="# multiuser disabled\n";
59	+ }
60	+if (("$multiaccess" eq "enabled") && ("$adminaccess" eq "enabled"))
61	+ {
62	+ $OUT .="}\n";
63	+ }
64	+}
65	+# end of multiuser login part
66	+$cfg['Servers'][$i]['controluser'] = "";
67	+$cfg['Servers'][$i]['controlpass'] = "";
68	+$cfg['Servers'][$i]['only_db'] = "";
69	+$cfg['Servers'][$i]['hide_db'] = "";
70	+$cfg['Servers'][$i]['verbose'] = 'Mysql55';// here is the name as it appears in phpmyadmin
71	+$cfg['Servers'][$i]['pmadb'] = "";
72	+$cfg['Servers'][$i]['bookmarktable'] = "";
73	+$cfg['Servers'][$i]['relation'] = "";
74	+$cfg['Servers'][$i]['table_info'] = "";
75	+$cfg['Servers'][$i]['table_coords'] = "";
76	+$cfg['Servers'][$i]['pdf_pages'] = "";
77	+$cfg['Servers'][$i]['column_info'] = "";
78	+$cfg['Servers'][$i]['history'] = "";
79	+$cfg['Servers'][$i]['verbose_check'] = TRUE;
80	+$cfg['Servers'][$i]['AllowRoot'] = TRUE;
81	+$cfg['Servers'][$i]['AllowDeny']['order']="";
82	+$cfg['Servers'][$i]['AllowDeny']['rules']= array();
83	+$cfg['Servers'][$i]['AllowNoPassword']= FALSE;
84	+$cfg['Servers'][$i]['designer_coords']= "";
85	+$cfg['Servers'][$i]['bs_garbage_threshold']= 50;
86	+$cfg['Servers'][$i]['bs_repository_threshold']= '32M';
87	+$cfg['Servers'][$i]['bs_temp_blob_timeout']= 600;
88	+$cfg['Servers'][$i]['bs_temp_log_threshold']= '32M';
89	+