http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97395
Revision: 97395
Author: reedy
Date: 2011-09-17 22:00:47 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
More indenting/tidying up
Modified Paths:
--------------
trunk/wikimania/wmreg/includes/SqlConnect-mysql.php
trunk/wikimania/wmreg/includes/prices.php
trunk/wikimania/wmreg/index.php
Modified: trunk/wikimania/wmreg/includes/SqlConnect-mysql.php
===================================================================
--- trunk/wikimania/wmreg/includes/SqlConnect-mysql.php 2011-09-17 21:53:09 UTC
(rev 97394)
+++ trunk/wikimania/wmreg/includes/SqlConnect-mysql.php 2011-09-17 22:00:47 UTC
(rev 97395)
@@ -58,7 +58,7 @@
{
return mysql_fetch_assoc( $query_result );
}
- function fetchRow()
+ function fetchRow( $query_result )
{
return mysql_fetch_row( $query_result );
}
Modified: trunk/wikimania/wmreg/includes/prices.php
===================================================================
--- trunk/wikimania/wmreg/includes/prices.php 2011-09-17 21:53:09 UTC (rev
97394)
+++ trunk/wikimania/wmreg/includes/prices.php 2011-09-17 22:00:47 UTC (rev
97395)
@@ -78,12 +78,9 @@
$attendee_type = 'regular_attendee';
$period = 'very_early_bird';
$currency = 'USD';
- $attendance_cost = 0;
- $accommodation_cost = 0;
$vat_cost = 0;
$n_main_days = 0;
$people_in_room = 0;
- $hotel = '';
if ( in_array( '3', $register_data['join_date'] ) )
$n_main_days++;
Modified: trunk/wikimania/wmreg/index.php
===================================================================
--- trunk/wikimania/wmreg/index.php 2011-09-17 21:53:09 UTC (rev 97394)
+++ trunk/wikimania/wmreg/index.php 2011-09-17 22:00:47 UTC (rev 97395)
@@ -1492,13 +1492,13 @@
$night_selected = $register_data['night1'] +
$register_data['night2'] + $register_data['night3'] + $register_data['night4'];
if ( $register_data['hotelname'] == 'metropol' )
-
{ $register_data['cost_total'] += $accommodation_cost_metropol *
$night_selected; }
-
elseif ( $register_data['hotelname'] == 'delta' )
-
{ $register_data['cost_total'] += $accommodation_cost_delta *
$night_selected; }
-
elseif ( $register_data['hotelname'] == 'dorms' )
-
{ $register_data['cost_total'] += $accommodation_cost_dorms *
$night_selected; }
-
else
-
{ $register_data['cost_total'] += 0; }
+ { $register_data['cost_total'] += $accommodation_cost_metropol
* $night_selected; }
+ elseif ( $register_data['hotelname'] == 'delta' )
+ { $register_data['cost_total'] += $accommodation_cost_delta *
$night_selected; }
+ elseif ( $register_data['hotelname'] == 'dorms' )
+ { $register_data['cost_total'] += $accommodation_cost_dorms *
$night_selected; }
+ else
+ { $register_data['cost_total'] += 0; }
}
elseif ( $MY_REQUEST['coupon_id'] == $coupon_volunteer )
@@ -1509,13 +1509,13 @@
$night_selected = $register_data['night1'] +
$register_data['night2'] + $register_data['night3'] + $register_data['night4'];
if ( $register_data['hotelname'] == 'metropol' )
-
{ $register_data['cost_total'] += $accommodation_cost_metropol *
$night_selected; }
-
elseif ( $register_data['hotelname'] == 'delta' )
-
{ $register_data['cost_total'] += $accommodation_cost_delta *
$night_selected; }
-
elseif ( $register_data['hotelname'] == 'dorms' )
-
{ $register_data['cost_total'] += $accommodation_cost_dorms *
$night_selected; }
-
else
-
{ $register_data['cost_total'] += 0; }
+ { $register_data['cost_total'] += $accommodation_cost_metropol
* $night_selected; }
+ elseif ( $register_data['hotelname'] == 'delta' )
+ { $register_data['cost_total'] += $accommodation_cost_delta *
$night_selected; }
+ elseif ( $register_data['hotelname'] == 'dorms' )
+ { $register_data['cost_total'] += $accommodation_cost_dorms *
$night_selected; }
+ else
+ { $register_data['cost_total'] += 0; }
}
else
{
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
