Changeset:
ef72c00e2fce
https://sourceforge.net/p/mrbs/hg-code/ci/ef72c00e2fceb47331df85fdd1acb09778b2a6c5
Author:
John Beranek <[email protected]>
Date:
Fri Oct 09 20:51:12 2015 +0100
Log message:
Changed default authentication scheme to 'db'.
diffstat:
tables.my.sql | 2 +-
tables.pg.sql | 2 +-
web/dbsys.inc | 2 +-
web/systemdefaults.inc.php | 6 +++---
web/upgrade/46/mysql.sql | 1 +
web/upgrade/46/post.inc | 18 ++++++++++++++++++
6 files changed, 25 insertions(+), 6 deletions(-)
diffs (77 lines):
diff -r 0eb34fb689d9 -r ef72c00e2fce tables.my.sql
--- a/tables.my.sql Thu Oct 08 22:22:48 2015 +0100
+++ b/tables.my.sql Fri Oct 09 20:51:12 2015 +0100
@@ -189,6 +189,6 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ( 'db_version', '45');
+ VALUES ( 'db_version', '46');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ( 'local_db_version', '1');
diff -r 0eb34fb689d9 -r ef72c00e2fce tables.pg.sql
--- a/tables.pg.sql Thu Oct 08 22:22:48 2015 +0100
+++ b/tables.pg.sql Fri Oct 09 20:51:12 2015 +0100
@@ -180,6 +180,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '45');
+ VALUES ('db_version', '46');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
diff -r 0eb34fb689d9 -r ef72c00e2fce web/dbsys.inc
--- a/web/dbsys.inc Thu Oct 08 22:22:48 2015 +0100
+++ b/web/dbsys.inc Fri Oct 09 20:51:12 2015 +0100
@@ -23,7 +23,7 @@
}
-$db_schema_version = 45;
+$db_schema_version = 46;
$local_db_schema_version = 1;
// Include the abstraction configured to be used for the default MRBS
diff -r 0eb34fb689d9 -r ef72c00e2fce web/systemdefaults.inc.php
--- a/web/systemdefaults.inc.php Thu Oct 08 22:22:48 2015 +0100
+++ b/web/systemdefaults.inc.php Fri Oct 09 20:51:12 2015 +0100
@@ -608,9 +608,9 @@
// "http" "php" "cookie" "ip" "host" "nt" "omni"
// "remote_user"
-$auth["type"] = "config"; // How to validate the user/password. One of "none"
- // "config" "db" "db_ext" "pop3" "imap" "ldap" "nis"
- // "nw" "ext".
+$auth["type"] = "db"; // How to validate the user/password. One of "none"
+ // "config" "db" "db_ext" "pop3" "imap" "ldap" "nis"
+ // "nw" "ext".
// Configuration parameters for 'cookie' session scheme
diff -r 0eb34fb689d9 -r ef72c00e2fce web/upgrade/46/mysql.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/upgrade/46/mysql.sql Fri Oct 09 20:51:12 2015 +0100
@@ -0,0 +1,1 @@
+#
diff -r 0eb34fb689d9 -r ef72c00e2fce web/upgrade/46/post.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/upgrade/46/post.inc Fri Oct 09 20:51:12 2015 +0100
@@ -0,0 +1,18 @@
+<?php
+
+global $auth;
+
+if ($auth["type"] == 'db')
+{
+
+?>
+
+<script type="text/javascript">
+//<![CDATA[
+ alert('If you have just upgraded to MRBS 1.5.0 and had previously configured
MRBS with the \'db\' authentication scheme, please be aware that the default
authentication scheme has now changed to \'db\'. Put "$auth["type"] =
\'config\';" in config.inc.php to go back to the \'config\' scheme.');
+//]];
+</script>
+
+<?php
+
+}
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
