Revision: 1355
http://mrbs.svn.sourceforge.net/mrbs/?rev=1355&view=rev
Author: cimorrison
Date: 2010-06-08 11:11:56 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
Replaced with spaces some tabs that had crept in due to a misconfigured editor.
Modified Paths:
--------------
mrbs/trunk/web/Mail/mail.php
mrbs/trunk/web/Mail/sendmail.php
mrbs/trunk/web/edit_entry_handler.php
mrbs/trunk/web/functions.inc
mrbs/trunk/web/language.inc
mrbs/trunk/web/mrbs.css.php
mrbs/trunk/web/xbLib.js
Modified: mrbs/trunk/web/Mail/mail.php
===================================================================
--- mrbs/trunk/web/Mail/mail.php 2010-06-08 10:28:09 UTC (rev 1354)
+++ mrbs/trunk/web/Mail/mail.php 2010-06-08 11:11:56 UTC (rev 1355)
@@ -57,7 +57,7 @@
$this->sep = (strstr(PHP_OS, 'WIN')) ? "\r\n" : "\n";
}
- /**
+ /**
* Implements Mail_mail::send() function using php's built-in mail()
* command.
*
Modified: mrbs/trunk/web/Mail/sendmail.php
===================================================================
--- mrbs/trunk/web/Mail/sendmail.php 2010-06-08 10:28:09 UTC (rev 1354)
+++ mrbs/trunk/web/Mail/sendmail.php 2010-06-08 11:11:56 UTC (rev 1355)
@@ -69,7 +69,7 @@
$this->sep = (strstr(PHP_OS, 'WIN')) ? "\r\n" : "\n";
}
- /**
+ /**
* Implements Mail::send() function using the sendmail
* command-line binary.
*
Modified: mrbs/trunk/web/edit_entry_handler.php
===================================================================
--- mrbs/trunk/web/edit_entry_handler.php 2010-06-08 10:28:09 UTC (rev
1354)
+++ mrbs/trunk/web/edit_entry_handler.php 2010-06-08 11:11:56 UTC (rev
1355)
@@ -546,7 +546,7 @@
$status);
// Send a mail to the Administrator
- if ($need_to_send_mail)
+ if ($need_to_send_mail)
{
require_once "functions_mail.inc";
// Send a mail only if this a new entry, or if this is an
Modified: mrbs/trunk/web/functions.inc
===================================================================
--- mrbs/trunk/web/functions.inc 2010-06-08 10:28:09 UTC (rev 1354)
+++ mrbs/trunk/web/functions.inc 2010-06-08 11:11:56 UTC (rev 1355)
@@ -948,8 +948,8 @@
// [status]
// slots records the duration of the booking in number of time slots.
- // Used to calculate how high to make the block used for clipping
- // overflow descriptions.
+ // Used to calculate how high to make the block used for clipping
+ // overflow descriptions.
// Fill in the map for this meeting. Start at the meeting start time,
// or the day start time, whichever is later. End one slot before the
Modified: mrbs/trunk/web/language.inc
===================================================================
--- mrbs/trunk/web/language.inc 2010-06-08 10:28:09 UTC (rev 1354)
+++ mrbs/trunk/web/language.inc 2010-06-08 11:11:56 UTC (rev 1355)
@@ -333,8 +333,8 @@
// Get first default set of language tokens for emails.
$need_to_send_mail = ($mail_settings['admin_on_bookings'] or
$mail_settings['area_admin_on_bookings'] or
-
$mail_settings['room_admin_on_bookings'] or $mail_settings['booker'] or
-
$mail_settings['book_admin_on_provisional']);
+ $mail_settings['room_admin_on_bookings'] or
$mail_settings['booker'] or
+ $mail_settings['book_admin_on_provisional']);
if ($need_to_send_mail)
{
include "lang." . $default_language_tokens;
Modified: mrbs/trunk/web/mrbs.css.php
===================================================================
--- mrbs/trunk/web/mrbs.css.php 2010-06-08 10:28:09 UTC (rev 1354)
+++ mrbs/trunk/web/mrbs.css.php 2010-06-08 11:11:56 UTC (rev 1355)
@@ -589,7 +589,7 @@
.form_general input#all_day {width: auto; margin-left: 1.0em; margin-right:
0.5em}
.form_general input#private {width: auto; margin-left: 3.0em; margin-right:
0.5em}
.form_general #div_rooms select, .form_general #div_typematch select {float:
left; margin-right: 2.0em}
-.form_general fieldset#rep_info {padding-top: 0}
+fieldset#rep_info {border-top: 1px solid <?php echo $report_h3_border_color
?>; padding-top: 1em}
.form_general #rep_info input {width: 13em}
.form_general input#rep_num_weeks {width: 2.0em}
Modified: mrbs/trunk/web/xbLib.js
===================================================================
--- mrbs/trunk/web/xbLib.js 2010-06-08 10:28:09 UTC (rev 1354)
+++ mrbs/trunk/web/xbLib.js 2010-06-08 11:11:56 UTC (rev 1355)
@@ -37,7 +37,7 @@
if (node.currentStyle) // The IE way
{
- return node.currentStyle.backgroundColor;
+ return node.currentStyle.backgroundColor;
}
if (window.getComputedStyle) // All other browsers
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
