"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "mrbs-1.9.4/web/systemdefaults.inc.php" between
mrbs-1.9.4.tar.gz and mrbs-1.10.0.tar.gz

About: MRBS is a web application for booking meeting rooms or other resources (using PHP and MySQL/pgsql).

systemdefaults.inc.php  (mrbs-1.9.4)	:	systemdefaults.inc.php  (mrbs-1.10.0)
skipping to change at line 174		skipping to change at line 174
// Available options are:		// Available options are:
// "default" Default MRBS theme		// "default" Default MRBS theme
// "classic126" Same colour scheme as MRBS 1.2.6		// "classic126" Same colour scheme as MRBS 1.2.6
$theme = "default";		$theme = "default";
// Use the $custom_css_url to override the standard MRBS CSS.		// Use the $custom_css_url to override the standard MRBS CSS.
//$custom_css_url = 'css/custom.css';		//$custom_css_url = 'css/custom.css';
		// Use the $custom_js_url to add your own JavaScript.
		//$custom_js_url = 'js/custom.js';
/*******************		/*******************
* Calendar settings		* Calendar settings
*******************/		*******************/
// MRBS has two different modes of operation: "times" and "periods". "Times"		// MRBS has two different modes of operation: "times" and "periods". "Times"
// based bookings allow you to define regular consecutive booking slots, eg ever y		// based bookings allow you to define regular consecutive booking slots, eg ever y
// half an hour from 7.00 am to 7.00 pm. "Periods" based bookings are useful		// half an hour from 7.00 am to 7.00 pm. "Periods" based bookings are useful
// in, for example, schools where the booking slots are of different lengths		// in, for example, schools where the booking slots are of different lengths
// and are not consecutive because of change-over time or breaks.		// and are not consecutive because of change-over time or breaks.
skipping to change at line 295		skipping to change at line 298
// at the same time.		// at the same time.
$prevent_simultaneous_bookings = false;		$prevent_simultaneous_bookings = false;
// Set this to true if you want to prevent bookings of a type that is invalid fo r a room		// Set this to true if you want to prevent bookings of a type that is invalid fo r a room
$prevent_invalid_types = true;		$prevent_invalid_types = true;
// The start of the booking day when using periods. Because MRBS has		// The start of the booking day when using periods. Because MRBS has
// no notion of when periods actually occur they are assumed to start		// no notion of when periods actually occur they are assumed to start
// at the time below when we are enforcing book ahead policies.		// at the time below when we are enforcing book ahead policies.
// The setting defines the time of day when bookings open.		// The setting defines the time of day when bookings open.
// This should be a in the format hh:mm using the 24 hour clock.		// This should be a string in the format hh:mm using the 24 hour clock.
$periods_booking_opens = '00:00';		$periods_booking_opens = '00:00';
// When setting max_create_ahead and max_delete_ahead policies, the time interva l is normally		// When setting max_create_ahead and max_delete_ahead policies, the time interva l is normally
// measured to the end time of the booking. This is to prevent users cheating t he system by		// measured to the end time of the booking. This is to prevent users cheating t he system by
// booking a very long slot with the start time just inside the limit and then e ither not using		// booking a very long slot with the start time just inside the limit and then e ither not using
// the early part of the booking, or else editing it down to what they actually need later.		// the early part of the booking, or else editing it down to what they actually need later.
// However this is not very intuitive for users who might expect the measurement to be relative		// However this is not very intuitive for users who might expect the measurement to be relative
// to the start time, in which case this can be achieved by changing this settin g to true.		// to the start time, in which case this can be achieved by changing this settin g to true.
$measure_max_to_start_time = false;		$measure_max_to_start_time = false;
skipping to change at line 335		skipping to change at line 338
// by defining some custom CSS for the .hidden_day class.		// by defining some custom CSS for the .hidden_day class.
$hidden_days = array();		$hidden_days = array();
// Time format in pages. FALSE to show dates in 12 hour format, TRUE to show the m		// Time format in pages. FALSE to show dates in 12 hour format, TRUE to show the m
// in 24 hour format		// in 24 hour format
$twentyfourhour_format = true;		$twentyfourhour_format = true;
// Formats used for dates and times. For formatting options		// Formats used for dates and times. For formatting options
// see http://php.net/manual/function.strftime.php. Note that MRBS will automa tically		// see http://php.net/manual/function.strftime.php. Note that MRBS will automa tically
// convert the following formats which are not supported on Windows: %e, %l, %P and %R.		// convert the following formats which are not supported on Windows: %e, %l, %P and %R.
		// MRBS will use IntlDateFormatter if it exists in preference to strftime() and
		try and convert
		// the strftime formats into an equivalent pattern for use with IntlDateFormatte
		r. The following
		// strftime formats do not have an equivalent and are not supported: %u, %w, %U,
		%V, %W, %C,
		// %g, $G, %l and %s.
$strftime_format['date'] = "%A %d %B %Y"; // Used in Day view		$strftime_format['date'] = "%A %d %B %Y"; // Used in Day view
$strftime_format['date_short'] = "%x"; // Used in Search resul ts		$strftime_format['date_short'] = "%x"; // Used in Search resul ts
$strftime_format['dayname'] = "%A"; // Used in Month view		$strftime_format['dayname'] = "%A"; // Used in Month view
$strftime_format['dayname_edit'] = "%a"; // Used in edit_entry f orm		$strftime_format['dayname_edit'] = "%a"; // Used in edit_entry f orm
$strftime_format['weekview_date'] = "%b %e"; // Used in the table he ader in Week view		$strftime_format['weekview_date'] = "%b %e"; // Used in the table he ader in Week view
$strftime_format['weekview_headers'] = "%a<br>%b %e"; // Used in the table he ader in Month view (all rooms)		$strftime_format['weekview_headers'] = "%a<br>%b %e"; // Used in the table he ader in Week view (all rooms)
$strftime_format['monthview_headers'] = "%a<br>%e"; // Used in the table he ader in Month view (all rooms)		$strftime_format['monthview_headers'] = "%a<br>%e"; // Used in the table he ader in Month view (all rooms)
$strftime_format['minical_monthname'] = "%B %Y"; // Used in mini calenda r heading		$strftime_format['minical_monthname'] = "%B %Y"; // Used in mini calenda r heading
$strftime_format['minical_dayname'] = "%a"; // Used in mini calenda r heading		$strftime_format['minical_dayname'] = "%a"; // Used in mini calenda r heading
$strftime_format['mon'] = "%b"; // Used in date selecto rs		$strftime_format['mon'] = "%b"; // Used in date selecto rs
$strftime_format['ampm'] = "%p";		$strftime_format['ampm'] = "%p";
$strftime_format['time12'] = "%I:%M%p"; // 12 hour clock		$strftime_format['time12'] = "%I:%M%p"; // 12 hour clock
$strftime_format['time24'] = "%H:%M"; // 24 hour clock		$strftime_format['time24'] = "%H:%M"; // 24 hour clock
$strftime_format['datetime'] = "%c"; // Used in Help		$strftime_format['datetime'] = "%c"; // Used in Help
$strftime_format['datetime12'] = "%I:%M%p - %A %d %B %Y"; // 12 hour cl ock		$strftime_format['datetime12'] = "%I:%M%p - %A %d %B %Y"; // 12 hour cl ock
$strftime_format['datetime24'] = "%H:%M - %A %d %B %Y"; // 24 hour cl ock		$strftime_format['datetime24'] = "%H:%M - %A %d %B %Y"; // 24 hour cl ock
skipping to change at line 430		skipping to change at line 437
// (was called $times_right_side in earlier versions of MRBS)		// (was called $times_right_side in earlier versions of MRBS)
$row_labels_both_sides = false;		$row_labels_both_sides = false;
// To display the column headers (times, rooms or days) on the bottom of the tab le as		// To display the column headers (times, rooms or days) on the bottom of the tab le as
// well as the top in the day and week views, set to true;		// well as the top in the day and week views, set to true;
$column_labels_both_ends = false;		$column_labels_both_ends = false;
// Show a line in the day and week views corresponding to the current time		// Show a line in the day and week views corresponding to the current time
$show_timeline = true;		$show_timeline = true;
		// For bookings that allow registration, show the number of people that have
		// registered and, if there is one, the registration limit. This will typically
		// be appended to the description in the calendar view, eg "Lecture [12/40]".
		// The way the registration level is presented can be changed with a
		// $vocab_override config setting.
		$show_registration_level = true;
// Define default starting view (month, week or day)		// Define default starting view (month, week or day)
// Default is day		// Default is day
$default_view = "day";		$default_view = "day";
// The default setting for the week and month views: whether to view all the		// The default setting for the week and month views: whether to view all the
// rooms (true) or not (false).		// rooms (true) or not (false).
$default_view_all = true;		$default_view_all = true;
// Define default room to start with (used by index.php)		// Define default room to start with (used by index.php)
// Room numbers can be determined by looking at the Edit or Delete URL for a		// Room numbers can be determined by looking at the Edit or Delete URL for a
skipping to change at line 518		skipping to change at line 532
$show_plus_link = false; // Change to true to always show the (+) link as in		$show_plus_link = false; // Change to true to always show the (+) link as in
// MRBS 1.1.		// MRBS 1.1.
// PRIVATE BOOKINGS SETTINGS		// PRIVATE BOOKINGS SETTINGS
// Note: some settings for private bookings can be set on a per-area basis and		// Note: some settings for private bookings can be set on a per-area basis and
// so appear in the areadefaults.inc.php file		// so appear in the areadefaults.inc.php file
// Choose which fields should be private by setting		// Choose which fields should be private by setting
// $is_private_field['tablename.columnname'] = true		// $is_private_field['tablename.columnname'] = true
// At the moment only fields in the entry table can be marked as private,		// At the moment only fields in the entry and users table can be marked as priva
// including custom fields, but with the exception of the following fields:		te,
		// including custom fields, but with the exception of the following entry table
		fields:
// start_time, end_time, entry_type, repeat_id, room_id, timestamp, type, status ,		// start_time, end_time, entry_type, repeat_id, room_id, timestamp, type, status ,
// reminded, info_time, info_user, info_text.		// reminded, info_time, info_user, info_text.
$is_private_field['entry.name'] = true;		$is_private_field['entry.name'] = true;
$is_private_field['entry.description'] = true;		$is_private_field['entry.description'] = true;
$is_private_field['entry.create_by'] = true;		$is_private_field['entry.create_by'] = true;
$is_private_field['entry.modified_by'] = true;		$is_private_field['entry.modified_by'] = true;
// SETTINGS FOR APPROVING BOOKINGS - PER-AREA		// SETTINGS FOR APPROVING BOOKINGS - PER-AREA
// These settings can all be be configured on a per-area basis, so these variabl es		// These settings can all be be configured on a per-area basis, so these variabl es
skipping to change at line 626		skipping to change at line 640
// You can define custom entry fields and some of the standard fields (descripti on		// You can define custom entry fields and some of the standard fields (descripti on
// and type) to be mandatory by setting items in the array $is_mandatory_field.		// and type) to be mandatory by setting items in the array $is_mandatory_field.
// (Note that making a checkbox field mandatory means that the box must be check ed.)		// (Note that making a checkbox field mandatory means that the box must be check ed.)
// For example:		// For example:
// $is_mandatory_field['entry.type'] = true;		// $is_mandatory_field['entry.type'] = true;
// $is_mandatory_field['entry.terms_and_conditions'] = true;		// $is_mandatory_field['entry.terms_and_conditions'] = true;
$is_mandatory_field['users.display_name'] = true;		$is_mandatory_field['users.display_name'] = true;
		// You can also enter regular expressions for validating text field input using
		// the pattern attribute. At the moment this is limited to custom fields in the
		// users table. For example the following could be used to ensure a valid US ZI
		P
		// code (you might want to have a better regex - this is just for illustration):
		// $pattern['users.zip_code'] = "^[0-9]{5}(?:-[0-9]{4})?$";
		// You would probably also want to enter a custom error message by using
		// $vocab_override, with the tag consisting of "table.field.oninvalid" eg
		// $vocab_override['users.zip_code.oninvalid']['en'] = "Please enter a valid ZIP
		code, eg '12345' or '12345-6789'";
// Set this to false if you do not want to have the ability to create events for which		// Set this to false if you do not want to have the ability to create events for which
// other people can register.		// other people can register.
$enable_registration = true;		$enable_registration = true;
// The default setting for new entries		// The default setting for new entries
$allow_registration_default = false;		$allow_registration_default = false;
// Whether a limit on the number of registrants is set by default		// Whether a limit on the number of registrants is set by default
$registrant_limit_enabled_default = true;		$registrant_limit_enabled_default = true;
// The default maximum number of registrations allowed		// The default maximum number of registrations allowed
$registrant_limit_default = 1;		$registrant_limit_default = 1;
skipping to change at line 779		skipping to change at line 805
// 'auth_db' configuration settings		// 'auth_db' configuration settings
// The highest level of access (0=none; 1=user; 2+=admin). Used in edit_users .php		// The highest level of access (0=none; 1=user; 2+=admin). Used in edit_users .php
// In the future we might want a higher level of granularity, eg to distinguish between		// In the future we might want a higher level of granularity, eg to distinguish between
// different levels of admin		// different levels of admin
$max_level = 2;		$max_level = 2;
// The lowest level of admin allowed to view other users		// The lowest level of admin allowed to view other users
$min_user_viewing_level = 2;		$min_user_viewing_level = 2;
// The lowest level of admin allowed to edit other users		// The lowest level of admin allowed to edit other users
$min_user_editing_level = 2;		$min_user_editing_level = 2;
		// The lowest level of admin allowed to edit other bookings
		$min_booking_admin_level = 2;
// Password policy. Uncomment the variables and set them to the		// Password policy. Uncomment the variables and set them to the
// required values as appropriate.		// required values as appropriate.
// $pwd_policy['length'] = 6; // Minimum length		// $pwd_policy['length'] = 6; // Minimum length
// $pwd_policy['alpha'] = 1; // Minimum number of alpha characters		// $pwd_policy['alpha'] = 1; // Minimum number of alpha characters
// $pwd_policy['lower'] = 1; // Minimum number of lower case characters		// $pwd_policy['lower'] = 1; // Minimum number of lower case characters
// $pwd_policy['upper'] = 1; // Minimum number of upper case characters		// $pwd_policy['upper'] = 1; // Minimum number of upper case characters
// $pwd_policy['numeric'] = 1; // Minimum number of numeric characters		// $pwd_policy['numeric'] = 1; // Minimum number of numeric characters
// $pwd_policy['special'] = 1; // Minimum number of special characters (not alp hanumeric)		// $pwd_policy['special'] = 1; // Minimum number of special characters (not alp hanumeric)
skipping to change at line 1038		skipping to change at line 1066
// and assign that level to user groups as appropriate.		// and assign that level to user groups as appropriate.
$auth['joomla']['user_access_levels'] = array(); // Can either be a single integ er, or an array of integers.		$auth['joomla']['user_access_levels'] = array(); // Can either be a single integ er, or an array of integers.
// 'auth_saml' configuration settings		// 'auth_saml' configuration settings
// (assuming Active Directory attributes):		// (assuming Active Directory attributes):
$auth['saml']['ssp_path'] = '/opt/simplesamlphp'; // must be an absolute and no t a relative path		$auth['saml']['ssp_path'] = '/opt/simplesamlphp'; // must be an absolute and no t a relative path
$auth['saml']['authsource'] = 'default-sp';		$auth['saml']['authsource'] = 'default-sp';
$auth['saml']['attr']['username'] = 'sAMAccountName';		$auth['saml']['attr']['username'] = 'sAMAccountName';
$auth['saml']['attr']['mail'] = 'mail';		$auth['saml']['attr']['mail'] = 'mail';
$auth['saml']['admin']['memberOf'] = ['CN=Domain Admins,CN=Users,DC=example,DC=c om'];		$auth['saml']['admin']['memberOf'] = ['CN=Domain Admins,CN=Users,DC=example,DC=c om'];
		// MRBS session initialisation can interfere with session handling in some
		// SAML libraries. If so, set this to true.
		$auth['saml']['disable_mrbs_session_init'] = false;
// This scheme assumes that you've already configured SimpleSamlPhp,		// This scheme assumes that you've already configured SimpleSamlPhp,
// and that you have set up aliases in your webserver so that SimpleSamlPhp		// and that you have set up aliases in your webserver so that SimpleSamlPhp
// can handle incoming assertions. Refer to the SimpleSamlPhp documentation		// can handle incoming assertions. Refer to the SimpleSamlPhp documentation
// for more information on how to do that.		// for more information on how to do that.
//		//
// https://simplesamlphp.org/docs/stable/simplesamlphp-install		// https://simplesamlphp.org/docs/stable/simplesamlphp-install
// https://simplesamlphp.org/docs/stable/simplesamlphp-sp		// https://simplesamlphp.org/docs/stable/simplesamlphp-sp
// 'auth_wordpress' configuration settings		// 'auth_wordpress' configuration settings
skipping to change at line 1129		skipping to change at line 1160
$auth['only_admin_can_copy_others_entries'] = false;		$auth['only_admin_can_copy_others_entries'] = false;
// If you don't want ordinary users to be able to see the other users'		// If you don't want ordinary users to be able to see the other users'
// details then set this to true. (Only relevant when using 'db' authentication ]		// details then set this to true. (Only relevant when using 'db' authentication ]
$auth['only_admin_can_see_other_users'] = false;		$auth['only_admin_can_see_other_users'] = false;
// For events that allow registration, the other registrants' names are by defau lt		// For events that allow registration, the other registrants' names are by defau lt
// not shown unless you have write access to the booking.		// not shown unless you have write access to the booking.
$auth['show_registrant_names'] = false;		$auth['show_registrant_names'] = false;
		// For events that allow registration you can also show the registrants' names i
		n
		// the calendar view, whether or not you have write access to the booking.
		// NOTE: you also need $show_registration_level = true; for this to work.
		$auth['show_registrant_names_in_calendar'] = false;
		// You can additionally choose whether to show the registrants' names in the cal
		endar
		// if the calendar is open to the public and the user is not logged in or has le
		vel 0 access.
		// NOTE: you also need $auth['show_registrant_names_in_calendar'] = true; for th
		is to work
		$auth['show_registrant_names_in_public_calendar'] = false;
// Set this to true if you want ordinary users to be able to register others.		// Set this to true if you want ordinary users to be able to register others.
$auth['users_can_register_others'] = false;		$auth['users_can_register_others'] = false;
// Set this to true if you don't want admins to be able to make bookings		// Set this to true if you don't want admins to be able to make bookings
// on behalf of other users		// on behalf of other users
$auth['admin_can_only_book_for_self'] = false;		$auth['admin_can_only_book_for_self'] = false;
// An array of booking types for admin use only		// An array of booking types for admin use only
$auth['admin_only_types'] = array(); // eg array('E');		$auth['admin_only_types'] = array(); // eg array('E');
skipping to change at line 1319		skipping to change at line 1360
// These settings are only used with the "smtp" backend		// These settings are only used with the "smtp" backend
$smtp_settings['host'] = 'localhost'; // SMTP server		$smtp_settings['host'] = 'localhost'; // SMTP server
$smtp_settings['port'] = 25; // SMTP port number		$smtp_settings['port'] = 25; // SMTP port number
$smtp_settings['auth'] = false; // Whether to use SMTP authentication		$smtp_settings['auth'] = false; // Whether to use SMTP authentication
$smtp_settings['secure'] = ''; // Encryption method: '', 'tls' or 'ssl' - note that 'tls' means TLS is used even if the SMTP		$smtp_settings['secure'] = ''; // Encryption method: '', 'tls' or 'ssl' - note that 'tls' means TLS is used even if the SMTP
// server doesn't advertise it. Conversel y if you specify '' and the server advertises TLS, TLS		// server doesn't advertise it. Conversel y if you specify '' and the server advertises TLS, TLS
// will be used, unless the 'disable_oppo rtunistic_tls' configuration parameter shown below is		// will be used, unless the 'disable_oppo rtunistic_tls' configuration parameter shown below is
// set to true.		// set to true.
$smtp_settings['username'] = ''; // Username (if using authentication)		$smtp_settings['username'] = ''; // Username (if using authentication)
$smtp_settings['password'] = ''; // Password (if using authentication)		$smtp_settings['password'] = ''; // Password (if using authentication)
		// The hostname to use in the Message-ID header and as default HELO string.
		// If empty, PHPMailer attempts to find one with, in order,
		// $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
		// 'localhost.localdomain'.
		$smtp_settings['hostname'] = '';
		// The SMTP HELO/EHLO name used for the SMTP connection.
		// Default is $smtp_settings['hostname']. If $smtp_settings['hostname'] is empty
		, PHPMailer attempts to find
		// one with the same method described above for $smtp_settings['hostname'].
		$smtp_settings['helo'] = '';
$smtp_settings['disable_opportunistic_tls'] = false; // Set this to true to disa ble		$smtp_settings['disable_opportunistic_tls'] = false; // Set this to true to disa ble
// opportunistic TLS		// opportunistic TLS
// https://github.com/PHPMa iler/PHPMailer/wiki/Troubleshooting#opportunistic-tls		// https://github.com/PHPMa iler/PHPMailer/wiki/Troubleshooting#opportunistic-tls
// If you're having problems with sending email to a TLS-enabled SMTP server *wh ich you trust* you can change the following		// If you're having problems with sending email to a TLS-enabled SMTP server *wh ich you trust* you can change the following
// settings, which reduce TLS security.		// settings, which reduce TLS security.
// See https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting#php-56-certif icate-verification-failure		// See https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting#php-56-certif icate-verification-failure
$smtp_settings['ssl_verify_peer'] = true;		$smtp_settings['ssl_verify_peer'] = true;
$smtp_settings['ssl_verify_peer_name'] = true;		$smtp_settings['ssl_verify_peer_name'] = true;
$smtp_settings['ssl_allow_self_signed'] = false;		$smtp_settings['ssl_allow_self_signed'] = false;
skipping to change at line 1440		skipping to change at line 1493
/*************		/*************
* iCalendar		* iCalendar
*************/		*************/
// The default delimiter for separating the area and room in the LOCATION proper ty		// The default delimiter for separating the area and room in the LOCATION proper ty
// of an iCalendar event. Note that no escaping of the delimiter is provided s o		// of an iCalendar event. Note that no escaping of the delimiter is provided s o
// it must not occur in room or area names.		// it must not occur in room or area names.
$default_area_room_delimiter = '/';		$default_area_room_delimiter = '/';
		// Set the default source type for imports. Can be 'file' or 'url'
		$default_import_source = 'file';
		// Default setting for importing past events
		$default_import_past = true;
/*************		/*************
* Entry Types		* Entry Types
*************/		*************/
// This array lists the configured entry type codes. The values map to a		// This array lists the configured entry type codes. The values map to a
// single char in the MRBS database, and so can be any permitted PHP array		// single char in the MRBS database, and so can be any permitted PHP array
// character.		// character.
//		//
// The default descriptions of the entry types are held in the language files		// The default descriptions of the entry types are held in the language files
// as "type.X" where 'X' is the entry type. If you want to change the descripti on		// as "type.X" where 'X' is the entry type. If you want to change the descripti on
skipping to change at line 1481		skipping to change at line 1540
$default_name = "";		$default_name = "";
// Set this to true if you want the booking name (brief description) to		// Set this to true if you want the booking name (brief description) to
// default to the current user's display name. If set, this setting overrides		// default to the current user's display name. If set, this setting overrides
// $default_name.		// $default_name.
$default_name_display_name = false;		$default_name_display_name = false;
// Default long description for new bookings		// Default long description for new bookings
$default_description = "";		$default_description = "";
// Only required if your MRBS installation runs from a Mercurial repository		// Only required if your MRBS installation runs from a Git repository
// and you want the "Help" page to show the Mercurial changeset ID you		// and you want the "Help" page to show the Git commit ID you are on. Default
// are on. Default should work if "hg" is in your search path, on Windows		// should work if "git" is in your search path, on Windows you may need to speci
// you may need to specify the full path to your "hg" executable, e.g.:		fy the
// "c:/Program Files/TortoiseHg/hg.exe"		// full path to your "git" executable, e.g.:
$hg_command = "hg";		// "c:/Program Files/TortoiseGit/git.exe"
		$git_command = "git";
End of changes. 13 change blocks.
4 lines changed or deleted		75 lines changed or added

---