Changeset:
79ea406e0760
https://sourceforge.net/p/mrbs/hg-code/ci/79ea406e07601dc98ebedc62662685e48c0de6ae
Author:
Campbell Morrison <[email protected]>
Date:
Fri Oct 16 16:18:31 2015 +0100
Log message:
Merge
diffstat:
INSTALL | 47 ++++++--------------------
LANGUAGE | 16 +++-----
README | 43 +++++++++++-------------
README.sqlapi | 11 ++----
destroy.pg.sql | 7 +++-
grant.pg.sql | 10 +++--
sample-data.sql | 19 -----------
testdata.php | 79 ----------------------------------------------
web/auth/auth_ldap.inc | 38 ++++++++++++++++++---
web/systemdefaults.inc.php | 10 ++++-
web/version_num.inc | 2 +-
11 files changed, 95 insertions(+), 187 deletions(-)
diffs (truncated from 479 to 300 lines):
diff -r 8fd4e3906c36 -r 79ea406e0760 INSTALL
--- a/INSTALL Fri Oct 16 16:16:50 2015 +0100
+++ b/INSTALL Fri Oct 16 16:18:31 2015 +0100
@@ -4,15 +4,15 @@
REQUIREMENTS
---------------------------------------------------------------------------
-MRBS works with both MySQL (Version 5 and above) and PostgreSQL (Version 7.3
-and above) systems. You must have PHP with support for your chosen database
-system installed and working for this application. See the PHP (www.php.net),
-MySQL (www.mysql.com), and PostgreSQL (www.postgresql.org) sites for more
-info on setting these up. You need to know how to install, secure, run,
-maintain, and back up your chosen database system.
+MRBS works with both MySQL (Version 5.1 and above) and PostgreSQL
+(Version 8.2 and above) systems. You must have at least PHP 5.3.3, with support
+for your chosen database system installed and working for this application.
+See the PHP (www.php.net), MySQL (www.mysql.com), and PostgreSQL
+(www.postgresql.org) sites for more info on setting these up. You need
+to know how to install, secure, run, maintain, and back up your chosen
database system.
-No optional PHP packages (other than the database system) are required for
-this application. PHP Version 5.3.0 or later is required.
+MRBS also requires that 'iconv' PHP extension, to provide
+internationalisation.
You can run PHP either as a CGI or with a direct module interface (also called
SAPI). These servers include Apache, Microsoft Internet Information Server,
@@ -102,16 +102,7 @@
You may need to set rights on the tables; for PostgreSQL see "grant.pg.sql".
If you need to delete the tables, for PostgreSQL see "destroy.pg.sql".
-The tables are now empty and ready for use. If you want to add a few sample
-areas and rooms without going through the Admin function, use this script:
-
-[MySQL] $ mysql mrbs < sample-data.sql
-[PostgreSQL] $ psql -a -f sample-data.sql mrbs
-
-Substitute the database name you used for "mrbs".
-This script is only for use in a newly initialized database! (It will not
-work properly in a database where the ID counters are greater than 0.)
-Also see the description of testdata.php in the README file.
+The tables are now empty and ready for use.
For an upgrade:
@@ -363,7 +354,6 @@
First, select your database system. Define one of the following:
- $dbsys = "mysql";
$dbsys = "mysqli";
$dbsys = "pgsql";
@@ -451,20 +441,9 @@
MRBS will serve all of its pages in UTF-8 and stores everything in the
database in UTF-8. This means that all languages work together.
-To use Unicode, PHP should be built with 'iconv' support ('--with-iconv'
-directive), or have the iconv extension installed and enabled. On Windows,
-if you are using PHP 5, iconv support is built-in.
-
-For PHP 4 on Windows, three things are needed :
-
-- iconv.dll file in in the system path. Either copy it from your
- \%phpdir%\dlls\ directory into \%windir%\system32\ directory,
- or add your \%phpdir%\dlls\ directory to your PATH environment variable.
- (Note: for Microsoft IIS, you HAVE to copy iconv.dll into
\%windir%\system32\)
-- uncomment php_iconv.dll in php.ini.
-- extension directory in php.ini have to be properly set to your actual
- \%phpdir%\extensions\
-
+For MRBS to use Unicode, PHP must be built with 'iconv' support
+('--with-iconv' directive), or have the iconv extension installed
+and enabled. On Windows, if you are using PHP 5, iconv support is built-in.
Note: Upgrading MySQL database from previous charsets to Unicode :
@@ -518,5 +497,3 @@
directory accessible to your web server. Anyone running this will add a
large number of test entries to your database, regardless of
authentication, and book all your rooms to people you've never heard of.
-
-$Id$
diff -r 8fd4e3906c36 -r 79ea406e0760 LANGUAGE
--- a/LANGUAGE Fri Oct 16 16:16:50 2015 +0100
+++ b/LANGUAGE Fri Oct 16 16:18:31 2015 +0100
@@ -1,9 +1,9 @@
MRBS Language Support
-Each "lang.*" file (in the web/ directory) contains the text strings for
-a language. Not all of these files are complete. Note that MRBS always
-reads the reference file "lang.en" first, before reading another language
-file.
+Each "lang.*" file (in the web/lang/ directory) contains the text strings
+for a language. Not all of these files are complete. Note that MRBS always
+reads a reference file (which defaults to "lang.en") first, before reading
+another language file.
Porting MRBS to another language is relatively easy. From the Admin page,
you will see "Your browser is set to use "xx" language". If no "lang.xx"
@@ -32,9 +32,5 @@
it on the mailing list, so it can be included in future releases. Thanks!
Important note: You should not use any HTML entities in the translation
-other than . If you need to use any other characters that don't fit
-in your single-byte encoding (e.g. iso-8859-1) you should change your
-language's encoding to utf-8, and then you can use whatever characters you
-would like, encoded in utf-8.
-
-$Id$
+other than . If you need to use any other characters you should
+just encode those characters in utf-8.
diff -r 8fd4e3906c36 -r 79ea406e0760 README
--- a/README Fri Oct 16 16:16:50 2015 +0100
+++ b/README Fri Oct 16 16:18:31 2015 +0100
@@ -18,32 +18,29 @@
------
See the INSTALL file for installation instructions.
-Once it's installed try going to http://yourhost/mrbs/ - if you loaded the
-sample data, this should give you a view of the first area meeting rooms
-for today. The (+) symbol means you can add new meetings by clicking
-there. Try it - it should all be pretty obvious. If you haven't loaded the
-sample data, start by clicking on Admin to add your Areas and Rooms.
+Once it's installed try going to http://yourhost/mrbs/
-By default, anyone can connect and only demo users "alice" and "bob" can add
-new meetings (passwords "a" and "b"), and only connections
-from user "administrator"/"secret" are administrators. Only administrators
-can add rooms and areas, and modify any other users' meetings. See
-AUTHENTICATION for a more complete description of the authentication.
+The first thing you'll need to do is login as an administrator and create
+areas and rooms.
-If you copy testdata.php into your web site, you can view
-http://yourhost/mrbs/testdata.php - it will generate a whole load of random
-appointments to fill up the calendar and let you play around. (Don't leave
-testdata.php in your web site, though.)
+The default authentication scheme uses a database table in the MRBS
+database. To create the first user click the "User list" link in the
+top-right of the page. If there aren't any users defined in your database
+yet, you will be able to create the first administrator.
-The latest version was tested with PHP 4.3.2, Apache 1.3.28, and either
-MySQL 4.0.14 or PostgreSQL 7.2. It should work on just about anything
-that's got PHP4 with MySQL or PostgreSQL support but PostgreSQL 7.3 and above.
-MRBS has also been somewhat tested on PHP 5.1.2, MySQL 5.0.18 and Apache
-2.2.0, using both the mysql and mysqli database access methods.
+Once you have logged in as an administrator you can click on "Rooms" and
+create first an "Area", and then a "Room" within that area.
-It should be pretty easy to adjust it to your corporate colours - the file
-mrbs.css is used on every page, as is style.inc. Just fiddle with these until
-you get the result you like.
+There are other ways to configure authentication in MRBS, see the
+file AUTHENTICATION for a more complete description.
+
+The latest version was tested with PHP 5.3.3, Apache 2.4, and either
+MySQL 5.6+ or PostgreSQL 8.2+. It should work on just about anything
+that's got PHP 5.3.3+ with MySQL 5.1+ or PostgreSQL 8.2+.
+
+It should be pretty easy to adjust it to your corporate colours - you can
+modify the themes under "Themes" or (preferably) copy an existing theme
+to a new directory and modify the new theme.
See COPYING for licensing info.
@@ -54,7 +51,7 @@
-------------
Requirements:
-------------
-- PHP4/5 with MySQL and/or PostgreSQL support
+- PHP 5.3.3+ with MySQL and/or PostgreSQL support
- MySQL or PostgreSQL
- Any web server that is supported by PHP
diff -r 8fd4e3906c36 -r 79ea406e0760 README.sqlapi
--- a/README.sqlapi Fri Oct 16 16:16:50 2015 +0100
+++ b/README.sqlapi Fri Oct 16 16:18:31 2015 +0100
@@ -1,9 +1,8 @@
README.sqlapi - Database wrappers for MRBS
-----------------------------------------------------------------------------
This is a simple set of PHP database call wrapper routines, currently
-implemented for MySQL (>= 3.22) (for both the 'mysql' and 'mysqli' extensions
-and PostgreSQL (>= 7.0). It was written for MRBS but may be useful in
-other applications.
+implemented for MySQL (>= 5.1) and PostgreSQL (>= 8.2). It was written
+for MRBS but may be useful in other applications.
This package supports multiple connections to arbitrary databases,
but also handles the default MRBS database connection without the user
@@ -27,7 +26,7 @@
To use this package, include "dbsys.inc" after defining the following
variables:
- $dbsys = The database abstraction to use, 'mysql', 'mysqli' or 'pgsql'
+ $dbsys = The database abstraction to use, 'mysqli' or 'pgsql'
$db_host = The hostname of the database server, or "localhost"
$db_login = The username to use when connecting to the database
$db_password = The database account password
@@ -51,7 +50,7 @@
The way MRBS uses this is to define a configuration file config.inc.php with
the above variables plus:
- $dbsys = "pgsql"; // or: $dbsys = "mysql"; or: $dbsys = "mysqli";
+ $dbsys = "pgsql"; // or: $dbsys = "mysqli";
Then, each PHP script which wants to connect to the database starts with:
include "config.inc.php";
include "dbsys.inc";
@@ -265,5 +264,3 @@
$sql = "SELECT * FROM mytable ORDER BY id LIMIT 20,100";
-----------------------------------------------------------------------------
-
-$Id$
diff -r 8fd4e3906c36 -r 79ea406e0760 destroy.pg.sql
--- a/destroy.pg.sql Fri Oct 16 16:16:50 2015 +0100
+++ b/destroy.pg.sql Fri Oct 16 16:18:31 2015 +0100
@@ -1,4 +1,3 @@
--- $Id$
--
-- MRBS table destruction script for PostgreSQL 7.0 or higher
-- This exists because I can never remember the sequence name magic.
@@ -8,7 +7,6 @@
-- lines below.
--
-
DROP TABLE mrbs_area;
DROP SEQUENCE mrbs_area_id_seq;
DROP TABLE mrbs_room;
@@ -17,3 +15,9 @@
DROP SEQUENCE mrbs_entry_id_seq;
DROP TABLE mrbs_repeat;
DROP SEQUENCE mrbs_repeat_id_seq;
+DROP TABLE mrbs_users;
+DROP SEQUENCE mrbs_users_id_seq;
+DROP TABLE mrbs_variables;
+DROP SEQUENCE mrbs_variables_id_seq;
+DROP TABLE mrbs_zoneinfo;
+DROP SEQUENCE mrbs_zoneinfo_id_seq;
diff -r 8fd4e3906c36 -r 79ea406e0760 grant.pg.sql
--- a/grant.pg.sql Fri Oct 16 16:16:50 2015 +0100
+++ b/grant.pg.sql Fri Oct 16 16:18:31 2015 +0100
@@ -14,10 +14,12 @@
--
-- Copy and edit this file as needed- Change the user name, then run it.
-
-grant all on
+GRANT ALL ON
mrbs_area,mrbs_area_id_seq,
mrbs_entry,mrbs_entry_id_seq,
mrbs_repeat,mrbs_repeat_id_seq,
- mrbs_room,mrbs_room_id_seq
-to mrbs;
+ mrbs_room,mrbs_room_id_seq,
+ mrbs_users,mrbs_users_id_seq,
+ mrbs_variables,mrbs_variables_id_seq,
+ mrbs_zoneinfo,mrbs_zoneinfo_id_seq
+TO mrbs;
diff -r 8fd4e3906c36 -r 79ea406e0760 sample-data.sql
--- a/sample-data.sql Fri Oct 16 16:16:50 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
--- $Id$
---
--- Sample data - make some areas and rooms. (This used to be in tables.sql)
--- This is meant to go into an empty database only!
-
---
--- If you have decided to change the prefix of your tables from 'mrbs_'
--- to something else then you must edit each 'INSERT INTO' line below.
---
-
--- Generate some default areas
-INSERT INTO mrbs_area ( area_name ) VALUES ('Building 1');
-INSERT INTO mrbs_area ( area_name ) VALUES ('Building 2');
-
--- Generate some default rooms
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
1, 'Room 1', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
1, 'Room 2', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
1, 'Room 3', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
1, 'Room 4', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
2, 'Room 1', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
2, 'Room 2', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
2, 'Room 3', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
2, 'Room 4', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
2, 'Room 5', '', 8);
-INSERT INTO mrbs_room ( area_id, room_name, description, capacity ) VALUES (
2, 'Room 6', '', 8);
-
diff -r 8fd4e3906c36 -r 79ea406e0760 testdata.php
--- a/testdata.php Fri Oct 16 16:16:50 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-<?php
-
-// $Id$
-
-// This script initialises the database with some random data
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
