contrib/plugins/blocks/mrbs
diff -u -r1.3 -r1.4
--- settings.php 30 Jul 2008 17:28:42 -0000 1.3
+++ settings.php 31 Jul 2008 12:00:20 -0000 1.4
@@ -1,15 +1,19 @@
-<?php //$Id: settings.php,v 1.3 2008/07/30 17:28:42 arborrow Exp $
+<?php //$Id: settings.php,v 1.4 2008/07/31 12:00:20 arborrow Exp $
$settings->add(new admin_setting_configtext('block_mrbs_serverpath', get_string('serverpath', 'block_mrbs'),
get_string('adminview', 'block_mrbs'), $CFG->wwwroot.'/blocks/mrbs/web', PARAM_URL));
+$settings->settings->block_mrbs_serverpath->plugin='block/mrbs';
$settings->add(new admin_setting_configtext('block_mrbs_admin', get_string('config_admin', 'block_mrbs'), get_string('config_admin2', 'block_mrbs'), $CFG->supportname, PARAM_TEXT));
+$settings->settings->block_mrbs_admin->plugin='block/mrbs';
$settings->add(new admin_setting_configtext('block_mrbs_admin_email', get_string('config_admin_email', 'block_mrbs'),get_string('config_admin_email2', 'block_mrbs'), $CFG->supportemail, PARAM_TEXT));
+$settings->settings->block_mrbs_admin_email->plugin='block/mrbs';
$options = array(0 => get_string('no'), 1=> get_string('yes'));
$settings->add(new admin_setting_configselect('block_mrbs_enable_periods', get_string('config_enable_periods', 'block_mrbs'),get_string('config_enable_periods2', 'block_mrbs'), 1, $options));
+$settings->settings->block_mrbs_enable_periods->plugin='block/mrbs';
if (isset($CFG->block_mrbs_enable_periods)) {
if($CFG->block_mrbs_enable_periods ==0) {
@@ -20,30 +24,34 @@
$strunits = get_string('resolution_units', 'block_mrbs');
$options = array('900' => '15' .$strunits , '1800'=> '30' . $strunits, '2700'=> '45' . $strunits, '3600'=> '60' . $strunits, '4500'=> '75' . $strunits, '5400'=> '90' . $strunits, '6300'=> '105' . $strunits, '7200'=> '120' . $strunits);
$settings->add(new admin_setting_configselect('block_mrbs_resolution', get_string('config_resolution', 'block_mrbs'),get_string('config_resolution2', 'block_mrbs'), '1800', $options));
+ $settings->settings->block_mrbs_resolution->plugin='block/mrbs';
// Start Time (Hours)
unset($options);
$options = array(1 => '01', 2=> '02', 3=> '03', 4=> '04', 5=> '05', 6=> '06', 7=> '07', 8=> '08', 9=> '09', 10=> '10', 11=> '11', 12=> '12', 13=> '13', 14=> '14', 15=> '15', 16=> '16', 17=> '17', 18=> '18', 19=> '19', 20=> '20', 21=> '21', 22=> '22', 23=> '23');
$settings->add(new admin_setting_configselect('block_mrbs_morningstarts', get_string('config_morningstarts', 'block_mrbs'),get_string('config_morningstarts2', 'block_mrbs'), 7, $options));
+ $settings->settings->block_mrbs_morningstarts->plugin='block/mrbs';
// Start Time (Min)
unset($options);
$options = array(0 => '00', 5=> '05', 10=> '10', 15=> '15', 20=> '20', 25=> '25', 30=> '30', 35=> '35', 40=> '40', 45=> '45', 50=> '50', 55=> '55');
$settings->add(new admin_setting_configselect('block_mrbs_morningstarts_min', get_string('config_morningstarts_min', 'block_mrbs'),get_string('config_morningstarts_min2', 'block_mrbs'), 0, $options));
-
+ $settings->settings->block_mrbs_morningstarts_min->plugin='block/mrbs';
// End Time (Hours)
unset($options);
$options = array(1 => '01', 2=> '02', 3=> '03', 4=> '04', 5=> '05', 6=> '06', 7=> '07', 8=> '08', 9=> '09', 10=> '10', 11=> '11', 12=> '12', 13=> '13', 14=> '14', 15=> '15', 16=> '16', 17=> '17', 18=> '18', 19=> '19', 20=> '20', 21=> '21', 22=> '22', 23=> '23' );
$settings->add(new admin_setting_configselect('block_mrbs_eveningends', get_string('config_eveningends', 'block_mrbs'),get_string('config_eveningends2', 'block_mrbs'), 19, $options));
-
+ $settings->settings->block_mrbs_eveningends->plugin='block/mrbs';
// End Time Time (Min)
unset($options);
$options = array(0 => '00', 5=> '05', 10=> '10', 15=> '15', 20=> '20', 25=> '25', 30=> '30', 35=> '35', 40=> '40', 45=> '45', 50=> '50', 55=> '55');
$settings->add(new admin_setting_configselect('block_mrbs_eveningends_min', get_string('config_eveningends_min', 'block_mrbs'),get_string('config_eveningends_min2', 'block_mrbs'), 0, $options));
+ $settings->settings->block_mrbs_eveningends_min->plugin='block/mrbs';
}
else { //Use Custom Periods
$settings->add(new admin_setting_configtextarea('block_mrbs_periods', get_string('config_periods', 'block_mrbs'),get_string('config_periods2', 'block_mrbs'),''));
+ $settings->settings->block_mrbs_periods->plugin='block/mrbs';
}
}
@@ -54,15 +62,16 @@
$options = array(0 => get_string('sunday', 'calendar'),1 => get_string('monday', 'calendar'),2 => get_string('tuesday', 'calendar'),3 => get_string('wednesday', 'calendar'),4 => get_string('thursday', 'calendar'),5 => get_string('friday', 'calendar'),6 => get_string('saturday', 'calendar'));
$settings->add(new admin_setting_configselect('block_mrbs_weekstarts', get_string('config_weekstarts', 'block_mrbs'),get_string('config_weekstarts2', 'block_mrbs'), 0, $options));
-
+$settings->settings->block_mrbs_weekstarts->plugin='block/mrbs';
//Date Format
unset($options);
$options = array(0 => get_string('config_date_mmddyy', 'block_mrbs'),1 => get_string('config_date_ddmmyy', 'block_mrbs'));
$settings->add(new admin_setting_configselect('block_mrbs_dateformat', get_string('config_dateformat', 'block_mrbs'),get_string('config_dateformat2', 'block_mrbs'), 0, $options));
-
+$settings->settings->block_mrbs_dateformat->plugin='block/mrbs';
//Time format
unset($options);
$options = array(0 => get_string('timeformat_12', 'calendar'),1 => get_string('timeformat_24', 'calendar'));
$settings->add(new admin_setting_configselect('block_mrbs_timeformat', get_string('config_timeformat', 'block_mrbs'),get_string('config_timeformat2', 'block_mrbs'), 1, $options));
-?>
+$settings->settings->block_mrbs_timeformat->plugin='block/mrbs';
+?>
\ No newline at end of file
contrib/plugins/blocks/mrbs/web
diff -u -r1.3 -r1.4
--- config.inc.php 30 Jul 2008 22:18:05 -0000 1.3
+++ config.inc.php 31 Jul 2008 12:00:20 -0000 1.4
@@ -1,6 +1,6 @@
<?php
-# $Id: config.inc.php,v 1.3 2008/07/30 22:18:05 arborrow Exp $
+# $Id: config.inc.php,v 1.4 2008/07/31 12:00:20 arborrow Exp $
###########################################################################
# MRBS Configuration File
@@ -10,6 +10,7 @@
//For integration with Moodle
require_once("../../../config.php");
+$cfg_mrbs = get_config('block/mrbs');
###################
# Database settings
###################
@@ -38,8 +39,8 @@
################################
# Site identification information
#################################
-$mrbs_admin = $CFG->block_mrbs_admin; //moodle username of the mrbs administrator
-$mrbs_admin_email = $CFG->block_mrbs_admin_email; // "admin@MyMoodleSite.com";
+$mrbs_admin = $cfg_mrbs->block_mrbs_admin; //moodle username of the mrbs administrator
+$mrbs_admin_email = $cfg_mrbs->block_mrbs_admin_email; // "admin@MyMoodleSite.com";
# This is the text displayed in the upper left corner of every page. Either
# type the name of your organization, or you can put your logo like this :
@@ -55,7 +56,7 @@
# It is also recommended that you set this if you intend to use email
# notifications, to ensure that the correct URL is displayed in the
# notification.
-$url_base = $CFG->block_mrbs_serverpath;
+$url_base = $cfg_mrbs->block_mrbs_serverpath;
###################
@@ -68,17 +69,17 @@
# the default) or user defined periods (TRUE). If user-defined periods
# are used then $resolution, $morningstarts, $eveningends,
# $eveningends_minutes and $twentyfourhour_format are ignored.
-$enable_periods = $CFG->block_mrbs_enable_periods;
+$enable_periods = $cfg_mrbs->block_mrbs_enable_periods;
if ($enable_periods == 0) { //if we are not using periods then set the following values, prevents error of unset variables
# Resolution - what blocks can be booked, in seconds.
# Default is half an hour: 1800 seconds.
- $resolution = $CFG->block_mrbs_resolution;
+ $resolution = $cfg_mrbs->block_mrbs_resolution;
# Start and end of day, NOTE: These are integer hours only, 0-23, and
# morningstarts must be < eveningends. See also eveningends_minutes.
- $morningstarts = $CFG->block_mrbs_morningstarts;
- $eveningends =$CFG->block_mrbs_eveningends;
+ $morningstarts = $cfg_mrbs->block_mrbs_morningstarts;
+ $eveningends =$cfg_mrbs->block_mrbs_eveningends;
# Minutes to add to $morningstarts to get to the real start of the day.
# Be sure to consider the value of $eveningends_minutes if you change
@@ -87,14 +88,14 @@
# morningstarts = 8 and morningstarts_minutes = 30 then for the last
# period to start at say 4:30pm you would need to set eveningends = 16
# and eveningends_minutes = 30
- $morningstarts_minutes = $CFG->block_mrbs_morningstarts_min;
+ $morningstarts_minutes = $cfg_mrbs->block_mrbs_morningstarts_min;
# Minutes to add to $eveningends hours to get the real end of the day.
# Examples: To get the last slot on the calendar to be 16:30-17:00, set
# eveningends=16 and eveningends_minutes=30. To get a full 24 hour display
# with 15-minute steps, set morningstarts=0; eveningends=23;
# eveningends_minutes=45; and resolution=900.
- $eveningends_minutes = $CFG->block_mrbs_eveningends_min;
+ $eveningends_minutes = $cfg_mrbs->block_mrbs_eveningends_min;
}
# Define the name or description for your periods in chronological order
@@ -112,7 +113,7 @@
// Moodle HACK
-if(!isset($CFG->block_mrbs_periods) or empty($CFG->block_mrbs_periods)) {
+if(!isset($cfg_mrbs->block_mrbs_periods) or empty($cfg_mrbs->block_mrbs_periods)) {
$periods[] = "Period 1";
$periods[] = "Period 2";
$periods[] = "Period 3";
@@ -127,7 +128,7 @@
$periods[] = "Period 12";
}
else {
- $pds = explode("\n", $CFG->block_mrbs_periods);
+ $pds = explode("\n", $cfg_mrbs->block_mrbs_periods);
foreach ($pds as $pd) {
$pd = trim($pd);
$periods[] = $pd;
@@ -135,14 +136,14 @@
}
# Start of week: 0 for Sunday, 1 for Monday, etc.
-$weekstarts = $CFG->block_mrbs_weekstarts;
+$weekstarts = $cfg_mrbs->block_mrbs_weekstarts;
# Trailer date format: 0 to show dates as "Jul 10", 1 for "10 Jul"
-$dateformat = $CFG->block_mrbs_dateformat;
+$dateformat = $cfg_mrbs->block_mrbs_dateformat;
# Time format in pages. 0 to show dates in 12 hour format, 1 to show them
# in 24 hour format
-$twentyfourhour_format = $CFG->block_mrbs_timeformat;
+$twentyfourhour_format = $cfg_mrbs->block_mrbs_timeformat;
########################
# Miscellaneous settings