| Index: trunk/wikimania/wmreg/includes/SqlConnect-mysql.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | { |
| 60 | 60 | return mysql_fetch_assoc( $query_result ); |
| 61 | 61 | } |
| 62 | | - function fetchRow() |
| | 62 | + function fetchRow( $query_result ) |
| 63 | 63 | { |
| 64 | 64 | return mysql_fetch_row( $query_result ); |
| 65 | 65 | } |
| Index: trunk/wikimania/wmreg/includes/prices.php |
| — | — | @@ -78,12 +78,9 @@ |
| 79 | 79 | $attendee_type = 'regular_attendee'; |
| 80 | 80 | $period = 'very_early_bird'; |
| 81 | 81 | $currency = 'USD'; |
| 82 | | - $attendance_cost = 0; |
| 83 | | - $accommodation_cost = 0; |
| 84 | 82 | $vat_cost = 0; |
| 85 | 83 | $n_main_days = 0; |
| 86 | 84 | $people_in_room = 0; |
| 87 | | - $hotel = ''; |
| 88 | 85 | |
| 89 | 86 | if ( in_array( '3', $register_data['join_date'] ) ) |
| 90 | 87 | $n_main_days++; |
| Index: trunk/wikimania/wmreg/index.php |
| — | — | @@ -1492,13 +1492,13 @@ |
| 1493 | 1493 | $night_selected = $register_data['night1'] + $register_data['night2'] + $register_data['night3'] + $register_data['night4']; |
| 1494 | 1494 | |
| 1495 | 1495 | if ( $register_data['hotelname'] == 'metropol' ) |
| 1496 | | - { $register_data['cost_total'] += $accommodation_cost_metropol * $night_selected; } |
| 1497 | | - elseif ( $register_data['hotelname'] == 'delta' ) |
| 1498 | | - { $register_data['cost_total'] += $accommodation_cost_delta * $night_selected; } |
| 1499 | | - elseif ( $register_data['hotelname'] == 'dorms' ) |
| 1500 | | - { $register_data['cost_total'] += $accommodation_cost_dorms * $night_selected; } |
| 1501 | | - else |
| 1502 | | - { $register_data['cost_total'] += 0; } |
| | 1496 | + { $register_data['cost_total'] += $accommodation_cost_metropol * $night_selected; } |
| | 1497 | + elseif ( $register_data['hotelname'] == 'delta' ) |
| | 1498 | + { $register_data['cost_total'] += $accommodation_cost_delta * $night_selected; } |
| | 1499 | + elseif ( $register_data['hotelname'] == 'dorms' ) |
| | 1500 | + { $register_data['cost_total'] += $accommodation_cost_dorms * $night_selected; } |
| | 1501 | + else |
| | 1502 | + { $register_data['cost_total'] += 0; } |
| 1503 | 1503 | |
| 1504 | 1504 | } |
| 1505 | 1505 | elseif ( $MY_REQUEST['coupon_id'] == $coupon_volunteer ) |
| — | — | @@ -1509,13 +1509,13 @@ |
| 1510 | 1510 | $night_selected = $register_data['night1'] + $register_data['night2'] + $register_data['night3'] + $register_data['night4']; |
| 1511 | 1511 | |
| 1512 | 1512 | if ( $register_data['hotelname'] == 'metropol' ) |
| 1513 | | - { $register_data['cost_total'] += $accommodation_cost_metropol * $night_selected; } |
| 1514 | | - elseif ( $register_data['hotelname'] == 'delta' ) |
| 1515 | | - { $register_data['cost_total'] += $accommodation_cost_delta * $night_selected; } |
| 1516 | | - elseif ( $register_data['hotelname'] == 'dorms' ) |
| 1517 | | - { $register_data['cost_total'] += $accommodation_cost_dorms * $night_selected; } |
| 1518 | | - else |
| 1519 | | - { $register_data['cost_total'] += 0; } |
| | 1513 | + { $register_data['cost_total'] += $accommodation_cost_metropol * $night_selected; } |
| | 1514 | + elseif ( $register_data['hotelname'] == 'delta' ) |
| | 1515 | + { $register_data['cost_total'] += $accommodation_cost_delta * $night_selected; } |
| | 1516 | + elseif ( $register_data['hotelname'] == 'dorms' ) |
| | 1517 | + { $register_data['cost_total'] += $accommodation_cost_dorms * $night_selected; } |
| | 1518 | + else |
| | 1519 | + { $register_data['cost_total'] += 0; } |
| 1520 | 1520 | } |
| 1521 | 1521 | else |
| 1522 | 1522 | { |