r97390 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97389‎ | r97390 | r97391 >
Date:21:31, 17 September 2011
Author:reedy
Status:ok
Tags:
Comment:
Stylize
Modified paths:
  • /trunk/wikimania/wmreg/dbdata.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/SqlConnect-mysql.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/UserSession.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/language_ar.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/language_de.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/language_en.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/language_es.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/language_fr.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/language_he.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/language_it.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/languages.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/mail.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_cs.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_de.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_es.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_fa.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_fr.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_it.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_ja.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_ko.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_nb.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_pl.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_pt.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_zh-hans.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/notinuse/language_zh-hant.php (modified) (history)
  • /trunk/wikimania/wmreg/includes/prices.php (modified) (history)
  • /trunk/wikimania/wmreg/index.php (modified) (history)
  • /trunk/wikimania/wmreg/recaptchalib.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/admin_interface.old.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/admin_interface.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/confirm_data.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/coupon.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/form.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/html_footer.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/html_header.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/login_form.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/mail_confirmed.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/mail_successful.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/patience.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/paypal.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/paypal_failed.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/paypal_successful.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/query.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/query_result.php (modified) (history)
  • /trunk/wikimania/wmreg/skin/register_successful.php (modified) (history)

Diff [purge]

Index: trunk/wikimania/wmreg/skin/paypal_failed.php
@@ -1,16 +1,16 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{ die('Hacking Attempt'); }
 4+if ( !defined( 'TC_STARTED' ) )
 5+{ die( 'Hacking Attempt' ); }
66
77 global $myself_url, $register_data, $lang_register_form ;
88
99 /* Fix XSS */
10 -$register_data = array_map('htmlspecialchars', $register_data);
 10+$register_data = array_map( 'htmlspecialchars', $register_data );
1111
1212 ?>
1313 <?php
14 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 14+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
1515 {
1616 echo '<div dir="rtl">';
1717 }
@@ -18,7 +18,7 @@
1919 <h2><?php echo $lang_register_form['paypal_failed']?></h2>
2020 <?php echo $lang_register_form['paypal_failed_description']?>
2121 <?php
22 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 22+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
2323 {
2424 echo '</div>';
25 -}?>
\ No newline at end of file
 25+} ?>
\ No newline at end of file
Index: trunk/wikimania/wmreg/skin/login_form.php
@@ -1,24 +1,24 @@
22 <?php
33
44 /* Prevent hacking */
5 -if(!defined('TC_STARTED'))
6 -{ die('Hacking Attempt'); }
 5+if ( !defined( 'TC_STARTED' ) )
 6+{ die( 'Hacking Attempt' ); }
77
88 global $error_message, $register_data;
99
1010 /* Fix XSS */
11 -$register_data = array_map('htmlspecialchars', $register_data);
 11+$register_data = array_map( 'htmlspecialchars', $register_data );
1212 ?>
1313
1414 <h1>Administration</h1>
15 -<p id="special_pages"><a href="<?php echo $myself_url.'index.php'?>"
 15+<p id="special_pages"><a href="<?php echo $myself_url . 'index.php'?>"
1616 title="Return to Registration form">Registration Form</a> | <a
17 - href="<?php echo $myself_url.'index.php?action=query'?>"
 17+ href="<?php echo $myself_url . 'index.php?action=query'?>"
1818 title="You can query the registration status for Wikimania 2011 in here.">Query
1919 your registration status</a></p>
2020
21 -<?php if (!empty($error_message))
22 -echo '<div id="correction">'."\n".'<p>Wrong username or Password, can\'t login!</p>'."\n".'</div>'."\n";
 21+<?php if ( !empty( $error_message ) )
 22+echo '<div id="correction">' . "\n" . '<p>Wrong username or Password, can\'t login!</p>' . "\n" . '</div>' . "\n";
2323 ?>
2424 <form method="post" action="<?php echo $myself_url?>index.php">
2525
@@ -30,16 +30,16 @@
3131 <tr>
3232 <td><label for="user_id" class="col_title">Username</label></td>
3333 <td><input name="user_id" type="text" id="user_id"
34 - value="<?php echo $register_data['user_id'];?>" /></td>
 34+ value="<?php echo $register_data['user_id']; ?>" /></td>
3535 </tr>
3636 <tr>
3737 <td><label for="password" class="col_title">Password</label></td>
3838 <td><input name="password" type="password" id="password"
39 - value="<?php echo $register_data['password'];?>" /></td>
 39+ value="<?php echo $register_data['password']; ?>" /></td>
4040 </tr>
4141 </table>
4242 <div id="button"><input type="submit" name="Submit" value="Login" /> <input
4343 name="reset" type="reset" id="reset" value="reset" /> <input
44 - type="hidden" name="action" value="admin_login" /> <?php if(!$_COOKIE['wikimania']) echo '<input type="hidden" name="secret_id" value="'.$my_session->handle.'" />'; ?>
 44+ type="hidden" name="action" value="admin_login" /> <?php if ( !$_COOKIE['wikimania'] ) echo '<input type="hidden" name="secret_id" value="' . $my_session->handle . '" />'; ?>
4545 </div>
4646 </form>
Index: trunk/wikimania/wmreg/skin/coupon.php
@@ -1,23 +1,23 @@
22 <?php
33
44 /* Prevent hacking */
5 -if(!defined('TC_STARTED'))
6 -{ die('Hacking Attempt'); }
 5+if ( !defined( 'TC_STARTED' ) )
 6+{ die( 'Hacking Attempt' ); }
77
88 global $error_message, $register_data, $lang_query, $lang_register_form, $lang_errors;
99
1010 /* Fix XSS */
11 -$register_data = array_map('htmlspecialchars', $register_data);
 11+$register_data = array_map( 'htmlspecialchars', $register_data );
1212
1313 ?>
1414 <h1>Coupon activation</h1>
1515 <p id="special_pages"><a
16 - href="<?php echo $myself_url.'index.php?uselang='.$userLanguage?>"
 16+ href="<?php echo $myself_url . 'index.php?uselang=' . $userLanguage?>"
1717 title="Return to Registration form">Registration Form</a> | <a
18 - href="<?php echo $myself_url.'index.php?action=admin'?>"
 18+ href="<?php echo $myself_url . 'index.php?action=admin'?>"
1919 title="Enter the managment System">Admin</a></p>
20 -<?php if (!empty($error_message))
21 -echo '<div id="correction">'."\n".'<p>'.'Error due to wrong information or accepted registration.'.'</p>'."\n".'</div>'."\n";
 20+<?php if ( !empty( $error_message ) )
 21+echo '<div id="correction">' . "\n" . '<p>' . 'Error due to wrong information or accepted registration.' . '</p>' . "\n" . '</div>' . "\n";
2222 ?>
2323
2424 <p>If you have a discount code for Wikimania 2011 registration, please
@@ -32,29 +32,29 @@
3333 <tr>
3434 <td><label for="surname" class="col_title"><?php echo $lang_register_form['surname']?></label></td>
3535 <td><input name="surname" type="text" size="20" id="surname"
36 - value="<?php echo $register_data['surname'];?>" /></td>
 36+ value="<?php echo $register_data['surname']; ?>" /></td>
3737 </tr>
3838 <tr>
3939 <td><label for="given_name" class="col_title"><?php echo $lang_register_form['given_name']?></label></td>
4040 <td><input name="given_name" type="text" size="20" id="given_name"
41 - value="<?php echo $register_data['given_name'];?>" /></td>
 41+ value="<?php echo $register_data['given_name']; ?>" /></td>
4242 </tr>
4343 <tr>
4444 <td><label for="unique_code" class="col_title"><?php echo $lang_query['unique_code'] ?></label></td>
4545 <td><input name="unique_code" type="text" id="unique_code" size="5"
46 - value="<?php echo $register_data['unique_code'];?>" /></td>
 46+ value="<?php echo $register_data['unique_code']; ?>" /></td>
4747 </tr>
4848 <tr>
4949 <td><label for="coupon_id" class="coupon_id">Coupon ID</label></td>
5050 <td><input name="coupon_id" type="text" id="coupon_id" size="6"
51 - value="<?php echo $register_data['coupon_id'];?>" /></td>
 51+ value="<?php echo $register_data['coupon_id']; ?>" /></td>
5252 </tr>
5353 </table>
5454 <div id="button"><input type="submit" name="Submit"
5555 value="<?php echo $lang_query['submit']?>" /> <input name="reset"
5656 type="reset" id="reset"
5757 value="<?php echo $lang_register_form['reset']?>" /> <input
58 - type="hidden" name="uselang" value="<?php echo $userLanguage;?>" /> <input
59 - type="hidden" name="action" value="coupon_activate" /> <?php if(!$_COOKIE['wikimania']) echo '<input type="hidden" name="secret_id" value="'.$my_session->handle.'" />'; ?>
 58+ type="hidden" name="uselang" value="<?php echo $userLanguage; ?>" /> <input
 59+ type="hidden" name="action" value="coupon_activate" /> <?php if ( !$_COOKIE['wikimania'] ) echo '<input type="hidden" name="secret_id" value="' . $my_session->handle . '" />'; ?>
6060 </div>
6161 </form>
Index: trunk/wikimania/wmreg/skin/form.php
@@ -4,7 +4,7 @@
55 {
66 document.getElementById(idarray[x]).disabled = true;
77 }
8 -}
 8+}
99
1010 function enable(idarray){
1111 for (x in idarray)
@@ -37,52 +37,52 @@
3838
3939 <?php
4040 /* Prevent hacking */
41 -if(!defined('TC_STARTED'))
 41+if ( !defined( 'TC_STARTED' ) )
4242 {
43 - die('Hacking Attempt');
 43+ die( 'Hacking Attempt' );
4444 }
45 -global $WikimediaLanguages, $WikimediaOrgs, $WikimediaProjects, $error_message, $register_data, $lang_countries, $myself_url, $_COOKIE, $my_session,
 45+global $WikimediaLanguages, $WikimediaOrgs, $WikimediaProjects, $error_message, $register_data, $lang_countries, $myself_url, $_COOKIE, $my_session,
4646 $lang_register_form, $userLanguage, $available_languages, $recaptcha_publickey, $mock;
4747
4848 /* Fix XSS */
49 -//$register_data = array_map('htmlspecialchars', $register_data);
 49+// $register_data = array_map('htmlspecialchars', $register_data);
5050
51 -$key_array = array('join_date', 'showname', 'nights');
52 -foreach ($key_array as $key)
 51+$key_array = array( 'join_date', 'showname', 'nights' );
 52+foreach ( $key_array as $key )
5353 {
54 - if (!is_array($register_data[$key]) || !isset($register_data[$key]))
 54+ if ( !is_array( $register_data[$key] ) || !isset( $register_data[$key] ) )
5555 {
5656 $register_data[$key] = array();
5757 }
5858 }
5959
60 -function create_label($label_id, $col_title = false) {
 60+function create_label( $label_id, $col_title = false ) {
6161 global $lang_register_form;
62 - //mandatory_fields is an an array containing fields names of the fields that the user should input
63 - $mandatory_fields = array("given_name", "surname", "sex", "country",
64 - "langn", "email", "join_date", "showname", "size", "color", "captcha");
65 - if (!in_array($label_id, array_keys($lang_register_form)))
 62+ // mandatory_fields is an an array containing fields names of the fields that the user should input
 63+ $mandatory_fields = array( "given_name", "surname", "sex", "country",
 64+ "langn", "email", "join_date", "showname", "size", "color", "captcha" );
 65+ if ( !in_array( $label_id, array_keys( $lang_register_form ) ) )
6666 { return false; }
67 - if (in_array($label_id, $mandatory_fields))
 67+ if ( in_array( $label_id, $mandatory_fields ) )
6868 {
69 - if (!$col_title)
70 - echo '<label for="'.$label_id.'">'.$lang_register_form[$label_id].'*</label>';
71 - else
72 - echo '<label for="'.$label_id.'" class="col_title">'.$lang_register_form[$label_id].'*</label>';
 69+ if ( !$col_title )
 70+ echo '<label for="' . $label_id . '">' . $lang_register_form[$label_id] . '*</label>';
 71+ else
 72+ echo '<label for="' . $label_id . '" class="col_title">' . $lang_register_form[$label_id] . '*</label>';
7373 }
74 - else
 74+ else
7575 {
76 - if (!$col_title)
77 - echo '<label for="'.$label_id.'">'.$lang_register_form[$label_id].'</label>';
78 - else
79 - echo '<label for="'.$label_id.'" class="col_title">'.$lang_register_form[$label_id].'</label>';
 76+ if ( !$col_title )
 77+ echo '<label for="' . $label_id . '">' . $lang_register_form[$label_id] . '</label>';
 78+ else
 79+ echo '<label for="' . $label_id . '" class="col_title">' . $lang_register_form[$label_id] . '</label>';
8080 }
8181 }
82 -function get_lang($lang_id)
 82+function get_lang( $lang_id )
8383 {
8484 global $lang_register_form;
85 - if (!in_array($lang_id, array_keys($lang_register_form)))
86 - return false;
 85+ if ( !in_array( $lang_id, array_keys( $lang_register_form ) ) )
 86+ return false;
8787 echo $lang_register_form[$lang_id];
8888 }
8989 ?>
@@ -90,193 +90,193 @@
9191
9292
9393 <?php
94 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 94+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
9595 {
9696 echo '<div dir="rtl">';
9797 }
9898 ?>
9999 <p style="text-align:center;"><img src="wikimania2011reg.png" alt="Wikimania 2011 Logo" /></p>
100100
101 -<?php if ($mock == true){?>
 101+<?php if ( $mock == true ) { ?>
102102 <p class="notice">
103103 This is a mock registration site only, use it just for
104104 testing.<br>
105105 Please <a href="mailto:wikimania-registration@wikimedia.org">e-mail us</a>
106106 about any problems you encounter with it.</p>
107 -<?php }?>
 107+<?php } ?>
108108
109 -<h1><?php get_lang('registration_title');?></h1>
 109+<h1><?php get_lang( 'registration_title' ); ?></h1>
110110 <p>
111 - <?php foreach ($available_languages as $name => $value)
 111+ <?php foreach ( $available_languages as $name => $value )
112112 {
113 - echo '<a href="'.$myself_url.'index.php?uselang='.$name.'" title="'.$name.' ('.$value.')">'.$value.'</a> |'."\n";
114 - }?>
 113+ echo '<a href="' . $myself_url . 'index.php?uselang=' . $name . '" title="' . $name . ' (' . $value . ')">' . $value . '</a> |' . "\n";
 114+ } ?>
115115 <br><small>Want to translate this form into another language? Write us <a href=mailto:wikimania-registration@wikimedia.org>here</a></small>
116116 </p>
117117 <p id="special_pages">
118118 <?php
119 - if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 119+ if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
120120 {
121121 echo '<div align="left">';
122 - }?>
123 - <a href="<?= $myself_url.'index.php?action=admin'?>" title="Enter the management system">Admin</a>
124 - |
125 - <a href="<?= $myself_url.'index.php?action=query&uselang='.$userLanguage?>" title="<?php get_lang('query_title')?>"><?php get_lang('query')?></a>
 122+ } ?>
 123+ <a href="<?= $myself_url . 'index.php?action=admin'?>" title="Enter the management system">Admin</a>
 124+ |
 125+ <a href="<?= $myself_url . 'index.php?action=query&uselang=' . $userLanguage?>" title="<?php get_lang( 'query_title' )?>"><?php get_lang( 'query' )?></a>
126126 <?php
127 - if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 127+ if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
128128 {
129129 echo '</div>';
130 - }?>
 130+ } ?>
131131 </p>
132 -<?php if (!empty($error_message))
 132+<?php if ( !empty( $error_message ) )
133133 {
134134 echo '<div id="correction"><p>';
135 - get_lang('correction');
136 - echo '</p>'.$error_message.'</div>';
137 -}?>
 135+ get_lang( 'correction' );
 136+ echo '</p>' . $error_message . '</div>';
 137+} ?>
138138
139 -<form method="post" action="<?= $myself_url.'index.php';?>" >
 139+<form method="post" action="<?= $myself_url . 'index.php'; ?>" >
140140 <fieldset class="record">
141 -<legend><?php get_lang('legend1') ?></legend>
 141+<legend><?php get_lang( 'legend1' ) ?></legend>
142142 <table class="form_table">
143143 <colgroup>
144144 <col class="col_left" />
145145 <col class="col_right" />
146146 </colgroup>
147147 <tr>
148 - <th colspan="2"> <?php get_lang('title1');?></th>
 148+ <th colspan="2"> <?php get_lang( 'title1' ); ?></th>
149149 </tr>
150150 <tr>
151 - <td><?php create_label('given_name', true);?></td>
152 - <td><input name="given_name" type="text" size="24" value="<?= $register_data['given_name'];?>" /></td>
 151+ <td><?php create_label( 'given_name', true ); ?></td>
 152+ <td><input name="given_name" type="text" size="24" value="<?= $register_data['given_name']; ?>" /></td>
153153 </tr>
154154 <tr>
155 - <td><?php create_label('surname', true);?></td>
156 - <td>
157 - <input name="surname" type="text" size="24" value="<?= $register_data['surname'];?>"/>
 155+ <td><?php create_label( 'surname', true ); ?></td>
 156+ <td>
 157+ <input name="surname" type="text" size="24" value="<?= $register_data['surname']; ?>"/>
158158 </td>
159159 </tr>
160160 <tr>
161 - <td><?php create_label('sex', true);?></td>
 161+ <td><?php create_label( 'sex', true ); ?></td>
162162 <td>
163 - <input type="radio" name="sex" value="m" id="sex1" <?php if($register_data['sex']== 'm') echo 'checked="checked"';?> /><?php create_label('sex1'); ?>
164 - <input type="radio" name="sex" value="f" id="sex2" <?php if($register_data['sex']== 'f') echo 'checked="checked"';?> /><?php create_label('sex2'); ?>
165 - <input type="radio" name="sex" value="d" id="sex3" <?php if($register_data['sex']== 'd') echo 'checked="checked"';?> /><?php create_label('sex3'); ?>
 163+ <input type="radio" name="sex" value="m" id="sex1" <?php if ( $register_data['sex'] == 'm' ) echo 'checked="checked"'; ?> /><?php create_label( 'sex1' ); ?>
 164+ <input type="radio" name="sex" value="f" id="sex2" <?php if ( $register_data['sex'] == 'f' ) echo 'checked="checked"'; ?> /><?php create_label( 'sex2' ); ?>
 165+ <input type="radio" name="sex" value="d" id="sex3" <?php if ( $register_data['sex'] == 'd' ) echo 'checked="checked"'; ?> /><?php create_label( 'sex3' ); ?>
166166 </td>
167167 </tr>
168168 <tr>
169 - <td><?php create_label('country', true)?></td>
 169+ <td><?php create_label( 'country', true )?></td>
170170 <td>
171171 <select name="country" id="country">
172 - <option value=""><?php get_lang('select'); ?></option>
173 - <?php foreach ($lang_countries as $lang_country => $lang_country_name)
 172+ <option value=""><?php get_lang( 'select' ); ?></option>
 173+ <?php foreach ( $lang_countries as $lang_country => $lang_country_name )
174174 {
175 - if ($register_data['country'] == $lang_country)
176 - echo '<option value="'. $lang_country . '" selected="selected">'. $lang_country_name . ' (' . $lang_country . ')</option>'."\n";
 175+ if ( $register_data['country'] == $lang_country )
 176+ echo '<option value="' . $lang_country . '" selected="selected">' . $lang_country_name . ' (' . $lang_country . ')</option>' . "\n";
177177 else
178 - echo '<option value="'. $lang_country . '">'. $lang_country_name . ' (' . $lang_country . ')</option>'."\n";
179 - }?>
 178+ echo '<option value="' . $lang_country . '">' . $lang_country_name . ' (' . $lang_country . ')</option>' . "\n";
 179+ } ?>
180180 </select>
181181 </td>
182182 </tr>
183183 <tr>
184 - <th colspan="2"> <?php get_lang('title2');?></th>
 184+ <th colspan="2"> <?php get_lang( 'title2' ); ?></th>
185185 </tr>
186186 <tr>
187 - <td><?php create_label('langn', true)?></td>
 187+ <td><?php create_label( 'langn', true )?></td>
188188 <td>
189189 <select name="langn" id="langn">
190 - <option value=""><?php get_lang('select'); ?></option>
191 - <?php foreach ($WikimediaLanguages as $WikimediaLanguage => $WikimediaLanguageName)
 190+ <option value=""><?php get_lang( 'select' ); ?></option>
 191+ <?php foreach ( $WikimediaLanguages as $WikimediaLanguage => $WikimediaLanguageName )
192192 {
193 - if ($register_data['langn'] == $WikimediaLanguage)
194 - echo '<option value="'. $WikimediaLanguage . '" selected="selected">'. $WikimediaLanguage .' '.$WikimediaLanguageName . '</option>'."\n";
 193+ if ( $register_data['langn'] == $WikimediaLanguage )
 194+ echo '<option value="' . $WikimediaLanguage . '" selected="selected">' . $WikimediaLanguage . ' ' . $WikimediaLanguageName . '</option>' . "\n";
195195 else
196 - echo '<option value="'. $WikimediaLanguage . '">'. $WikimediaLanguage .' '.$WikimediaLanguageName . '</option>'."\n";
197 - }?>
 196+ echo '<option value="' . $WikimediaLanguage . '">' . $WikimediaLanguage . ' ' . $WikimediaLanguageName . '</option>' . "\n";
 197+ } ?>
198198 </select>
199199 </td>
200200 </tr>
201201 <tr>
202 - <td><?php create_label('lang');?></td>
 202+ <td><?php create_label( 'lang' ); ?></td>
203203 <td>
204 - <?php for ($i=1; $i<=3; $i++ )
 204+ <?php for ( $i = 1; $i <= 3; $i++ )
205205 {
206 - echo '<p class="langline"><select name="lang'. $i .'">'."\n".'<option value="">'.$lang_register_form['select_lang'].'</option>'."\n";
207 - foreach ($WikimediaLanguages as $WikimediaLanguage => $WikimediaLanguageName)
 206+ echo '<p class="langline"><select name="lang' . $i . '">' . "\n" . '<option value="">' . $lang_register_form['select_lang'] . '</option>' . "\n";
 207+ foreach ( $WikimediaLanguages as $WikimediaLanguage => $WikimediaLanguageName )
208208 {
209 - if ($register_data['lang'.$i] == $WikimediaLanguage)
210 - echo '<option value="'. $WikimediaLanguage . '" selected="selected">'. $WikimediaLanguage .' '.$WikimediaLanguageName . '</option>'."\n";
 209+ if ( $register_data['lang' . $i] == $WikimediaLanguage )
 210+ echo '<option value="' . $WikimediaLanguage . '" selected="selected">' . $WikimediaLanguage . ' ' . $WikimediaLanguageName . '</option>' . "\n";
211211 else
212 - echo '<option value="'. $WikimediaLanguage . '">'. $WikimediaLanguage .' '.$WikimediaLanguageName . '</option>'."\n";
 212+ echo '<option value="' . $WikimediaLanguage . '">' . $WikimediaLanguage . ' ' . $WikimediaLanguageName . '</option>' . "\n";
213213 }
214 - echo'</select>'."\n".'<select name="lang'. $i .'-level">'."\n".' <option value="">'.$lang_register_form['select_level'].'</option>'."\n";
215 - if ($register_data['lang'.$i.'-level']=='1')
216 - echo '<option value="1" selected="selected">'.$lang_register_form['lang_level1'].'</option>'."\n";
 214+ echo'</select>' . "\n" . '<select name="lang' . $i . '-level">' . "\n" . ' <option value="">' . $lang_register_form['select_level'] . '</option>' . "\n";
 215+ if ( $register_data['lang' . $i . '-level'] == '1' )
 216+ echo '<option value="1" selected="selected">' . $lang_register_form['lang_level1'] . '</option>' . "\n";
217217 else
218 - echo '<option value="1">'.$lang_register_form['lang_level1'].'</option>'."\n";
219 - if ($register_data['lang'.$i.'-level']=='2')
220 - echo '<option value="2" selected="selected">'.$lang_register_form['lang_level2'].'</option>'."\n";
 218+ echo '<option value="1">' . $lang_register_form['lang_level1'] . '</option>' . "\n";
 219+ if ( $register_data['lang' . $i . '-level'] == '2' )
 220+ echo '<option value="2" selected="selected">' . $lang_register_form['lang_level2'] . '</option>' . "\n";
221221 else
222 - echo '<option value="2">'.$lang_register_form['lang_level2'].'</option>'."\n";
223 - if ($register_data['lang'.$i.'-level']=='3')
224 - echo '<option value="3" selected="selected">'.$lang_register_form['lang_level3'].'</option>'."\n";
 222+ echo '<option value="2">' . $lang_register_form['lang_level2'] . '</option>' . "\n";
 223+ if ( $register_data['lang' . $i . '-level'] == '3' )
 224+ echo '<option value="3" selected="selected">' . $lang_register_form['lang_level3'] . '</option>' . "\n";
225225 else
226 - echo '<option value="3">'.$lang_register_form['lang_level3'].'</option>'."\n";
227 - if ($register_data['lang'.$i.'-level']=='4')
228 - echo '<option value="4" selected="selected">'.$lang_register_form['lang_level4'].'</option>'."\n";
 226+ echo '<option value="3">' . $lang_register_form['lang_level3'] . '</option>' . "\n";
 227+ if ( $register_data['lang' . $i . '-level'] == '4' )
 228+ echo '<option value="4" selected="selected">' . $lang_register_form['lang_level4'] . '</option>' . "\n";
229229 else
230 - echo '<option value="4">'.$lang_register_form['lang_level4'].'</option>'."\n";
231 - echo'</select>'."\n";
232 - echo'</p>'."\n";
233 - }?>
 230+ echo '<option value="4">' . $lang_register_form['lang_level4'] . '</option>' . "\n";
 231+ echo'</select>' . "\n";
 232+ echo'</p>' . "\n";
 233+ } ?>
234234 </td>
235235 </tr>
236236 <tr>
237 - <th colspan="2"><?php get_lang('title3');?></th>
 237+ <th colspan="2"><?php get_lang( 'title3' ); ?></th>
238238 </tr>
239239 <tr>
240 - <td><?php create_label('wiki_id', true)?></td>
 240+ <td><?php create_label( 'wiki_id', true )?></td>
241241 <td>
242 - <input name="wiki_id" type="text" size="15" id="wiki_id" value="<?= $register_data['wiki_id'];?>" />
 242+ <input name="wiki_id" type="text" size="15" id="wiki_id" value="<?= $register_data['wiki_id']; ?>" />
243243 @
244244 <select name="wiki_language">
245 - <option value=""><?php get_lang('select'); ?></option>
246 - <?php foreach ($WikimediaLanguages as $WikimediaLanguage => $dummy)
247 - if ($WikimediaLanguage == $register_data['wiki_language'])
248 - echo '<option value="'. $WikimediaLanguage . '" selected="selected">'. $WikimediaLanguage . '</option>'."\n";
249 - else
250 - echo '<option value="'. $WikimediaLanguage . '">'. $WikimediaLanguage . '</option>'."\n";
 245+ <option value=""><?php get_lang( 'select' ); ?></option>
 246+ <?php foreach ( $WikimediaLanguages as $WikimediaLanguage => $dummy )
 247+ if ( $WikimediaLanguage == $register_data['wiki_language'] )
 248+ echo '<option value="' . $WikimediaLanguage . '" selected="selected">' . $WikimediaLanguage . '</option>' . "\n";
 249+ else
 250+ echo '<option value="' . $WikimediaLanguage . '">' . $WikimediaLanguage . '</option>' . "\n";
251251 ?>
252252 <option value="">----</option>
253 - <?php foreach ($WikimediaOrgs as $WikimediaOrg)
254 - if ($WikimediaOrg == $register_data['wiki_language'])
255 - echo '<option value="'. $WikimediaOrg . '" selected="selected">'. $WikimediaOrg . '</option>'."\n";
256 - else
257 - echo '<option value="'. $WikimediaOrg . '">'. $WikimediaOrg . '</option>'."\n";
 253+ <?php foreach ( $WikimediaOrgs as $WikimediaOrg )
 254+ if ( $WikimediaOrg == $register_data['wiki_language'] )
 255+ echo '<option value="' . $WikimediaOrg . '" selected="selected">' . $WikimediaOrg . '</option>' . "\n";
 256+ else
 257+ echo '<option value="' . $WikimediaOrg . '">' . $WikimediaOrg . '</option>' . "\n";
258258 ?>
259259 </select>
260260 .
261261 <select name="wiki_project">
262 - <option value=""><?php get_lang('select'); ?></option>
263 - <?php foreach ($WikimediaProjects as $WikimediaProject)
264 - if ($WikimediaProject == $register_data['wiki_project'])
265 - echo '<option value="'. $WikimediaProject . '" selected="selected">'. $WikimediaProject . '</option>'."\n";
 262+ <option value=""><?php get_lang( 'select' ); ?></option>
 263+ <?php foreach ( $WikimediaProjects as $WikimediaProject )
 264+ if ( $WikimediaProject == $register_data['wiki_project'] )
 265+ echo '<option value="' . $WikimediaProject . '" selected="selected">' . $WikimediaProject . '</option>' . "\n";
266266 else
267 - echo '<option value="'. $WikimediaProject . '">'. $WikimediaProject . '</option>'."\n";
 267+ echo '<option value="' . $WikimediaProject . '">' . $WikimediaProject . '</option>' . "\n";
268268 ?>
269269 </select>
270270 .org
271271 </td>
272272 </tr>
273273 <tr>
274 - <td><?php create_label('email', true)?></td>
275 - <td><input name="email" type="text" size="40" id="email" value="<?= $register_data['email'];?>" /></td>
 274+ <td><?php create_label( 'email', true )?></td>
 275+ <td><input name="email" type="text" size="40" id="email" value="<?= $register_data['email']; ?>" /></td>
276276 </tr>
277277 </table>
278278 </fieldset>
279279 <fieldset class="record">
280 -<legend class="title"><?php get_lang('legend2') ?></legend>
 280+<legend class="title"><?php get_lang( 'legend2' ) ?></legend>
281281 <table class="form_table">
282282 <colgroup>
283283 <col class="col_left" />
@@ -284,251 +284,251 @@
285285 <col class="col_right" />
286286 </colgroup>
287287 <tr>
288 - <th colspan="2"><?php get_lang('title4');?></th>
 288+ <th colspan="2"><?php get_lang( 'title4' ); ?></th>
289289 </tr>
290290 <tr>
291291 <td>
292 - <?php create_label('join_date'); ?>
 292+ <?php create_label( 'join_date' ); ?>
293293 </td>
294294 <td>
295 - <?php get_lang('hackingdays');?>:<br>
296 - <input type="checkbox" value="1" name="join_date[]" id="join1" <?php if (in_array(1, $register_data['join_date'])) echo 'checked="checked"';?>/>
297 - <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Developer_meetings" onClick="return popup(this, 'join1')"><?php get_lang('join1');?></a><br>
298 - <input type="checkbox" value="2" name="join_date[]" id="join2" <?php if (in_array(2, $register_data['join_date'])) echo 'checked="checked"';?>/>
299 - <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Developer_meetings" onClick="return popup(this, 'join2')"><?php get_lang('join2');?></a><br>
300 - <strong><?php get_lang('maindays');?>:<br>
301 - <input type="checkbox" value="3" name="join_date[]" id="join3" <?php if (in_array(3, $register_data['join_date'])) echo 'checked="checked"';?>/>
302 - <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Thursday.2C_August_4th" onClick="return popup(this, 'join3')"><?php get_lang('join3');?></a><br>
303 - <input type="checkbox" value="4" name="join_date[]" id="join4" <?php if (in_array(4, $register_data['join_date'])) echo 'checked="checked"';?>/>
304 - <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Friday.2C_August_5th" onClick="return popup(this, 'join4')"><?php get_lang('join4');?></a><br>
305 - <input type="checkbox" value="5" name="join_date[]" id="join5" <?php if (in_array(5, $register_data['join_date'])) echo 'checked="checked"';?>/>
306 - <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Saturday.2C_August_6th" onClick="return popup(this, 'join5')"><?php get_lang('join5');?></a><br>
307 - </strong><?php get_lang('tourdays');?>:<br>
308 - <input type="checkbox" value="6" name="join_date[]" id="join6" <?php if (in_array(6, $register_data['join_date'])) echo 'checked="checked"';?> onclick='flip(["tour0","tour1","tour2","tour3","tour4","tour5"])'/>
309 - <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Sunday.2C_August_7th" onClick="return popup(this, 'join6')"><?php get_lang('join6');?></a><br>
 295+ <?php get_lang( 'hackingdays' ); ?>:<br>
 296+ <input type="checkbox" value="1" name="join_date[]" id="join1" <?php if ( in_array( 1, $register_data['join_date'] ) ) echo 'checked="checked"'; ?>/>
 297+ <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Developer_meetings" onClick="return popup(this, 'join1')"><?php get_lang( 'join1' ); ?></a><br>
 298+ <input type="checkbox" value="2" name="join_date[]" id="join2" <?php if ( in_array( 2, $register_data['join_date'] ) ) echo 'checked="checked"'; ?>/>
 299+ <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Developer_meetings" onClick="return popup(this, 'join2')"><?php get_lang( 'join2' ); ?></a><br>
 300+ <strong><?php get_lang( 'maindays' ); ?>:<br>
 301+ <input type="checkbox" value="3" name="join_date[]" id="join3" <?php if ( in_array( 3, $register_data['join_date'] ) ) echo 'checked="checked"'; ?>/>
 302+ <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Thursday.2C_August_4th" onClick="return popup(this, 'join3')"><?php get_lang( 'join3' ); ?></a><br>
 303+ <input type="checkbox" value="4" name="join_date[]" id="join4" <?php if ( in_array( 4, $register_data['join_date'] ) ) echo 'checked="checked"'; ?>/>
 304+ <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Friday.2C_August_5th" onClick="return popup(this, 'join4')"><?php get_lang( 'join4' ); ?></a><br>
 305+ <input type="checkbox" value="5" name="join_date[]" id="join5" <?php if ( in_array( 5, $register_data['join_date'] ) ) echo 'checked="checked"'; ?>/>
 306+ <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Saturday.2C_August_6th" onClick="return popup(this, 'join5')"><?php get_lang( 'join5' ); ?></a><br>
 307+ </strong><?php get_lang( 'tourdays' ); ?>:<br>
 308+ <input type="checkbox" value="6" name="join_date[]" id="join6" <?php if ( in_array( 6, $register_data['join_date'] ) ) echo 'checked="checked"'; ?> onclick='flip(["tour0","tour1","tour2","tour3","tour4","tour5"])'/>
 309+ <a href="http://wikimania2011.wikimedia.org/wiki/Schedule#Sunday.2C_August_7th" onClick="return popup(this, 'join6')"><?php get_lang( 'join6' ); ?></a><br>
310310 </td>
311311 </tr>
312312 <tr>
313313 <td>
314 - <?php create_label('picktour'); ?>
 314+ <?php create_label( 'picktour' ); ?>
315315 </td>
316316 <td>
317 - <input type="radio" value="0" name="tours" id="tour0" <?php if ($register_data['tours'] == 0|| empty($register_data['tour'])) echo 'checked="checked"';?> <?php if (!in_array(6, $register_data['join_date'])) echo 'disabled=True';?>/>
318 - <?php get_lang('tour0');?><br>
319 - <input type="radio" value="1" name="tours" id="tour1" <?php if ($register_data['tours'] == 1) echo 'checked="checked"';?><?php if (!in_array(6, $register_data['join_date'])) echo 'disabled=True';?>/>
320 - <a href="http://wikimania2011.wikimedia.org/wiki/Tours/Nazareth_and_the_Galilee" onClick="return popup(this, 'tour1')"><?php get_lang('tour1');?></a><br>
321 - <input type="radio" value="2" name="tours" id="tour2" <?php if ($register_data['tours'] == 2) echo 'checked="checked"';?><?php if (!in_array(6, $register_data['join_date'])) echo 'disabled=True';?>/>
322 - <a href="http://wikimania2011.wikimedia.org/wiki/Tours/Jerusalem" onClick="return popup(this, 'tour2')"><?php get_lang('tour2');?></a><br>
323 - <input type="radio" value="3" name="tours" id="tour3" <?php if ($register_data['tours'] == 3) echo 'checked="checked"';?><?php if (!in_array(6, $register_data['join_date'])) echo 'disabled=True';?>/>
324 - <a href="http://wikimania2011.wikimedia.org/wiki/Tours/Acre_(Acco)" onClick="return popup(this, 'tour3')"><?php get_lang('tour3');?></a><br>
325 - <input type="radio" value="4" name="tours" id="tour4" <?php if ($register_data['tours'] == 4) echo 'checked="checked"';?> <?php if (!in_array(6, $register_data['join_date'])) echo 'disabled=True';?>/>
326 - <a href="http://wikimania2011.wikimedia.org/wiki/Tours/The_Baha%27i_Gardens" onClick="return popup(this, 'tour4')"><?php get_lang('tour4');?></a><br>
327 - <input type="radio" value="5" name="tours" id="tour5" <?php if ($register_data['tours'] == 5) echo 'checked="checked"';?> <?php if (!in_array(6, $register_data['join_date'])) echo 'disabled=True';?>/>
328 - <a href="http://wikimania2011.wikimedia.org/wiki/Tours/Druze_villages" onClick="return popup(this, 'tour5')"><?php get_lang('tour5');?></a><br>
 317+ <input type="radio" value="0" name="tours" id="tour0" <?php if ( $register_data['tours'] == 0 || empty( $register_data['tour'] ) ) echo 'checked="checked"'; ?> <?php if ( !in_array( 6, $register_data['join_date'] ) ) echo 'disabled=True'; ?>/>
 318+ <?php get_lang( 'tour0' ); ?><br>
 319+ <input type="radio" value="1" name="tours" id="tour1" <?php if ( $register_data['tours'] == 1 ) echo 'checked="checked"'; ?><?php if ( !in_array( 6, $register_data['join_date'] ) ) echo 'disabled=True'; ?>/>
 320+ <a href="http://wikimania2011.wikimedia.org/wiki/Tours/Nazareth_and_the_Galilee" onClick="return popup(this, 'tour1')"><?php get_lang( 'tour1' ); ?></a><br>
 321+ <input type="radio" value="2" name="tours" id="tour2" <?php if ( $register_data['tours'] == 2 ) echo 'checked="checked"'; ?><?php if ( !in_array( 6, $register_data['join_date'] ) ) echo 'disabled=True'; ?>/>
 322+ <a href="http://wikimania2011.wikimedia.org/wiki/Tours/Jerusalem" onClick="return popup(this, 'tour2')"><?php get_lang( 'tour2' ); ?></a><br>
 323+ <input type="radio" value="3" name="tours" id="tour3" <?php if ( $register_data['tours'] == 3 ) echo 'checked="checked"'; ?><?php if ( !in_array( 6, $register_data['join_date'] ) ) echo 'disabled=True'; ?>/>
 324+ <a href="http://wikimania2011.wikimedia.org/wiki/Tours/Acre_(Acco)" onClick="return popup(this, 'tour3')"><?php get_lang( 'tour3' ); ?></a><br>
 325+ <input type="radio" value="4" name="tours" id="tour4" <?php if ( $register_data['tours'] == 4 ) echo 'checked="checked"'; ?> <?php if ( !in_array( 6, $register_data['join_date'] ) ) echo 'disabled=True'; ?>/>
 326+ <a href="http://wikimania2011.wikimedia.org/wiki/Tours/The_Baha%27i_Gardens" onClick="return popup(this, 'tour4')"><?php get_lang( 'tour4' ); ?></a><br>
 327+ <input type="radio" value="5" name="tours" id="tour5" <?php if ( $register_data['tours'] == 5 ) echo 'checked="checked"'; ?> <?php if ( !in_array( 6, $register_data['join_date'] ) ) echo 'disabled=True'; ?>/>
 328+ <a href="http://wikimania2011.wikimedia.org/wiki/Tours/Druze_villages" onClick="return popup(this, 'tour5')"><?php get_lang( 'tour5' ); ?></a><br>
329329 </td>
330330 <tr>
331 - <td><?php create_label('showname', true) ?></td>
 331+ <td><?php create_label( 'showname', true ) ?></td>
332332 <td>
333 - <input type="checkbox" name="showname[]" value="1" id="showname1" <?php if (in_array(1, $register_data['showname']) || empty($register_data['showname'])) echo 'checked="checked"';?> /><?php create_label('showname1'); ?>
334 - <input type="checkbox" name="showname[]" value="2" id="showname2" <?php if (in_array(2, $register_data['showname'])) echo 'checked="checked"';?> /><?php create_label('showname2'); ?>
335 - <input type="checkbox" name="showname[]" value="3" id="showname3" <?php if (in_array(3, $register_data['showname'])) echo 'checked="checked"';?> onclick='flip(["custom_showname"])'/><?php create_label('showname3'); ?>
336 - <input type="text" name="custom_showname" id ="custom_showname" size="32" value="<?= $register_data['custom_showname'];?>" <?php if (!in_array(3, $register_data['showname'])) echo 'disabled=True';?>/>
 333+ <input type="checkbox" name="showname[]" value="1" id="showname1" <?php if ( in_array( 1, $register_data['showname'] ) || empty( $register_data['showname'] ) ) echo 'checked="checked"'; ?> /><?php create_label( 'showname1' ); ?>
 334+ <input type="checkbox" name="showname[]" value="2" id="showname2" <?php if ( in_array( 2, $register_data['showname'] ) ) echo 'checked="checked"'; ?> /><?php create_label( 'showname2' ); ?>
 335+ <input type="checkbox" name="showname[]" value="3" id="showname3" <?php if ( in_array( 3, $register_data['showname'] ) ) echo 'checked="checked"'; ?> onclick='flip(["custom_showname"])'/><?php create_label( 'showname3' ); ?>
 336+ <input type="text" name="custom_showname" id ="custom_showname" size="32" value="<?= $register_data['custom_showname']; ?>" <?php if ( !in_array( 3, $register_data['showname'] ) ) echo 'disabled=True'; ?>/>
337337 </td>
338338 </tr>
339339 <tr>
340 - <td><?php create_label('size'); ?></td>
341 - <td>
342 - <input type="radio" name="size" value="XXS" id="e1" <?php if($register_data['size']=='XXS') echo 'checked="checked"';?> /><label for="e1">XXS</label>
343 - <input type="radio" name="size" value="XS" id="e2" <?php if($register_data['size']=='XS') echo 'checked="checked"';?> /><label for="e2">XS</label>
344 - <input type="radio" name="size" value="S" id="e3" <?php if($register_data['size']=='S') echo 'checked="checked"';?> /><label for="e3">S</label>
345 - <input type="radio" name="size" value="M" id="e4" <?php if($register_data['size']=='M') echo 'checked="checked"';?> /><label for="e4">M</label>
346 - <input type="radio" name="size" value="L" id="e5" <?php if($register_data['size']=='L') echo 'checked="checked"';?> /><label for="e5">L</label>
347 - <input type="radio" name="size" value="XL" id="e6" <?php if($register_data['size']=='XL') echo 'checked="checked"';?> /><label for="e6">XL</label>
348 - <input type="radio" name="size" value="XXL" id="e7" <?php if($register_data['size']=='XXL') echo 'checked="checked"';?> /><label for="e7">XXL</label>
349 - <input type="radio" name="size" value="XXXL" id="e8" <?php if($register_data['size']=='XXXL') echo 'checked="checked"';?> /><label for="e8">XXXL</label>
 340+ <td><?php create_label( 'size' ); ?></td>
 341+ <td>
 342+ <input type="radio" name="size" value="XXS" id="e1" <?php if ( $register_data['size'] == 'XXS' ) echo 'checked="checked"'; ?> /><label for="e1">XXS</label>
 343+ <input type="radio" name="size" value="XS" id="e2" <?php if ( $register_data['size'] == 'XS' ) echo 'checked="checked"'; ?> /><label for="e2">XS</label>
 344+ <input type="radio" name="size" value="S" id="e3" <?php if ( $register_data['size'] == 'S' ) echo 'checked="checked"'; ?> /><label for="e3">S</label>
 345+ <input type="radio" name="size" value="M" id="e4" <?php if ( $register_data['size'] == 'M' ) echo 'checked="checked"'; ?> /><label for="e4">M</label>
 346+ <input type="radio" name="size" value="L" id="e5" <?php if ( $register_data['size'] == 'L' ) echo 'checked="checked"'; ?> /><label for="e5">L</label>
 347+ <input type="radio" name="size" value="XL" id="e6" <?php if ( $register_data['size'] == 'XL' ) echo 'checked="checked"'; ?> /><label for="e6">XL</label>
 348+ <input type="radio" name="size" value="XXL" id="e7" <?php if ( $register_data['size'] == 'XXL' ) echo 'checked="checked"'; ?> /><label for="e7">XXL</label>
 349+ <input type="radio" name="size" value="XXXL" id="e8" <?php if ( $register_data['size'] == 'XXXL' ) echo 'checked="checked"'; ?> /><label for="e8">XXXL</label>
350350 </td>
351351 <tr>
352 - <td><?php create_label('food'); ?></td>
 352+ <td><?php create_label( 'food' ); ?></td>
353353 <td>
354 - <input type="radio" value="0" name="food" id="food0" <?php if ($register_data['food'] == 0) echo 'checked="checked"';?> onclick='disable(["food_other"])'/> <?php create_label('food0');?><br>
355 - <input type="radio" value="1" name="food" id="food1" <?php if ($register_data['food'] == 1) echo 'checked="checked"';?> onclick='disable(["food_other"])'/> <?php create_label('food1');?><br>
356 - <input type="radio" value="2" name="food" id="food2" <?php if ($register_data['food'] == 2) echo 'checked="checked"';?> onclick='disable(["food_other"])' /> <?php create_label('food2');?><br>
357 - <input type="radio" value="3" name="food" id="food3" <?php if ($register_data['food'] == 3) echo 'checked="checked"';?> onclick='enable(["food_other"])' /> <?php create_label('food_other');?>
358 - <input type="text" name="food_other" id="food_other" value="<?= $register_data['food_other'];?>" <?php if (!$register_data['food'] == 3) echo 'disabled=True';?> />
 354+ <input type="radio" value="0" name="food" id="food0" <?php if ( $register_data['food'] == 0 ) echo 'checked="checked"'; ?> onclick='disable(["food_other"])'/> <?php create_label( 'food0' ); ?><br>
 355+ <input type="radio" value="1" name="food" id="food1" <?php if ( $register_data['food'] == 1 ) echo 'checked="checked"'; ?> onclick='disable(["food_other"])'/> <?php create_label( 'food1' ); ?><br>
 356+ <input type="radio" value="2" name="food" id="food2" <?php if ( $register_data['food'] == 2 ) echo 'checked="checked"'; ?> onclick='disable(["food_other"])' /> <?php create_label( 'food2' ); ?><br>
 357+ <input type="radio" value="3" name="food" id="food3" <?php if ( $register_data['food'] == 3 ) echo 'checked="checked"'; ?> onclick='enable(["food_other"])' /> <?php create_label( 'food_other' ); ?>
 358+ <input type="text" name="food_other" id="food_other" value="<?= $register_data['food_other']; ?>" <?php if ( !$register_data['food'] == 3 ) echo 'disabled=True'; ?> />
359359 </td>
360360 </tr>
361361 <tr>
362 - <th colspan="2"><?php get_lang('title_visa');?></th>
 362+ <th colspan="2"><?php get_lang( 'title_visa' ); ?></th>
363363 </tr>
364364 <tr>
365 - <td><?php create_label('visa_assistance'); ?></td>
 365+ <td><?php create_label( 'visa_assistance' ); ?></td>
366366 <td>
367 - <input type="checkbox" name="visa_assistance" value="1" id="need_visa_assistance" <?php if($register_data['visa_assistance'] == 1) echo 'checked="checked"';?> onclick='flip(["nationality","passport","passport_day","passport_month", "passport_year","passport_issued","day","month","year","countryofbirth","homeaddress","visa_assistance_description"])' />
368 - <?php create_label('need_visa_assistance'); ?>
 367+ <input type="checkbox" name="visa_assistance" value="1" id="need_visa_assistance" <?php if ( $register_data['visa_assistance'] == 1 ) echo 'checked="checked"'; ?> onclick='flip(["nationality","passport","passport_day","passport_month", "passport_year","passport_issued","day","month","year","countryofbirth","homeaddress","visa_assistance_description"])' />
 368+ <?php create_label( 'need_visa_assistance' ); ?>
369369 </td>
370370 </tr>
371371 <tr>
372 - <td><?php create_label('nationality')?></td>
 372+ <td><?php create_label( 'nationality' )?></td>
373373 <td>
374 - <select name="nationality" id="nationality" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?>>
375 - <option value=""><?php get_lang('select'); ?></option>
376 - <?php foreach ($lang_countries as $lang_country => $lang_country_name)
 374+ <select name="nationality" id="nationality" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?>>
 375+ <option value=""><?php get_lang( 'select' ); ?></option>
 376+ <?php foreach ( $lang_countries as $lang_country => $lang_country_name )
377377 {
378 - if ($register_data['nationality'] == $lang_country)
379 - echo '<option value="'. $lang_country . '" selected="selected">'. $lang_country_name . ' (' . $lang_country . ')</option>'."\n";
 378+ if ( $register_data['nationality'] == $lang_country )
 379+ echo '<option value="' . $lang_country . '" selected="selected">' . $lang_country_name . ' (' . $lang_country . ')</option>' . "\n";
380380 else
381 - echo '<option value="'. $lang_country . '">'. $lang_country_name . ' (' . $lang_country . ')</option>'."\n";
382 - }?>
 381+ echo '<option value="' . $lang_country . '">' . $lang_country_name . ' (' . $lang_country . ')</option>' . "\n";
 382+ } ?>
383383 </select>
384384 </td>
385385 <tr>
386 - <td><?php create_label('passport')?></td>
 386+ <td><?php create_label( 'passport' )?></td>
387387 <td>
388 - <input type="text" name="passport" id="passport" size="24" value="<?= $register_data['passport'];?>" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?> />
 388+ <input type="text" name="passport" id="passport" size="24" value="<?= $register_data['passport']; ?>" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?> />
389389 </td>
390390 </tr>
391391 <tr>
392392 <td>
393 - <label for="year"><?php create_label('passport_valid')?></label>
 393+ <label for="year"><?php create_label( 'passport_valid' )?></label>
394394 </td>
395395 <td>
396 - <input name="passport_day" id="passport_day" type="text" size="2" maxlength="2" value="<?= $register_data['passport_day'];?>" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?> /><?php get_lang('day'); ?>
397 - <select name="passport_month" id="passport_month" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?>>
398 - <option value=""><?php get_lang('select'); ?></option>
399 - <?php for ($i = 1; $i <= 12; $i++)
 396+ <input name="passport_day" id="passport_day" type="text" size="2" maxlength="2" value="<?= $register_data['passport_day']; ?>" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?> /><?php get_lang( 'day' ); ?>
 397+ <select name="passport_month" id="passport_month" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?>>
 398+ <option value=""><?php get_lang( 'select' ); ?></option>
 399+ <?php for ( $i = 1; $i <= 12; $i++ )
400400 {
401 - if ($register_data['passport_month'] == $i)
402 - echo '<option value="'. $i . '" selected="selected">'. $lang_register_form['months'][$i] . '</option>'."\n";
 401+ if ( $register_data['passport_month'] == $i )
 402+ echo '<option value="' . $i . '" selected="selected">' . $lang_register_form['months'][$i] . '</option>' . "\n";
403403 else
404 - echo '<option value="'. $i . '">'. $lang_register_form['months'][$i] . '</option>'."\n";
405 - }?>
 404+ echo '<option value="' . $i . '">' . $lang_register_form['months'][$i] . '</option>' . "\n";
 405+ } ?>
406406 </select>
407 - <?php get_lang('year1'); ?> <input name="passport_year" id="passport_year" type="text" size="4" maxlength="4" id="year" value="<?= $register_data['passport_year'];?>" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?> /><?php get_lang('year'); ?>
 407+ <?php get_lang( 'year1' ); ?> <input name="passport_year" id="passport_year" type="text" size="4" maxlength="4" id="year" value="<?= $register_data['passport_year']; ?>" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?> /><?php get_lang( 'year' ); ?>
408408 </td>
409409 </tr>
410410 <tr>
411 - <td><?php create_label('passport_issued')?></td>
 411+ <td><?php create_label( 'passport_issued' )?></td>
412412 <td>
413 - <input type="text" name="passport_issued" id="passport_issued" size="24" value="<?= $register_data['passport_issued'];?>" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?> />
 413+ <input type="text" name="passport_issued" id="passport_issued" size="24" value="<?= $register_data['passport_issued']; ?>" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?> />
414414 </td>
415415 </tr>
416416 <tr>
417417 <td>
418 - <label for="year"><?php create_label('birthday')?></label>
 418+ <label for="year"><?php create_label( 'birthday' )?></label>
419419 </td>
420420 <td>
421 - <input name="day" id="day" type="text" size="2" maxlength="2" value="<?= $register_data['day'];?>" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?> /><?php get_lang('day'); ?>
422 - <select name="month" id="month" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?>>
423 - <option value=""><?php get_lang('select'); ?></option>
424 - <?php for ($i = 1; $i <= 12; $i++)
 421+ <input name="day" id="day" type="text" size="2" maxlength="2" value="<?= $register_data['day']; ?>" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?> /><?php get_lang( 'day' ); ?>
 422+ <select name="month" id="month" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?>>
 423+ <option value=""><?php get_lang( 'select' ); ?></option>
 424+ <?php for ( $i = 1; $i <= 12; $i++ )
425425 {
426 - if ($register_data['month'] == $i)
427 - echo '<option value="'. $i . '" selected="selected">'. $lang_register_form['months'][$i] . '</option>'."\n";
 426+ if ( $register_data['month'] == $i )
 427+ echo '<option value="' . $i . '" selected="selected">' . $lang_register_form['months'][$i] . '</option>' . "\n";
428428 else
429 - echo '<option value="'. $i . '">'. $lang_register_form['months'][$i] . '</option>'."\n";
430 - }?>
 429+ echo '<option value="' . $i . '">' . $lang_register_form['months'][$i] . '</option>' . "\n";
 430+ } ?>
431431 </select>
432 - <?php get_lang('year1'); ?> <input name="year" id="year" type="text" size="4" maxlength="4" id="year" value="<?= $register_data['year'];?>" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?> /><?php get_lang('year'); ?>
 432+ <?php get_lang( 'year1' ); ?> <input name="year" id="year" type="text" size="4" maxlength="4" id="year" value="<?= $register_data['year']; ?>" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?> /><?php get_lang( 'year' ); ?>
433433 </td>
434434 </tr>
435435 <tr>
436 - <td><?php create_label('countryofbirth',True)?></td>
 436+ <td><?php create_label( 'countryofbirth', True )?></td>
437437 <td>
438 - <select name="countryofbirth" id="countryofbirth" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?>>
439 - <option value=""><?php get_lang('select'); ?></option>
440 - <?php foreach ($lang_countries as $lang_country => $lang_country_name)
 438+ <select name="countryofbirth" id="countryofbirth" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?>>
 439+ <option value=""><?php get_lang( 'select' ); ?></option>
 440+ <?php foreach ( $lang_countries as $lang_country => $lang_country_name )
441441 {
442 - if ($register_data['countryofbirth'] == $lang_country)
443 - echo '<option value="'. $lang_country . '" selected="selected">'. $lang_country_name . ' (' . $lang_country . ')</option>'."\n";
 442+ if ( $register_data['countryofbirth'] == $lang_country )
 443+ echo '<option value="' . $lang_country . '" selected="selected">' . $lang_country_name . ' (' . $lang_country . ')</option>' . "\n";
444444 else
445 - echo '<option value="'. $lang_country . '">'. $lang_country_name . ' (' . $lang_country . ')</option>'."\n";
446 - }?>
 445+ echo '<option value="' . $lang_country . '">' . $lang_country_name . ' (' . $lang_country . ')</option>' . "\n";
 446+ } ?>
447447 </select>
448448 </td>
449449 </tr>
450450 <tr>
451 - <td><?php create_label('homeaddress',True) ?></td>
 451+ <td><?php create_label( 'homeaddress', True ) ?></td>
452452 <td>
453 - <textarea name="homeaddress" id="homeaddress" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?>><?= $register_data['homeaddress'] ?></textarea>
 453+ <textarea name="homeaddress" id="homeaddress" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?>><?= $register_data['homeaddress'] ?></textarea>
454454 </td>
455455 </tr>
456456 <tr>
457 - <td><?php create_label('visa_assistance_description',True) ?></td>
 457+ <td><?php create_label( 'visa_assistance_description', True ) ?></td>
458458 <td>
459 - <textarea name="visa_assistance_description" id="visa_assistance_description" <?php if (!$register_data['visa_assistance']) echo 'disabled=True';?>><?= $register_data['visa_assistance_description'] ?></textarea>
 459+ <textarea name="visa_assistance_description" id="visa_assistance_description" <?php if ( !$register_data['visa_assistance'] ) echo 'disabled=True'; ?>><?= $register_data['visa_assistance_description'] ?></textarea>
460460 </td>
461461 </tr>
462462 <tr>
463 - <th colspan="2"><?php get_lang('title5');?></th>
 463+ <th colspan="2"><?php get_lang( 'title5' ); ?></th>
464464 </tr>
465465 <tr>
466 - <td><?php create_label('accommodation'); ?></td>
467 - <td>
 466+ <td><?php create_label( 'accommodation' ); ?></td>
 467+ <td>
468468 <?php
469 - for ($i = 1; $i <=8; $i++)
 469+ for ( $i = 1; $i <= 8; $i++ )
470470 {
471 - if (in_array($i, $register_data['nights']))
472 - echo '<input type="checkbox" value="'. $i .'" name="nights[]" id="night'.$i.'" checked="checked"/>';
473 - else
474 - echo '<input type="checkbox" value="'. $i .'" name="nights[]" id="night'.$i.'" />';
475 - create_label('night'. $i);
 471+ if ( in_array( $i, $register_data['nights'] ) )
 472+ echo '<input type="checkbox" value="' . $i . '" name="nights[]" id="night' . $i . '" checked="checked"/>';
 473+ else
 474+ echo '<input type="checkbox" value="' . $i . '" name="nights[]" id="night' . $i . '" />';
 475+ create_label( 'night' . $i );
476476 echo "<br>";
477 - }?>
 477+ } ?>
478478 </td>
479479 </tr>
480480 <tr>
481 - <td><?php get_lang('room'); ?></td>
 481+ <td><?php get_lang( 'room' ); ?></td>
482482 <td>
483 - <input type="radio" value="1" name="room" id="room1" <?php if ($register_data['room'] == 1) echo 'checked="checked"';?> onclick='disable(["room_partner"])'/> <?php create_label('room1');?><br>
484 - <input type="radio" value="2" name="room" id="room2" <?php if ($register_data['room'] == 2) echo 'checked="checked"';?> onclick='disable(["room_partner"])' /> <?php create_label('room2');?><br>
485 - <input type="radio" value="3" name="room" id="room3" <?php if ($register_data['room'] == 3) echo 'checked="checked"';?> onclick='enable(["room_partner"])' /> <?php create_label('room3');?>
486 - <input name="room_partner" id="room_partner" type="text" value="<?= $register_data['room_partner'];?>" <?php if (!$register_data['room'] == 3) echo 'disabled=True';?> />
 483+ <input type="radio" value="1" name="room" id="room1" <?php if ( $register_data['room'] == 1 ) echo 'checked="checked"'; ?> onclick='disable(["room_partner"])'/> <?php create_label( 'room1' ); ?><br>
 484+ <input type="radio" value="2" name="room" id="room2" <?php if ( $register_data['room'] == 2 ) echo 'checked="checked"'; ?> onclick='disable(["room_partner"])' /> <?php create_label( 'room2' ); ?><br>
 485+ <input type="radio" value="3" name="room" id="room3" <?php if ( $register_data['room'] == 3 ) echo 'checked="checked"'; ?> onclick='enable(["room_partner"])' /> <?php create_label( 'room3' ); ?>
 486+ <input name="room_partner" id="room_partner" type="text" value="<?= $register_data['room_partner']; ?>" <?php if ( !$register_data['room'] == 3 ) echo 'disabled=True'; ?> />
487487 </td>
488488 </tr>
489489 <tr>
490 - <td><?php create_label('room_requests',True) ?></td>
 490+ <td><?php create_label( 'room_requests', True ) ?></td>
491491 <td>
492492 <textarea name="room_requests" id="room_requests"><?= $register_data['room_requests'] ?></textarea>
493493 </td>
494494 </tr>
495495 <tr>
496 - <td><?php create_label('accommodation_hotel'); ?></td>
 496+ <td><?php create_label( 'accommodation_hotel' ); ?></td>
497497 <td>
498 - <input type="radio" value="1" name="hotels" id="hotel1" <?php if ($register_data['hotels'] == 1) echo 'checked="checked"';?> disabled=True/>
499 - <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Dorms" onClick="return popup(this, 'hotel1')"><?php create_label('hotel1');?></a><br>
500 - <?php get_lang('hotel3stars');?>:<br>
501 - <input type="radio" value="2" name="hotels" id="hotel2" <?php if ($register_data['hotels'] == 2) echo 'checked="checked"';?> disabled=True/>
502 - <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Three_Stars_Hotels#Dan_Gardens_.28.2A.2A.2A.29" onClick="return popup(this, 'hotel2')"><?php create_label('hotel2');?></a><br>
503 - <?php get_lang('hotel4stars');?>:<br>
504 - <input type="radio" value="4" name="hotels" id="hotel4" <?php if ($register_data['hotels'] == 4) echo 'checked="checked"';?> disabled=True/>
505 - <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Four_Stars_Hotels#Mount_Carmel_.28.2A.2A.2A.2A.29" onClick="return popup(this, 'hotel4')"><?php create_label('hotel4');?></a><br>
506 - <input type="radio" value="5" name="hotels" id="hotel5" <?php if ($register_data['hotels'] == 5) echo 'checked="checked"';?> disabled=True/>
507 - <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Four_Stars_Hotels#Nof_.28.2A.2A.2A.2A.29" onClick="return popup(this, 'hotel5')"><?php create_label('hotel5');?></a><br>
508 - <?php get_lang('hotel5stars');?>:<br>
509 - <input type="radio" value="6" name="hotels" id="hotel6" <?php if ($register_data['hotels'] == 6) echo 'checked="checked"';?>/>
510 - <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Five_Stars_Hotels#Dan_Panorama_.28.2A.2A.2A.2A.2A.29" onClick="return popup(this, 'hotel6')"><?php create_label('hotel6');?></a><br>
 498+ <input type="radio" value="1" name="hotels" id="hotel1" <?php if ( $register_data['hotels'] == 1 ) echo 'checked="checked"'; ?> disabled=True/>
 499+ <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Dorms" onClick="return popup(this, 'hotel1')"><?php create_label( 'hotel1' ); ?></a><br>
 500+ <?php get_lang( 'hotel3stars' ); ?>:<br>
 501+ <input type="radio" value="2" name="hotels" id="hotel2" <?php if ( $register_data['hotels'] == 2 ) echo 'checked="checked"'; ?> disabled=True/>
 502+ <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Three_Stars_Hotels#Dan_Gardens_.28.2A.2A.2A.29" onClick="return popup(this, 'hotel2')"><?php create_label( 'hotel2' ); ?></a><br>
 503+ <?php get_lang( 'hotel4stars' ); ?>:<br>
 504+ <input type="radio" value="4" name="hotels" id="hotel4" <?php if ( $register_data['hotels'] == 4 ) echo 'checked="checked"'; ?> disabled=True/>
 505+ <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Four_Stars_Hotels#Mount_Carmel_.28.2A.2A.2A.2A.29" onClick="return popup(this, 'hotel4')"><?php create_label( 'hotel4' ); ?></a><br>
 506+ <input type="radio" value="5" name="hotels" id="hotel5" <?php if ( $register_data['hotels'] == 5 ) echo 'checked="checked"'; ?> disabled=True/>
 507+ <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Four_Stars_Hotels#Nof_.28.2A.2A.2A.2A.29" onClick="return popup(this, 'hotel5')"><?php create_label( 'hotel5' ); ?></a><br>
 508+ <?php get_lang( 'hotel5stars' ); ?>:<br>
 509+ <input type="radio" value="6" name="hotels" id="hotel6" <?php if ( $register_data['hotels'] == 6 ) echo 'checked="checked"'; ?>/>
 510+ <a href="http://wikimania2011.wikimedia.org/wiki/Accommodation/Five_Stars_Hotels#Dan_Panorama_.28.2A.2A.2A.2A.2A.29" onClick="return popup(this, 'hotel6')"><?php create_label( 'hotel6' ); ?></a><br>
511511 <?php
512512 ?>
513513 </td>
514514 </tr>
515515 <tr>
516 - <th colspan="2"><?php get_lang('title6');?></th>
 516+ <th colspan="2"><?php get_lang( 'title6' ); ?></th>
517517 </tr>
518518 <tr>
519 - <td><?php create_label('discount_code')?></td>
 519+ <td><?php create_label( 'discount_code' )?></td>
520520 <td>
521 - <input type="text" name="discount_code" id="discount_code" size="24" value="<?= $register_data['discount_code'];?>">
 521+ <input type="text" name="discount_code" id="discount_code" size="24" value="<?= $register_data['discount_code']; ?>">
522522 </td>
523523 </tr>
524524 <tr>
525 - <th colspan="2"><?php get_lang('title7');?></th>
 525+ <th colspan="2"><?php get_lang( 'title7' ); ?></th>
526526 </tr>
527527 <tr>
528 - <td><?php create_label('captcha')?></td>
 528+ <td><?php create_label( 'captcha' )?></td>
529529 <td>
530 - <?php
531 - require_once('recaptchalib.php');
532 - echo recaptcha_get_html($recaptcha_publickey);
 530+ <?php
 531+ require_once( 'recaptchalib.php' );
 532+ echo recaptcha_get_html( $recaptcha_publickey );
533533 ?>
534534 </td>
535535 </tr>
@@ -537,22 +537,22 @@
538538
539539
540540 <ul id="submit_notice">
541 -<?php get_lang('submit_notice'); ?>
542 -<?php get_lang('asterix_meaning'); ?>
 541+<?php get_lang( 'submit_notice' ); ?>
 542+<?php get_lang( 'asterix_meaning' ); ?>
543543 </ul>
544544
545545 <div id="button">
546 - <input type="submit" name="submit" value="<?php get_lang('submit'); ?>" />
547 - <input type="reset" name="reset" value="<?php get_lang('reset'); ?>" />
 546+ <input type="submit" name="submit" value="<?php get_lang( 'submit' ); ?>" />
 547+ <input type="reset" name="reset" value="<?php get_lang( 'reset' ); ?>" />
548548 <input type="hidden" name="uselang" value="<?= $userLanguage?>" />
549549 <input type="hidden" name="action" value="confirm" />
550 - <?php if(!$_COOKIE['wikimania'])
551 - echo '<input type="hidden" name="secret_id" value="'.$my_session->handle.'" />';
 550+ <?php if ( !$_COOKIE['wikimania'] )
 551+ echo '<input type="hidden" name="secret_id" value="' . $my_session->handle . '" />';
552552 ?>
553553 </div>
554 -</form>
 554+</form>
555555 <?php
556 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 556+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
557557 {
558558 echo '</div>';
559 -}?>
 559+} ?>
Index: trunk/wikimania/wmreg/skin/query_result.php
@@ -1,16 +1,16 @@
22 <?php
33
44 /* Prevent hacking */
5 -if(!defined('TC_STARTED'))
6 -{ die('Hacking Attempt'); }
 5+if ( !defined( 'TC_STARTED' ) )
 6+{ die( 'Hacking Attempt' ); }
77
88 global $error_message, $register_data, $lang_query, $lang_register_form, $lang_errors;
99
1010 /* Fix XSS */
11 -$register_data = array_map('htmlspecialchars', $register_data);
 11+$register_data = array_map( 'htmlspecialchars', $register_data );
1212 ?>
1313 <?php
14 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 14+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
1515 {
1616 echo '<div dir="rtl">';
1717 }
@@ -18,43 +18,43 @@
1919
2020 <p id="special_pages">
2121 <?php
22 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 22+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
2323 {
2424 echo '<div align="left">';
25 -}?>
26 -<a href="<?php echo $myself_url.'index.php'?>"
 25+} ?>
 26+<a href="<?php echo $myself_url . 'index.php'?>"
2727 title="Return to Registration form">Registration Form</a> | <a
28 - href="<?php echo $myself_url.'index.php?action=admin'?>"
 28+ href="<?php echo $myself_url . 'index.php?action=admin'?>"
2929 title="Enter the managment system">Admin</a><?php
30 - if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 30+ if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
3131 {
3232 echo '</div>';
3333 }
3434 ?>
3535 </p>
36 -<h1><?php echo $lang_query['query_title'];?></h1>
 36+<h1><?php echo $lang_query['query_title']; ?></h1>
3737 <p>
38 -<?php echo preg_replace('/(.+)/',$lang_query['your_status'], $register_data['given_name'] . ' ' . $register_data['surname']); ?>
 38+<?php echo preg_replace( '/(.+)/', $lang_query['your_status'], $register_data['given_name'] . ' ' . $register_data['surname'] ); ?>
3939 </p>
4040 <br>
4141 <p>
42 -<?php echo $lang_query['unique_code'] . ' <b>' . $register_data['unique_code'].'</b>';?>
 42+<?php echo $lang_query['unique_code'] . ' <b>' . $register_data['unique_code'] . '</b>'; ?>
4343 </p>
4444 <br>
4545 <p>
46 -<?php echo $lang_query['received_money'] . ' <br> <b>' . $register_data['cost_paid'].' out of '. $register_data['cost_total'] . ' ' . $register_data['currency'] . '</b>';
47 -if($register_data['cost_paid']<$register_data['cost_total']) {
48 - echo ' ('.$lang_query['lack'].')';
 46+<?php echo $lang_query['received_money'] . ' <br> <b>' . $register_data['cost_paid'] . ' out of ' . $register_data['cost_total'] . ' ' . $register_data['currency'] . '</b>';
 47+if ( $register_data['cost_paid'] < $register_data['cost_total'] ) {
 48+ echo ' (' . $lang_query['lack'] . ')';
4949 include 'skin/paypal.php';
5050 }
5151
52 -if($register_data['cost_paid']==$register_data['cost_total']) echo ' ('.$lang_query['enough'].')';
53 -if($register_data['cost_paid']>$register_data['cost_total']) echo ' ('.$lang_query['too_much'].')';
 52+if ( $register_data['cost_paid'] == $register_data['cost_total'] ) echo ' (' . $lang_query['enough'] . ')';
 53+if ( $register_data['cost_paid'] > $register_data['cost_total'] ) echo ' (' . $lang_query['too_much'] . ')';
5454 ?>
5555 </p>
5656 <br><br>
5757 <p>
58 -<?php switch($register_data['status'])
 58+<?php switch( $register_data['status'] )
5959 {
6060 case 0:
6161 echo $lang_query['not_yet'];
@@ -65,11 +65,11 @@
6666 case 2:
6767 echo $lang_query['rejected'];
6868 break;
69 -}?>
 69+} ?>
7070 </p>
7171 <?php
7272
73 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 73+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
7474 {
7575 echo '</div>';
76 -}?>
\ No newline at end of file
 76+} ?>
\ No newline at end of file
Index: trunk/wikimania/wmreg/skin/query.php
@@ -1,36 +1,36 @@
22 <?php
33
44 /* Prevent hacking */
5 -if(!defined('TC_STARTED'))
6 -{ die('Hacking Attempt'); }
 5+if ( !defined( 'TC_STARTED' ) )
 6+{ die( 'Hacking Attempt' ); }
77
88 global $error_message, $register_data, $lang_query, $lang_register_form, $lang_errors;
99
1010 /* Fix XSS */
11 -$register_data = array_map('htmlspecialchars', $register_data);
 11+$register_data = array_map( 'htmlspecialchars', $register_data );
1212
1313 ?>
1414 <?php
15 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 15+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
1616 {
1717 echo '<div dir="rtl">';
1818 }
1919 ?>
20 -<h1><?php echo $lang_register_form['query'];?></h1>
 20+<h1><?php echo $lang_register_form['query']; ?></h1>
2121 <p id="special_pages"><?php
22 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 22+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
2323 {
2424 echo '<div align="left">';
25 -}?><a href="<?php echo $myself_url.'index.php?uselang='.$userLanguage?>"
 25+} ?><a href="<?php echo $myself_url . 'index.php?uselang=' . $userLanguage?>"
2626 title="Return to Registration form">Registration Form</a> | <a
27 - href="<?php echo $myself_url.'index.php?action=admin'?>"
 27+ href="<?php echo $myself_url . 'index.php?action=admin'?>"
2828 title="Enter the managment System">Admin</a><?php
29 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 29+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
3030 {
3131 echo '</div>';
32 -}?></p>
33 -<?php if ($error_message != 0)
34 -echo '<div id="correction">'."\n".'<p>'.$lang_errors['wrong_query'].'</p>'."\n".'</div>'."\n";
 32+} ?></p>
 33+<?php if ( $error_message != 0 )
 34+echo '<div id="correction">' . "\n" . '<p>' . $lang_errors['wrong_query'] . '</p>' . "\n" . '</div>' . "\n";
3535 ?>
3636 <form method="post" action="<?php echo $myself_url?>index.php">
3737
@@ -42,29 +42,29 @@
4343 <tr>
4444 <td><label for="given_name" class="col_title"><?php echo $lang_register_form['given_name']?></label></td>
4545 <td><input name="given_name" type="text" size="20" id="given_name"
46 - value="<?php echo $register_data['given_name'];?>" /></td>
 46+ value="<?php echo $register_data['given_name']; ?>" /></td>
4747 </tr>
4848 <tr>
4949 <td><label for="surname" class="col_title"><?php echo $lang_register_form['surname']?></label></td>
5050 <td><input name="surname" type="text" size="20" id="surname"
51 - value="<?php echo $register_data['surname'];?>" /></td>
 51+ value="<?php echo $register_data['surname']; ?>" /></td>
5252 </tr>
5353 <tr>
5454 <td><label for="unique_code" class="col_title"><?php echo $lang_query['unique_code'] ?></label></td>
5555 <td><input name="unique_code" type="text" id="u_code" size="5"
56 - value="<?php echo $register_data['unique_code'];?>" /></td>
 56+ value="<?php echo $register_data['unique_code']; ?>" /></td>
5757 </tr>
5858 </table>
5959 <div id="button">
60 -<input type="submit" name="Submit" value="<?php echo $lang_query['submit']?>" />
 60+<input type="submit" name="Submit" value="<?php echo $lang_query['submit']?>" />
6161 <input type="reset" name="reset" id="reset" value="<?php echo $lang_register_form['reset']?>" />
62 -<input type="hidden" name="uselang" value="<?php echo $userLanguage;?>" />
63 -<input type="hidden" name="action" value="query_result" />
64 -<?php if(!$_COOKIE['wikimania']) echo '<input type="hidden" name="secret_id" value="'.$my_session->handle.'" />'; ?>
 62+<input type="hidden" name="uselang" value="<?php echo $userLanguage; ?>" />
 63+<input type="hidden" name="action" value="query_result" />
 64+<?php if ( !$_COOKIE['wikimania'] ) echo '<input type="hidden" name="secret_id" value="' . $my_session->handle . '" />'; ?>
6565 </div>
6666 </form>
6767 <?php
68 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 68+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
6969 {
7070 echo '</div>';
71 -}?>
\ No newline at end of file
 71+} ?>
\ No newline at end of file
Index: trunk/wikimania/wmreg/skin/admin_interface.php
@@ -1,37 +1,37 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{ die('nothing here!'); }
 4+if ( !defined( 'TC_STARTED' ) )
 5+{ die( 'nothing here!' ); }
66
77 include_once 'includes/language_en.php';
88
99 global $myself_url, $register_data, $table_data, $lang_countries, $error_message, $lang_register_form;
1010
11 -function get_percentage($number) {
 11+function get_percentage( $number ) {
1212 global $register_data;
13 - if ($register_data['total_people'] == 0) return '0.0%';
14 - else return number_format($number / $register_data['total_people'] * 100, 1).'%';
 13+ if ( $register_data['total_people'] == 0 ) return '0.0%';
 14+ else return number_format( $number / $register_data['total_people'] * 100, 1 ) . '%';
1515 }
1616 /* Fix XSS */
17 -$register_data = array_map('htmlspecialchars', $register_data);
 17+$register_data = array_map( 'htmlspecialchars', $register_data );
1818
19 -$cloth_sizes = array(NULL, 'XXS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL');
 19+$cloth_sizes = array( NULL, 'XXS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL' );
2020
21 -$parameters = $myself_url.'index.php?action=admin';
22 -$parameters2 = $myself_url.'index.php?action=admin';
 21+$parameters = $myself_url . 'index.php?action=admin';
 22+$parameters2 = $myself_url . 'index.php?action=admin';
2323
24 -if ($MY_REQUEST['page'])
25 -{ $parameters .= '&page='.urlencode($MY_REQUEST['page']); }
 24+if ( $MY_REQUEST['page'] )
 25+{ $parameters .= '&page=' . urlencode( $MY_REQUEST['page'] ); }
2626
27 -if ($MY_REQUEST['keyword'])
 27+if ( $MY_REQUEST['keyword'] )
2828 {
29 - $parameters .= '&keyword='.urlencode($MY_REQUEST['keyword']).'&filter='.urlencode($MY_REQUEST['filter']);
30 - $parameters2 .= '&keyword='.urlencode($MY_REQUEST['keyword']).'&filter='.urlencode($MY_REQUEST['filter']);
 29+ $parameters .= '&keyword=' . urlencode( $MY_REQUEST['keyword'] ) . '&filter=' . urlencode( $MY_REQUEST['filter'] );
 30+ $parameters2 .= '&keyword=' . urlencode( $MY_REQUEST['keyword'] ) . '&filter=' . urlencode( $MY_REQUEST['filter'] );
3131 }
32 -$parameters2 .= '&mode='.urlencode($MY_REQUEST['mode']);
 32+$parameters2 .= '&mode=' . urlencode( $MY_REQUEST['mode'] );
3333
34 -$parameters .= '&real='.urlencode($MY_REQUEST['real']);
35 -$parameters2 .= '&real='.urlencode($MY_REQUEST['real']);
 34+$parameters .= '&real=' . urlencode( $MY_REQUEST['real'] );
 35+$parameters2 .= '&real=' . urlencode( $MY_REQUEST['real'] );
3636 ?>
3737
3838 <script type="text/javascript" src="jquery-1.4.3.min.js"></script>
@@ -74,19 +74,19 @@
7575 $("#u_code").val(unique_code);
7676
7777 for (var i=1; i<=6; i++)
78 - {
 78+ {
7979 if (join_date.indexOf(i) != -1) $("#j"+i).attr("checked", "checked");
8080 else $("#j"+i).removeAttr("checked");
8181 }
8282 for (var i=1; i<=8; i++)
83 - {
 83+ {
8484 if (nights.indexOf(i) != -1) $("#n"+i).attr("checked", "checked");
8585 else $("#n"+i).removeAttr("checked");
8686 }
87 -
 87+
8888 $("#h"+hotel).attr("checked", "checked");
8989 $("#room_number").val(room_number);
90 - $("#vips"+coupon).attr("selected", "selected");
 90+ $("#vips"+coupon).attr("selected", "selected");
9191 }
9292
9393 function radiocheck(num)
@@ -114,47 +114,47 @@
115115 <h1>Wikimania 2011 administration interface</h1>
116116
117117 <p id="special_pages">Signed in as <strong> <?php echo $_SESSION['user_id']?></strong>
118 -| <a href="<?php echo $myself_url.'index.php?action=logout'?>"
 118+| <a href="<?php echo $myself_url . 'index.php?action=logout'?>"
119119 title="Exit the admin interface and log out">Logout</a></p>
120120
121 -<?php if (!empty($error_message))
 121+<?php if ( !empty( $error_message ) )
122122 {
123 - echo '<div id="correction">'."\n".$error_message."\n".'</div>'."\n";
 123+ echo '<div id="correction">' . "\n" . $error_message . "\n" . '</div>' . "\n";
124124 }
125125 ?>
126126
127127 <h3>List and statistics</h3>
128128
129 -<?php if($register_data['total_keyword']) {?>
 129+<?php if ( $register_data['total_keyword'] ) { ?>
130130 <p>Found <strong><?php echo $register_data['total_keyword']?></strong>
131 -registrant(s). <a href="<?php echo $myself_url;?>?action=admin"
 131+registrant(s). <a href="<?php echo $myself_url; ?>?action=admin"
132132 title="End search and display all of the data">Clear search result</a>
133133 <?php
134 -}
135 -else {?>
136 -<p><strong><?php echo $register_data['total_people'];?>
 134+}
 135+else { ?>
 136+<p><strong><?php echo $register_data['total_people']; ?>
137137 </strong>
138 -registrants (<?php echo $register_data['total_people_confirmed'];?> confirmed)
139 -<?php }?>
 138+registrants (<?php echo $register_data['total_people_confirmed']; ?> confirmed)
 139+<?php } ?>
140140
141 -<form action="<?php echo $myself_url. 'index.php';?>" method="GET">
 141+<form action="<?php echo $myself_url . 'index.php'; ?>" method="GET">
142142 <div id="admin_navigation">
143143
144144 <p id="search_form">
145145 <select name="filter">
146146 <option value="name"
147 - <?php if ($MY_REQUEST['filter'] == 'name') echo 'selected="selected"'; ?>>Name, Wiki username</option>
 147+ <?php if ( $MY_REQUEST['filter'] == 'name' ) echo 'selected="selected"'; ?>>Name, Wiki username</option>
148148 <option value="email"
149 - <?php if ($MY_REQUEST['filter'] == 'email') echo 'selected="selected"'; ?>>Mail</option>
 149+ <?php if ( $MY_REQUEST['filter'] == 'email' ) echo 'selected="selected"'; ?>>Mail</option>
150150 <option value="unique_code"
151 - <?php if ($MY_REQUEST['filter'] == 'unique_code') echo 'selected="selected"'; ?>>Registration
 151+ <?php if ( $MY_REQUEST['filter'] == 'unique_code' ) echo 'selected="selected"'; ?>>Registration
152152 number</option>
153 -</select>
 153+</select>
154154 <input type="text" name="keyword"
155 - value="<?php echo stripslashes(htmlspecialchars($MY_REQUEST['keyword']));?>" />
 155+ value="<?php echo stripslashes( htmlspecialchars( $MY_REQUEST['keyword'] ) ); ?>" />
156156 <input type="submit" value="Search" /> <input type="hidden"
157157 name="action" value="admin" /> <input type="hidden" name="mode"
158 - value="<?php echo htmlspecialchars($MY_REQUEST['mode']);?>" /></p>
 158+ value="<?php echo htmlspecialchars( $MY_REQUEST['mode'] ); ?>" /></p>
159159
160160 <p><a href="<?php echo $parameters?>"
161161 title="Info like birthday, name, and ID code">General</a> | <a
@@ -166,48 +166,48 @@
167167 | <a href="<?php echo $parameters?>&mode=pay" title="Payment status">Payment</a></p>
168168
169169 </div>
170 -<input type="checkbox" name="real" <?php if ($MY_REQUEST['real']) echo 'checked="checked"';?>/> Approved only
 170+<input type="checkbox" name="real" <?php if ( $MY_REQUEST['real'] ) echo 'checked="checked"'; ?>/> Approved only
171171 </form>
172172
173173 <p><?php
174174
175 -switch($MY_REQUEST['mode'])
 175+switch( $MY_REQUEST['mode'] )
176176 {
177177 case NULL:
178 - echo 'From <strong>'.$register_data['total_countries'].'</strong> countries / '.
179 - '<strong>'.$register_data['total_male'].'</strong> male ('.get_percentage($register_data['total_male']).') '.
180 - '<strong>'.$register_data['total_female'].'</strong> female ('.get_percentage($register_data['total_female']).') '.
181 - '<strong>'.$register_data['total_sex_other'].'</strong> decline to state sex ('.get_percentage($register_data['total_sex_other']).') '.
182 - '<strong>'.$register_data['total_wikimedians'].'</strong> are Wikimedians ('.get_percentage($register_data['total_wikimedians']).') ';
 178+ echo 'From <strong>' . $register_data['total_countries'] . '</strong> countries / ' .
 179+ '<strong>' . $register_data['total_male'] . '</strong> male (' . get_percentage( $register_data['total_male'] ) . ') ' .
 180+ '<strong>' . $register_data['total_female'] . '</strong> female (' . get_percentage( $register_data['total_female'] ) . ') ' .
 181+ '<strong>' . $register_data['total_sex_other'] . '</strong> decline to state sex (' . get_percentage( $register_data['total_sex_other'] ) . ') ' .
 182+ '<strong>' . $register_data['total_wikimedians'] . '</strong> are Wikimedians (' . get_percentage( $register_data['total_wikimedians'] ) . ') ';
183183 break;
184184
185185 case 'topic':
186 - for ($i = 1; $i <= 6; $i++)
187 - echo 'Day '.$i.' total: <strong>'.$register_data['total_day'.$i].'</strong> people ('.get_percentage($register_data['total_day'.$i]).') | ';
 186+ for ( $i = 1; $i <= 6; $i++ )
 187+ echo 'Day ' . $i . ' total: <strong>' . $register_data['total_day' . $i] . '</strong> people (' . get_percentage( $register_data['total_day' . $i] ) . ') | ';
188188 echo '<br>';
189 - for ($i = 1; $i <= 6; $i++)
190 - echo $i.' days: <strong>'.$register_data['total_'.$i.'days'].'</strong> people ('.get_percentage($register_data['total_'.$i.'days']).') | ';
 189+ for ( $i = 1; $i <= 6; $i++ )
 190+ echo $i . ' days: <strong>' . $register_data['total_' . $i . 'days'] . '</strong> people (' . get_percentage( $register_data['total_' . $i . 'days'] ) . ') | ';
191191 break;
192192
193193 case 'accommodation':
194 - for ($i = 1; $i <= 9; $i++)
 194+ for ( $i = 1; $i <= 9; $i++ )
195195 {
196 - echo $lang_register_form['hotel' . $i] . ': <strong>'.$register_data['total_hotel' . $i].'</strong> people ('.get_percentage($register_data['total_hotel' . $i]).') ';
197 - echo 'in <strong>'.$register_data['rooms_hotel' . $i].'</strong> rooms | ';
 196+ echo $lang_register_form['hotel' . $i] . ': <strong>' . $register_data['total_hotel' . $i] . '</strong> people (' . get_percentage( $register_data['total_hotel' . $i] ) . ') ';
 197+ echo 'in <strong>' . $register_data['rooms_hotel' . $i] . '</strong> rooms | ';
198198 }
199199 echo '<br>';
200 - for ($i = 0; $i <= 8; $i++)
201 - echo $i.' nights: <strong>'.$register_data['total_'.$i.'nights'].'</strong> people ('.get_percentage($register_data['total_'.$i.'nights']).') | ';
 200+ for ( $i = 0; $i <= 8; $i++ )
 201+ echo $i . ' nights: <strong>' . $register_data['total_' . $i . 'nights'] . '</strong> people (' . get_percentage( $register_data['total_' . $i . 'nights'] ) . ') | ';
202202 break;
203203
204204 case 'visa':
205 - echo '<strong>'.$register_data['total_assist'].'</strong> people ('.get_percentage($register_data['total_assist']).') needs visa assistance';
 205+ echo '<strong>' . $register_data['total_assist'] . '</strong> people (' . get_percentage( $register_data['total_assist'] ) . ') needs visa assistance';
206206 break;
207207 }
208208 ?></p>
209209
210210
211 -<form action="<?php echo $myself_url. 'index.php';?>" method="POST"
 211+<form action="<?php echo $myself_url . 'index.php'; ?>" method="POST"
212212 onsubmit="return confirm_warning();">
213213 <table id="admin_table">
214214 <tr>
@@ -216,12 +216,12 @@
217217 <th>Signup time</th>
218218 <th>Name</th>
219219 <th>Sex</th>
220 - <?php
221 - switch($MY_REQUEST['mode']){
 220+ <?php
 221+ switch( $MY_REQUEST['mode'] ) {
222222 case NULL:
223223 echo '
224224 <th>E-mail</th>
225 - <th>Country</th>
 225+ <th>Country</th>
226226 <th>Native lang</th>
227227 <th>Languages</th>
228228 <th>Username</th>
@@ -264,7 +264,7 @@
265265 <th>Birthday</th>
266266 <th>Born in</th>
267267 <th>Address</th>
268 - <th>Detail</th>';
 268+ <th>Detail</th>';
269269 break;
270270 case 'pay':
271271 echo '
@@ -272,175 +272,175 @@
273273 <th>Hotel cost</th>
274274 <th>VAT</th>
275275 <th>Total cost</th>
276 - <th>Currency</th>
 276+ <th>Currency</th>
277277 <th>PayPal OK</th>
278278 <th>Received</th>
279279 <th>Coupon</th>';
280280 break;
281 - }?>
 281+ } ?>
282282 <th>Status</th>
283283 <!--<th>Tag</th>-->
284284 <th id="fill_data_col">Edit</th>
285285 </tr>
286 - <?php foreach ($table_data as $data) {
 286+ <?php foreach ( $table_data as $data ) {
287287 /* I Hate XSS */
288 - $data = array_map('htmlspecialchars', $data);
 288+ $data = array_map( 'htmlspecialchars', $data );
289289 ?>
290290 <tr>
291291 <td><input type="checkbox" name="no[]"
292292 value=<?php echo $data['unique_code']; ?> /></td>
293 - <td><?php echo $data['unique_code'];?></td>
294 - <td><?php echo $data['signuptime'];?></td>
295 - <td><?php echo $data['given_name'].' '.$data['surname'];?></td>
296 - <td><?php echo $data['sex'];?></td>
 293+ <td><?php echo $data['unique_code']; ?></td>
 294+ <td><?php echo $data['signuptime']; ?></td>
 295+ <td><?php echo $data['given_name'] . ' ' . $data['surname']; ?></td>
 296+ <td><?php echo $data['sex']; ?></td>
297297
298 - <?php
299 -
300 - switch($MY_REQUEST['mode']) {
 298+ <?php
 299+
 300+ switch( $MY_REQUEST['mode'] ) {
301301 case NULL:
302 - echo '<td>'.$data['email'].'</td>';
303 - echo '<td>'.$lang_countries[strtolower($data['country'])].'</td>
304 - <td>'.$data['langn'].'</td>
 302+ echo '<td>' . $data['email'] . '</td>';
 303+ echo '<td>' . $lang_countries[strtolower( $data['country'] )] . '</td>
 304+ <td>' . $data['langn'] . '</td>
305305 <td>';
306 - if ($data['lang1'])
307 - echo $data['lang1'].'-'.$data['lang1-level']. ' ';
308 - if ($data['lang2'])
309 - echo $data['lang2'].'-'.$data['lang2-level']. ' ';
310 - if ($data['lang3'])
311 - echo $data['lang3'].'-'.$data['lang3-level']. ' ';
 306+ if ( $data['lang1'] )
 307+ echo $data['lang1'] . '-' . $data['lang1-level'] . ' ';
 308+ if ( $data['lang2'] )
 309+ echo $data['lang2'] . '-' . $data['lang2-level'] . ' ';
 310+ if ( $data['lang3'] )
 311+ echo $data['lang3'] . '-' . $data['lang3-level'] . ' ';
312312 echo '</td><td>';
313 - if ($data['wiki_id'])
314 - echo $data['wiki_id'].'@'.$data['wiki_language'].'.'.$data['wiki_project'];
 313+ if ( $data['wiki_id'] )
 314+ echo $data['wiki_id'] . '@' . $data['wiki_language'] . '.' . $data['wiki_project'];
315315 echo '</td><td>';
316 - foreach(explode(',',$data['showname']) as $key => $value)
 316+ foreach ( explode( ',', $data['showname'] ) as $key => $value )
317317 {
318 - if ($value == 1) echo 'N,';
319 - if ($value == 2) echo 'U,';
320 - if ($value == 3) echo 'A(' . $data['custom_showname'] . ')';
321 - }
 318+ if ( $value == 1 ) echo 'N,';
 319+ if ( $value == 2 ) echo 'U,';
 320+ if ( $value == 3 ) echo 'A(' . $data['custom_showname'] . ')';
 321+ }
322322 echo '</td>';
323323 break;
324324 case "topic":
325325 ?>
326 - <td class="group1"><?php if (!(strpos($data['join_date'], '1') === false)) echo 'X';?></td>
327 - <td class="group1"><?php if (!(strpos($data['join_date'], '2') === false)) echo 'X';?></td>
328 - <td class="group1"><?php if (!(strpos($data['join_date'], '3') === false)) echo 'X';?></td>
329 - <td class="group1"><?php if (!(strpos($data['join_date'], '4') === false)) echo 'X';?></td>
330 - <td class="group1"><?php if (!(strpos($data['join_date'], '5') === false)) echo 'X';?></td>
331 - <td class="group1"><?php if (!(strpos($data['join_date'], '6') === false)) echo 'X';?></td>
332 - <td class="group1"><?php echo $data['tours'];?></td>
 326+ <td class="group1"><?php if ( !( strpos( $data['join_date'], '1' ) === false ) ) echo 'X'; ?></td>
 327+ <td class="group1"><?php if ( !( strpos( $data['join_date'], '2' ) === false ) ) echo 'X'; ?></td>
 328+ <td class="group1"><?php if ( !( strpos( $data['join_date'], '3' ) === false ) ) echo 'X'; ?></td>
 329+ <td class="group1"><?php if ( !( strpos( $data['join_date'], '4' ) === false ) ) echo 'X'; ?></td>
 330+ <td class="group1"><?php if ( !( strpos( $data['join_date'], '5' ) === false ) ) echo 'X'; ?></td>
 331+ <td class="group1"><?php if ( !( strpos( $data['join_date'], '6' ) === false ) ) echo 'X'; ?></td>
 332+ <td class="group1"><?php echo $data['tours']; ?></td>
333333 <?php echo
334 - '<td class="group3">'.$data['size'].'</td>
 334+ '<td class="group3">' . $data['size'] . '</td>
335335 <td class="group3">';
336 - foreach(explode(',',$data['food']) as $key => $value)
 336+ foreach ( explode( ',', $data['food'] ) as $key => $value )
337337 {
338 - if ($value == 1) echo 'V';
339 - if ($value == 2) echo 'H';
340 - if ($value == 3) echo 'O(' . $data['food_other'] . ')';
 338+ if ( $value == 1 ) echo 'V';
 339+ if ( $value == 2 ) echo 'H';
 340+ if ( $value == 3 ) echo 'O(' . $data['food_other'] . ')';
341341 }
342342 break;
343343 case "accommodation":
344344 ?>
345345
346 - <td class="group2"><?php if (!(strpos($data['nights'], '1') === false)) echo 'X';?></td>
347 - <td class="group2"><?php if (!(strpos($data['nights'], '2') === false)) echo 'X';?></td>
348 - <td class="group2"><?php if (!(strpos($data['nights'], '3') === false)) echo 'X';?></td>
349 - <td class="group2"><?php if (!(strpos($data['nights'], '4') === false)) echo 'X';?></td>
350 - <td class="group2"><?php if (!(strpos($data['nights'], '5') === false)) echo 'X';?></td>
351 - <td class="group2"><?php if (!(strpos($data['nights'], '6') === false)) echo 'X';?></td>
352 - <td class="group2"><?php if (!(strpos($data['nights'], '7') === false)) echo 'X';?></td>
353 - <td class="group2"><?php if (!(strpos($data['nights'], '8') === false)) echo 'X';?></td>
354 - <?php
 346+ <td class="group2"><?php if ( !( strpos( $data['nights'], '1' ) === false ) ) echo 'X'; ?></td>
 347+ <td class="group2"><?php if ( !( strpos( $data['nights'], '2' ) === false ) ) echo 'X'; ?></td>
 348+ <td class="group2"><?php if ( !( strpos( $data['nights'], '3' ) === false ) ) echo 'X'; ?></td>
 349+ <td class="group2"><?php if ( !( strpos( $data['nights'], '4' ) === false ) ) echo 'X'; ?></td>
 350+ <td class="group2"><?php if ( !( strpos( $data['nights'], '5' ) === false ) ) echo 'X'; ?></td>
 351+ <td class="group2"><?php if ( !( strpos( $data['nights'], '6' ) === false ) ) echo 'X'; ?></td>
 352+ <td class="group2"><?php if ( !( strpos( $data['nights'], '7' ) === false ) ) echo 'X'; ?></td>
 353+ <td class="group2"><?php if ( !( strpos( $data['nights'], '8' ) === false ) ) echo 'X'; ?></td>
 354+ <?php
355355 echo '<td class="group3">';
356356 echo $lang_register_form['hotel' . $data['hotels']];
357357 echo '</td><td class="group3">';
358 - if ($data['room'] == 1) echo 'S';
359 - if ($data['room'] == 2) echo 'T';
360 - if ($data['room'] == 3) echo 'D';
 358+ if ( $data['room'] == 1 ) echo 'S';
 359+ if ( $data['room'] == 2 ) echo 'T';
 360+ if ( $data['room'] == 3 ) echo 'D';
361361 echo '</td>';
362 - echo '<td class="group3">'. $data['room_partner'].'</td>';
363 - echo '<td class="group3">'. $data['room_number'].'</td>';
364 - echo '<td class="group3">'. $data['room_requests'].'</td>';
 362+ echo '<td class="group3">' . $data['room_partner'] . '</td>';
 363+ echo '<td class="group3">' . $data['room_number'] . '</td>';
 364+ echo '<td class="group3">' . $data['room_requests'] . '</td>';
365365 break;
366366 case 'visa':
367367 echo '<td class="group3">';
368 - if ($data['visa_assistance']) echo 'X';
369 - echo '<td class="group3">'. $lang_countries[strtolower($data['nationality'])].'</td>';
370 - echo '<td class="group3">'. $data['passport'].'</td>';
371 - echo '<td class="group3">'. $data['passport_valid'].'</td>';
372 - echo '<td class="group3">'. $data['passport_issued'].'</td>';
373 - echo '<td class="group3">'. $data['birthday'].'</td>';
374 - echo '<td class="group3">'. $lang_countries[strtolower($data['countryofbirth'])].'</td>';
375 - echo '<td class="group3">'. $data['homeaddress'].'</td>';
376 - echo '<td class="group3">'. $data['visa_assistance_description'].'</td>';
 368+ if ( $data['visa_assistance'] ) echo 'X';
 369+ echo '<td class="group3">' . $lang_countries[strtolower( $data['nationality'] )] . '</td>';
 370+ echo '<td class="group3">' . $data['passport'] . '</td>';
 371+ echo '<td class="group3">' . $data['passport_valid'] . '</td>';
 372+ echo '<td class="group3">' . $data['passport_issued'] . '</td>';
 373+ echo '<td class="group3">' . $data['birthday'] . '</td>';
 374+ echo '<td class="group3">' . $lang_countries[strtolower( $data['countryofbirth'] )] . '</td>';
 375+ echo '<td class="group3">' . $data['homeaddress'] . '</td>';
 376+ echo '<td class="group3">' . $data['visa_assistance_description'] . '</td>';
377377 break;
378378 case 'pay':
379 - echo '<td class="group3">'. $data['attendance_cost'].'</td>';
380 - echo '<td class="group3">'. $data['accommodation_cost'].'</td>';
381 - echo '<td class="group3">'. $data['vat_cost'].'</td>';
382 - echo '<td class="group3">'. $data['cost_total'].'</td>';
383 - echo '<td class="group3">'. $data['currency'].'</td>';
 379+ echo '<td class="group3">' . $data['attendance_cost'] . '</td>';
 380+ echo '<td class="group3">' . $data['accommodation_cost'] . '</td>';
 381+ echo '<td class="group3">' . $data['vat_cost'] . '</td>';
 382+ echo '<td class="group3">' . $data['cost_total'] . '</td>';
 383+ echo '<td class="group3">' . $data['currency'] . '</td>';
384384 echo '<td class="group3">';
385 - if ($data['paypal'] == 1) echo 'X';
 385+ if ( $data['paypal'] == 1 ) echo 'X';
386386 echo '</td>';
387 - echo '<td class="group3">'. $data['cost_paid'].'</td>';
 387+ echo '<td class="group3">' . $data['cost_paid'] . '</td>';
388388 // @todo make this into a *type of discount_code* field
389 - echo '<td class="group3">' . $data['discount_code'].'</td>';
 389+ echo '<td class="group3">' . $data['discount_code'] . '</td>';
390390 } // switch
391391 echo '<td>';
392 - if ($data['status'] == 1) echo '√';
393 - if ($data['status'] == 2) echo 'X';
 392+ if ( $data['status'] == 1 ) echo '√';
 393+ if ( $data['status'] == 2 ) echo 'X';
394394 echo '</td>';
395 - echo '<td><a href="#" class="fill_data_link" onclick="fill_data(\''.addslashes($data['surname']).'\',\''.addslashes($data['given_name']).'\',\''.$data['unique_code'].'\',\''.$data['join_date'].'\',\''.$data['nights'].'\',\''.$data['hotels'].'\',\''.$data['room_number'].'\')">Edit</a></td>';
 395+ echo '<td><a href="#" class="fill_data_link" onclick="fill_data(\'' . addslashes( $data['surname'] ) . '\',\'' . addslashes( $data['given_name'] ) . '\',\'' . $data['unique_code'] . '\',\'' . $data['join_date'] . '\',\'' . $data['nights'] . '\',\'' . $data['hotels'] . '\',\'' . $data['room_number'] . '\')">Edit</a></td>';
396396 echo '</tr>';
397 - } //foreach ?>
 397+ } // foreach ?>
398398
399399 </table>
400400 <p id="page"><?php
401401 /* @todo Another dirty and quick work... */
402 - if ($MY_REQUEST['keyword'])
403 - { $total_page = ceil($register_data['total_keyword'] / $register_data['per_page']); }
 402+ if ( $MY_REQUEST['keyword'] )
 403+ { $total_page = ceil( $register_data['total_keyword'] / $register_data['per_page'] ); }
404404 else
405 - { $total_page = ceil($register_data['total_people'] / $register_data['per_page']); }
406 -
407 - if ($register_data['page'] >= 5)
408 - { echo '<a href="'.$parameters2.'&page=1" title="Go to page 1">1</a> '; }
409 - if ($register_data['page'] >= 6)
 405+ { $total_page = ceil( $register_data['total_people'] / $register_data['per_page'] ); }
 406+
 407+ if ( $register_data['page'] >= 5 )
 408+ { echo '<a href="' . $parameters2 . '&page=1" title="Go to page 1">1</a> '; }
 409+ if ( $register_data['page'] >= 6 )
410410 { echo '... '; }
411 - for ($i = max(1, $register_data['page'] - 3); ($i < $register_data['page']); $i++)
 411+ for ( $i = max( 1, $register_data['page'] - 3 ); ( $i < $register_data['page'] ); $i++ )
412412 {
413 - echo '<a href="'.$parameters2.'&page='.($i).'" title="Go to page'.($i).'">'.($i).'</a> ';
 413+ echo '<a href="' . $parameters2 . '&page=' . ( $i ) . '" title="Go to page' . ( $i ) . '">' . ( $i ) . '</a> ';
414414 }
415 - echo '<strong>'.$register_data['page'].'</strong> ';
416 -
417 - for ($i = $register_data['page'] + 1; ($i <= $total_page && $i <= $register_data['page'] + 3); $i++)
 415+ echo '<strong>' . $register_data['page'] . '</strong> ';
 416+
 417+ for ( $i = $register_data['page'] + 1; ( $i <= $total_page && $i <= $register_data['page'] + 3 ); $i++ )
418418 {
419 - echo '<a href="'.$parameters2.'&page='.($i).'" title="Go to page '.($i).'">'.($i).'</a> ';
 419+ echo '<a href="' . $parameters2 . '&page=' . ( $i ) . '" title="Go to page ' . ( $i ) . '">' . ( $i ) . '</a> ';
420420 }
421 - if ($total_page - $register_data['page'] >= 5)
422 - { echo '... ';}
 421+ if ( $total_page - $register_data['page'] >= 5 )
 422+ { echo '... '; }
423423
424 - if ($total_page - $register_data['page'] >= 4)
425 - { echo '<a href="'.$parameters2.'&page='.$total_page.'" title="Go to page'.$total_page.'">'.$total_page.'</a> ';}
 424+ if ( $total_page - $register_data['page'] >= 4 )
 425+ { echo '<a href="' . $parameters2 . '&page=' . $total_page . '" title="Go to page' . $total_page . '">' . $total_page . '</a> '; }
426426 ?>
427427 </p>
428428
429429 <div id="admin_form1">
430 -<p>Checked registrant(s):
431 -<input type="hidden" name="modification" value="change_status" />
432 -<input type="radio" name="status" value="1" id="accept" checked="checked" /><label for="accept"> Confirm</label>
 430+<p>Checked registrant(s):
 431+<input type="hidden" name="modification" value="change_status" />
 432+<input type="radio" name="status" value="1" id="accept" checked="checked" /><label for="accept"> Confirm</label>
433433 <input type="radio" name="status" value="2" id="reject" /><label for="reject">Reject</label>
434 -<input type="hidden" name="action" value="admin" />
435 -<input type="hidden" name="mode" value="<?php echo htmlspecialchars($MY_REQUEST['mode']);?>" />
436 -<input type="hidden" name="keyword" value="<?php echo htmlspecialchars($MY_REQUEST['keyword']);?>" />
437 -<input type="hidden" name="page" value="<?php echo htmlspecialchars($MY_REQUEST['page']);?>" />
 434+<input type="hidden" name="action" value="admin" />
 435+<input type="hidden" name="mode" value="<?php echo htmlspecialchars( $MY_REQUEST['mode'] ); ?>" />
 436+<input type="hidden" name="keyword" value="<?php echo htmlspecialchars( $MY_REQUEST['keyword'] ); ?>" />
 437+<input type="hidden" name="page" value="<?php echo htmlspecialchars( $MY_REQUEST['page'] ); ?>" />
438438 <input type="submit" value="OK" /></p>
439439 </div>
440440 </form>
441441 </div>
442442
443443
444 -<form action="<?php echo $myself_url;?>index.php" method="POST" onsubmit="return warning2();">
 444+<form action="<?php echo $myself_url; ?>index.php" method="POST" onsubmit="return warning2();">
445445 <div id="admin_form2">
446446 <h3>Edit registrant</h3>
447447 <p>
@@ -451,13 +451,13 @@
452452 <div id="item1" class="checked_item">
453453 <input type="radio" name="item" value="1" checked="checked" id="item1_radio" onclick="radiocheck(1);" />
454454 <label for="item1_radio">Payment received</label>
455 -<p>Received: <input type="text" name="cost_paid" size="5" />
456 -<input type="hidden" name="modification" value="edit_user" />
 455+<p>Received: <input type="text" name="cost_paid" size="5" />
 456+<input type="hidden" name="modification" value="edit_user" />
457457 (The amount can be negative for correction convenience)
458 -<input type="hidden" name="action" value="admin" /> <input type="hidden" name="mode" value="<?php echo htmlspecialchars($MY_REQUEST['mode']);?>" />
459 -<input type="hidden" name="keyword" value="<?php echo htmlspecialchars($MY_REQUEST['keyword']);?>" />
460 -<input type="hidden" name="filter" value="<?php echo htmlspecialchars($MY_REQUEST['filter']);?>" />
461 -<input type="hidden" name="page" value="<?php echo htmlspecialchars($MY_REQUEST['page']);?>" />
 458+<input type="hidden" name="action" value="admin" /> <input type="hidden" name="mode" value="<?php echo htmlspecialchars( $MY_REQUEST['mode'] ); ?>" />
 459+<input type="hidden" name="keyword" value="<?php echo htmlspecialchars( $MY_REQUEST['keyword'] ); ?>" />
 460+<input type="hidden" name="filter" value="<?php echo htmlspecialchars( $MY_REQUEST['filter'] ); ?>" />
 461+<input type="hidden" name="page" value="<?php echo htmlspecialchars( $MY_REQUEST['page'] ); ?>" />
462462 </p></div>
463463
464464
@@ -465,26 +465,26 @@
466466 <input type="radio" name="item" value="2" id="item2_radio" onclick="radiocheck(2);" />
467467 <label for="item2_radio">Date and accommodation</label>
468468 <p>Date to participate: <br> <?php
469 -for ($i = 1; $i <=6; $i++)
 469+for ( $i = 1; $i <= 6; $i++ )
470470 {
471 - echo '<input type="checkbox" value="'.$i.'" name="join_date[]" id="j'. $i .'" />';
472 - echo '<label for="j'. $i. '">'.$lang_register_form['join'.$i].'</label><br>';
 471+ echo '<input type="checkbox" value="' . $i . '" name="join_date[]" id="j' . $i . '" />';
 472+ echo '<label for="j' . $i . '">' . $lang_register_form['join' . $i] . '</label><br>';
473473 }
474474 ?>
475475 </p>
476476 <p>Nights: <br><?php
477 -for ($i = 1; $i <=8; $i++)
 477+for ( $i = 1; $i <= 8; $i++ )
478478 {
479 - echo '<input type="checkbox" value="'.$i.'" name="nights[]" id="n'. $i .'" />';
480 - echo '<label for="n'. $i. '">'.$lang_register_form['night'.$i].'</label><br>';
 479+ echo '<input type="checkbox" value="' . $i . '" name="nights[]" id="n' . $i . '" />';
 480+ echo '<label for="n' . $i . '">' . $lang_register_form['night' . $i] . '</label><br>';
481481 }
482482 ?>
483483 </p>
484484 <p>Accommodation: <br><?php
485 -for ($i = 1; $i <=9; $i++)
 485+for ( $i = 1; $i <= 9; $i++ )
486486 {
487 - echo '<input type="radio" value="'.$i.'" name="hotels" id="h'.$i.'" />';
488 - echo '<label for="hotels">'.$lang_register_form['hotel'.$i].'</label><br>';
 487+ echo '<input type="radio" value="' . $i . '" name="hotels" id="h' . $i . '" />';
 488+ echo '<label for="hotels">' . $lang_register_form['hotel' . $i] . '</label><br>';
489489 }
490490 ?>
491491 </p>
@@ -513,7 +513,7 @@
514514
515515
516516 <div id="admin_form3">
517 -<form enctype="multipart/form-data" action="<?php echo $myself_url;?>index.php" method="POST">
 517+<form enctype="multipart/form-data" action="<?php echo $myself_url; ?>index.php" method="POST">
518518 <h3>Upload</h3>
519519 <p>Upload accommodation data:
520520 <input type="file" name="accommodation_file">
@@ -523,9 +523,9 @@
524524 </p>
525525 </form>
526526
527 -<form action="<?php echo $myself_url;?>index.php" method="POST">
 527+<form action="<?php echo $myself_url; ?>index.php" method="POST">
528528 <h3>Download</h3>
529 -<p>
 529+<p>
530530 <input type="hidden" name="modification" value="get_data" />
531531 <input type="hidden" name="action" value="admin" />
532532 <input type="submit" value="Download registration data" /> as tab-separated, UTF8 encoded file.
Index: trunk/wikimania/wmreg/skin/mail_confirmed.php
@@ -1,7 +1,7 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{ die('Hacking Attempt'); }
 4+if ( !defined( 'TC_STARTED' ) )
 5+{ die( 'Hacking Attempt' ); }
66
77 $mail_confirmed_content = <<<EOM
88 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -14,26 +14,26 @@
1515 <p>Dear $1,</p>
1616
1717 <p>Thank you for joining Wikimania 2011, hich will be held at the Haifa Auditorium in Haifa, Israel on August 4-7, 2011.</p>
18 -
 18+
1919 <p>Your registration has been confirmed!</p>
2020
2121 <h4>Further questions</h4>
2222
23 -<p>If you have any questions about your registration, please make sure to visit our conference website at <a href="http://wikimania2011.wikimedia.org">http://wikimania2011.wikimedia.org</a>.
24 -Should you have any specific requests (including accommodation, payment, cancellation or modfications), please email the Wikiminia 2011 team at <a href="mailto:wikimania-registration@wikimedia.org" title="Send mail to wikimania-registration@wikimedia.org">wikimania-registration@wikimedia.org</a>,
 23+<p>If you have any questions about your registration, please make sure to visit our conference website at <a href="http://wikimania2011.wikimedia.org">http://wikimania2011.wikimedia.org</a>.
 24+Should you have any specific requests (including accommodation, payment, cancellation or modfications), please email the Wikiminia 2011 team at <a href="mailto:wikimania-registration@wikimedia.org" title="Send mail to wikimania-registration@wikimedia.org">wikimania-registration@wikimedia.org</a>,
2525 with the registration details listed below.</p>
2626
27 -<ul>
 27+<ul>
2828 <li>Confirmation Number: $2</li>
2929 <li>Name: $1</li>
30 -<li>Email: $4</li>
 30+<li>Email: $4</li>
3131 <li>Accommodation: $5</li>
3232 <li>Accommodation choice: $6</li>
3333 </ul>
3434
3535 <p>We look forward to welcoming you in Haifa,</p>
3636
37 -<p>The Wikimania 2011 team</p>
 37+<p>The Wikimania 2011 team</p>
3838 </body>
3939 </html>
4040 EOM;
Index: trunk/wikimania/wmreg/skin/html_header.php
@@ -1,22 +1,22 @@
22 <?php
33
44 /* Prevent hacking */
5 -if(!defined('TC_STARTED'))
6 -{ die('Hacking Attempt'); }
 5+if ( !defined( 'TC_STARTED' ) )
 6+{ die( 'Hacking Attempt' ); }
77
88 global $userLanguage;
99 ?>
1010 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
1111 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
1212 <html xmlns="http://www.w3.org/1999/xhtml" <?php
13 -switch ($userLanguage)
 13+switch ( $userLanguage )
1414 {
1515 case 'zh-hant':
1616 echo 'xml:lang="zh-tw" lang="zh-tw"'; break;
1717 case 'zh-hans':
1818 echo 'xml:lang="zh-cn" lang="zh-cn"'; break;
1919 default:
20 -echo 'xml:lang="'.$userLanguage.'" lang="'.$userLanguage.'"'; break;
 20+echo 'xml:lang="' . $userLanguage . '" lang="' . $userLanguage . '"'; break;
2121 }
2222 ?>
2323 >
Index: trunk/wikimania/wmreg/skin/mail_successful.php
@@ -1,7 +1,7 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{ die('Hacking Attempt'); }
 4+if ( !defined( 'TC_STARTED' ) )
 5+{ die( 'Hacking Attempt' ); }
66
77 $mail_successful_content = <<<EOM
88 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -15,25 +15,25 @@
1616
1717 <p>Thank you for joining Wikimania 2011, which will be held at the Haifa Auditorium in Haifa, Israel on August 4-7, 2011. </p>
1818
19 -<p>We have received your registration online. This mail only indicates that your registration has been processed successfully.
 19+<p>We have received your registration online. This mail only indicates that your registration has been processed successfully.
2020 We will send you another confirmation mail after we have verified all the details and made sure everything is fine.</p>
2121
2222 <p>If you have not completed paying the registration and accommodation fee online, please complete the payment through <a href="http://wmreg.wikimedia.org.il?action=query">our registration system</a>.</p>
23 -<h4>Further questions</h4>
 23+<h4>Further questions</h4>
2424
25 -<p>If you have any questions about your registration, please make sure to visit our conference website at <a href="http://wikimania2011.wikimedia.org">http://wikimania2011.wikimedia.org</a>.
26 -Should you have any specific requests (including accommodation, payment, cancellation or modfications), please email the Wikiminia 2011 team at <a href="mailto:wikimania-registration@wikimedia.org" title="Send mail to wikimania-registration@wikimedia.org">wikimania-registration@wikimedia.org</a>,
 25+<p>If you have any questions about your registration, please make sure to visit our conference website at <a href="http://wikimania2011.wikimedia.org">http://wikimania2011.wikimedia.org</a>.
 26+Should you have any specific requests (including accommodation, payment, cancellation or modfications), please email the Wikiminia 2011 team at <a href="mailto:wikimania-registration@wikimedia.org" title="Send mail to wikimania-registration@wikimedia.org">wikimania-registration@wikimedia.org</a>,
2727 with the registration details listed below.</p>
2828
29 -<ul>
 29+<ul>
3030 <li>Confirmation Number: $2</li>
3131 <li>Name: $1</li>
32 -<li>Email: $3</li>
 32+<li>Email: $3</li>
3333 </ul>
3434
3535 <p>We look forward to welcoming you in Haifa,</p>
3636
37 -<p>The Wikimania 2011 team</p>
 37+<p>The Wikimania 2011 team</p>
3838 </body>
3939 </html>
4040 EOM;
Index: trunk/wikimania/wmreg/skin/html_footer.php
@@ -1,8 +1,8 @@
22 <?php
33
44 /* Prevent hacking */
5 -if(!defined('TC_STARTED'))
6 -{ die('Hacking Attempt'); }
 5+if ( !defined( 'TC_STARTED' ) )
 6+{ die( 'Hacking Attempt' ); }
77
88 ?>
99 <div id="footer">
Index: trunk/wikimania/wmreg/skin/register_successful.php
@@ -1,17 +1,17 @@
22 <?php
33
44 /* Prevent hacking */
5 -if(!defined('TC_STARTED'))
6 -{ die('Hacking Attempt'); }
 5+if ( !defined( 'TC_STARTED' ) )
 6+{ die( 'Hacking Attempt' ); }
77
88 global $register_data, $lang_messages;
99
1010 /* Fix XSS */
11 -$register_data = array_map('htmlspecialchars', $register_data);
 11+$register_data = array_map( 'htmlspecialchars', $register_data );
1212
1313 ?>
1414 <?php
15 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 15+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
1616 {
1717 echo '<div dir="rtl">';
1818 }
Index: trunk/wikimania/wmreg/skin/admin_interface.old.php
@@ -1,33 +1,33 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{ die('Hacking Attempt'); }
 4+if ( !defined( 'TC_STARTED' ) )
 5+{ die( 'Hacking Attempt' ); }
66
77 include_once 'includes/language_zh-hant.php';
88
99 global $myself_url, $register_data, $table_data, $lang_countries, $error_message, $lang_register_form;
1010
11 -function get_percentage($number) {
 11+function get_percentage( $number ) {
1212 global $register_data;
13 - if ($register_data['total_people'] == 0) return '0.0%';
14 - else return number_format($number / $register_data['total_people'] * 100, 1).'%';
 13+ if ( $register_data['total_people'] == 0 ) return '0.0%';
 14+ else return number_format( $number / $register_data['total_people'] * 100, 1 ) . '%';
1515 }
1616 /* Fix XSS */
17 -$register_data = array_map('htmlspecialchars', $register_data);
 17+$register_data = array_map( 'htmlspecialchars', $register_data );
1818
19 -$cloth_sizes = array(NULL, 'XXS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL');
 19+$cloth_sizes = array( NULL, 'XXS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL' );
2020
21 -$parameters = $myself_url.'index.php?action=admin';
22 -$parameters2 = $myself_url.'index.php?action=admin';
23 -if ($MY_REQUEST['page'])
24 -{ $parameters .= '&page='.urlencode($MY_REQUEST['page']); }
 21+$parameters = $myself_url . 'index.php?action=admin';
 22+$parameters2 = $myself_url . 'index.php?action=admin';
 23+if ( $MY_REQUEST['page'] )
 24+{ $parameters .= '&page=' . urlencode( $MY_REQUEST['page'] ); }
2525
26 -if ($MY_REQUEST['keyword'])
 26+if ( $MY_REQUEST['keyword'] )
2727 {
28 - $parameters .= '&keyword='.urlencode($MY_REQUEST['keyword']).'&filter='.urlencode($MY_REQUEST['filter']);
29 - $parameters2 .= '&keyword='.urlencode($MY_REQUEST['keyword']).'&filter='.urlencode($MY_REQUEST['filter']);
 28+ $parameters .= '&keyword=' . urlencode( $MY_REQUEST['keyword'] ) . '&filter=' . urlencode( $MY_REQUEST['filter'] );
 29+ $parameters2 .= '&keyword=' . urlencode( $MY_REQUEST['keyword'] ) . '&filter=' . urlencode( $MY_REQUEST['filter'] );
3030 }
31 -$parameters2 .= '&mode='.urlencode($MY_REQUEST['mode']);
 31+$parameters2 .= '&mode=' . urlencode( $MY_REQUEST['mode'] );
3232
3333 ?>
3434 <script type="text/javascript" src="jquery-latest.pack.js"><!--//XHTML hack--></script>
@@ -54,7 +54,7 @@
5555 {
5656 if (document.getElementById("item2_radio").checked == true)
5757 return confirm('注意:\n(1) 請確認該報名者是否有有選擇過參加8/2的議程;如果有的話請確認Hacking Days Extra與Citizen Journalism Unconference的參加有沒有勾選。若沒有勾選,可能需要確認報名者希望參與哪場活動。\n(2) 新加入的勾選住宿者將自動設定為「不在乎」房間類型;而取消住宿者也將取消喜好房間類型的設定,而再次勾選住宿並無法復原其喜好設定。\n\n請再度確定填寫的資料是否正確。是否確定執行?');
58 - else
 58+ else
5959 return confirm('請再度確定填寫的資料是否正確。是否確定執行?');
6060
6161 }
@@ -85,12 +85,12 @@
8686 else $("#j"+i).removeAttr("checked");
8787 }
8888 for (var i=1; i<=6; i++)
89 - { if (eval("n"+i)) $("#n"+i).attr("checked", "checked");
 89+ { if (eval("n"+i)) $("#n"+i).attr("checked", "checked");
9090 else $("#n"+i).removeAttr("checked");
9191 }
92 -
 92+
9393 for (var i=0; i<=3; i++)
94 - { if (vip_status == i) $("#vips"+i).attr("selected", "selected");
 94+ { if (vip_status == i) $("#vips"+i).attr("selected", "selected");
9595 else $("#vips"+i).removeAttr("selected");
9696 }
9797 }
@@ -118,73 +118,73 @@
119119 <div id="mask">&nbsp;</div>
120120 <div id="content_part">
121121 <h1>管理介面</h1>
122 - <p id="special_pages">登入為<strong> <?php echo $_SESSION['user_id']?></strong> | <a href="<?php echo $myself_url.'index.php?action=logout'?>" title="登出並離開管理介面">登出</a></p>
123 - <?php if (!empty($error_message))
 122+ <p id="special_pages">登入為<strong> <?php echo $_SESSION['user_id']?></strong> | <a href="<?php echo $myself_url . 'index.php?action=logout'?>" title="登出並離開管理介面">登出</a></p>
 123+ <?php if ( !empty( $error_message ) )
124124 {
125 - echo '<div id="correction">'."\n".$error_message."\n".'</div>'."\n";
 125+ echo '<div id="correction">' . "\n" . $error_message . "\n" . '</div>' . "\n";
126126 }
127127 ?>
128128 <h3>列表與統計資料</h3>
129129
130 -<?php if($register_data['total_keyword']) {?>
131 -<p>搜尋結果共找到 <strong><?php echo $register_data['total_keyword']?></strong> 筆資料。<a href="<?php echo $myself_url;?>?action=admin" title="結束搜尋,顯示所有資料">清除搜尋結果</a>
132 -<?php } else {?>
133 -<p>目前共有 <strong><?php echo $register_data['total_people'];?> 人</strong>報名,<strong><?php echo $register_data['total_accommodation'];?> 人</strong>需要安排住宿。</p>
134 -<?php }?>
135 -<form action="<?php echo $myself_url. 'index.php';?>" method="GET">
 130+<?php if ( $register_data['total_keyword'] ) { ?>
 131+<p>搜尋結果共找到 <strong><?php echo $register_data['total_keyword']?></strong> 筆資料。<a href="<?php echo $myself_url; ?>?action=admin" title="結束搜尋,顯示所有資料">清除搜尋結果</a>
 132+<?php } else { ?>
 133+<p>目前共有 <strong><?php echo $register_data['total_people']; ?> 人</strong>報名,<strong><?php echo $register_data['total_accommodation']; ?> 人</strong>需要安排住宿。</p>
 134+<?php } ?>
 135+<form action="<?php echo $myself_url . 'index.php'; ?>" method="GET">
136136 <div id="admin_navigation">
137137 <p id="search_form">
138138 <select name="filter">
139 - <option value="name" <?php if ($MY_REQUEST['filter'] == 'name') echo 'selected="selected"'; ?>>姓名、維基帳號</option>
140 - <option value="organization" <?php if ($MY_REQUEST['filter'] == 'organization') echo 'selected="selected"'; ?>>組織</option>
141 - <option value="email" <?php if ($MY_REQUEST['filter'] == 'email') echo 'selected="selected"'; ?>>電子郵件</option>
142 - <option value="unique_code" <?php if ($MY_REQUEST['filter'] == 'unique_code') echo 'selected="selected"'; ?>>識別碼</option>
143 - <option value="tag" <?php if ($MY_REQUEST['filter'] == 'tag') echo 'selected="selected"'; ?>>標籤</option>
 139+ <option value="name" <?php if ( $MY_REQUEST['filter'] == 'name' ) echo 'selected="selected"'; ?>>姓名、維基帳號</option>
 140+ <option value="organization" <?php if ( $MY_REQUEST['filter'] == 'organization' ) echo 'selected="selected"'; ?>>組織</option>
 141+ <option value="email" <?php if ( $MY_REQUEST['filter'] == 'email' ) echo 'selected="selected"'; ?>>電子郵件</option>
 142+ <option value="unique_code" <?php if ( $MY_REQUEST['filter'] == 'unique_code' ) echo 'selected="selected"'; ?>>識別碼</option>
 143+ <option value="tag" <?php if ( $MY_REQUEST['filter'] == 'tag' ) echo 'selected="selected"'; ?>>標籤</option>
144144 </select>
145 - <input type="text" name="keyword" value="<?php echo stripslashes(htmlspecialchars($MY_REQUEST['keyword']));?>" />
 145+ <input type="text" name="keyword" value="<?php echo stripslashes( htmlspecialchars( $MY_REQUEST['keyword'] ) ); ?>" />
146146 <input type="submit" value="查詢" />
147147 <input type="hidden" name="action" value="admin" />
148 - <input type="hidden" name="mode" value="<?php echo htmlspecialchars($MY_REQUEST['mode']);?>" />
 148+ <input type="hidden" name="mode" value="<?php echo htmlspecialchars( $MY_REQUEST['mode'] ); ?>" />
149149 </p>
150150 <p><a href="<?php echo $parameters?>" title="諸如生日、姓名與身分證資料的資訊">基本資料</a> | <a href="<?php echo $parameters?>&mode=topic" title="參加的日期、偏好的主題、飲食習慣與衣服尺寸">日期、主題、食衣住行</a> | <a href="<?php echo $parameters?>&mode=liveinfo" title="是否須安排住宿,偏好的房間大小">住宿資訊</a> | <a href="<?php echo $parameters?>&mode=visa" title="是否要籌備團隊安排簽證協助,與需求的內容">簽證需求</a> | <a href="<?php echo $parameters?>&mode=pay" title="是否已經付款,付了多少錢">付款狀態</a></p>
151151 </div>
152152 </form>
153153 <p>
154154 <?php
155 -switch($MY_REQUEST['mode'])
 155+switch( $MY_REQUEST['mode'] )
156156 {
157157 case NULL:
158 - echo '共來自 <strong>'.$register_data['total_countries'].'</strong> 個國家 / '.
159 - '<strong>'.$register_data['total_male'].'</strong> 男 ('.get_percentage($register_data['total_male']).')/ '.
160 - '<strong>'.$register_data['total_female'].'</strong> 女 ('.get_percentage($register_data['total_female']).')/ '.
161 - '<strong>'.$register_data['total_sex_other'].'</strong> 其他 ('.get_percentage($register_data['total_sex_other']).')/ '.
162 - '<strong>'.$register_data['total_wikimedians'].'</strong> 維基人 ('.get_percentage($register_data['total_wikimedians']).')';
 158+ echo '共來自 <strong>' . $register_data['total_countries'] . '</strong> 個國家 / ' .
 159+ '<strong>' . $register_data['total_male'] . '</strong> 男 (' . get_percentage( $register_data['total_male'] ) . ')/ ' .
 160+ '<strong>' . $register_data['total_female'] . '</strong> 女 (' . get_percentage( $register_data['total_female'] ) . ')/ ' .
 161+ '<strong>' . $register_data['total_sex_other'] . '</strong> 其他 (' . get_percentage( $register_data['total_sex_other'] ) . ')/ ' .
 162+ '<strong>' . $register_data['total_wikimedians'] . '</strong> 維基人 (' . get_percentage( $register_data['total_wikimedians'] ) . ')';
163163 break;
164164
165165 case 'topic':
166 - for ($i = 3; $i <= 5; $i++)
167 - echo '8/'.$i.':<strong>'.$register_data['total_day'.$i].'</strong> 人 ('.get_percentage($register_data['total_day'.$i]).') / ';
168 - for ($i = 1; $i <= 3; $i++)
169 - echo ''.$i.' 天:<strong>'.$register_data['total_'.$i.'days'].'</strong> 人 ('.get_percentage($register_data['total_'.$i.'days']).') / ';
 166+ for ( $i = 3; $i <= 5; $i++ )
 167+ echo '8/' . $i . ':<strong>' . $register_data['total_day' . $i] . '</strong> 人 (' . get_percentage( $register_data['total_day' . $i] ) . ') / ';
 168+ for ( $i = 1; $i <= 3; $i++ )
 169+ echo '' . $i . ' 天:<strong>' . $register_data['total_' . $i . 'days'] . '</strong> 人 (' . get_percentage( $register_data['total_' . $i . 'days'] ) . ') / ';
170170 break;
171171
172172 case 'liveinfo':
173 - for ($i = 1; $i <= 6; $i++)
174 - echo $i.' 天:<strong>'.$register_data['total_'.$i.'nights'].'</strong> 人 ('.get_percentage($register_data['total_'.$i.'nights']).') / ';
 173+ for ( $i = 1; $i <= 6; $i++ )
 174+ echo $i . ' 天:<strong>' . $register_data['total_' . $i . 'nights'] . '</strong> 人 (' . get_percentage( $register_data['total_' . $i . 'nights'] ) . ') / ';
175175 break;
176176
177177 case 'visa':
178 - echo '共 <strong>'.$register_data['total_assist'].'</strong> 人 ('.get_percentage($register_data['total_assist']).') 需要簽證協助';
 178+ echo '共 <strong>' . $register_data['total_assist'] . '</strong> 人 (' . get_percentage( $register_data['total_assist'] ) . ') 需要簽證協助';
179179 break;
180180 }
181181 ?></p>
182 -<form action="<?php echo $myself_url. 'index.php';?>" method="POST" onsubmit="return confirm_warning();">
 182+<form action="<?php echo $myself_url . 'index.php'; ?>" method="POST" onsubmit="return confirm_warning();">
183183 <table id="admin_table">
184184 <tr>
185185 <th>核取</th>
186186 <th>編號</th><th>姓名</th><th>台籍</th>
187187 <th>姓別</th><th>註冊時間</th>
188 - <?php if($MY_REQUEST['mode']){?>
 188+ <?php if ( $MY_REQUEST['mode'] ) { ?>
189189 <th>8/1</th>
190190 <th>8/2</th>
191191 <th>HE</th>
@@ -193,10 +193,10 @@
194194 <th>8/4</th>
195195 <th>8/5</th>
196196 <?php }
197 - switch($MY_REQUEST['mode']){
 197+ switch( $MY_REQUEST['mode'] ) {
198198 case NULL:
199199 echo '<th>ID</th><th>國家</th>
200 - '/*<th>城市</th>*/.'<th>生日</th><th>母語</th>
 200+ '/*<th>城市</th>*/ . '<th>生日</th><th>母語</th>
201201 <th>語言程度</th>
202202 <th>組織</th><th>維基用戶名</th><th>名稱顯示</th>';
203203 break;
@@ -227,130 +227,130 @@
228228 case 'pay':
229229 echo '<th>Email</th><th>識別碼</th><th>付款方式</th><th>付款狀態</th><!--<th>PayPal OK</th>--><th>應繳金額</th><th>收到金額</th>';
230230 break;
231 - }?>
 231+ } ?>
232232 <th>折價券</th>
233233 <th>狀態</th>
234234 <th>標籤</th>
235235 <th id="fill_data_col">編輯資訊</th>
236236 </tr>
237 -<?php foreach ($table_data as $data) {
 237+<?php foreach ( $table_data as $data ) {
238238 /* I Hate XSS */
239 -$data = array_map('htmlspecialchars', $data);
 239+$data = array_map( 'htmlspecialchars', $data );
240240 ?>
241241 <tr>
242242 <td><input type="checkbox" name="no[]" value=<?php echo $data['no']; ?> /></td>
243 - <td><?php echo $data['no'];?></td>
244 - <td><?php echo $data['given_name'].' '.$data['surname'];?></td>
245 - <td><?php if ($data['egy']) echo '是'; else echo '否';?></td>
 243+ <td><?php echo $data['no']; ?></td>
 244+ <td><?php echo $data['given_name'] . ' ' . $data['surname']; ?></td>
 245+ <td><?php if ( $data['egy'] ) echo '是'; else echo '否'; ?></td>
246246 <td><?php
247 - switch($data['sex'])
 247+ switch( $data['sex'] )
248248 {
249249 case 1: echo '男'; break;
250250 case 2: echo '女'; break;
251251 case 3: echo $data['custom_sex']; break;
252252 }
253 - ?></td><td><?php echo $data['signuptime'];?></td>
254 - <?php if($MY_REQUEST['mode']){?>
255 - <td class="group1"><?php if($data['join1']) echo '●';?></td>
256 - <td class="group1"><?php if($data['join2']) echo '●';?></td>
257 - <td class="group1"><?php if($data['hacking']) echo '●';?></td>
258 - <td class="group1"><?php if($data['citizen']) echo '●';?></td>
259 - <td class="group1"><?php if($data['join3']) echo '●';?></td>
260 - <td class="group1"><?php if($data['join4']) echo '●';?></td>
261 - <td class="group1"><?php if($data['join5']) echo '●';?></td>
 253+ ?></td><td><?php echo $data['signuptime']; ?></td>
 254+ <?php if ( $MY_REQUEST['mode'] ) { ?>
 255+ <td class="group1"><?php if ( $data['join1'] ) echo '●'; ?></td>
 256+ <td class="group1"><?php if ( $data['join2'] ) echo '●'; ?></td>
 257+ <td class="group1"><?php if ( $data['hacking'] ) echo '●'; ?></td>
 258+ <td class="group1"><?php if ( $data['citizen'] ) echo '●'; ?></td>
 259+ <td class="group1"><?php if ( $data['join3'] ) echo '●'; ?></td>
 260+ <td class="group1"><?php if ( $data['join4'] ) echo '●'; ?></td>
 261+ <td class="group1"><?php if ( $data['join5'] ) echo '●'; ?></td>
262262 <?php
263263 }
264 - switch($MY_REQUEST['mode']){
 264+ switch( $MY_REQUEST['mode'] ) {
265265 case "":
266 - echo '<td>'.$data['id'].'</td><td>'.$lang_countries[strtolower($data['country'])].'</td>
267 - <td>'/*.$data['city'].'</td><td>'*/.$data['birthday'].'</td><td>'.$data['langn'].'</td>
 266+ echo '<td>' . $data['id'] . '</td><td>' . $lang_countries[strtolower( $data['country'] )] . '</td>
 267+ <td>'/*.$data['city'].'</td><td>'*/ . $data['birthday'] . '</td><td>' . $data['langn'] . '</td>
268268 <td>';
269 - if ($data['lang1'])
270 - echo $data['lang1'].'-'.$data['lang1-level']. '<br />';
271 - if ($data['lang2'])
272 - echo $data['lang2'].'-'.$data['lang2-level']. '<br />';
273 - if ($data['lang3'])
274 - echo $data['lang3'].'-'.$data['lang3-level']. '<br />';
 269+ if ( $data['lang1'] )
 270+ echo $data['lang1'] . '-' . $data['lang1-level'] . '<br />';
 271+ if ( $data['lang2'] )
 272+ echo $data['lang2'] . '-' . $data['lang2-level'] . '<br />';
 273+ if ( $data['lang3'] )
 274+ echo $data['lang3'] . '-' . $data['lang3-level'] . '<br />';
275275 echo '</td><td>';
276276 echo $data['organization'];
277277 echo '</td><td>';
278 - if ($data['wiki_id']) echo $data['wiki_id'].'@'.$data['wiki_language'].'.'.$data['wiki_project'];
 278+ if ( $data['wiki_id'] ) echo $data['wiki_id'] . '@' . $data['wiki_language'] . '.' . $data['wiki_project'];
279279 echo '</td><td>';
280280
281 - foreach(explode(',',$data['showname']) as $key => $value)
 281+ foreach ( explode( ',', $data['showname'] ) as $key => $value )
282282 {
283 - echo $lang_register_form['showname'.$value];
284 - if ($value == 4)
285 - { echo ': '.$data['custom_showname']; }
 283+ echo $lang_register_form['showname' . $value];
 284+ if ( $value == 4 )
 285+ { echo ': ' . $data['custom_showname']; }
286286 else
287 - { echo ', '; }
 287+ { echo ', '; }
288288 }
289289 echo '</td>';
290290 break;
291291 case "topic":?>
292 - <td class="group2"><?php if($data['topic1']) echo '●';?></td>
293 - <td class="group2"><?php if($data['topic2']) echo '●';?></td>
294 - <td class="group2"><?php if($data['topic3']) echo '●';?></td>
 292+ <td class="group2"><?php if ( $data['topic1'] ) echo '●'; ?></td>
 293+ <td class="group2"><?php if ( $data['topic2'] ) echo '●'; ?></td>
 294+ <td class="group2"><?php if ( $data['topic3'] ) echo '●'; ?></td>
295295 <?php echo
296 - '<td>'.$cloth_sizes[$data['size']].'</td>
 296+ '<td>' . $cloth_sizes[$data['size']] . '</td>
297297 <td>';
298 - foreach(explode(',',$data['food']) as $key => $value)
 298+ foreach ( explode( ',', $data['food'] ) as $key => $value )
299299 {
300 - echo $lang_register_form['food'.$value];
301 - if ($value == 6)
302 - { echo ': '.$data['food_other']; }
 300+ echo $lang_register_form['food' . $value];
 301+ if ( $value == 6 )
 302+ { echo ': ' . $data['food_other']; }
303303 else
304 - { echo ', '; }
 304+ { echo ', '; }
305305 }
306 - echo '</td><td>'.$data['allegric'].'</td>';
 306+ echo '</td><td>' . $data['allegric'] . '</td>';
307307 break;
308308 case "liveinfo":
309309 echo '<td class="group2">';
310 - if ($data['night1'] && $data['room_num1']) echo $data['room_num1']; elseif ($data['night1']) echo '●';
 310+ if ( $data['night1'] && $data['room_num1'] ) echo $data['room_num1']; elseif ( $data['night1'] ) echo '●';
311311 echo '</td><td class="group2">';
312 - if ($data['night2'] && $data['room_num2']) echo $data['room_num2']; elseif ($data['night2']) echo '●';
 312+ if ( $data['night2'] && $data['room_num2'] ) echo $data['room_num2']; elseif ( $data['night2'] ) echo '●';
313313 echo '</td><td class="group2">';
314 - if ($data['night3'] && $data['room_num3']) echo $data['room_num3']; elseif ($data['night3']) echo '●';
 314+ if ( $data['night3'] && $data['room_num3'] ) echo $data['room_num3']; elseif ( $data['night3'] ) echo '●';
315315 echo '</td><td class="group2">';
316 - if ($data['night4'] && $data['room_num4']) echo $data['room_num4']; elseif ($data['night4']) echo '●';
 316+ if ( $data['night4'] && $data['room_num4'] ) echo $data['room_num4']; elseif ( $data['night4'] ) echo '●';
317317 echo '</td><td class="group2">';
318 - if ($data['night5'] && $data['room_num5']) echo $data['room_num5']; elseif ($data['night5']) echo '●';
 318+ if ( $data['night5'] && $data['room_num5'] ) echo $data['room_num5']; elseif ( $data['night5'] ) echo '●';
319319 echo '</td><td class="group2">';
320 - if ($data['night6'] && $data['room_num6']) echo $data['room_num6']; elseif ($data['night6']) echo '●';
 320+ if ( $data['night6'] && $data['room_num6'] ) echo $data['room_num6']; elseif ( $data['night6'] ) echo '●';
321321 echo '</td><td class="group3">';
322 - if ($data['room2']) echo '●';
 322+ if ( $data['room2'] ) echo '●';
323323 echo '</td><td class="group3">';
324 - if ($data['room4']) echo '●';
 324+ if ( $data['room4'] ) echo '●';
325325 echo '</td><td class="group3">';
326 - if ($data['room6']) echo '●';
 326+ if ( $data['room6'] ) echo '●';
327327 echo '</td><td class="group3">';
328 - if ($data['room8']) echo '●';
 328+ if ( $data['room8'] ) echo '●';
329329 echo '</td>';
330 - echo '<td>'. $data['cost_total'].'</td>';
 330+ echo '<td>' . $data['cost_total'] . '</td>';
331331 break;
332332 case 'visa':
333333 echo '<td>';
334 - if ($data['visa_assistance']) echo '是'; else echo '否';
 334+ if ( $data['visa_assistance'] ) echo '是'; else echo '否';
335335 echo '</td>
336 - <td>'.$data['visa_assistance_description'].'</td>';
 336+ <td>' . $data['visa_assistance_description'] . '</td>';
337337 break;
338338 case 'pay':
339 - echo '<td>'.$data['email'].'</td>';
340 - echo '<td>'.$data['unique_code'].'</td><td>';
341 - if ($data['pay_method'] == 1) echo 'PayPal'; else echo '匯款';
 339+ echo '<td>' . $data['email'] . '</td>';
 340+ echo '<td>' . $data['unique_code'] . '</td><td>';
 341+ if ( $data['pay_method'] == 1 ) echo 'PayPal'; else echo '匯款';
342342 echo '</td><td>';
343 - if ($data['cost_total'] > $data['cost_paid']) echo '不足';
344 - if ($data['cost_total'] == 0) echo '免費';
345 - elseif ($data['cost_total'] == $data['cost_paid']) echo '剛好付清';
346 - if ($data['cost_total'] < $data['cost_paid']) echo '超過';
347 - //echo '</td><td>';
348 - //if ($data['paypal'] == 1) echo '完成'; else echo '未完成';
349 - echo '</td><td>'. $data['cost_total'];
350 - echo '</td><td>'. $data['cost_paid'].'</td>';
 343+ if ( $data['cost_total'] > $data['cost_paid'] ) echo '不足';
 344+ if ( $data['cost_total'] == 0 ) echo '免費';
 345+ elseif ( $data['cost_total'] == $data['cost_paid'] ) echo '剛好付清';
 346+ if ( $data['cost_total'] < $data['cost_paid'] ) echo '超過';
 347+ // echo '</td><td>';
 348+ // if ($data['paypal'] == 1) echo '完成'; else echo '未完成';
 349+ echo '</td><td>' . $data['cost_total'];
 350+ echo '</td><td>' . $data['cost_paid'] . '</td>';
351351
352352 }
353353 echo '<td>';
354 - switch ($data['vip_status'])
 354+ switch ( $data['vip_status'] )
355355 {
356356 case 1: echo '完全免費'; break;
357357 case 2: echo '一律維基人價'; break;
@@ -358,48 +358,48 @@
359359 }
360360 echo '</td>';
361361 echo '<td>';
362 - switch ($data['status'])
 362+ switch ( $data['status'] )
363363 {
364364 case 0: echo '未受理'; break;
365365 case 1: echo '已接受'; break;
366366 case 2: echo '已拒絕'; break;
367367 }
368 - echo '</td><td>'.$data['tag'].'</td><td>';
369 - echo '<a href="#" class="fill_data_link" onclick="fill_data(\''.addslashes($data['surname']).'\',\''.addslashes($data['given_name']).'\',\''.$data['unique_code'].'\','.$data['join1'].','.$data['hacking'].','.$data['citizen'].','.$data['join3'].','.$data['join4'].','.$data['join5'].','.$data['night1'].','.$data['night2'].','.$data['night3'].','.$data['night4'].','.$data['night5'].','.$data['night6'].',\''.addslashes($data['tag']).'\','.$data['vip_status'].')">編輯</a>';
 368+ echo '</td><td>' . $data['tag'] . '</td><td>';
 369+ echo '<a href="#" class="fill_data_link" onclick="fill_data(\'' . addslashes( $data['surname'] ) . '\',\'' . addslashes( $data['given_name'] ) . '\',\'' . $data['unique_code'] . '\',' . $data['join1'] . ',' . $data['hacking'] . ',' . $data['citizen'] . ',' . $data['join3'] . ',' . $data['join4'] . ',' . $data['join5'] . ',' . $data['night1'] . ',' . $data['night2'] . ',' . $data['night3'] . ',' . $data['night4'] . ',' . $data['night5'] . ',' . $data['night6'] . ',\'' . addslashes( $data['tag'] ) . '\',' . $data['vip_status'] . ')">編輯</a>';
370370 echo '</td>';
371371 ?>
372372 </tr>
373 -<?php }?>
 373+<?php } ?>
374374 </table>
375375 <p id="page">
376376 <?php
377 - if ($MY_REQUEST['keyword'])
378 - { $total_page = ceil($register_data['total_keyword'] / $register_data['per_page']); }
 377+ if ( $MY_REQUEST['keyword'] )
 378+ { $total_page = ceil( $register_data['total_keyword'] / $register_data['per_page'] ); }
379379 else
380 - { $total_page = ceil($register_data['total_people'] / $register_data['per_page']); }
381 -
382 - if ($register_data['page'] >= 5)
383 - { echo '<a href="'.$parameters2.'&page=1" title="第 1 頁">1</a> '; }
384 - if ($register_data['page'] >= 6)
 380+ { $total_page = ceil( $register_data['total_people'] / $register_data['per_page'] ); }
 381+
 382+ if ( $register_data['page'] >= 5 )
 383+ { echo '<a href="' . $parameters2 . '&page=1" title="第 1 頁">1</a> '; }
 384+ if ( $register_data['page'] >= 6 )
385385 { echo '... '; }
386 - for ($i = max(1, $register_data['page'] - 3); ($i < $register_data['page']); $i++)
 386+ for ( $i = max( 1, $register_data['page'] - 3 ); ( $i < $register_data['page'] ); $i++ )
387387 {
388 - echo '<a href="'.$parameters2.'&page='.($i).'" title="第 '.($i).' 頁">'.($i).'</a> ';
 388+ echo '<a href="' . $parameters2 . '&page=' . ( $i ) . '" title="第 ' . ( $i ) . ' 頁">' . ( $i ) . '</a> ';
389389 }
390 - echo '<strong>'.$register_data['page'].'</strong> ';
391 -
392 - for ($i = $register_data['page'] + 1; ($i <= $total_page && $i <= $register_data['page'] + 3); $i++)
 390+ echo '<strong>' . $register_data['page'] . '</strong> ';
 391+
 392+ for ( $i = $register_data['page'] + 1; ( $i <= $total_page && $i <= $register_data['page'] + 3 ); $i++ )
393393 {
394 - echo '<a href="'.$parameters2.'&page='.($i).'" title="第 '.($i).' 頁">'.($i).'</a> ';
 394+ echo '<a href="' . $parameters2 . '&page=' . ( $i ) . '" title="第 ' . ( $i ) . ' 頁">' . ( $i ) . '</a> ';
395395 }
396 - if ($total_page - $register_data['page'] >= 5)
397 - { echo '... ';}
 396+ if ( $total_page - $register_data['page'] >= 5 )
 397+ { echo '... '; }
398398
399 - if ($total_page - $register_data['page'] >= 4)
400 - { echo '<a href="'.$parameters2.'&page='.$total_page.'" title="第 '.$total_page.' 頁">'.$total_page.'</a> ';}
401 - ?>
 399+ if ( $total_page - $register_data['page'] >= 4 )
 400+ { echo '<a href="' . $parameters2 . '&page=' . $total_page . '" title="第 ' . $total_page . ' 頁">' . $total_page . '</a> '; }
 401+ ?>
402402 </p>
403 -
 403+
404404 <div id="admin_form1">
405405 <p>
406406 所核取的報名者:
@@ -407,14 +407,14 @@
408408 <input type="radio" name="status" value="1" id="accept" checked="checked" /><label for="accept"> 接受報名</label>
409409 <input type="radio" name="status" value="2" id="reject" /><label for="reject"> 退回報名</label>
410410 <input type="hidden" name="action" value="admin" />
411 - <input type="hidden" name="mode" value="<?php echo htmlspecialchars($MY_REQUEST['mode']);?>" />
412 - <input type="hidden" name="keyword" value="<?php echo htmlspecialchars($MY_REQUEST['keyword']);?>" />
413 - <input type="hidden" name="page" value="<?php echo htmlspecialchars($MY_REQUEST['page']);?>" />
 411+ <input type="hidden" name="mode" value="<?php echo htmlspecialchars( $MY_REQUEST['mode'] ); ?>" />
 412+ <input type="hidden" name="keyword" value="<?php echo htmlspecialchars( $MY_REQUEST['keyword'] ); ?>" />
 413+ <input type="hidden" name="page" value="<?php echo htmlspecialchars( $MY_REQUEST['page'] ); ?>" />
414414 <input type="submit" value="確認" /> (接受報名只對已付完全款者有效)
415415 </p> </div>
416416 </form>
417417 </div>
418 - <form action="<?php echo $myself_url;?>index.php" method="POST" onsubmit="return warning2();">
 418+ <form action="<?php echo $myself_url; ?>index.php" method="POST" onsubmit="return warning2();">
419419 <div id="admin_form2">
420420 <h3>調整項目</h3>
421421 <p>名:<input type="text" name="given_name" id="given_name" />
@@ -423,13 +423,13 @@
424424 </p>
425425 <div id="item1" class="checked_item">
426426 <input type="radio" name="item" value="1" checked="checked" id="item1_radio" onclick="radiocheck(1);" /><label for="item1_radio">收到付款登記</label>
427 - <p>收到金額:<input type="text" name="cost_paid" value="<?php if($MY_REQUEST['cost_paid']!=0) echo htmlspecialchars($MY_REQUEST['cost_paid']);?>" size="5" />
 427+ <p>收到金額:<input type="text" name="cost_paid" value="<?php if ( $MY_REQUEST['cost_paid'] != 0 ) echo htmlspecialchars( $MY_REQUEST['cost_paid'] ); ?>" size="5" />
428428 <input type="hidden" name="modification" value="add_paid" />
429429 <input type="hidden" name="action" value="admin" />
430 - <input type="hidden" name="mode" value="<?php echo htmlspecialchars($MY_REQUEST['mode']);?>" />
431 - <input type="hidden" name="keyword" value="<?php echo htmlspecialchars($MY_REQUEST['keyword']);?>" />
432 - <input type="hidden" name="filter" value="<?php echo htmlspecialchars($MY_REQUEST['filter']);?>" />
433 - <input type="hidden" name="page" value="<?php echo htmlspecialchars($MY_REQUEST['page']);?>" />
 430+ <input type="hidden" name="mode" value="<?php echo htmlspecialchars( $MY_REQUEST['mode'] ); ?>" />
 431+ <input type="hidden" name="keyword" value="<?php echo htmlspecialchars( $MY_REQUEST['keyword'] ); ?>" />
 432+ <input type="hidden" name="filter" value="<?php echo htmlspecialchars( $MY_REQUEST['filter'] ); ?>" />
 433+ <input type="hidden" name="page" value="<?php echo htmlspecialchars( $MY_REQUEST['page'] ); ?>" />
434434
435435 (若輸入錯誤,可設定為負值以調整)
436436 </p>
@@ -438,24 +438,24 @@
439439 <input type="radio" name="item" value="2" id="item2_radio" onclick="radiocheck(2);" /><label for="item2_radio">日期與住宿資訊</label>
440440 <p>
441441 參加日期:
442 - <?php if($MY_REQUEST['j'])
443 - { echo ' <input type="checkbox" value="1" name="j1" id="j1" checked="checked" />';}
444 - else
 442+ <?php if ( $MY_REQUEST['j'] )
 443+ { echo ' <input type="checkbox" value="1" name="j1" id="j1" checked="checked" />'; }
 444+ else
445445 { echo ' <input type="checkbox" value="1" name="j1" id="j1" />'; }
446 - echo '<label for="j1">'.$lang_register_form['join1'].'</label>'."\n";
 446+ echo '<label for="j1">' . $lang_register_form['join1'] . '</label>' . "\n";
447447
448 - //echo $lang_register_form['join2']; ?>
449 - <input type="checkbox" name="he" value="1" id="he"<?php if ($MY_REQUEST['he']) echo ' checked="checked"';?> /> <label for="he">Hacking Days Extra</label>
450 - <input type="checkbox" name="cju" value="1" id="cju"<?php if ($MY_REQUEST['cju']) echo ' checked="checked"';?> /> <label for="cju">Citizen Journalism Unconference</label>
 448+ // echo $lang_register_form['join2']; ?>
 449+ <input type="checkbox" name="he" value="1" id="he"<?php if ( $MY_REQUEST['he'] ) echo ' checked="checked"'; ?> /> <label for="he">Hacking Days Extra</label>
 450+ <input type="checkbox" name="cju" value="1" id="cju"<?php if ( $MY_REQUEST['cju'] ) echo ' checked="checked"'; ?> /> <label for="cju">Citizen Journalism Unconference</label>
451451 </p><p style="margin-left: 6em;">
452452 <?php
453 -for ($i = 3; $i <=5; $i++)
 453+for ( $i = 3; $i <= 5; $i++ )
454454 {
455 - if($MY_REQUEST['j' . $i])
456 - { echo ' <input type="checkbox" value="1" name="j'.$i.'" id="j'. $i .'" checked="checked" />';}
457 - else
458 - { echo ' <input type="checkbox" value="1" name="j'.$i.'" id="j'. $i .'" />'; }
459 - echo '<label for="j'. $i. '">'.$lang_register_form['join'.$i].'</label>';
 455+ if ( $MY_REQUEST['j' . $i] )
 456+ { echo ' <input type="checkbox" value="1" name="j' . $i . '" id="j' . $i . '" checked="checked" />'; }
 457+ else
 458+ { echo ' <input type="checkbox" value="1" name="j' . $i . '" id="j' . $i . '" />'; }
 459+ echo '<label for="j' . $i . '">' . $lang_register_form['join' . $i] . '</label>';
460460
461461 echo "\n";
462462
@@ -466,13 +466,13 @@
467467 <p>
468468 住宿:
469469 <?php
470 -for ($i = 1; $i <=6; $i++)
 470+for ( $i = 1; $i <= 6; $i++ )
471471 {
472 - if($MY_REQUEST['n' . $i])
473 - { echo ' <input type="checkbox" value="1" name="n'.$i.'" id="n'. $i .'" checked="checked" />';}
474 - else
475 - { echo ' <input type="checkbox" value="1" name="n'.$i.'" id="n'. $i .'" />'; }
476 - echo '<label for="n'. $i. '">'.$lang_register_form['night'.$i].'</label>';
 472+ if ( $MY_REQUEST['n' . $i] )
 473+ { echo ' <input type="checkbox" value="1" name="n' . $i . '" id="n' . $i . '" checked="checked" />'; }
 474+ else
 475+ { echo ' <input type="checkbox" value="1" name="n' . $i . '" id="n' . $i . '" />'; }
 476+ echo '<label for="n' . $i . '">' . $lang_register_form['night' . $i] . '</label>';
477477
478478 echo "\n";
479479
@@ -494,7 +494,7 @@
495495 <p><input type="submit" value="確認" /><input type="button" value="取消" id="cancel_button" class="hide_item" onclick="close_popup()" /></p></div>
496496 </form>
497497 <div id="admin_form3">
498 - <form enctype="multipart/form-data" action="<?php echo $myself_url;?>index.php" method="POST">
 498+ <form enctype="multipart/form-data" action="<?php echo $myself_url; ?>index.php" method="POST">
499499 <h3>資料上傳</h3>
500500 <p>上傳住宿資料:
501501 <input type="file" name="accommodation_file">
@@ -504,9 +504,9 @@
505505 </p>
506506 </form>
507507
508 - <form action="<?php echo $myself_url;?>index.php" method="POST">
 508+ <form action="<?php echo $myself_url; ?>index.php" method="POST">
509509 <h3>下載資料</h3>
510 - <p>
 510+ <p>
511511 <input type="hidden" name="modification" value="get_data" />
512512 <input type="hidden" name="action" value="admin" />
513513 <input type="submit" value="下載住宿資料庫" /> 格式為Tab分隔,UTF16-LE編碼的檔案,可匯入Micorosft Excel處理,處理完後存成Tab分隔檔案上傳即可。
Index: trunk/wikimania/wmreg/skin/paypal_successful.php
@@ -1,15 +1,15 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{ die('Hacking Attempt'); }
 4+if ( !defined( 'TC_STARTED' ) )
 5+{ die( 'Hacking Attempt' ); }
66
77 global $myself_url, $register_data, $lang_register_form;
88
99 /* Fix XSS */
10 -$register_data = array_map('htmlspecialchars', $register_data);
 10+$register_data = array_map( 'htmlspecialchars', $register_data );
1111 ?>
1212 <?php
13 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 13+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
1414 {
1515 echo '<div dir="rtl">';
1616 }
@@ -17,7 +17,7 @@
1818 <h2><?php echo $lang_register_form['paypal_successful']?></h2>
1919 <?php echo $lang_register_form['paypal_successful_description']?>
2020 <?php
21 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 21+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
2222 {
2323 echo '</div>';
24 -}?>
 24+} ?>
Index: trunk/wikimania/wmreg/skin/confirm_data.php
@@ -1,113 +1,113 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{
6 - die('Hacking Attempt');
 4+if ( !defined( 'TC_STARTED' ) )
 5+{
 6+ die( 'Hacking Attempt' );
77 }
88
9 -global $WikimediaLanguages, $WikimediaOrgs, $WikimediaProjects,
10 -$error_message, $register_data, $lang_countries, $myself_url,
 9+global $WikimediaLanguages, $WikimediaOrgs, $WikimediaProjects,
 10+$error_message, $register_data, $lang_countries, $myself_url,
1111 $_COOKIE, $my_session, $lang_register_form, $lang_messages, $userLanguage;
1212
1313 /* Fix XSS */
14 -foreach ($register_data as $key => $val)
 14+foreach ( $register_data as $key => $val )
1515 {
16 - if (!is_array($val))
17 - $val = htmlspecialchars($val);
 16+ if ( !is_array( $val ) )
 17+ $val = htmlspecialchars( $val );
1818 }
1919
20 -function get_lang($lang_id) {
 20+function get_lang( $lang_id ) {
2121 global $lang_register_form;
22 - if (!in_array($lang_id, array_keys($lang_register_form)))
23 - {
24 - return false;
 22+ if ( !in_array( $lang_id, array_keys( $lang_register_form ) ) )
 23+ {
 24+ return false;
2525 }
2626 echo $lang_register_form[$lang_id];
2727 }
2828 ?>
2929 <?php
30 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 30+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
3131 {
3232 echo '<div dir="rtl">';
3333 }
3434 ?>
3535 <p style="text-align:center;"><img src="wikimania2011reg.png" alt="Wikimania 2011 Logo" /></p>
36 -<h1><?php get_lang('confirm');?></h1>
37 -<p><?php get_lang('confirm_description');?></p>
38 -<form method="post" action="<?php echo $myself_url.'index.php';?>" >
 36+<h1><?php get_lang( 'confirm' ); ?></h1>
 37+<p><?php get_lang( 'confirm_description' ); ?></p>
 38+<form method="post" action="<?php echo $myself_url . 'index.php'; ?>" >
3939 <fieldset class="record">
40 -<legend class="title"><?php get_lang('legend1') ?></legend>
 40+<legend class="title"><?php get_lang( 'legend1' ) ?></legend>
4141 <table class="form_table">
4242 <colgroup>
4343 <col class="col_left" />
4444 <col class="col_right" />
4545 </colgroup>
4646 <tr>
47 - <th colspan="2"> <?php get_lang('title1');?></th>
 47+ <th colspan="2"> <?php get_lang( 'title1' ); ?></th>
4848 </tr>
4949 <tr>
50 - <td><?php get_lang('given_name');?></td>
51 - <td><?php echo $register_data['given_name'];?></td>
 50+ <td><?php get_lang( 'given_name' ); ?></td>
 51+ <td><?php echo $register_data['given_name']; ?></td>
5252 </tr>
5353 <tr>
54 - <td><?php get_lang('surname');?></td>
55 - <td><?php echo $register_data['surname'];?></td>
 54+ <td><?php get_lang( 'surname' ); ?></td>
 55+ <td><?php echo $register_data['surname']; ?></td>
5656 </tr>
5757 <tr>
58 - <td><?php get_lang('sex'); ?></td>
 58+ <td><?php get_lang( 'sex' ); ?></td>
5959 <td>
6060 <?php
61 - if($register_data['sex']== 'm') get_lang('sex1');
62 - if($register_data['sex']== 'f') get_lang('sex2');
63 - if($register_data['sex']== 'd') get_lang('sex3');
 61+ if ( $register_data['sex'] == 'm' ) get_lang( 'sex1' );
 62+ if ( $register_data['sex'] == 'f' ) get_lang( 'sex2' );
 63+ if ( $register_data['sex'] == 'd' ) get_lang( 'sex3' );
6464 ?>
6565 </td>
6666 </tr>
6767 <tr>
68 - <td><?php get_lang('country')?></td>
 68+ <td><?php get_lang( 'country' )?></td>
6969 <td>
7070 <?php echo $lang_countries[$register_data['country']]; ?>
7171 </td>
7272 </tr>
7373 <tr>
74 - <th colspan="2"><?php get_lang('title2');?></th>
 74+ <th colspan="2"><?php get_lang( 'title2' ); ?></th>
7575 </tr>
7676 <tr>
77 - <td><?php get_lang('langn')?></td>
 77+ <td><?php get_lang( 'langn' )?></td>
7878 <td>
7979 <?php echo $WikimediaLanguages[$register_data['langn']]; ?>
8080 </td>
8181 </tr>
8282 <tr>
83 - <td><?php get_lang('lang');?></td>
 83+ <td><?php get_lang( 'lang' ); ?></td>
8484 <td>
85 - <?php for ($i=1; $i<=3; $i++ )
 85+ <?php for ( $i = 1; $i <= 3; $i++ )
8686 {
8787 echo '<p class="langline">';
88 - echo $WikimediaLanguages[$register_data['lang'.$i]] . ' - ';
89 - get_lang('lang_level'.$register_data['lang'. $i .'-level']);
90 - echo'</p>'."\n";
91 - }
 88+ echo $WikimediaLanguages[$register_data['lang' . $i]] . ' - ';
 89+ get_lang( 'lang_level' . $register_data['lang' . $i . '-level'] );
 90+ echo'</p>' . "\n";
 91+ }
9292 ?>
9393 </td>
9494 </tr>
9595 <tr>
96 - <th colspan="2"><?php get_lang('title3');?></th>
 96+ <th colspan="2"><?php get_lang( 'title3' ); ?></th>
9797 </tr>
9898 <tr>
99 - <td><?php get_lang('wiki_id')?></td>
 99+ <td><?php get_lang( 'wiki_id' )?></td>
100100 <td>
101 - <?php if ($register_data['wiki_id']) echo $register_data['wiki_id'].'@'.$register_data['wiki_language'].'.'.$register_data['wiki_project'].'.org';?>
 101+ <?php if ( $register_data['wiki_id'] ) echo $register_data['wiki_id'] . '@' . $register_data['wiki_language'] . '.' . $register_data['wiki_project'] . '.org'; ?>
102102 </td>
103103 </tr>
104104 <tr>
105 - <td><?php get_lang('email')?></td>
106 - <td><?php echo $register_data['email'];?></td>
 105+ <td><?php get_lang( 'email' )?></td>
 106+ <td><?php echo $register_data['email']; ?></td>
107107 </tr>
108108 </table>
109109 </fieldset>
110110 <fieldset class="record">
111 -<legend class="title"><?php get_lang('legend2') ?></legend>
 111+<legend class="title"><?php get_lang( 'legend2' ) ?></legend>
112112 <table class="form_table">
113113 <colgroup>
114114 <col class="col_left" />
@@ -115,17 +115,17 @@
116116 <col class="col_right" />
117117 </colgroup>
118118 <tr>
119 - <th colspan="2"><?php get_lang('title4');?></th>
 119+ <th colspan="2"><?php get_lang( 'title4' ); ?></th>
120120 </tr>
121121 <tr>
122 - <td><?php get_lang('join_date'); ?></td>
 122+ <td><?php get_lang( 'join_date' ); ?></td>
123123 <td>
124124 <?php
125 - for ($i = 1; $i <=6; $i++)
 125+ for ( $i = 1; $i <= 6; $i++ )
126126 {
127 - if (in_array($i, $register_data['join_date']))
 127+ if ( in_array( $i, $register_data['join_date'] ) )
128128 {
129 - get_lang('join'. $i);
 129+ get_lang( 'join' . $i );
130130 echo '<br>';
131131 }
132132 }
@@ -133,32 +133,32 @@
134134 </td>
135135 </tr>
136136 <tr>
137 - <td><?php get_lang('picktour'); ?></td>
 137+ <td><?php get_lang( 'picktour' ); ?></td>
138138 <td>
139139 <?php
140 - if ($register_data['tours'] >= 0 && $register_data['tours'] <= 5)
 140+ if ( $register_data['tours'] >= 0 && $register_data['tours'] <= 5 )
141141 {
142 - get_lang('tour'.$register_data['tours']);
 142+ get_lang( 'tour' . $register_data['tours'] );
143143 }
144144 ?>
145145 </td>
146146 </tr>
147147 <tr>
148 - <td><?php get_lang('showname'); ?></td>
 148+ <td><?php get_lang( 'showname' ); ?></td>
149149 <td>
150150 <?php
151 - for ($i = 1; $i <= 3; $i++)
 151+ for ( $i = 1; $i <= 3; $i++ )
152152 {
153 - if (in_array($i, $register_data['showname']))
 153+ if ( in_array( $i, $register_data['showname'] ) )
154154 {
155 - get_lang('showname'.$i);
156 - if ($i == 3)
157 - {
158 - echo ' : '.$register_data['custom_showname'];
 155+ get_lang( 'showname' . $i );
 156+ if ( $i == 3 )
 157+ {
 158+ echo ' : ' . $register_data['custom_showname'];
159159 }
160160 else
161 - {
162 - echo ', ';
 161+ {
 162+ echo ', ';
163163 }
164164 }
165165 }
@@ -166,95 +166,95 @@
167167 </td>
168168 </tr>
169169 <tr>
170 - <td><?php get_lang('size'); ?></td>
171 - <td>
 170+ <td><?php get_lang( 'size' ); ?></td>
 171+ <td>
172172 <?php echo $register_data['size']; ?>
173173 </td>
174174 </tr>
175175 <tr>
176 - <td><?php get_lang('food'); ?></td>
177 - <td>
 176+ <td><?php get_lang( 'food' ); ?></td>
 177+ <td>
178178 <?php
179 - if ($register_data['food'] >= 1 && $register_data['food'] <= 2)
 179+ if ( $register_data['food'] >= 1 && $register_data['food'] <= 2 )
180180 {
181 - get_lang('food'.$register_data['food']);
 181+ get_lang( 'food' . $register_data['food'] );
182182 }
183 - if ($register_data['food'] == 3 )
184 - {
185 - get_lang('food_other');
186 - echo $register_data['food_other'];
187 - }?>
 183+ if ( $register_data['food'] == 3 )
 184+ {
 185+ get_lang( 'food_other' );
 186+ echo $register_data['food_other'];
 187+ } ?>
188188 </td>
189189 </tr>
190190 <tr>
191 - <th colspan="2"><?php get_lang('title_visa');?></th>
 191+ <th colspan="2"><?php get_lang( 'title_visa' ); ?></th>
192192 </tr>
193193 <tr>
194 - <td><?php get_lang('visa_assistance'); ?></td>
195 - <td><?php if($register_data['visa_assistance']) get_lang('need_visa_assistance'); ?></td>
 194+ <td><?php get_lang( 'visa_assistance' ); ?></td>
 195+ <td><?php if ( $register_data['visa_assistance'] ) get_lang( 'need_visa_assistance' ); ?></td>
196196 </tr>
197197 <tr>
198 - <td><?php get_lang('nationality'); ?></td>
199 - <td><?php if($register_data['visa_assistance']) echo $register_data['nationality']; ?></td>
 198+ <td><?php get_lang( 'nationality' ); ?></td>
 199+ <td><?php if ( $register_data['visa_assistance'] ) echo $register_data['nationality']; ?></td>
200200 </tr>
201201 <tr>
202 - <td><?php get_lang('passport'); ?></td>
203 - <td><?php if($register_data['visa_assistance']) echo $register_data['passport']; ?></td>
 202+ <td><?php get_lang( 'passport' ); ?></td>
 203+ <td><?php if ( $register_data['visa_assistance'] ) echo $register_data['passport']; ?></td>
204204 </tr>
205205 <tr>
206 - <td><?php get_lang('passport_issued'); ?></td>
207 - <td><?php if($register_data['visa_assistance']) echo $register_data['passport_issued']; ?></td>
 206+ <td><?php get_lang( 'passport_issued' ); ?></td>
 207+ <td><?php if ( $register_data['visa_assistance'] ) echo $register_data['passport_issued']; ?></td>
208208 </tr>
209209 <tr>
210 - <td><?php get_lang('countryofbirth'); ?></td>
211 - <td><?php if($register_data['visa_assistance']) echo $register_data['countryofbirth']; ?></td>
 210+ <td><?php get_lang( 'countryofbirth' ); ?></td>
 211+ <td><?php if ( $register_data['visa_assistance'] ) echo $register_data['countryofbirth']; ?></td>
212212 </tr>
213213 <tr>
214 - <td><?php get_lang('homeaddress'); ?></td>
215 - <td><?php if($register_data['visa_assistance']) echo $register_data['homeaddress']; ?></td>
 214+ <td><?php get_lang( 'homeaddress' ); ?></td>
 215+ <td><?php if ( $register_data['visa_assistance'] ) echo $register_data['homeaddress']; ?></td>
216216 </tr>
217217 <tr>
218 - <td><?php get_lang('visa_assistance_description'); ?></td>
219 - <td><?php if($register_data['visa_assistance']) echo $register_data['visa_assistance_description'] ?></td>
 218+ <td><?php get_lang( 'visa_assistance_description' ); ?></td>
 219+ <td><?php if ( $register_data['visa_assistance'] ) echo $register_data['visa_assistance_description'] ?></td>
220220 </tr>
221221 <tr>
222 - <th colspan="2"><?php get_lang('title5');?></th>
 222+ <th colspan="2"><?php get_lang( 'title5' ); ?></th>
223223 </tr>
224224 <tr>
225 - <td><?php get_lang('accommodation'); ?></td>
 225+ <td><?php get_lang( 'accommodation' ); ?></td>
226226 <td>
227227 <?php
228 - if (is_array($register_data['nights'])) {
229 - for ($i = 1; $i <= 8; $i++)
 228+ if ( is_array( $register_data['nights'] ) ) {
 229+ for ( $i = 1; $i <= 8; $i++ )
230230 {
231 - if (in_array($i, $register_data['nights']))
 231+ if ( in_array( $i, $register_data['nights'] ) )
232232 {
233 - get_lang('night'. $i);
 233+ get_lang( 'night' . $i );
234234 echo '<br>';
235235 }
236236 }
237 - }?>
 237+ } ?>
238238 </td>
239239 </tr>
240240 <tr>
241 - <td><?php get_lang('accommodation_hotel'); ?></td>
 241+ <td><?php get_lang( 'accommodation_hotel' ); ?></td>
242242 <td>
243243 <?php
244 - if ($register_data['hotels'] >= 1 && $register_data['hotels'] <= 9)
 244+ if ( $register_data['hotels'] >= 1 && $register_data['hotels'] <= 9 )
245245 {
246 - get_lang('hotel'.$register_data['hotels']);
247 - }?>
 246+ get_lang( 'hotel' . $register_data['hotels'] );
 247+ } ?>
248248 </td>
249249 </tr>
250250 <tr>
251 - <td><?php get_lang('room'); ?></td>
 251+ <td><?php get_lang( 'room' ); ?></td>
252252 <td>
253253 <?php
254 - if ($register_data['room'] >= 1 && $register_data['room'] <= 3)
 254+ if ( $register_data['room'] >= 1 && $register_data['room'] <= 3 )
255255 {
256 - get_lang('room'.$register_data['room']);
 256+ get_lang( 'room' . $register_data['room'] );
257257 }
258 - if ($register_data['room'] == 3)
 258+ if ( $register_data['room'] == 3 )
259259 {
260260 echo $register_data['room_partner'];
261261 }
@@ -262,11 +262,11 @@
263263 </td>
264264 </tr>
265265 <tr>
266 - <td><?php get_lang('room_requests'); ?></td>
 266+ <td><?php get_lang( 'room_requests' ); ?></td>
267267 <td><?php echo $register_data['room_requests']; ?></td>
268268 </tr>
269269 <tr>
270 - <th colspan="2"><?php get_lang('title6');?></th>
 270+ <th colspan="2"><?php get_lang( 'title6' ); ?></th>
271271 </tr>
272272 <tr>
273273 <td><?php echo $lang_messages['attendance_cost']; ?></td>
@@ -290,49 +290,49 @@
291291
292292
293293 <div id="button">
294 - <?php
295 - for ($i = 1; $i <= 6; $i++)
 294+ <?php
 295+ for ( $i = 1; $i <= 6; $i++ )
296296 {
297 - if (in_array($i, $register_data['join_date']))
 297+ if ( in_array( $i, $register_data['join_date'] ) )
298298 {
299 - echo '<input type="hidden" name="join_date[]" value="'.$i.'" />'."\n";
 299+ echo '<input type="hidden" name="join_date[]" value="' . $i . '" />' . "\n";
300300 }
301301 }
302 - unset($register_data['join_date']);
303 - for ($i = 1; $i <= 3; $i++)
 302+ unset( $register_data['join_date'] );
 303+ for ( $i = 1; $i <= 3; $i++ )
304304 {
305 - if (in_array($i, $register_data['showname']))
 305+ if ( in_array( $i, $register_data['showname'] ) )
306306 {
307 - echo '<input type="hidden" name="showname[]" value="'.$i.'" />'."\n";
 307+ echo '<input type="hidden" name="showname[]" value="' . $i . '" />' . "\n";
308308 }
309309 }
310 - unset($register_data['showname']);
311 - if (is_array($register_data['nights']))
 310+ unset( $register_data['showname'] );
 311+ if ( is_array( $register_data['nights'] ) )
312312 {
313 - for ($i = 1; $i <= 8; $i++)
 313+ for ( $i = 1; $i <= 8; $i++ )
314314 {
315 - if (in_array($i, $register_data['nights']))
 315+ if ( in_array( $i, $register_data['nights'] ) )
316316 {
317 - echo '<input type="hidden" name="nights[]" value="'.$i.'" />'."\n";
 317+ echo '<input type="hidden" name="nights[]" value="' . $i . '" />' . "\n";
318318 }
319319 }
320320 }
321 - unset($register_data['nights']);
322 - foreach ($register_data as $name=>$value)
 321+ unset( $register_data['nights'] );
 322+ foreach ( $register_data as $name => $value )
323323 {
324 - echo '<input type="hidden" name="'.$name.'" value="'.$value.'" />'."\n";
 324+ echo '<input type="hidden" name="' . $name . '" value="' . $value . '" />' . "\n";
325325 }
326326 ?>
327 - <input type="submit" name="submit" value="<?php get_lang('submit'); ?>" />
328 - <input type="submit" name="submit" value="<?php get_lang('reset'); ?>" />
 327+ <input type="submit" name="submit" value="<?php get_lang( 'submit' ); ?>" />
 328+ <input type="submit" name="submit" value="<?php get_lang( 'reset' ); ?>" />
329329 <input type="hidden" name="uselang" value="<?php echo $userLanguage?>" />
330330 <input type="hidden" name="action" value="submit" />
331 - <?php if(!$_COOKIE['wikimania']) echo '<input type="hidden" name="secret_id" value="'.$my_session->handle.'" />'; ?>
332 - <input type="hidden" name="secert_id2" value="<?echo $_SESSION['secret'];?>" />
 331+ <?php if ( !$_COOKIE['wikimania'] ) echo '<input type="hidden" name="secret_id" value="' . $my_session->handle . '" />'; ?>
 332+ <input type="hidden" name="secert_id2" value="<?echo $_SESSION['secret']; ?>" />
333333 </div>
334 -</form>
 334+</form>
335335 <?php
336 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 336+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
337337 {
338338 echo '</div>';
339 -}?>
\ No newline at end of file
 339+} ?>
\ No newline at end of file
Index: trunk/wikimania/wmreg/skin/paypal.php
@@ -1,14 +1,14 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{ die('Hacking Attempt'); }
 4+if ( !defined( 'TC_STARTED' ) )
 5+{ die( 'Hacking Attempt' ); }
66
77 global $myself_url, $register_data, $userLanguage, $lang_register_form;
88
99 /* WARNING: check $register_data & htmlentities!! */
1010 ?>
1111 <?php
12 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 12+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
1313 {
1414 echo '<div dir="rtl">';
1515 }
@@ -20,26 +20,26 @@
2121 <input type="hidden" name="cmd" value="_xclick">
2222 <input type="hidden" name="business" value="SFPHVU7QV7VFU">
2323 <input type="hidden" name="lc" value="IL">
24 -<input type="hidden" name="item_name" value="Wikimania 2011 registration fee for <?php echo $register_data['given_name'].' '.$register_data['surname']?>"; />
25 -<input type="hidden" name="item_number" value="<?php echo $register_data['unique_code'];?>"/>
26 -<input type="hidden" name="amount" value="<?php echo $register_data['cost_total'];?>" />
27 -<input type="hidden" name="currency_code" value="<?php echo $register_data['currency'];?>"/>
 24+<input type="hidden" name="item_name" value="Wikimania 2011 registration fee for <?php echo $register_data['given_name'] . ' ' . $register_data['surname']?>"; />
 25+<input type="hidden" name="item_number" value="<?php echo $register_data['unique_code']; ?>"/>
 26+<input type="hidden" name="amount" value="<?php echo $register_data['cost_total']; ?>" />
 27+<input type="hidden" name="currency_code" value="<?php echo $register_data['currency']; ?>"/>
2828 <input type="hidden" name="button_subtype" value="services">
2929 <input type="hidden" name="no_note" value="1">
3030 <input type="hidden" name="bn" value="PP-BuyNowBF:btn_paynowCC_LG.gif:NonHosted">
3131 <input type="hidden" name="no_shipping" value="1" />
3232 <input type="hidden" name="rm" value="1">
33 -<input type="hidden" name="return" value="<?php echo $myself_url . '/index.php?action=paypal_successful&unique_code=' . $register_data['unique_code'] . '&nonce='.md5($_SESSION['secret'] . $register_data['unique_code']).'&uselang='.$userLanguage; ?>"/>
34 -<input type="hidden" name="cancel_return" value="<?php echo $myself_url . '/index.php?action=paypal_failed&unique_code=' . $register_data['unique_code'] . '&uselang='.$userLanguage; ?>"/>
 33+<input type="hidden" name="return" value="<?php echo $myself_url . '/index.php?action=paypal_successful&unique_code=' . $register_data['unique_code'] . '&nonce=' . md5( $_SESSION['secret'] . $register_data['unique_code'] ) . '&uselang=' . $userLanguage; ?>"/>
 34+<input type="hidden" name="cancel_return" value="<?php echo $myself_url . '/index.php?action=paypal_failed&unique_code=' . $register_data['unique_code'] . '&uselang=' . $userLanguage; ?>"/>
3535 <input type="hidden" name="no_note" value="1" />
3636 <input type="image" src="https://www.paypal.com/en_US/IL/i/btn/btn_paynowCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
3737 <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
3838 </form>
3939 <?php
40 -if ($userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he')
 40+if ( $userLanguage == 'ar' || $userLanguage == 'fa' || $userLanguage == 'he' )
4141 {
4242 echo '</div>';
43 -}?>
 43+} ?>
4444
4545
4646
Index: trunk/wikimania/wmreg/skin/patience.php
@@ -1,7 +1,7 @@
22 <?php
33 /* Prevent hacking */
4 -if(!defined('TC_STARTED'))
5 -{ die('Hacking Attempt'); }
 4+if ( !defined( 'TC_STARTED' ) )
 5+{ die( 'Hacking Attempt' ); }
66 ?>
77
88 <script type="text/javascript">
@@ -74,9 +74,9 @@
7575 border='0' /></a>
7676 <br>
7777 <br>
78 -<?php
79 -echo 'Wikimania 2011 Registration will open on '.gmdate('Y-m-d H:i',
80 -$open_time). ' (UTC). ';
81 -echo '<br> <p id="countbox" align="center"></p> ';?>
 78+<?php
 79+echo 'Wikimania 2011 Registration will open on ' . gmdate( 'Y-m-d H:i',
 80+$open_time ) . ' (UTC). ';
 81+echo '<br> <p id="countbox" align="center"></p> '; ?>
8282 </p>
8383
Index: trunk/wikimania/wmreg/dbdata.php
@@ -1,8 +1,8 @@
22 <?php
33
44 /* Prevent hacking */
5 -if(!defined('TC_STARTED'))
6 -{ die('Hacking Attempt'); }
 5+if ( !defined( 'TC_STARTED' ) )
 6+{ die( 'Hacking Attempt' ); }
77
88 $DB_HOST = '127.0.0.1';
99
@@ -16,17 +16,16 @@
1717 * The URL of the system
1818 */
1919 $myself_url = 'https://secure.wikidc.org/wm/reg/';
20 -//$myself_url = 'http://wmreg11.eu5.org/wmreg/';
 20+// $myself_url = 'http://wmreg11.eu5.org/wmreg/';
2121
2222 $recaptcha_publickey = "";
2323 $recaptcha_privatekey = "";
2424
25 -$open_time = gmmktime(0, 0, 0, /*january*/ 1, /*1st*/ 1, 2011);
26 -$close_time = gmmktime(0, 0, 0, /*august*/ 8, /*1st*/ 1, 2012);
 25+$open_time = gmmktime( 0, 0, 0, /*january*/ 1, /*1st*/ 1, 2011 );
 26+$close_time = gmmktime( 0, 0, 0, /*august*/ 8, /*1st*/ 1, 2012 );
2727 $mock = true;
2828
2929 $coupon_vip = 'foo';
3030 $coupon_median = 'bar';
3131 $coupon_volunteer = 'baz';
3232
33 -?>
Index: trunk/wikimania/wmreg/includes/language_es.php
@@ -12,24 +12,24 @@
1313 '<p><strong>Datos de información personal</strong></p>',
1414 'surname' => 'Apellido',
1515 'given_name' => 'Nombre',
16 -'sex' => 'Género',
 16+'sex' => 'Género',
1717 'sex1' => 'Masculino',
1818 'sex2' => 'Femenino',
1919 'sex3' => 'No declara',
20 -'passport' => 'Número de pasaporte / Número de identificación',
 20+'passport' => 'Número de pasaporte / Número de identificación',
2121 'passport_valid' => 'Pasaporte válido hasta (dd/mmm/yyyy)<br><small>Tu pasaporte debe ser válido por 6 meses.</small>',
2222 'passport_issued' => 'Lugar en donde el pasaporte fue emitido',
23 -'country' => 'País de residencia',
 23+'country' => 'País de residencia',
2424 'birthday' => 'Fecha de nacimiento (dd/mmm/yyyy)',
25 -'year1' => '',
26 -'year' => '',
27 -'month' => '',
28 -'months' => array(NULL, 'Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'),
29 -'day' => '',
 25+'year1' => '',
 26+'year' => '',
 27+'month' => '',
 28+'months' => array( NULL, 'Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre' ),
 29+'day' => '',
3030 'title2' =>
3131 ' <p><strong>Habilidades lingüísticas</strong></p>',
32 -'langn' => 'Idioma nativo',
33 -'lang' => 'Idiomas adicionales',
 32+'langn' => 'Idioma nativo',
 33+'lang' => 'Idiomas adicionales',
3434 'select_lang' => 'Selecciona el idioma',
3535 'select_level' => 'Selecciona el nivel de dominio',
3636
@@ -46,13 +46,13 @@
4747 'lang2_level' => 'Nivel del Idioma 2',
4848 'lang3_level' => 'Nivel del Idioma 3',
4949
50 -'title3' =>
 50+'title3' =>
5151 '<p><strong>Proyecto de Wikimedia y dirección/es de correo electrónico</strong></p>
5252 <p>Tu correo electrónico sólo será utilizado para la inscripción y para notificaciones urgentes sobre Wikimanía 2011.
5353 </p>
54 -',
55 -'wiki_id' => 'Nombre de la cuenta de tu proyecto Wikimedia preferido',
56 -'email' => 'Tu correo electrónico',
 54+',
 55+'wiki_id' => 'Nombre de la cuenta de tu proyecto Wikimedia preferido',
 56+'email' => 'Tu correo electrónico',
5757
5858 'legend2' => 'Participación',
5959 'title4' =>
@@ -70,16 +70,16 @@
7171 'showname1' => 'Nombre',
7272 'showname2' => 'Cuenta Wikimedia',
7373 'showname3' => 'Información adicional:',
74 -'size' => 'Talla de camiseta',
 74+'size' => 'Talla de camiseta',
7575 'food' => 'Restricciones de dieta<br><small>Todos los alimentos que se servirán durante la conferencia serán kosher.</small>',
7676 'food0' => 'No',
7777 'food1' => 'Vegetariano',
7878 'food2' => 'Halal',
7979 'food_other' => 'Otro:',
80 -
81 -'title_visa' =>
 80+
 81+'title_visa' =>
8282 '<p><strong>Asistencia para visa</strong></p>
83 -<p>Si tu pasaporte es emitido por <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>un país para el que se requiere un visado de entrada a Israel</a>, por favor llena esta sección para que los organizadores pueden pasar sus datos al Ministerio israelí de Asuntos Exteriores.',
 83+<p>Si tu pasaporte es emitido por <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>un país para el que se requiere un visado de entrada a Israel</a>, por favor llena esta sección para que los organizadores pueden pasar sus datos al Ministerio israelí de Asuntos Exteriores.',
8484 'need_visa_assistance' => 'Sí, necesito un visado de entrada a Israel',
8585 'visa_assistance' => 'Ayuda para obtener la visa',
8686 'visa_assistance_description' => 'Por favor indícanos cómo puede ayudarte el equipo organizador a obtener la visa. (en <strong>Inglés</strong>)',
@@ -103,7 +103,7 @@
104104 'hotel5stars' => 'Hotel de cinco estrellas',
105105 'hotelboutique' => 'Hotel boutique',
106106
107 -'accommodation' => 'Noches de alojamiento que necesitas',
 107+'accommodation' => 'Noches de alojamiento que necesitas',
108108 'night1' => 'Lunes 1 de agosto, 2011',
109109 'night2' => 'Martes 2 de agosto, 2011',
110110 'night3' => 'Miércoles 3 de agosto, 2011',
@@ -112,7 +112,7 @@
113113 'night6' => 'Sábado 5 de agosto, 2011',
114114 'night7' => 'Domingo 7 de agosto, 2011',
115115 'night8' => 'Lunes 8 de agosto, 2011',
116 -'room' => 'Habitación preferida',
 116+'room' => 'Habitación preferida',
117117 'room1' => 'Ocupación individual',
118118 'room2' => 'Ocupación doble con pareja del mismo género seleccionada al azar por los organizadores',
119119 'room3' => 'Ocupación doble con un compañero (a) en específico (por favor escriba nombre completo)',
@@ -148,8 +148,8 @@
149149 'color' => 'Color de camiseta',
150150 'white' => 'Blanca',
151151 'black' => 'negra',
152 -'nationality' => 'Pasaporte emitido por',
153 -'countryofbirth' => 'País de nacimiento',
 152+'nationality' => 'Pasaporte emitido por',
 153+'countryofbirth' => 'País de nacimiento',
154154 'homeaddress' => 'Dirección',
155155 'picktour' => 'Destino de tour preferido',
156156 'tour0' => 'No tengo una preferencia',
@@ -165,7 +165,7 @@
166166
167167 $lang_messages = array(
168168 'successful' => 'Registro completo',
169 -'successful_description' =>
 169+'successful_description' =>
170170 '<p>¡Gracias por sumarte a Wikimanía 2011! Tu formulario de inscripción fue aceptado. Por favor, ten en cuenta que necesitas completar el proceso de pago para que la inscripción pueda ser confirmada.
171171
172172 Tu <strong>número de registro</strong> será mostrado debajo. Por favor, anota este número ya que será utilizado para consultar el estado de tu inscripción y para confirmar tu identidad en el futuro.
Index: trunk/wikimania/wmreg/includes/language_fr.php
@@ -12,24 +12,24 @@
1313 '<p><strong>Données sur l\'identité du participant</strong></p>',
1414 'surname' => 'Nom',
1515 'given_name' => 'Prénom',
16 -'sex' => 'Sexe',
 16+'sex' => 'Sexe',
1717 'sex1' => 'masculin',
1818 'sex2' => 'féminin',
1919 'sex3' => 'non communiqué',
20 -'passport' => 'Numéro de passeport',
 20+'passport' => 'Numéro de passeport',
2121 'passport_valid' => 'Passeport valide jusqu\'au (JJ/MM/AAAA)<br><small>Vôtre passeport doit impérativement être encore valide six mois après la date d\'entrée sur le territoire.</small>',
2222 'passport_issued' => 'Passeport délivré à',
23 -'country' => 'Pays de résidence',
 23+'country' => 'Pays de résidence',
2424 'birthday' => 'Date de naissance (JJ/MM/AAAA)',
25 -'year1' => '',
26 -'year' => '',
27 -'month' => '',
28 -'months' => array(NULL, 'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'),
29 -'day' => '',
 25+'year1' => '',
 26+'year' => '',
 27+'month' => '',
 28+'months' => array( NULL, 'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre' ),
 29+'day' => '',
3030 'title2' =>
3131 ' <p><strong>Compétences linguistiques</strong></p>',
32 -'langn' => 'Langue maternelle',
33 -'lang' => 'Autres langues',
 32+'langn' => 'Langue maternelle',
 33+'lang' => 'Autres langues',
3434 'select_lang' => 'Choisir une langue',
3535 'select_level' => 'Choisir un niveau',
3636
@@ -46,13 +46,13 @@
4747 'lang2_level' => 'Compétences linguistiques pour la langue 2',
4848 'lang3_level' => 'Compétences linguistiques pour la langue 3',
4949
50 -'title3' =>
 50+'title3' =>
5151 '<p><strong>Projet Wikimédia et adresse de courriel</strong></p>
5252 <p>Vôtre adresse de courriel sera utilisée uniquement dans le cadre de Wikimania 2011.
5353 </p>
54 -',
55 -'wiki_id' => 'Nom d\'utilisateur sur les projets Wikimédia',
56 -'email' => 'Adresse de courriel',
 54+',
 55+'wiki_id' => 'Nom d\'utilisateur sur les projets Wikimédia',
 56+'email' => 'Adresse de courriel',
5757
5858 'legend2' => 'Participation',
5959 'title4' =>
@@ -70,16 +70,16 @@
7171 'showname1' => 'Nom',
7272 'showname2' => 'Nom d\'utilisateur sur les projets Wikimédia',
7373 'showname3' => 'Informations supplémentaires :',
74 -'size' => 'Taille du T-Shirt',
 74+'size' => 'Taille du T-Shirt',
7575 'food' => 'Pratique alimentaire particulière<br><small>Tous les repas durant la conférence seront casher.</small>',
7676 'food0' => 'aucune',
7777 'food1' => 'végétarien',
7878 'food2' => 'halal',
7979 'food_other' => 'autre :',
80 -
81 -'title_visa' =>
 80+
 81+'title_visa' =>
8282 '<p><strong>Visa</strong></p>
83 -<p>Si vôtre passeport a été émis d\'un <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>pays pour lequel il est exigé un visa de la part d\'Israël</a>, renseignez le formulaire suivant afin que l\'organisation soit en mesure de communiquer ces informations au ministère israélien des Affaires étrangères.',
 83+<p>Si vôtre passeport a été émis d\'un <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>pays pour lequel il est exigé un visa de la part d\'Israël</a>, renseignez le formulaire suivant afin que l\'organisation soit en mesure de communiquer ces informations au ministère israélien des Affaires étrangères.',
8484 'need_visa_assistance' => 'Oui, ma venue en Israël nécessite un visa.',
8585 'visa_assistance' => 'Nécessité d\'un visa',
8686 'visa_assistance_description' => 'Requête particulière relative à la demande de visa (en <strong>anglais</strong>)',
@@ -103,7 +103,7 @@
104104 'hotel5stars' => 'Hotels *****',
105105 'hotelboutique' => 'Boutique-Hotels',
106106
107 -'accommodation' => 'Nuitées où un hébergement est nécessaire',
 107+'accommodation' => 'Nuitées où un hébergement est nécessaire',
108108 'night1' => 'Lundi, 1. août 2011',
109109 'night2' => 'Mardi, 2 août 2011',
110110 'night3' => 'Mercredi, 3 août 2011',
@@ -112,7 +112,7 @@
113113 'night6' => 'Samedi, 6 août 2011',
114114 'night7' => 'Dimanche, 7 août 2011',
115115 'night8' => 'Lundi, 8 août 2011',
116 -'room' => 'Type de chambre souhaitée',
 116+'room' => 'Type de chambre souhaitée',
117117 'room1' => 'Individuelle',
118118 'room2' => 'Double avec un autre participant du même sexe choisi au hasard.',
119119 'room3' => 'Double avec un autre participant en particulier (prière de donner le nom et prénom complet) :',
@@ -148,8 +148,8 @@
149149 'color' => 'Couleur du T-Shirt',
150150 'white' => 'blanc',
151151 'black' => 'noir',
152 -'nationality' => 'Pays d\'émission du passeport',
153 -'countryofbirth' => 'Pays de naissance',
 152+'nationality' => 'Pays d\'émission du passeport',
 153+'countryofbirth' => 'Pays de naissance',
154154 'homeaddress' => 'Adresse de résidence',
155155 'picktour' => 'Souhait de visite',
156156 'tour0' => 'pas de souhait particulier',
@@ -157,7 +157,7 @@
158158 'tour2' => 'Jérusalem',
159159 'tour3' => 'Acre',
160160 'tour4' => 'Terrasses Baha\'i sur le Mont Carmel',
161 -'tour5' => 'Villages druses',
 161+'tour5' => 'Villages druses',
162162 'main_date' => 'Journée principale de la conférence',
163163 'captcha' => 'Information du CAPTCHA'
164164 );
@@ -165,7 +165,7 @@
166166
167167 $lang_messages = array(
168168 'successful' => 'Inscription terminée',
169 -'successful_description' =>
 169+'successful_description' =>
170170 '<p>Merci beaucoup pour vôtre participation à Wikimania 2011! Vôtre inscription a été transmise. Prenez en considération qu\'il vous faudra effecuté le paiement afin de que vôtre inscription puisse être confirmée.
171171
172172 Vôtre <strong>numéro d\'inscription</strong> va être indiqué ci-dessous. Prenez en considération qu\'il vous faudra obligatoirement ce numéro pour interroger le système sur le statut de vôtre inscription.
Index: trunk/wikimania/wmreg/includes/language_de.php
@@ -12,24 +12,24 @@
1313 '<p><strong>Persönliche Identitätsdaten</strong></p>',
1414 'surname' => 'Nachname',
1515 'given_name' => 'Vorname',
16 -'sex' => 'Geschlecht',
 16+'sex' => 'Geschlecht',
1717 'sex1' => 'männlich',
1818 'sex2' => 'weiblich',
1919 'sex3' => 'keine Angabe',
20 -'passport' => 'Reisepass-Nummer',
 20+'passport' => 'Reisepass-Nummer',
2121 'passport_valid' => 'Gültigkeit des Reisepasses (TT/MM/JJJJ)<br><small>Ihr Reisepass muss noch mindestens sechs Monate gültig sein.</small>',
2222 'passport_issued' => 'Ausstellungsort',
23 -'country' => 'Land des aktuellen Wohnorts',
 23+'country' => 'Land des aktuellen Wohnorts',
2424 'birthday' => 'Geburtsdatum (TT/MM/JJJJ)',
25 -'year1' => '',
26 -'year' => '',
27 -'month' => '',
28 -'months' => array(NULL, 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'),
29 -'day' => '',
 25+'year1' => '',
 26+'year' => '',
 27+'month' => '',
 28+'months' => array( NULL, 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember' ),
 29+'day' => '',
3030 'title2' =>
3131 ' <p><strong>Sprachkenntnisse</strong></p>',
32 -'langn' => 'Muttersprache',
33 -'lang' => 'Weitere Sprachen',
 32+'langn' => 'Muttersprache',
 33+'lang' => 'Weitere Sprachen',
3434 'select_lang' => 'bitte Sprache auswählen',
3535 'select_level' => 'bitte Fähgkeit angeben',
3636
@@ -46,13 +46,13 @@
4747 'lang2_level' => 'Sprachkenntnis für Sprache 2',
4848 'lang3_level' => 'Sprachkenntnis für Sprache 3',
4949
50 -'title3' =>
 50+'title3' =>
5151 '<p><strong>Wikimedia-Projekt und E-Mail-Adresse</strong></p>
5252 <p>Ihre E-Mail-Adresse wird ausschliesslich für die Registrierung sowie dringende Benachrichtigungen zur Wikimania 2011 verwendet.
5353 </p>
54 -',
55 -'wiki_id' => 'Wikimedia-Benutzername',
56 -'email' => 'E-Mail-Adresse',
 54+',
 55+'wiki_id' => 'Wikimedia-Benutzername',
 56+'email' => 'E-Mail-Adresse',
5757
5858 'legend2' => 'Teilnahme',
5959 'title4' =>
@@ -70,16 +70,16 @@
7171 'showname1' => 'Name',
7272 'showname2' => 'Wikimedia-Benutzername',
7373 'showname3' => 'Weitere Informationen:',
74 -'size' => 'T-Shirt-Grösse',
 74+'size' => 'T-Shirt-Grösse',
7575 'food' => 'Ernährungseinschränkungen<br><small>Alle Mahlzeiten während der Konferenz werden kosher zubereitet.</small>',
7676 'food0' => 'keine',
7777 'food1' => 'Vegetarier',
7878 'food2' => 'Halal',
7979 'food_other' => 'Andere:',
80 -
81 -'title_visa' =>
 80+
 81+'title_visa' =>
8282 '<p><strong>Visum</strong></p>
83 -<p>Wenn Ihr Reisepass von <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>einem Land ausgestellt wurde, für das ein Visum zur Einreise nach Israel benötigt wird</a>, füllen Sie bitte die folgenden Angaben aus, damit das Organisationsteam Ihre Daten an das israelische Aussenministerium weitergeben kann.',
 83+<p>Wenn Ihr Reisepass von <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>einem Land ausgestellt wurde, für das ein Visum zur Einreise nach Israel benötigt wird</a>, füllen Sie bitte die folgenden Angaben aus, damit das Organisationsteam Ihre Daten an das israelische Aussenministerium weitergeben kann.',
8484 'need_visa_assistance' => 'Ja, ich benötige ein Visum zur Einreise nach Israel',
8585 'visa_assistance' => 'Visum-Antrag',
8686 'visa_assistance_description' => 'Spezielle Anforderungen im Bezug auf den Visums-Antrag (auf <strong>Englisch</strong>)',
@@ -103,7 +103,7 @@
104104 'hotel5stars' => 'Fünf-Sterne Hotels',
105105 'hotelboutique' => 'Boutique-Hotels',
106106
107 -'accommodation' => 'Nächte in denen Übernachtung benötigt wird',
 107+'accommodation' => 'Nächte in denen Übernachtung benötigt wird',
108108 'night1' => 'Montag, 1. August 2011',
109109 'night2' => 'Diensta, 2. August 2011',
110110 'night3' => 'Mittwoch, 3. August 2011',
@@ -112,7 +112,7 @@
113113 'night6' => 'Samstag, 6. August 2011',
114114 'night7' => 'Sonntag, 7. August 2011',
115115 'night8' => 'Montag, 8. August 2011',
116 -'room' => 'Gewünschtes Zimmer',
 116+'room' => 'Gewünschtes Zimmer',
117117 'room1' => 'Einzelbelegung',
118118 'room2' => 'Doppelbelegung mit einem zufällig gewählten Teilnehmer gleichen Geschlechts',
119119 'room3' => 'Doppelbelegung mit einem bestimmten Partner (bitte vollen Namen angeben):',
@@ -148,8 +148,8 @@
149149 'color' => 'T-Shirt-Farbe',
150150 'white' => 'weiss',
151151 'black' => 'schwarz',
152 -'nationality' => 'Reisepass ausgestellt durch',
153 -'countryofbirth' => 'Geburtsland',
 152+'nationality' => 'Reisepass ausgestellt durch',
 153+'countryofbirth' => 'Geburtsland',
154154 'homeaddress' => 'Heimatadresse',
155155 'picktour' => 'Gewünschte Tour',
156156 'tour0' => 'kein bestimmter Wunsch',
@@ -157,7 +157,7 @@
158158 'tour2' => 'Jerusalem',
159159 'tour3' => 'Akkon (Acco)',
160160 'tour4' => 'die Hängenden Gärten der Bahai',
161 -'tour5' => 'Drusen-Dörfer',
 161+'tour5' => 'Drusen-Dörfer',
162162 'main_date' => 'Haupt-Konferenztag',
163163 'captcha' => 'CAPTCHA-Information'
164164 );
@@ -165,7 +165,7 @@
166166
167167 $lang_messages = array(
168168 'successful' => 'Registrierung abgeschlossen',
169 -'successful_description' =>
 169+'successful_description' =>
170170 '<p>Vielen Dank für Ihre Teilnahme an Wikimania 2011! Ihre Registrierun wurde übermittelt. Bitte beachten Sie, dass Sie die Zahlung vornehmen müssen, bevor die Registrierung bestätigt werden kann.
171171
172172 Ihre <strong>Registrierungsnummer</strong> wird unten angezeigt. Bitte notieren Sie sich diese Nummer, da Sie sie benötigen um Ihren Registrierungsstatus abzufragen und zukünftig Ihre Identität zu prüfen.
Index: trunk/wikimania/wmreg/includes/SqlConnect-mysql.php
@@ -2,35 +2,35 @@
33 /* ToyCastle project */
44
55 /* Prevent hacking */
6 -if(!defined('TC_STARTED'))
7 -{ die('Hacking Attempt'); }
 6+if ( !defined( 'TC_STARTED' ) )
 7+{ die( 'Hacking Attempt' ); }
88
99 /* Class SqlConnect start */
1010 Class SqlConnect
1111 {
1212 var $handle;
13 - var $database_name;
 13+ var $database_name;
1414
15 - function Start($sql_server,$sql_name,$sql_password,$sql_database_name,$sql_persistency=false)
16 - {
17 - if($this->handle) return false;
18 -
 15+ function Start( $sql_server, $sql_name, $sql_password, $sql_database_name, $sql_persistency = false )
 16+ {
 17+ if ( $this->handle ) return false;
 18+
1919 /* Start Connect */
20 - if($sql_persistency)
 20+ if ( $sql_persistency )
2121 {
22 - $this->handle = mysql_pconnect($sql_server,$sql_name,$sql_password);
 22+ $this->handle = mysql_pconnect( $sql_server, $sql_name, $sql_password );
2323 }
2424 else
2525 {
26 - $this->handle = mysql_connect($sql_server,$sql_name,$sql_password);
 26+ $this->handle = mysql_connect( $sql_server, $sql_name, $sql_password );
2727 }
2828
29 - if($this->handle)
 29+ if ( $this->handle )
3030 {
3131 /* force to use UTF-8 */
32 - @mysql_query('SET NAMES \'utf8\'');
33 -
34 - if(mysql_select_db($sql_database_name))
 32+ @mysql_query( 'SET NAMES \'utf8\'' );
 33+
 34+ if ( mysql_select_db( $sql_database_name ) )
3535 {
3636 $this->database_name = $sql_database_name;
3737 return true;
@@ -46,21 +46,21 @@
4747 }
4848 }
4949
50 - function Query($query_string)
51 - {
52 - return mysql_query($query_string,$this->handle);
 50+ function Query( $query_string )
 51+ {
 52+ return mysql_query( $query_string, $this->handle );
5353 }
54 - function fetchArray($query_result)
 54+ function fetchArray( $query_result )
5555 {
56 - return mysql_fetch_array($query_result);
 56+ return mysql_fetch_array( $query_result );
5757 }
58 - function fetchAssoc($query_result)
 58+ function fetchAssoc( $query_result )
5959 {
60 - return mysql_fetch_assoc($query_result);
 60+ return mysql_fetch_assoc( $query_result );
6161 }
6262 function fetchRow()
6363 {
64 - return mysql_fetch_row($query_result);
 64+ return mysql_fetch_row( $query_result );
6565 }
6666 /*
6767 Function : EscapeString
@@ -69,221 +69,221 @@
7070 Return values : true if success,false if failed
7171 Last modified : 2006/04/25 littleb
7272 */
73 - function EscapeString($unescaped_string)
 73+ function EscapeString( $unescaped_string )
7474 {
7575 /* No Connect, No Escape */
76 - if(!$this->handle) return false;
 76+ if ( !$this->handle ) return false;
7777
78 - if(function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) $unescaped_string = stripslashes($unescaped_string);
 78+ if ( function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc() ) $unescaped_string = stripslashes( $unescaped_string );
7979
8080 /* Try Escape String by MySQL */
81 - $escape_result = @mysql_real_escape_string($unescaped_string,$this->handle);
 81+ $escape_result = @mysql_real_escape_string( $unescaped_string, $this->handle );
8282 /* Try Escape String by php */
83 - if(!$escape_result) {$escape_result = @mysql_escape_string($unescaped_string);}
 83+ if ( !$escape_result ) { $escape_result = @mysql_escape_string( $unescaped_string ); }
8484 /* Finally, Try addslashes */
85 - if(!$escape_result) {$escape_result = @addslashes($unescaped_string);}
 85+ if ( !$escape_result ) { $escape_result = @addslashes( $unescaped_string ); }
8686
87 -
 87+
8888 return $escape_result;
8989 }
9090 /*SHOW TABLES FROM db_name LIKE 'pattern'*/
9191 /* function isTableExist($table_name)*/
92 - //{
 92+ // {
9393 /* No Connect, No Action */
94 - //if(!$this->handle) return false;
95 -
 94+ // if(!$this->handle) return false;
 95+
9696 /*MySQL Query */
97 - //$this->query('SHOW TABLE FROM `'. $this->database_name .'` LIKE\''. preg_replace('\_','\\\_',$this->EscapeString($table_name) .'\'');
98 - //}
 97+ // $this->query('SHOW TABLE FROM `'. $this->database_name .'` LIKE\''. preg_replace('\_','\\\_',$this->EscapeString($table_name) .'\'');
 98+ // }
9999
100100
101 - function insertData($table, $data_array)
 101+ function insertData( $table, $data_array )
102102 {
103103
104104 /* No Connect, No Action */
105 - if(!$this->handle) return false;
 105+ if ( !$this->handle ) return false;
106106
107107 /* Must be an array */
108 - if (!is_array($data_array)) return false;
 108+ if ( !is_array( $data_array ) ) return false;
109109
110110 /* No special table name */
111 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $table)) return false;
 111+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $table ) ) return false;
112112
113113 /* No Multi-Dimentional Array and special column name; Escape Strings */
114 - foreach ($data_array as $key => $value)
 114+ foreach ( $data_array as $key => $value )
115115 {
116 - if (empty($key)) return false;
117 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $key)) return false;
118 - if (is_array($value)) return false;
119 - $data_array[$key] = $this->EscapeString($value);
 116+ if ( empty( $key ) ) return false;
 117+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $key ) ) return false;
 118+ if ( is_array( $value ) ) return false;
 119+ $data_array[$key] = $this->EscapeString( $value );
120120 }
121 -
 121+
122122 /* Prepare Query */
123 - $queryString = 'INSERT INTO `'.$table.'` (`'.implode('`, `', array_keys($data_array)).'`)'.
124 - ' VALUES (\''.implode('\', \'', /* Esacped in Foreach */array_values($data_array)).'\');';
125 - return $this->Query($queryString);
 123+ $queryString = 'INSERT INTO `' . $table . '` (`' . implode( '`, `', array_keys( $data_array ) ) . '`)' .
 124+ ' VALUES (\'' . implode( '\', \'', /* Esacped in Foreach */array_values( $data_array ) ) . '\');';
 125+ return $this->Query( $queryString );
126126 }
127 - function updateData($table, $data_array, $where_parameters)
 127+ function updateData( $table, $data_array, $where_parameters )
128128 {
129129 /* No Connect, No Action */
130 - if(!$this->handle)
 130+ if ( !$this->handle )
131131 { return false; }
132132
133133 /* Must be an array */
134 - if (!is_array($data_array))
 134+ if ( !is_array( $data_array ) )
135135 { return false; }
136136
137137 /* No special table name */
138 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $table))
 138+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $table ) )
139139 { return false; }
140 -
 140+
141141 $data_parameters = '';
142142
143143 /* No Multi-Dimentional Array and special field name; Escape Strings */
144 - foreach ($data_array as $key => $value)
 144+ foreach ( $data_array as $key => $value )
145145 {
146 - if (empty($key)) return false;
147 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $key)) return false;
148 - if (is_array($value)) return false;
 146+ if ( empty( $key ) ) return false;
 147+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $key ) ) return false;
 148+ if ( is_array( $value ) ) return false;
149149
150 - if (empty($data_parameters))
151 - { $data_parameters = '`' . $key . '` = \'' . $this->EscapeString($value) . '\'';}
 150+ if ( empty( $data_parameters ) )
 151+ { $data_parameters = '`' . $key . '` = \'' . $this->EscapeString( $value ) . '\''; }
152152 else
153 - { $data_parameters .= ', `' . $key . '` = \'' . $this->EscapeString($value) . '\'';}
 153+ { $data_parameters .= ', `' . $key . '` = \'' . $this->EscapeString( $value ) . '\''; }
154154 }
155 -
 155+
156156 /* Prepare Query */
157 - $queryString = 'UPDATE `'.$table.'` SET '. /* Esacped in Foreach */ $data_parameters . ' WHERE ' . $where_parameters;
 157+ $queryString = 'UPDATE `' . $table . '` SET ' . /* Esacped in Foreach */ $data_parameters . ' WHERE ' . $where_parameters;
158158
159 - return $this->Query($queryString);
 159+ return $this->Query( $queryString );
160160 }
161161
162162
163 - function removeData($table, $where_parameters)
 163+ function removeData( $table, $where_parameters )
164164 {
165165 /* No Connect, No Action */
166 - if(!$this->handle)
 166+ if ( !$this->handle )
167167 { return false; }
168168
169169 /* No special table name */
170 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $table))
 170+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $table ) )
171171 { return false; }
172172
173173 /* Prepare Query */
174 - $queryString = 'DELETE FROM `'.$table.'` WHERE ' . $where_parameters;
 174+ $queryString = 'DELETE FROM `' . $table . '` WHERE ' . $where_parameters;
175175
176176 /* FIXME: DEVELOPEMENT USE ONLY ***/
177 - /**/echo $queryString; return 1;/**/
178 - /* END FIXME **********************/
179 -
180 - return $this->Query($queryString);
181 - }
182 - function selectData($table, $field_array = array(), $where_parameters = '', $order_array = array(), $other_array = array())
 177+ /**/echo $queryString; return 1; /**/
 178+ /* END FIXME **********************/
 179+
 180+ return $this->Query( $queryString );
 181+ }
 182+ function selectData( $table, $field_array = array(), $where_parameters = '', $order_array = array(), $other_array = array() )
183183 {
184184 /* FIXME: add support of multi-table */
185 - if (empty($other_array) || ! is_array($other_array))
 185+ if ( empty( $other_array ) || ! is_array( $other_array ) )
186186 { $other_array = array(); }
187187
188188 /* No Connect, No Action */
189 - if(!$this->handle)
 189+ if ( !$this->handle )
190190 { return false; }
191191
192192 /* Must be an array or empty */
193 - if (!is_array($field_array) && !empty($field_array))
 193+ if ( !is_array( $field_array ) && !empty( $field_array ) )
194194 { return false; }
195195
196196 /* No special table name */
197 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $table))
 197+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $table ) )
198198 { return false; }
199199
200200 $field_parameters = '';
201201
202202 /* distinct process */
203 - if ($other_array['distinct'])
 203+ if ( $other_array['distinct'] )
204204 {
205205
206206 /* Only one field is ok */
207 - if (count($field_array) !=1)
 207+ if ( count( $field_array ) != 1 )
208208 { return false; }
209209
210210 /* pop the only value */
211 - $value = array_pop($field_array);
 211+ $value = array_pop( $field_array );
212212
213213 /* No Multi-Dimentional Array and special field name; Escape Strings */
214 - if (empty($value)) return false;
215 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $value)) return false;
216 - if (is_array($value)) return false;
 214+ if ( empty( $value ) ) return false;
 215+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $value ) ) return false;
 216+ if ( is_array( $value ) ) return false;
217217
218 - if ($other_array['count'])
219 - { $field_parameters .= 'COUNT( DISTINCT `'. $value .'` )'; }
 218+ if ( $other_array['count'] )
 219+ { $field_parameters .= 'COUNT( DISTINCT `' . $value . '` )'; }
220220 else
221 - { $field_parameters .= 'DISTINCT `' . $value . '`';}
 221+ { $field_parameters .= 'DISTINCT `' . $value . '`'; }
222222
223223 }
224224 else
225225 {
226226 /* count? */
227 - if ($other_array['count'])
 227+ if ( $other_array['count'] )
228228 $field_parameters .= 'COUNT(';
229 -
230 - /* Select All Fields */
231 - if (empty($field_array))
 229+
 230+ /* Select All Fields */
 231+ if ( empty( $field_array ) )
232232 { $field_parameters .= '*'; }
233233 else
234 - {
 234+ {
235235 /* No Multi-Dimentional Array and special field name; Escape Strings */
236 - foreach ($field_array as $value)
 236+ foreach ( $field_array as $value )
237237 {
238 - if (empty($value)) return false;
239 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $value)) return false;
240 - if (is_array($value)) return false;
241 - }
242 - $field_parameters .= '`'.implode('`, `', $field_array).'`';
 238+ if ( empty( $value ) ) return false;
 239+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $value ) ) return false;
 240+ if ( is_array( $value ) ) return false;
 241+ }
 242+ $field_parameters .= '`' . implode( '`, `', $field_array ) . '`';
243243 }
244 -
 244+
245245 /* count? */
246 - if ($other_array['count'])
 246+ if ( $other_array['count'] )
247247 $field_parameters .= ')';
248248 }
249 -
250 - /* Select All Fields */
251 - if (empty($order_array))
 249+
 250+ /* Select All Fields */
 251+ if ( empty( $order_array ) )
252252 { $order_parameters = ''; }
253253 else
254 - {
 254+ {
255255 /* No Multi-Dimentional Array and special field name; Escape Strings */
256 - foreach ($order_array as $value)
 256+ foreach ( $order_array as $value )
257257 {
258 - if (empty($value)) return false;
259 - if (preg_match('/[^0-9A-Z\.\_\-]/i', $value)) return false;
260 - if (is_array($value)) return false;
261 - }
262 - $order_parameters = ' ORDER BY `'.implode('`, `', $order_array).'`';
263 - if ($other_array['asc'])
264 - {$order_parameters .= ' ASC';}
 258+ if ( empty( $value ) ) return false;
 259+ if ( preg_match( '/[^0-9A-Z\.\_\-]/i', $value ) ) return false;
 260+ if ( is_array( $value ) ) return false;
 261+ }
 262+ $order_parameters = ' ORDER BY `' . implode( '`, `', $order_array ) . '`';
 263+ if ( $other_array['asc'] )
 264+ { $order_parameters .= ' ASC'; }
265265 else
266 - {$order_parameters .= 'DESC';}
 266+ { $order_parameters .= 'DESC'; }
267267 }
268268
269269 /* page set */
270 - $other_array['start'] = intval($other_array['start']);
271 - $other_array['total'] = intval($other_array['total']);
 270+ $other_array['start'] = intval( $other_array['start'] );
 271+ $other_array['total'] = intval( $other_array['total'] );
272272
273 - if ($other_array['start'] >=0 && $other_array['total'] > 0 )
 273+ if ( $other_array['start'] >= 0 && $other_array['total'] > 0 )
274274 {
275 - $order_parameters .= ' LIMIT ' . $other_array['start'] . ', '. $other_array['total'] ;
 275+ $order_parameters .= ' LIMIT ' . $other_array['start'] . ', ' . $other_array['total'] ;
276276 }
277277 else
278278 {
279279 /* FIXME: unset */
280280 }
281 -
282 - if (empty($where_parameters))
 281+
 282+ if ( empty( $where_parameters ) )
283283 { $where_parameters = '1'; }
284284
285285 /* Prepare Query */
286 - $queryString = 'SELECT ' . $field_parameters .' FROM `'.$table.'` WHERE ' . $where_parameters. $order_parameters;
287 - return $this->Query($queryString);
288 - }
 286+ $queryString = 'SELECT ' . $field_parameters . ' FROM `' . $table . '` WHERE ' . $where_parameters . $order_parameters;
 287+ return $this->Query( $queryString );
 288+ }
289289 }
290290 ?>
Index: trunk/wikimania/wmreg/includes/notinuse/language_fa.php
@@ -1,12 +1,12 @@
22 <?php
3 -
 3+
44 $lang_register_form = array(
55 'registration_title' => 'ثبت نام در ویکی‌مانیا ۲۰۰۸',
66 'select' => 'لطفاً انتخاب کنید',
77 'query' => 'پیگیری وضعیت ثبت نام',
88 'query_title' => 'در این قسمت می‌توانید وضعیت ثبت نام در ویکی‌مانیا ۲۰۰۸ را پیگیری کنید.',
99 'correction' => 'اطلاعات شما ثبت نشده چرا که اشتباهی در آن وجود دارد.',
10 -
 10+
1111 'legend1' => 'اطلاعات شخصی',
1212 'title1' =>
1313 ' <p><div align="right"><strong>اطلاعات شخصی</strong></div></div></p>
@@ -17,51 +17,51 @@
1818 'egy0' => 'خیر، نیستم. (لطفاً شماره گذرنامه و نام خود را نظیر آن چه در گذرنامه آمده در قسمت‌های زیر وارد کنید)',
1919 'surname' => 'نام خانوادگی',
2020 'given_name' => 'نام',
21 -'sex' => 'جنسیت',
 21+'sex' => 'جنسیت',
2222 'sex1' => 'مرد',
2323 'sex2' => 'زن',
2424 'sex3' => 'نمی‌خواهم بگویم',
25 -'id' => 'شمارهٔ شناسنامه / گذرنامه',
26 -'country' => 'کشور / منطقه',
27 -'city' => 'استان / شهر',
 25+'id' => 'شمارهٔ شناسنامه / گذرنامه',
 26+'country' => 'کشور / منطقه',
 27+'city' => 'استان / شهر',
2828 'birthday' => 'تاریخ تولد (dd/mm/yyyy)',
2929 'organization' => 'سازمان',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, 'ژانویه', 'فوریه', 'مارس', 'آوریل', 'مه', 'ژوئن', 'ژوئیه', 'اوت', 'سپتامبر', 'اکتبر', 'نوامبر', 'دسامبر'),
34 -'day' => '',
35 -
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, 'ژانویه', 'فوریه', 'مارس', 'آوریل', 'مه', 'ژوئن', 'ژوئیه', 'اوت', 'سپتامبر', 'اکتبر', 'نوامبر', 'دسامبر' ),
 34+'day' => '',
 35+
3636 'title2' =>
3737 ' <p><div align="right"><strong>توانایی‌های زبانی</strong></div></div></p>',
38 -'langn' => 'زبان مادری',
39 -'lang' => 'سطح مهارت',
 38+'langn' => 'زبان مادری',
 39+'lang' => 'سطح مهارت',
4040 'select_lang' => 'زبان را انتخاب کنید',
4141 'select_level' => 'سطح مهارت را انتخاب کنید',
42 -
 42+
4343 'lang_level1' => '۱ (مقدماتی)',
4444 'lang_level2' => '۲ (متوسط)',
4545 'lang_level3' => '۳ (پیشرفته)',
4646 'lang_level4' => '۴ (در حد زبان مادری)',
47 -
 47+
4848 'lang1' => 'زبان ۱',
4949 'lang2' => 'زبان ۲',
5050 'lang3' => 'زبان ۳',
51 -
 51+
5252 'lang1_level' => 'سطح مهارت در زبان ۱',
5353 'lang2_level' => 'سطح مهارت در زبان ۲',
5454 'lang3_level' => 'سطح مهارت در زبان ۳',
55 -
56 -'title3' =>
 55+
 56+'title3' =>
5757 ' <p><div align="right"><strong>پروژه و نشانی پست الکترونیکی در ویکی‌مدیا</strong>
5858 <br>
5959 پست الکترونیکی شما تنها برای ثبت نام و تماس‌های ضروری دربارهٔ ویکی‌مانیا ۲۰۰۸ استفاده خواهد شد.
6060 </div></p>
61 -',
62 -'wiki_id' => 'حساب کاربری در پروژه دلخواه ویکی‌مدیا',
63 -'email' => 'پست الکترونیکی شما',
64 -
65 -
 61+',
 62+'wiki_id' => 'حساب کاربری در پروژه دلخواه ویکی‌مدیا',
 63+'email' => 'پست الکترونیکی شما',
 64+
 65+
6666 'legend2' => 'شرکت کردن',
6767 'title4' =>
6868 ' <p><div align="right"><strong>شرکت کردن، اطلاعات نشان فردی و سایر موارد</strong></div></p>
@@ -71,7 +71,7 @@
7272 'join1' => '۱۷ ژوئیه',
7373 'join2' => '۱۸ ژوئیه',
7474 'join3' => '۱۹ ژوئیه',
75 -'topic' => 'نشست‌های انتخابی',
 75+'topic' => 'نشست‌های انتخابی',
7676 'topic1' => 'جامعه‌های ویکی‌مدیا',
7777 'topic2' => 'محتوای آزاد',
7878 'topic3' => 'زیرساخت فنی',
@@ -82,7 +82,7 @@
8383 'showname2' => 'حساب کاربری ویکی‌مدیا',
8484 'showname3' => 'سازمان',
8585 'showname4' => 'سایر',
86 -'size' => 'اندازه تی-شرت',
 86+'size' => 'اندازه تی-شرت',
8787 'food' => 'رژیم غذایی',
8888 'food0' => '-',
8989 'food1' => 'بدون گوشت',
@@ -91,54 +91,54 @@
9292 'food4' => 'حلال خوار',
9393 'food5' => 'سایر',
9494 'food_other' => 'رژیم غذایی ذکر شده',
95 -'allegric' => 'حساسیت (آلرژی)',
96 -'transportation_assistance' =>'کمک بلیط‌های پروازها',
 95+'allegric' => 'حساسیت (آلرژی)',
 96+'transportation_assistance' => 'کمک بلیط‌های پروازها',
9797 'need_transportation_assistance' => ' بله ،من به کمک شما در رزرو بلیط پروازم نیاز دارم.',
98 -'visa_assistance' => 'کمک برای روادید',
 98+'visa_assistance' => 'کمک برای روادید',
9999 'need_visa_assistance' => 'بله، نیاز به کمک برای دریافت روادید دارم',
100100 'visa_assistance_description' => 'لطفاً مشخیص کنید که تیم سازمانی چگونه می‌تواند به شما در اخذ روادید کمک کند. (به زبان <strong>عربی</strong> یا <strong>انگلیسی</strong> بنویسید)',
101 -
 101+
102102 'title5' =>
103103 ' <p><div align="right"><strong>اسکان</strong></div></p>
104104 <p><div align="right">ما دو گزینه برای اسکان پیش روی شما گذاشته‌ایم. شما می‌توانید در یک هتل اقامت کنید، یا در خوابگاه‌های کالج سنت-مارک باشید.
105105 لطفاً جزئیات بیشتر را در <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>وبگاه رسمی ویکی‌مانیا</a> ببینید تا پیش از ثبت نام از مکان دقیق و خصوصیات هر یک از دو گزینه آگاه شوید.</div></p>
106106 ',
107107 'accommodation_hotel' => 'هتل انتخابی',
108 -'hotels_metropol'=> 'هتل متروپول (۶۰ دلار برای هر شب)',
109 -'hotels_delta'=> 'هتل دلتا (۳۰ دلار برای هر شب)',
 108+'hotels_metropol' => 'هتل متروپول (۶۰ دلار برای هر شب)',
 109+'hotels_delta' => 'هتل دلتا (۳۰ دلار برای هر شب)',
110110 'hotels_dorms' => 'خوابگاه سنت-مارک (۱۰ دلار برای هر شب)',
111 -
112 -'accommodation' => 'تاریخ اقامت',
 111+
 112+'accommodation' => 'تاریخ اقامت',
113113 'night1' => '۱۶ ژوئیه',
114114 'night2' => '۱۷ ژوئیه',
115115 'night3' => '۱۸ ژوئیه',
116116 'night4' => '۱۹ ژوئیه',
117117 'night5' => '۲۰ ژوئیه',
118 -'room' => 'اتاق انتخابی',
 118+'room' => 'اتاق انتخابی',
119119 'room2' => 'دو نفره',
120120 'room4' => 'چهار نفره',
121121 'room6' => 'فرقی نمی‌کند',
122 -
 122+
123123 'title6' =>
124124 ' <p><div align="right"><strong>پرداخت</strong></div></p>
125125 <p><div align="right">در <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">۱۰۳ منطقه / کشور</a> (شامل مصر نمی‌شود) شما می‌توانید از حساب PayPal خود پرداخت را انجام دهید یا کارت اعتباری خود را از طریق PayPal استفاده کنید، یا می‌توانید از Remittance و پرداخت مستقیم به حساب بانکی متعلق به تیم سازمانی ساکن در اسکندریه پرداخت را انجام دهید. توجه: اگر اهل مصر هستید نمی‌توانید از روش PayPal استفاده کنید</div></p>
126126 ',
127 -
128 -'pay_method' => 'روش پرداخت',
 127+
 128+'pay_method' => 'روش پرداخت',
129129 'atm' => 'پرداخت از طریق حساب بانکی',
130130 'receipt' => 'رسید',
131 -'need_receipt' => 'بله، من یک رسید چاپی می‌خواهم.',
132 -'receipt_title' => 'عنوان',
133 -'receipt_address' => 'نشانی پستی',
134 -
 131+'need_receipt' => 'بله، من یک رسید چاپی می‌خواهم.',
 132+'receipt_title' => 'عنوان',
 133+'receipt_address' => 'نشانی پستی',
 134+
135135 'submit_notice' =>
136136 '<li><strong>بعد از این که فرم را ارسال کنید، هنوز فرصت دارید که اطلاعات را بازبینی کنید.</strong></li>',
137137 'submit' => 'ارسال',
138138 'reset' => 'از نو',
139 -
 139+
140140 'confirm' => 'بازبینی',
141141 'confirm_description' => 'قبل از این که فرم را ارسال کنید، لطفاً از درستی اطلاعات زیر اطمینان حاصل کنید:',
142 -
 142+
143143 'paypal' => 'پرداخت از طریق PayPal',
144144 'paypal_description' =>
145145 '<p><div align="right">لطفاً دکمهٔ «Buy Now» را بزنید تا از طریق PayPal پرداخت کنید</div></p> ',
@@ -163,12 +163,12 @@
164164 <p><div align="right">همچنین لطفاً رسید پرداخت را به شکل الکترونیکی به همراه نام و شماره ثبت نام خود به نشانی regwikimania2008 AT wikimedia.org بفرستید؛ ما ظرف سه روز کاری به شما پاسخ خواهیم داد. شما همچنین می‌توانید <a href="index.php?action=query" title="query the registration status">وضعیت ثبت‌نام خود را به صورت برخط پیگیری کنید</a>.</div></p>
165165 '
166166 );
167 -
 167+
168168 $lang_messages = array(
169169 'successful' => 'ثبت نام کامل شد',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p><div align="right">از این که به ویکی‌مانیا ۲۰۰۸ پیوستید متشکریم! فرم ثبت نام شما ارسال شده‌است. لطفاً توجه داشته باشید که برای تایید ثبت نام باید روال پرداخت هزینه‌ها را کامل کنید.
172 -
 172+
173173 <strong>شماره ثبت</strong> شما در زیر نمایش داده می‌شود. لطفاً این شماره را به خاطر بسپارید تا بعداً برای پیگیری ثبت نام یا تایید هویت خودتان از آن استفاده نمایید.
174174 ',
175175 'cost' => 'هزینهٔ ثبت نام',
@@ -179,7 +179,7 @@
180180 'usd' => ' دلار آمریکا',
181181 'egp' => ' پوند مصر',
182182 );
183 -
 183+
184184 $lang_errors = array(
185185 'repeat' => 'فرد دیگری با همین نام و شماره شناسنامه / گذرنامه ثبت نام کرده‌است. امکان دارد که شما فرم را دو بار ارسال کرده باشید یا صفحه را ثبت نام را از نو کرده باشید..',
186186 'not_input' => '$1 خالی است.',
@@ -193,7 +193,7 @@
194194 'wrong_query' => 'نام یا شماره ثبت اشتباه.',
195195 'paypal_unavailable' => 'کشور / منطقه‌ای که انتخاب کردید توسط PayPal پشتیبانی نمی‌شود.'
196196 );
197 -
 197+
198198 $lang_query = array(
199199 'unique_code' => 'شماره ثبت',
200200 'submit' => 'پیگیری',
@@ -205,9 +205,9 @@
206206 'accepted' => 'ثبت نام شما <strong>تایید شده‌است</strong>.',
207207 'rejected' => 'ثبت نام شما <strong>رد شده‌است</strong>.',
208208 'not_yet' => 'ثبت نام شما <strong>تایید نشده‌است</strong>.'
209 -
 209+
210210 );
211 -
 211+
212212 $lang_countries = array(
213213 'af' => 'Afghanistan',
214214 'ax' => 'Aland Islands',
Index: trunk/wikimania/wmreg/includes/notinuse/language_es.php
@@ -17,25 +17,25 @@
1818 'egy0' => 'No. (Por favor escribe tu número de pasaporte y tu nombre tal como figura en el pasaporte en los siguientes campos)',
1919 'surname' => 'Apellido',
2020 'given_name' => 'Nombre',
21 -'sex' => 'Sexo',
 21+'sex' => 'Sexo',
2222 'sex1' => 'Masculino',
2323 'sex2' => 'Femenino',
2424 'sex3' => 'No declara',
25 -'id' => 'Número de identificación / Número de Pasaporte',
26 -'country' => 'País / Región',
27 -'city' => 'Estado / Ciudad',
 25+'id' => 'Número de identificación / Número de Pasaporte',
 26+'country' => 'País / Región',
 27+'city' => 'Estado / Ciudad',
2828 'birthday' => 'Fecha de Nacimiento (dd/mm/aaaa)',
2929 'organization' => 'Organización',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, 'Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, 'Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>Habilidades lingüísticas</strong></p>',
38 -'langn' => 'Idioma nativo',
39 -'lang' => 'Nivel',
 38+'langn' => 'Idioma nativo',
 39+'lang' => 'Nivel',
4040 'select_lang' => 'Selecciona un idioma',
4141 'select_level' => 'Selecciona el nivel',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => 'Nivel del idioma 2',
5454 'lang3_level' => 'Nivel del idioma 3',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>Proyecto de Wikimedia y dirección/es de correo electrónico</strong></p>
5858 <ul class="form_notice">
5959 <li>Tu correo electrónico sólo será utilizado para la inscripción y para notificaciones urgentes sobre Wikimania 2008.</li>
6060 </ul>
61 -',
62 -'wiki_id' => 'Nombre de la cuenta de tu proyecto Wikimedia preferido',
63 -'email' => 'Tu correo electrónico',
 61+',
 62+'wiki_id' => 'Nombre de la cuenta de tu proyecto Wikimedia preferido',
 63+'email' => 'Tu correo electrónico',
6464
6565
6666 'legend2' => 'Participación',
@@ -71,7 +71,7 @@
7272 'join1' => '17 de julio',
7373 'join2' => '18 de julio',
7474 'join3' => '19 de julio',
75 -'topic' => 'Área preferida',
 75+'topic' => 'Área preferida',
7676 'topic1' => 'Comunidades Wikimedia',
7777 'topic2' => 'Contenido libre',
7878 'topic3' => 'Infraestructura técnica',
@@ -82,7 +82,7 @@
8383 'showname2' => 'Cuenta de Wikimedia',
8484 'showname3' => 'Organización',
8585 'showname4' => 'Otro',
86 -'size' => 'Talla de remera',
 86+'size' => 'Talla de remera',
8787 'food' => 'Restricciones en la dieta',
8888 'food0' => '-',
8989 'food1' => 'No como carne',
@@ -91,10 +91,10 @@
9292 'food4' => 'Kosher',
9393 'food5' => 'Otras',
9494 'food_other' => 'Restricciones especificadas en la dieta',
95 -'allegric' => 'Alguna alergia',
 95+'allegric' => 'Alguna alergia',
9696 'transportation_assistance' => 'Asistencia para boletos de viaje',
9797 'need_transportation_assistance' => 'Sí, necesito que me ayuden con mi reservación',
98 -'visa_assistance' => 'Ayuda para obtener la visa',
 98+'visa_assistance' => 'Ayuda para obtener la visa',
9999 'need_visa_assistance' => 'Sí, necesito ayuda para obtener la visa',
100100 'visa_assistance_description' => ' Por favor indícanos cómo puede ayudarte el equipo organizador a obtener la visa. (en <strong>Árabe</strong> o <strong>Inglés</strong>)',
101101
@@ -104,17 +104,17 @@
105105 Por favor mira los detalles en el <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>sitio oficial de Wikimania</a> para conocer la localización y especificaciones exactas de cada opción antes de registrarte.</p>
106106 ',
107107 'accommodation_hotel' => 'Hotel preferido.',
108 -'hotels_metropol'=> 'Hotel Metropol ($60 por noche)',
109 -'hotels_delta'=> 'Hotel Delta ($30 por noche)',
 108+'hotels_metropol' => 'Hotel Metropol ($60 por noche)',
 109+'hotels_delta' => 'Hotel Delta ($30 por noche)',
110110 'hotels_dorms' => 'Dormitorios en Saint Marc ($10 por noche)',
111111
112 -'accommodation' => 'Fechas de estadía',
 112+'accommodation' => 'Fechas de estadía',
113113 'night1' => '16 de julio',
114114 'night2' => '17 de julio',
115115 'night3' => '18 de julio',
116116 'night4' => '19 de julio',
117117 'night5' => '20 de julio',
118 -'room' => 'Preferencia de habitación',
 118+'room' => 'Preferencia de habitación',
119119 'room2' => 'doble',
120120 'room4' => 'cádruple',
121121 'room6' => 'Cualquiera',
@@ -124,12 +124,12 @@
125125 <p>Puedes utilizar tu cuenta Paypal o pagar utilizando tu tarjeta de crédito a través de PayPal en <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">103 países / regiones</a> (No incluye Egipto) o por transferencia y pago directo a la cuenta bancaria del equipo organizador en Alejandría. Nota: la opción de PayPal será descartada si eres egipcio</p>
126126 ',
127127
128 -'pay_method' => 'Tipo de Pago',
 128+'pay_method' => 'Tipo de Pago',
129129 'atm' => 'Pago a través de cuenta bancaria',
130130 'receipt' => 'Recibo',
131 -'need_receipt' => 'Sí, necesito recibo impreso.',
132 -'receipt_title' => 'Título',
133 -'receipt_address' => 'Dirección postal',
 131+'need_receipt' => 'Sí, necesito recibo impreso.',
 132+'receipt_title' => 'Título',
 133+'receipt_address' => 'Dirección postal',
134134
135135 'submit_notice' =>
136136 '<li><strong>Luego de enviar el formulario, tendrás la posibilidad de verificar su inscripción.</strong></li>',
@@ -166,7 +166,7 @@
167167
168168 $lang_messages = array(
169169 'successful' => 'Inscripción completa',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p>¡Gracias por sumarte a Wikimania 2008! Tu formulario de inscripción fue aceptado. Por favor, ten en cuenta que necesitas completar el proceso de pago para que la inscripción pueda ser confirmada.
172172
173173 Tu <strong>número de inscripción</strong> será mostrado debajo. Por favor, anota este número ya que será utilizado para consultar el estado de tu inscripción y para confirmar tu identidad en el futuro.
Index: trunk/wikimania/wmreg/includes/notinuse/language_fr.php
@@ -4,36 +4,36 @@
55 'registration_title' => 'Enregistrement Wikimania 2008!',
66 'select' => 'S’il vous plaît sélectionnez',
77 'query' => 'Demander votre formulaire d\'enregistrement',
8 -'query_title' => 'Vous pouvez demander votre formulaire
 8+'query_title' => 'Vous pouvez demander votre formulaire
99
1010 d\'enregistrement à Wikimania 2008 ici.',
11 -'correction' => 'Vos informations n\'ont pas été envoyées à
 11+'correction' => 'Vos informations n\'ont pas été envoyées à
1212
1313 cause d\'erreurs dans le formulaire.',
1414
1515 'legend1' => 'Informations personnelles',
1616 'title1' =>
17 -' <p><strong>Données d\'identification
 17+' <p><strong>Données d\'identification
1818
1919 personnelle</strong></p>
20 - <p>S’il vous plaît remplir vos données personnelles
 20+ <p>S’il vous plaît remplir vos données personnelles
2121
2222 dans le formulaire correctement.</p>
2323 ',
24 -'egy' => 'Etes-vous un citoyen de la République arabe
 24+'egy' => 'Etes-vous un citoyen de la République arabe
2525
2626 d\'Egypte?',
27 -'egy1' => 'Oui. (S’il vous plaît taper votre numéro national
 27+'egy1' => 'Oui. (S’il vous plaît taper votre numéro national
2828
29 -d\'identification et votre nom dans les domaines
 29+d\'identification et votre nom dans les domaines
3030
3131 suivants).',
32 -'egy0' => 'No. (S’il vous plaît taper votre numéro de
 32+'egy0' => 'No. (S’il vous plaît taper votre numéro de
3333
34 -passeport et votre nom sur le passeport dans les domaines
 34+passeport et votre nom sur le passeport dans les domaines
3535
3636 suivants).',
37 -'local_language_name' => 'Nom arabe / Nom sur le passeport (S’il
 37+'local_language_name' => 'Nom arabe / Nom sur le passeport (S’il
3838
3939 vous plaît taper en forme romanisée).',
4040 'surname' => 'Nom',
@@ -50,15 +50,15 @@
5151 'year1' => '',
5252 'year' => '',
5353 'month' => '',
54 -'months' => array(NULL, 'janvier', 'février', 'mars',
 54+'months' => array( NULL, 'janvier', 'février', 'mars',
5555
56 -'avril', 'mai', 'juin', 'juillet', 'août', 'septembre',
 56+'avril', 'mai', 'juin', 'juillet', 'août', 'septembre',
5757
58 -'octobre', 'novembre', 'décembre'),
 58+'octobre', 'novembre', 'décembre' ),
5959 'day' => '',
6060
6161 'title2' =>
62 -' <p><strong>Connaissances
 62+' <p><strong>Connaissances
6363
6464 linguistiques</strong></p>',
6565 'langn' => 'Langue maternelle',
@@ -80,13 +80,13 @@
8181 'lang3_level' => 'Niveau d\'apprentissage de la langue 3',
8282
8383 'title3' =>
84 -' <p><strong>Projets Wikimedia et courrier
 84+' <p><strong>Projets Wikimedia et courrier
8585
8686 électronique(s)</strong></p>
8787 <ul class="form_notice">
88 - <li>Ces informations seront utilisées pour
 88+ <li>Ces informations seront utilisées pour
8989
90 -enregistrement et notifications urgentes sur Wikimania 2008
 90+enregistrement et notifications urgentes sur Wikimania 2008
9191
9292 seulement.</li>
9393 </ul>
@@ -97,14 +97,14 @@
9898
9999 'legend2' => 'Participation aux conférences',
100100 'title4' =>
101 -' <p><strong>Participation, informations sur le
 101+' <p><strong>Participation, informations sur le
102102
103103 badge, et divers</strong></p>
104 - <p>Pour mieux organiser le logement, les pistes de
 104+ <p>Pour mieux organiser le logement, les pistes de
105105
106 -conférences et les services connexes, s\'il vous plaît
 106+conférences et les services connexes, s\'il vous plaît
107107
108 -laissez-nous savoir vos préférences dans les domaines
 108+laissez-nous savoir vos préférences dans les domaines
109109
110110 suivants.</p>
111111 ',
@@ -133,39 +133,39 @@
134134 'food5' => 'Autres',
135135 'food_other' => 'Indication des restrictions alimentaires',
136136 'allegric' => 'Réactions allergiques',
137 -'transportation_assistance' => 'Assistance avec les billets d\'avions',
 137+'transportation_assistance' => 'Assistance avec les billets d\'avions',
138138 'need_transportation_assistance' => 'Oui, j’ai besoin de votre aide avec mes réservations de vols.',
139139 'visa_assistance' => 'Aide à l\'obtention du visa',
140 -'need_visa_assistance' => 'Oui, j\'ai besoin d\'aide pour
 140+'need_visa_assistance' => 'Oui, j\'ai besoin d\'aide pour
141141
142142 obtenir mon visa.',
143 -'visa_assistance_description' => 'Précisez comment nous
 143+'visa_assistance_description' => 'Précisez comment nous
144144
145 -pouvons vous aider à obtenir votre visa.(en
 145+pouvons vous aider à obtenir votre visa.(en
146146
147147 <strong>arabe</strong> et <strong>anglais</strong>)',
148148
149149 'title5' =>
150150 ' <p><strong>Logement</strong></p>
151 - <p>Vous avez deux options disponibles pour le
 151+ <p>Vous avez deux options disponibles pour le
152152
153 -logement: vous pouvez logé dans un hôtel du centre-ville à
 153+logement: vous pouvez logé dans un hôtel du centre-ville à
154154
155 -chambre double, ou vous pouvez rester dans les logements du
 155+chambre double, ou vous pouvez rester dans les logements du
156156
157 -Collège Saint-Marc. S\'il vous plaît vérifier les détails
 157+Collège Saint-Marc. S\'il vous plaît vérifier les détails
158158
159 -sur <a
 159+sur <a
160160
161161 href=http://wikimania2008.wikimedia.org/wiki/Accommodation>l
162162
163 -e site officiel de Wikimania</a> pour les localisations
 163+e site officiel de Wikimania</a> pour les localisations
164164
165165 précises et les spécifications avant de vous inscrire.</p>',
166166 'accommodation_hotel' => 'Logement préféré ',
167 -'hotels_metropol'=> 'Hôtel Metropol ($60 par nuit)',
168 -'hotels_delta'=> 'Hôtel Delta ($30 par nuit)',
169 -'hotels_dorms' => 'Chambres du Collège Saint Marc ($10 par
 167+'hotels_metropol' => 'Hôtel Metropol ($60 par nuit)',
 168+'hotels_delta' => 'Hôtel Delta ($30 par nuit)',
 169+'hotels_dorms' => 'Chambres du Collège Saint Marc ($10 par
170170
171171 nuit)',
172172
@@ -182,17 +182,17 @@
183183
184184 'title6' =>
185185 ' <p><strong>Paiement</strong></p>
186 - <p>Vous pouvez payer avec PayPal ou carte de crédit
 186+ <p>Vous pouvez payer avec PayPal ou carte de crédit
187187
188188 (via PayPal) en <a href="https://www.paypal.com/cgi-
189189
190 -bin/webscr?cmd=_display-approved-signup-countries-outside"
 190+bin/webscr?cmd=_display-approved-signup-countries-outside"
191191
192 -title="PayPal Worldwide">103 Pays et régions </a> (Egypte
 192+title="PayPal Worldwide">103 Pays et régions </a> (Egypte
193193
194 -non-inclus) ou par virement automatique au compte de banque
 194+non-inclus) ou par virement automatique au compte de banque
195195
196 -de l\'équipe organisatrice en Alexandrie. Note: l\'option
 196+de l\'équipe organisatrice en Alexandrie. Note: l\'option
197197
198198 PayPal sera écartée si vous êtes égyptien</p>
199199 ',
@@ -205,41 +205,41 @@
206206 'receipt_address' => 'Adresse d\'envoi',
207207
208208 'submit_notice' =>
209 -'<li><strong>Après avoir soumis le formulaire, vous avez
 209+'<li><strong>Après avoir soumis le formulaire, vous avez
210210
211 -toujours une chance de confirmer votre
 211+toujours une chance de confirmer votre
212212
213213 enregistrement.</strong></li>',
214214 'submit' => 'Valider le formulaire',
215215 'reset' => 'Recommencer',
216216
217217 'confirm' => 'Vérification',
218 -'confirm_description' => 'Avant de valider le formulaire,
 218+'confirm_description' => 'Avant de valider le formulaire,
219219
220220 vérifiez les données saisies :',
221221
222222 'paypal' => 'Paiement par PayPal',
223223 'paypal_description' =>
224 -'<p>S’il vous plaît, utiliser le bouton "Buy Now" ci-dessous
 224+'<p>S’il vous plaît, utiliser le bouton "Buy Now" ci-dessous
225225
226226 pour payer avec PayPal</p> ',
227227 'paypal_failed' => 'Annuler le paiement par PayPal ',
228 -'paypal_failed_description' => '<p>Vous pouvez réessayer en
 228+'paypal_failed_description' => '<p>Vous pouvez réessayer en
229229
230 -remplissant à nouveau le formulaire ci-dessous, ou utiliser
 230+remplissant à nouveau le formulaire ci-dessous, ou utiliser
231231
232232 un autre mode de paiement expliqué plus bas.</p>',
233233 'paypal_successful' => 'Paiement par PayPal réussi',
234 -'paypal_successful_description' => '<p>Merci ! Nous vous
 234+'paypal_successful_description' => '<p>Merci ! Nous vous
235235
236 -tiendrons informé du résultat après avoir reçu le paiement
 236+tiendrons informé du résultat après avoir reçu le paiement
237237
238238 et relu vos informations de réservation.</p>',
239239 'atm' => 'Paiement par virement bancaire',
240240 'atm_description' => '
241 -<p>S’il vous plaît utiliser les coordonnées bancaires
 241+<p>S’il vous plaît utiliser les coordonnées bancaires
242242
243 -suivantes en Egypte pour le transfert de vos registeration
 243+suivantes en Egypte pour le transfert de vos registeration
244244
245245 frais et / ou un logement:</p>
246246 <ul class="atm-account">
@@ -249,25 +249,25 @@
250250 <li>SWIFT BIC code: CIBEEGCX041</li>
251251 <li>Numéro de compte Wikimania (USD): 41-8930006-6</li>
252252 </ul>
253 -<p>En raison de la restriction de PayPal en<b>Egypte</b>,
 253+<p>En raison de la restriction de PayPal en<b>Egypte</b>,
254254
255 -vous pouvez payer à la banque, s’il vous plaît utiliser les
 255+vous pouvez payer à la banque, s’il vous plaît utiliser les
256256
257 -coordonnées bancaires ci-dessus, à la suite de l\'EGP numéro
 257+coordonnées bancaires ci-dessus, à la suite de l\'EGP numéro
258258
259259 de compte:</p>
260260 <ul class="atm-account">
261261 <li>Numéro de compte Wikimania (EGP): 41-8900019-5</li>
262262 </ul>
263 -<p>Et envoyez votre reçu de virement avec votre nom et votre
 263+<p>Et envoyez votre reçu de virement avec votre nom et votre
264264
265 -numéro de réservation à wm08registration@wikimedia.org, nous
 265+numéro de réservation à wm08registration@wikimedia.org, nous
266266
267 -vous répondrons sous trois jours ouvrables. Vous pouvez
 267+vous répondrons sous trois jours ouvrables. Vous pouvez
268268
269 -également <a href="index.php?action=query" title="query the
 269+également <a href="index.php?action=query" title="query the
270270
271 -registration status">demander le statut de votre réservation
 271+registration status">demander le statut de votre réservation
272272
273273 en ligne</a>.</p>
274274 '
@@ -276,19 +276,19 @@
277277 $lang_messages = array(
278278 'successful' => 'Enregistrement complète',
279279 'successful_description' =>
280 -'<p>Merci de vous joindre à Wikimania 2008! Votre formulaire
 280+'<p>Merci de vous joindre à Wikimania 2008! Votre formulaire
281281
282 -d\'enregistrement a été soumise. S’il vous plaît prendre
 282+d\'enregistrement a été soumise. S’il vous plaît prendre
283283
284 -note que vous devez remplir le paiement de sorte que le
 284+note que vous devez remplir le paiement de sorte que le
285285
286286 processus d\'inscription peut être confirmée.
287287
288 -Votre <strong>numéro d\'enregistrement</strong> Sera affiché
 288+Votre <strong>numéro d\'enregistrement</strong> Sera affiché
289289
290290 ci-dessous. S’il vous plaît prendre note du numéro de celle
291291
292 --ci est utilisée pour interroger le statut d\'enregistrement
 292+-ci est utilisée pour interroger le statut d\'enregistrement
293293
294294 et de confirmer votre identité à l\'avenir.
295295 ',
@@ -302,27 +302,27 @@
303303 );
304304
305305 $lang_errors = array(
306 -'repeat' => 'Quelqu\'un s\'est enregistré avec le même nom
 306+'repeat' => 'Quelqu\'un s\'est enregistré avec le même nom
307307
308 -et le même numéro d\'identification/passeport. Il est
 308+et le même numéro d\'identification/passeport. Il est
309309
310 -possible que vous ayez validé le formulaire deux fois ou que
 310+possible que vous ayez validé le formulaire deux fois ou que
311311
312312 vous ayez rafraîchi la page de réservation.',
313313 'not_input' => '$1 est vide.',
314314 'not_input_completely' => '$1 est incomplet.',
315315 'not_select' => '$1 n\'est pas vérifié.',
316316 'not_select_whether' => '$1 n\'a pas été précisé.',
317 -'too_long' => '$1 est trop long, la longueur maximale est
 317+'too_long' => '$1 est trop long, la longueur maximale est
318318
319319 $2.',
320320 'incorect' => '$1 est incorrect.',
321321 'wrong' => '$1 est faux.',
322 -'visa_assistance_incomplete' => 'Aide à l\'obtention d\'un
 322+'visa_assistance_incomplete' => 'Aide à l\'obtention d\'un
323323
324324 visa est vide.',
325325 'wrong_query' => 'Mauvais nom ou numéro d\'enregistrement.',
326 -'paypal_unavailable' => 'Le pays ou la région que vous avez
 326+'paypal_unavailable' => 'Le pays ou la région que vous avez
327327
328328 choisi(e) ne permet pas le paiement par PayPal.'
329329 );
@@ -330,22 +330,22 @@
331331 $lang_query = array(
332332 'unique_code' => 'Numéro d\'enregistrement',
333333 'submit' => 'Demander',
334 -'your_status' => 'Bonjour, $1, voici le statut de votre
 334+'your_status' => 'Bonjour, $1, voici le statut de votre
335335
336336 réservation:',
337 -'received_money' => 'Frais d\'enregistrement (reçus /
 337+'received_money' => 'Frais d\'enregistrement (reçus /
338338
339339 attendus):',
340340 'lack' => 'Non reçu',
341341 'enough' => 'Déjà payé',
342342 'too_much' => 'Trop d\'argent versé',
343 -'accepted' => 'Votre réservation est
 343+'accepted' => 'Votre réservation est
344344
345345 <strong>confirmée</strong>.',
346 -'rejected' => 'Votre réservation est
 346+'rejected' => 'Votre réservation est
347347
348348 <strong>rejetée</strong>.',
349 -'not_yet' => 'Votre réservation est <strong>non
 349+'not_yet' => 'Votre réservation est <strong>non
350350
351351 confirmée</strong>.'
352352
@@ -553,7 +553,7 @@
554554 'sb' => 'Solomon Islands',
555555 'so' => 'Somalia',
556556 'za' => 'South Africa',
557 - 'gs' => 'South Georgia and the South Sandwich
 557+ 'gs' => 'South Georgia and the South Sandwich
558558
559559 Islands',
560560 'es' => 'Spain',
Index: trunk/wikimania/wmreg/includes/notinuse/language_de.php
@@ -17,25 +17,25 @@
1818 'egy0' => 'Nein, bin ich nicht. (Bitte schreibe deine Reisepassnummer und deinen Namen in die folgenden Felder)',
1919 'surname' => 'Familienname',
2020 'given_name' => 'Vorname',
21 -'sex' => 'Geschlecht',
 21+'sex' => 'Geschlecht',
2222 'sex1' => 'männlich',
2323 'sex2' => 'weiblich',
2424 'sex3' => 'anonym',
25 -'id' => 'ID- / Reisepassnummer',
26 -'country' => 'Staat / Region',
27 -'city' => 'Bundesland/Provinz/Kanton / Stadt',
 25+'id' => 'ID- / Reisepassnummer',
 26+'country' => 'Staat / Region',
 27+'city' => 'Bundesland/Provinz/Kanton / Stadt',
2828 'birthday' => 'Geburtsdatum (TT/MMM/JJJJ)',
2929 'organization' => 'Organisation',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>Sprachkenntnisse</strong></p>',
38 -'langn' => 'Muttersprache',
39 -'lang' => 'Kenntnisstand',
 38+'langn' => 'Muttersprache',
 39+'lang' => 'Kenntnisstand',
4040 'select_lang' => 'Wähle die Sprache aus',
4141 'select_level' => 'Wähle den Kenntnisstand aus',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => 'Kenntnisstand in Sprache 2',
5454 'lang3_level' => 'Kenntnisstand in Sprache 3',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>Wikimedia-Projekt und Account(s) mit E-Mail-Funktion</strong></p>
5858 <ul class="form_notice">
5959 <li>Deine Email-Daten werden nur für die Registrierung sowie für dringende Nachrichten über die Wikimania 2008 benutzt.</li>
6060 </ul>
61 -',
62 -'wiki_id' => 'Bevorzugter Benutzername auf Wikimedia-Projekten',
63 -'email' => 'Deine Emailadresse',
 61+',
 62+'wiki_id' => 'Bevorzugter Benutzername auf Wikimedia-Projekten',
 63+'email' => 'Deine Emailadresse',
6464
6565
6666 'legend2' => 'Teilnahme',
@@ -71,7 +71,7 @@
7272 'join1' => '17. Juli',
7373 'join2' => '18. Juli',
7474 'join3' => '19. Juli',
75 -'topic' => 'Bevorzugter Veranstaltungsbereich',
 75+'topic' => 'Bevorzugter Veranstaltungsbereich',
7676 'topic1' => 'Wikimedia-Communitys',
7777 'topic2' => 'Freie Inhalte',
7878 'topic3' => 'Technische Infrastruktur',
@@ -82,7 +82,7 @@
8383 'showname2' => 'Wikimedia-Account',
8484 'showname3' => 'Organisation',
8585 'showname4' => 'andere',
86 -'size' => 'T-Shirt-Größe',
 86+'size' => 'T-Shirt-Größe',
8787 'food' => 'Ernährungseinschränkungen',
8888 'food0' => '-',
8989 'food1' => 'Kein Rindfleisch',
@@ -91,10 +91,10 @@
9292 'food4' => 'Koscher',
9393 'food5' => 'andere',
9494 'food_other' => 'spezifische Ernährungseinschränkungen',
95 -'allegric' => 'Allergien',
 95+'allegric' => 'Allergien',
9696 'transportation_assistance' => 'Flugticketunterstützung',
9797 'need_transportation_assistance' => 'Ja, ich brauche Hilfe bei meiner Flugreservierung',
98 -'visa_assistance' => 'Hilfe mit dem Visum',
 98+'visa_assistance' => 'Hilfe mit dem Visum',
9999 'need_visa_assistance' => 'Ja, ich benötige Hilfe mit dem Visum',
100100 'visa_assistance_description' => ' Bitte erläutere, wie das Organisationsteam dir mit Visumproblemen helfen kann. (auf <strong>Arabisch</strong> oder <strong>Englisch</strong>)',
101101
@@ -104,17 +104,17 @@
105105 Bitte lies vor der Registrierung die genauen Details zu Örtlichkeiten und Eigenschaften der Optionen auf <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>der offiziellen Webseite der Wikimania</a>.</p>
106106 ',
107107 'accommodation_hotel' => 'Bevorzugtes Hotel.',
108 -'hotels_metropol'=> 'Metropol Hotel (etwa $60 pro Nacht)',
109 -'hotels_delta'=> 'Delta Hotel (etwa $30 pro Nacht)',
 108+'hotels_metropol' => 'Metropol Hotel (etwa $60 pro Nacht)',
 109+'hotels_delta' => 'Delta Hotel (etwa $30 pro Nacht)',
110110 'hotels_dorms' => 'Saint-Marc-College (etwa $10 pro Nacht)',
111111
112 -'accommodation' => 'Wann willst du übernachten?',
 112+'accommodation' => 'Wann willst du übernachten?',
113113 'night1' => '16. Juli',
114114 'night2' => '17. Juli',
115115 'night3' => '18. Juli',
116116 'night4' => '19. Juli',
117117 'night5' => '20. Juli',
118 -'room' => 'Bevorzugtes Zimmer',
 118+'room' => 'Bevorzugtes Zimmer',
119119 'room2' => 'Doppelzimmer',
120120 'room4' => '4-Mann-Zimmer',
121121 'room6' => 'Mir egal',
@@ -124,12 +124,12 @@
125125 <p>Du kannst deinen PayPal-Account belasten oder mit deiner Kreditkarte über PayPal bezahlen: <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">103 Länder / Regionen</a> (Ägypten nicht eingeschlossen) oder über eine Überweisung oder direkte Einzahlung auf das Bankkonto des Organisationsteams in Alexandria. Achtung: Die Möglichkeit der PayPal-Zahlung wird deaktiviert, wenn du Ägypter bist.</p>
126126 ',
127127
128 -'pay_method' => 'Art der Bezahlung',
 128+'pay_method' => 'Art der Bezahlung',
129129 'atm' => 'Bezahlung auf das Bankkonto',
130130 'receipt' => 'Quittung',
131 -'need_receipt' => 'Ja, ich benötige eine Quittung auf Papier.',
132 -'receipt_title' => 'Titel',
133 -'receipt_address' => 'Postanschrift',
 131+'need_receipt' => 'Ja, ich benötige eine Quittung auf Papier.',
 132+'receipt_title' => 'Titel',
 133+'receipt_address' => 'Postanschrift',
134134
135135 'submit_notice' =>
136136 '<li><strong>Nachdem du das Formular abgeschickt hast, hast du immer noch die Möglichkeit, deine Angaben zur Registrierung zu überprüfen.</strong></li>',
@@ -166,7 +166,7 @@
167167
168168 $lang_messages = array(
169169 'successful' => 'Registrierung vollständig',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p>Vielen Dank, dass du an der Wikimania 2008 teilnimmst! Dein Registrierungsformular wurde abgeschickt. Bitte beachte, dass du den Bezahlvorgang abschließen musst, um die Registrierung zu bestätigen.
172172
173173 Deine <strong>Registrierungsnummer</strong> steht unten. Bitte schreibe dir die Nummer auf, da sie benutzt wird, um den Status der Registrierung abzufragen und deine Identität zu bestätigen.
Index: trunk/wikimania/wmreg/includes/notinuse/language_zh-hans.php
@@ -17,25 +17,25 @@
1818 'egy0' => '否(请在以下栏位填上你的护照号码和姓名。)',
1919 'surname' => '姓氏',
2020 'given_name' => '名',
21 -'sex' => '性别',
 21+'sex' => '性别',
2222 'sex1' => '男',
2323 'sex2' => '女',
2424 'sex3' => '不愿申明',
25 -'id' => '身份证明文件 / 护照号码',
26 -'country' => '国家 / 地区',
27 -'city' => '州/ 省 / 城市',
 25+'id' => '身份证明文件 / 护照号码',
 26+'country' => '国家 / 地区',
 27+'city' => '州/ 省 / 城市',
2828 'birthday' => '出生日期(dd/mm/yyyy)',
2929 'organization' => '所属组织',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>语言</strong></p>',
38 -'langn' => '母语',
39 -'lang' => '熟练程度',
 38+'langn' => '母语',
 39+'lang' => '熟练程度',
4040 'select_lang' => '选择语言',
4141 'select_level' => '选择熟练程度',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => '第二语言的熟练程度',
5454 'lang3_level' => '第三语言的熟练程度',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>参与的维基计划和电邮帐戶</strong></p>
5858 <ul class="form_notice">
5959 <li>年会筹备小组将只会在注册相关程序和紧急通知时使用你的电邮地址资讯。</li>
6060 </ul>
61 -',
62 -'wiki_id' => '意欲使用的维基计划帐戶名称。',
63 -'email' => '电邮地址',
 61+',
 62+'wiki_id' => '意欲使用的维基计划帐戶名称。',
 63+'email' => '电邮地址',
6464
6565
6666 'legend2' => '参与情况',
@@ -71,7 +71,7 @@
7272 'join1' => '7月17日',
7373 'join2' => '7月18日',
7474 'join3' => '7月19日',
75 -'topic' => '感兴趣的议程类型',
 75+'topic' => '感兴趣的议程类型',
7676 'topic1' => '维基媒体社群',
7777 'topic2' => '自由资讯',
7878 'topic3' => '技术架构',
@@ -82,7 +82,7 @@
8383 'showname2' => '维基媒体计划中的帐戶名',
8484 'showname3' => '所属组织',
8585 'showname4' => '其他',
86 -'size' => 'T恤的尺寸',
 86+'size' => 'T恤的尺寸',
8787 'food' => '饮食习惯',
8888 'food0' => '-',
8989 'food1' => '不吃牛肉',
@@ -91,10 +91,10 @@
9292 'food4' => '犹太饮食',
9393 'food5' => '其他',
9494 'food_other' => '请注明特别的饮食习惯',
95 -'allegric' => '任何食物敏感',
 95+'allegric' => '任何食物敏感',
9696 'transportation_assistance' => '机票协助',
9797 'need_transportation_assistance' => '我需要筹备小组为我预定机票。',
98 -'visa_assistance' => '签证协助',
 98+'visa_assistance' => '签证协助',
9999 'need_visa_assistance' => '我需要签证协助',
100100 'visa_assistance_description' => '请说明筹备小组可以提供什么协助(请使用<strong>阿拉伯语</strong>或<strong>英语</strong>填写)',
101101
@@ -104,17 +104,17 @@
105105 请查阅<a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>该页面上的资讯</a>,取得住宿地点的实际位置和其附属设施的资料,以便报名时申明你的决定。</p>
106106 ',
107107 'accommodation_hotel' => '希望入住酒店',
108 -'hotels_metropol'=> '大都会酒店(Metropole Hotel,每晚60美元)',
109 -'hotels_delta'=> '三角洲酒店 (Delta Hotel,每晚30美元)',
 108+'hotels_metropol' => '大都会酒店(Metropole Hotel,每晚60美元)',
 109+'hotels_delta' => '三角洲酒店 (Delta Hotel,每晚30美元)',
110110 'hotels_dorms' => '圣马可书院宿舍 (每晚10美元)',
111111
112 -'accommodation' => '入住日期',
 112+'accommodation' => '入住日期',
113113 'night1' => '7月16日',
114114 'night2' => '7月17日',
115115 'night3' => '7月18日',
116116 'night4' => '7月19日',
117117 'night5' => '7月20日',
118 -'room' => '偏好的房间类别',
 118+'room' => '偏好的房间类别',
119119 'room2' => '二人房',
120120 'room4' => '四人房',
121121 'room6' => '没有所谓',
@@ -124,12 +124,12 @@
125125 <p>若你居住在<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">这里所列出的103个国家/地区</a> (埃及除外),你可以通过PayPal,以借帐或信用卡付款。你也可以选择汇款或将款项直接存入亚力山卓筹备小组的银行户口。请注意:来自埃及的申请人将不能使用PayPal付款。</p>
126126 ',
127127
128 -'pay_method' => '付款方法',
 128+'pay_method' => '付款方法',
129129 'atm' => '银行户口付款',
130130 'receipt' => '收据',
131 -'need_receipt' => '我需要收据。',
132 -'receipt_title' => '称谓',
133 -'receipt_address' => '邮寄地址',
 131+'need_receipt' => '我需要收据。',
 132+'receipt_title' => '称谓',
 133+'receipt_address' => '邮寄地址',
134134
135135 'submit_notice' =>
136136 '<li><strong>递交了这份表格後,你需要再一次确认你的申请。</strong></li>',
@@ -167,10 +167,10 @@
168168
169169 $lang_messages = array(
170170 'successful' => '完成报名',
171 -'successful_description' =>
172 -'<p>多谢阁下报名参加2008国际维基媒体年会!你的报名表格己经成功递交。请注意你必须完成缴费步骤,才能确认参与资格。
 171+'successful_description' =>
 172+'<p>多谢阁下报名参加2008国际维基媒体年会!你的报名表格己经成功递交。请注意你必须完成缴费步骤,才能确认参与资格。
173173
174 -你的<strong>注册编号</strong>已显示在下面。请记下有关编号,以便日後查询报名受理状况及确认身份。
 174+你的<strong>注册编号</strong>已显示在下面。请记下有关编号,以便日後查询报名受理状况及确认身份。
175175 ',
176176 'cost' => '报名费用',
177177 'wikimania_cost' => '会议:',
Index: trunk/wikimania/wmreg/includes/notinuse/language_ko.php
@@ -17,25 +17,25 @@
1818 'egy0' => '그렇지않습니다. (다음 양식에 여권에 나와 있는 당신의 이름과 여권 번호를 기재해 주세요.)',
1919 'surname' => '성',
2020 'given_name' => '이름',
21 -'sex' => '성별',
 21+'sex' => '성별',
2222 'sex1' => '남성',
2323 'sex2' => '여성',
2424 'sex3' => '응답 거부',
25 -'id' => 'ID / 여권 번호',
26 -'country' => '국가 / 지역',
27 -'city' => '주 / 도시',
 25+'id' => 'ID / 여권 번호',
 26+'country' => '국가 / 지역',
 27+'city' => '주 / 도시',
2828 'birthday' => '생년월일(dd/mmm/yyyy)',
2929 'organization' => '기관',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, '1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, '1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>언어 구사 능력</strong></p>',
38 -'langn' => '모국어',
39 -'lang' => '언어 능력 수준',
 38+'langn' => '모국어',
 39+'lang' => '언어 능력 수준',
4040 'select_lang' => '언어를 선택해 주세요',
4141 'select_level' => '언어 구사 능력을 선택해 주세요',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => '언어 2의 구사 능력',
5454 'lang3_level' => '온어 3의 구사 능력',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>위키미디어 프로젝트와 이메일 계정</strong></p>
5858 <ul class="form_notice">
5959 <li>당신의 이메일 정보는 위키매니아 2008의 등록과 긴급 확인 용도로만 사용될 것입니다.</li>
6060 </ul>
61 -',
62 -'wiki_id' => '선호하는 위키미디어 프로젝트 계정 이름',
63 -'email' => '당신의 이메일',
 61+',
 62+'wiki_id' => '선호하는 위키미디어 프로젝트 계정 이름',
 63+'email' => '당신의 이메일',
6464
6565
6666 'legend2' => '참가',
@@ -71,7 +71,7 @@
7272 'join1' => '7월 17일',
7373 'join2' => '7월 18일',
7474 'join3' => '7월 19일',
75 -'topic' => '선호하는 세션 분야',
 75+'topic' => '선호하는 세션 분야',
7676 'topic1' => '위키미디어 커뮤니티',
7777 'topic2' => '자유 콘텐츠',
7878 'topic3' => '기술 기반',
@@ -82,7 +82,7 @@
8383 'showname2' => '위키미디어 계정',
8484 'showname3' => '기관',
8585 'showname4' => '기타',
86 -'size' => 'T-셔츠 사이즈',
 86+'size' => 'T-셔츠 사이즈',
8787 'food' => '규정식',
8888 'food0' => '-',
8989 'food1' => '소고기 불가',
@@ -91,10 +91,10 @@
9292 'food4' => '코샤르',
9393 'food5' => '기타',
9494 'food_other' => '특별한 규정식',
95 -'allegric' => '엘러지 있음',
 95+'allegric' => '엘러지 있음',
9696 'transportation_assistance' => '항공권 지원 요청',
9797 'need_transportation_assistance' => '예, 제 항공권 예약에 지원이 필요합니다.',
98 -'visa_assistance' => '비자 요청',
 98+'visa_assistance' => '비자 요청',
9999 'need_visa_assistance' => '예, 비자 발급이 필요합니다',
100100 'visa_assistance_description' => ' 비자 발급을 위해 어떤 기관이 어떻게 도와주어야 하는 기재해 주세요. (<strong>아랍어</strong> 또는 <strong>영어</strong>로)',
101101
@@ -104,17 +104,17 @@
105105 등록하시기 전에, 정확한 위치와 선택가능한 사양을 <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>위키매니아 공식 사이트</a>에서 상세 내용을 확인하세요.></p>
106106 ',
107107 'accommodation_hotel' => '선호하는 호텔',
108 -'hotels_metropol'=> '메트로폴 호텔(1박에 $60)',
109 -'hotels_delta'=> '델타 호텔(1박에 $30)',
 108+'hotels_metropol' => '메트로폴 호텔(1박에 $60)',
 109+'hotels_delta' => '델타 호텔(1박에 $30)',
110110 'hotels_dorms' => '성 마르크 기숙사(1박에 $10)',
111111
112 -'accommodation' => '체류 일자',
 112+'accommodation' => '체류 일자',
113113 'night1' => '7월 16일',
114114 'night2' => '7월 17일',
115115 'night3' => '7월 18일',
116116 'night4' => '7월 19일',
117117 'night5' => '7월 20일',
118 -'room' => '공동 숙박 가능 여부',
 118+'room' => '공동 숙박 가능 여부',
119119 'room2' => '2인실',
120120 'room4' => '4인실',
121121 'room6' => '상관 없음',
@@ -124,12 +124,12 @@
125125 <p>당신은 당신의 Paypal 계좌에서 출금하거나 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">103개 국가/지역</a>(이집트는 포함되지 않음)에서 PayPal을 통해 당신의 신용카드를 사용하거나 또는 알렉산드리아에 있는 조직위 소유의 은행 계좌에 송금과 직접 지불을 통해 지불할 수도 있습니다. 주의: 당신이 이집트인이면 PayPal 옵션은 사용 불가합니다.</p>
126126 ',
127127
128 -'pay_method' => '지불 수단',
 128+'pay_method' => '지불 수단',
129129 'atm' => '은행 계좌 지불',
130130 'receipt' => '영수증',
131 -'need_receipt' => '예, 종이로 된 영수증이 필요합니다.',
132 -'receipt_title' => '제목',
133 -'receipt_address' => '메일 주소',
 131+'need_receipt' => '예, 종이로 된 영수증이 필요합니다.',
 132+'receipt_title' => '제목',
 133+'receipt_address' => '메일 주소',
134134
135135 'submit_notice' =>
136136 '<li><strong>양식을 제출하고서, 당신은 아직 당신의 등록을 확인할 기회가 한 번 있습니다.</strong></li>',
@@ -166,8 +166,8 @@
167167
168168 $lang_messages = array(
169169 'successful' => '등록 완료',
170 -'successful_description' =>
171 -'<p>위키매니아 2008에 함께 하여 주셔서 감사합니다! 당신의 등록 양식은 제출되었습니다. 등록을 확인하려면 납부 과정을 완료할 필요가 있음을 유의하세요.
 170+'successful_description' =>
 171+'<p>위키매니아 2008에 함께 하여 주셔서 감사합니다! 당신의 등록 양식은 제출되었습니다. 등록을 확인하려면 납부 과정을 완료할 필요가 있음을 유의하세요.
172172 당신의 <strong>등록 번호</strong>는 아래 표시됩니다. 나중에 당신의 신원을 확인하거나 등록 현황을 조회하기 위하여 필요하오니 등록 번호를 적어 두세요',
173173 'cost' => '등록비',
174174 'wikimania_cost' => '회의: ',
Index: trunk/wikimania/wmreg/includes/notinuse/language_zh-hant.php
@@ -17,25 +17,25 @@
1818 'egy0' => '否(請在以下欄位填上你的護照號碼和姓名。)',
1919 'surname' => '姓氏',
2020 'given_name' => '名',
21 -'sex' => '性別',
 21+'sex' => '性別',
2222 'sex1' => '男',
2323 'sex2' => '女',
2424 'sex3' => '不願申明',
25 -'id' => '身份證明文件 / 護照號碼',
26 -'country' => '國家 / 地區',
27 -'city' => '州/ 省 / 城市',
 25+'id' => '身份證明文件 / 護照號碼',
 26+'country' => '國家 / 地區',
 27+'city' => '州/ 省 / 城市',
2828 'birthday' => '出生日期(dd/mm/yyyy)',
2929 'organization' => '所屬組織',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>語言</strong></p>',
38 -'langn' => '母語',
39 -'lang' => '熟練程度',
 38+'langn' => '母語',
 39+'lang' => '熟練程度',
4040 'select_lang' => '選擇語言',
4141 'select_level' => '選擇熟練程度',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => '第二語言的熟練程度',
5454 'lang3_level' => '第三語言的熟練程度',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>參與的維基計劃和電郵戶口</strong></p>
5858 <ul class="form_notice">
5959 <li>年會籌備小組將只會在註冊相關程序和緊急通知時使用你的電郵地址資訊。</li>
6060 </ul>
61 -',
62 -'wiki_id' => '意欲使用的維基計劃戶口名稱。',
63 -'email' => '電郵地址',
 61+',
 62+'wiki_id' => '意欲使用的維基計劃戶口名稱。',
 63+'email' => '電郵地址',
6464
6565
6666 'legend2' => '參與狀況',
@@ -71,7 +71,7 @@
7272 'join1' => '7月17日',
7373 'join2' => '7月18日',
7474 'join3' => '7月19日',
75 -'topic' => '感興趣的議程類型',
 75+'topic' => '感興趣的議程類型',
7676 'topic1' => '維基媒體社群',
7777 'topic2' => '自由資訊',
7878 'topic3' => '技術架構',
@@ -82,7 +82,7 @@
8383 'showname2' => '維基媒體計劃中的戶口名',
8484 'showname3' => '所屬組織',
8585 'showname4' => '其他',
86 -'size' => 'T恤的大小',
 86+'size' => 'T恤的大小',
8787 'food' => '飲食習慣',
8888 'food0' => '-',
8989 'food1' => '不吃牛肉',
@@ -91,10 +91,10 @@
9292 'food4' => '猶太飲食',
9393 'food5' => '其他',
9494 'food_other' => '請註明特別的飲食習慣',
95 -'allegric' => '任何食物敏感',
 95+'allegric' => '任何食物敏感',
9696 'transportation_assistance' => '機票協助',
9797 'need_transportation_assistance' => '我需要籌備小組為我預訂機票。',
98 -'visa_assistance' => '簽證協助',
 98+'visa_assistance' => '簽證協助',
9999 'need_visa_assistance' => '我需要簽證協助',
100100 'visa_assistance_description' => '請說明籌備小組可以如何協助(請使用<strong>阿拉伯語</strong>或<strong>英語</strong>填寫)',
101101
@@ -104,17 +104,17 @@
105105 請查閱<a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>該頁面上的資訊</a>,取得住宿地點的實際位置和其附屬設施的資料,以便報名時申明你的決定。</p>
106106 ',
107107 'accommodation_hotel' => '希望入住酒店',
108 -'hotels_metropol'=> '大都會酒店(Metropole Hotel,每晚60美元)',
109 -'hotels_delta'=> '三角洲酒店 (Delta Hotel,每晚30美元)',
 108+'hotels_metropol' => '大都會酒店(Metropole Hotel,每晚60美元)',
 109+'hotels_delta' => '三角洲酒店 (Delta Hotel,每晚30美元)',
110110 'hotels_dorms' => '聖馬可書院宿舍 (每晚10美元)',
111111
112 -'accommodation' => '入住日期',
 112+'accommodation' => '入住日期',
113113 'night1' => '7月16日',
114114 'night2' => '7月17日',
115115 'night3' => '7月18日',
116116 'night4' => '7月19日',
117117 'night5' => '7月20日',
118 -'room' => '偏好的房間類別',
 118+'room' => '偏好的房間類別',
119119 'room2' => '二人房',
120120 'room4' => '四人房',
121121 'room6' => '沒有所謂',
@@ -124,12 +124,12 @@
125125 <p>若你居住在<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">這裡所列出的103個國家/地區</a> (埃及除外),你可以通過PayPal,以借帳或信用卡付款。你也可以選擇匯款或將款項直接存入亞力山卓籌備小組的銀行戶口。請注意:來自埃及的申請人將不能使用PayPal付款。</p>
126126 ',
127127
128 -'pay_method' => '付款方法',
 128+'pay_method' => '付款方法',
129129 'atm' => '銀行戶口付款',
130130 'receipt' => '收據',
131 -'need_receipt' => '我需要收據。',
132 -'receipt_title' => '抬頭',
133 -'receipt_address' => '郵寄地址',
 131+'need_receipt' => '我需要收據。',
 132+'receipt_title' => '抬頭',
 133+'receipt_address' => '郵寄地址',
134134
135135 'submit_notice' =>
136136 '<li><strong>遞交了這份表格後,你需要再一次確認你的申請。</strong></li>',
@@ -167,10 +167,10 @@
168168
169169 $lang_messages = array(
170170 'successful' => '完成報名',
171 -'successful_description' =>
172 -'<p>多謝閣下報名參加2008國際維基媒體年會!你的報名表格己經成功遞交。請注意你必須完成繳費步驟,才能確認參與資格。
 171+'successful_description' =>
 172+'<p>多謝閣下報名參加2008國際維基媒體年會!你的報名表格己經成功遞交。請注意你必須完成繳費步驟,才能確認參與資格。
173173
174 -你的<strong>註冊編號</strong>已顯示在下面。請記下有關編號,以便日後查詢報名受理狀況及確認身份。
 174+你的<strong>註冊編號</strong>已顯示在下面。請記下有關編號,以便日後查詢報名受理狀況及確認身份。
175175 ',
176176 'cost' => '報名費用',
177177 'wikimania_cost' => '會議:',
Index: trunk/wikimania/wmreg/includes/notinuse/language_ja.php
@@ -17,25 +17,25 @@
1818 'egy0' => 'いいえ、ちがいます(あなたのパスポート番号とパスポートに記載された名前をローマ字で以下に記入してください)',
1919 'surname' => '姓(日本人の方はローマ字でお願いします)',
2020 'given_name' => '名(日本人の方はローマ字でお願いします)',
21 -'sex' => '性別',
 21+'sex' => '性別',
2222 'sex1' => '男',
2323 'sex2' => '女',
2424 'sex3' => '記入を拒否します',
25 -'id' => '身分証番号 / パスポート番号',
26 -'country' => '国 / 地域',
27 -'city' => '市町村',
 25+'id' => '身分証番号 / パスポート番号',
 26+'country' => '国 / 地域',
 27+'city' => '市町村',
2828 'birthday' => '生年月日(日(2桁)、月、年(4桁))',
2929 'organization' => '所属',
30 -'year1' => '',
31 -'year' => '年(西暦)',
32 -'month' => '月',
33 -'months' => array(NULL, '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'),
34 -'day' => '日(2桁)',
 30+'year1' => '',
 31+'year' => '年(西暦)',
 32+'month' => '月',
 33+'months' => array( NULL, '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12' ),
 34+'day' => '日(2桁)',
3535
3636 'title2' =>
3737 ' <p><strong>言語</strong></p>',
38 -'langn' => '母語',
39 -'lang' => '習熟度',
 38+'langn' => '母語',
 39+'lang' => '習熟度',
4040 'select_lang' => '言語を選んでください。',
4141 'select_level' => '当該言語の習熟度',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => '言語2の習熟度',
5454 'lang3_level' => '言語3の習熟度',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>ウィキメディア・プロジェクトのアカウントと電子メールアドレス</strong></p>
5858 <ul class="form_notice">
5959 <li>メールアドレスはウィキマニア2008における参加受付および緊急連絡の際にのみ使われます。</li>
6060 </ul>
61 -',
62 -'wiki_id' => 'ウィキメディア・プロジェクトのアカウント(ひとつ選択)',
63 -'email' => '電子メールアドレス',
 61+',
 62+'wiki_id' => 'ウィキメディア・プロジェクトのアカウント(ひとつ選択)',
 63+'email' => '電子メールアドレス',
6464
6565
6666 'legend2' => '参加登録',
@@ -71,7 +71,7 @@
7272 'join1' => '7月17日',
7373 'join2' => '7月18日',
7474 'join3' => '7月19日',
75 -'topic' => '興味のあるセッション',
 75+'topic' => '興味のあるセッション',
7676 'topic1' => 'ウィキメディア・コミュニティ',
7777 'topic2' => '自由なコンテンツ',
7878 'topic3' => '技術基盤',
@@ -82,7 +82,7 @@
8383 'showname2' => 'ウィキメディア・アカウント名',
8484 'showname3' => '所属',
8585 'showname4' => 'その他',
86 -'size' => 'Tシャツのサイズ',
 86+'size' => 'Tシャツのサイズ',
8787 'food' => '飲食習慣',
8888 'food0' => '-',
8989 'food1' => '牛肉は食べません',
@@ -91,10 +91,10 @@
9292 'food4' => 'ユダヤ式',
9393 'food5' => 'その他',
9494 'food_other' => '詳細',
95 -'allegric' => 'アレルギー反応を起こす食べ物',
 95+'allegric' => 'アレルギー反応を起こす食べ物',
9696 'transportation_assistance' => '航空券予約支援',
9797 'need_transportation_assistance' => 'はい、航空券予約に支援が必要です。',
98 -'visa_assistance' => 'ビザ取得の支援',
 98+'visa_assistance' => 'ビザ取得の支援',
9999 'need_visa_assistance' => 'はい、ビザ取得に支援が必要です',
100100 'visa_assistance_description' => '運営チームがビザの件にどのように対応したらよいか、ご記入ください(<strong>アラビア語</strong>または<strong>英語</strong>でお願いします)',
101101
@@ -104,17 +104,17 @@
105105 ご登録の前に、<a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>ウィキマニア公式ウェブサイト</a>で宿泊先の所在、宿泊環境をよくお確かめください。</p>
106106 ',
107107 'accommodation_hotel' => '希望する宿泊先',
108 -'hotels_metropol'=> 'メトロポール・ホテル (Metropol Hotel)(1泊60ドル)',
109 -'hotels_delta'=> 'デルタ・ホテル (Delta Hotel)(1泊30ドル)',
 108+'hotels_metropol' => 'メトロポール・ホテル (Metropol Hotel)(1泊60ドル)',
 109+'hotels_delta' => 'デルタ・ホテル (Delta Hotel)(1泊30ドル)',
110110 'hotels_dorms' => 'サン・マルク宿舎 (Saint Marc Dorms)(1泊10ドル)',
111111
112 -'accommodation' => '宿泊日程',
 112+'accommodation' => '宿泊日程',
113113 'night1' => '7月16日',
114114 'night2' => '7月17日',
115115 'night3' => '7月18日',
116116 'night4' => '7月19日',
117117 'night5' => '7月20日',
118 -'room' => '希望するタイプ',
 118+'room' => '希望するタイプ',
119119 'room2' => 'ツイン',
120120 'room4' => '4人部屋',
121121 'room6' => '指定なし',
@@ -124,12 +124,12 @@
125125 <p>(エジプトは含まれない)<a href="http://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">103の国・地域から</a>PayPal経由でお支払い可能です。もしくはアレクサンドリア運営チーム所有の銀行口座への振込によってもお支払いいただけます。注意: エジプト人の方はPayPalでお支払いいただけません。</p>
126126 ',
127127
128 -'pay_method' => '支払い種別',
 128+'pay_method' => '支払い種別',
129129 'atm' => '銀行口座への送金',
130130 'receipt' => '領収書',
131 -'need_receipt' => 'はい、領収書が必要です。',
132 -'receipt_title' => '宛名',
133 -'receipt_address' => '住所',
 131+'need_receipt' => 'はい、領収書が必要です。',
 132+'receipt_title' => '宛名',
 133+'receipt_address' => '住所',
134134
135135 'submit_notice' =>
136136 '<li><strong>フォーム送信後に送信内容を確認できます。</strong></li>',
@@ -166,7 +166,7 @@
167167
168168 $lang_messages = array(
169169 'successful' => '登録完了',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p>ウィキマニア2008へのご参加ありがとうございます! ご登録を受け付けました。登録を確定するためには送金処理を済ませる必要がありますので、ご注意ください。
172172
173173 あなたの<strong>受付番号 (registration number)<strong>は以下に記載されています。番号をお控えの上、受付状況の確認や会議の際のご自身の情報の確認などにお使いください。
Index: trunk/wikimania/wmreg/includes/notinuse/language_pl.php
@@ -17,25 +17,25 @@
1818 'egy0' => 'Nie. (W poniższych polach podaj numer paszportu i nazwisko)',
1919 'surname' => 'Nazwisko',
2020 'given_name' => 'Imię',
21 -'sex' => 'Płeć',
 21+'sex' => 'Płeć',
2222 'sex1' => 'Mężczyzna',
2323 'sex2' => 'Kobieta',
2424 'sex3' => 'Odmawiam podania',
25 -'id' => 'Numer paszportu',
26 -'country' => 'Kraj / Region',
27 -'city' => 'Stan / miasto',
 25+'id' => 'Numer paszportu',
 26+'country' => 'Kraj / Region',
 27+'city' => 'Stan / miasto',
2828 'birthday' => 'Data urodzenie (dd/mmm/rrrr)',
2929 'organization' => 'Organizacja',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, 'Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, 'Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>Znajomość języków</strong></p>',
38 -'langn' => 'Język ojczysty',
39 -'lang' => 'Poziom znajomości języka',
 38+'langn' => 'Język ojczysty',
 39+'lang' => 'Poziom znajomości języka',
4040 'select_lang' => 'Wybierz język',
4141 'select_level' => 'Wybierz poziom znajomości języka',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => 'Poziom znajomości języka 2',
5454 'lang3_level' => 'Poziom znajomości języka 3',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>Projekty Wikimedia i konto/konta e-mail</strong></p>
5858 <ul class="form_notice">
5959 <li>Informacja o twoim koncie będzie wykorzystana wyłącznie do celów rejestracji i pilnych powiadomień o Wikimanii 2008.</li>
6060 </ul>
61 -',
62 -'wiki_id' => 'Nazwa głównego projektu Wikimedia',
63 -'email' => 'Twój e-mail',
 61+',
 62+'wiki_id' => 'Nazwa głównego projektu Wikimedia',
 63+'email' => 'Twój e-mail',
6464
6565
6666 'legend2' => 'Uczestnictwo',
@@ -71,7 +71,7 @@
7272 'join1' => '17 lipca',
7373 'join2' => '18 lipca',
7474 'join3' => '19 lipca',
75 -'topic' => 'Preferowany zestaw sesji',
 75+'topic' => 'Preferowany zestaw sesji',
7676 'topic1' => 'Społeczności Wikimedia',
7777 'topic2' => 'Wolne treści',
7878 'topic3' => 'Infrastruktura techniczna',
@@ -82,7 +82,7 @@
8383 'showname2' => 'Konto Wikimedia',
8484 'showname3' => 'Organizacja',
8585 'showname4' => 'Inne',
86 -'size' => 'Rozmiar T-shirtu',
 86+'size' => 'Rozmiar T-shirtu',
8787 'food' => 'Ograniczenia diety',
8888 'food0' => '-',
8989 'food1' => 'Bez wołowiny',
@@ -91,10 +91,10 @@
9292 'food4' => 'Koszerna',
9393 'food5' => 'Inna',
9494 'food_other' => 'Określone ograniczenia dietetyczne',
95 -'allegric' => 'Alergie',
 95+'allegric' => 'Alergie',
9696 'transportation_assistance' => 'Pomoc w zorganizowaniu biletów lotniczych',
9797 'need_transportation_assistance' => 'Tak, potrzebuję pomocy w dziedzinie rezerwacji lotniczej',
98 -'visa_assistance' => 'Pomoc w uzyskaniu wizy',
 98+'visa_assistance' => 'Pomoc w uzyskaniu wizy',
9999 'need_visa_assistance' => 'Tak, potrzebuję pomocy',
100100 'visa_assistance_description' => 'Proszę podać jak organizatorzy mogą pomóc w uzyskaniu wizy. (po <strong>arabsku</strong> lub <strong>angielsku</strong>)',
101101
@@ -104,17 +104,17 @@
105105 Sprawdź szczegóły lokalizacji na <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>oficjalnej stronie Wikimanii</a> przed zarejestrowniem.</p>
106106 ',
107107 'accommodation_hotel' => 'Preferowany hotel.',
108 -'hotels_metropol'=> 'Hotel Metropol ($60 za noc)',
109 -'hotels_delta'=> 'Hotel Delta ($30 za noc)',
 108+'hotels_metropol' => 'Hotel Metropol ($60 za noc)',
 109+'hotels_delta' => 'Hotel Delta ($30 za noc)',
110110 'hotels_dorms' => 'Akademiki Saint Marc($10 za noc)',
111111
112 -'accommodation' => 'Noclegi',
 112+'accommodation' => 'Noclegi',
113113 'night1' => '16 lipca',
114114 'night2' => '17 lipca',
115115 'night3' => '18 lipca',
116116 'night4' => '19 lipca',
117117 'night5' => '20 lipca',
118 -'room' => 'Preferowany pokój',
 118+'room' => 'Preferowany pokój',
119119 'room2' => '2-osobowy',
120120 'room4' => '4-osobowy',
121121 'room6' => 'Bez znaczenia',
@@ -124,12 +124,12 @@
125125 <p>Możesz skorzystać ze swojego konta PayPal lub zapłacić kartą kredytową poprzez PayPal w <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">103 krajach / regionach</a> (Egipt jest z tej usługi wyłączony) lub przelewem na konto bankowe organizatorów w Aleksandrii. Uwaga: płatność przez PayPal jest niedostępna jeśli jesteś Egipcjaninem.</p>
126126 ',
127127
128 -'pay_method' => 'Rodzaj płatności',
 128+'pay_method' => 'Rodzaj płatności',
129129 'atm' => 'Przelew z konta bankowego',
130130 'receipt' => 'Rachunek',
131 -'need_receipt' => 'Tak, poproszę o rachunek',
132 -'receipt_title' => 'Tytuł',
133 -'receipt_address' => 'Adres do korespondencji',
 131+'need_receipt' => 'Tak, poproszę o rachunek',
 132+'receipt_title' => 'Tytuł',
 133+'receipt_address' => 'Adres do korespondencji',
134134
135135 'submit_notice' =>
136136 '<li><strong>Po wysłaniu formularza nadal dostępna jest możliwość weryfikacji zgłoszenia.</strong></li>',
@@ -166,7 +166,7 @@
167167
168168 $lang_messages = array(
169169 'successful' => 'Rejestracja zakończona',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p>Dziękujemy za zgłoszenie udziału w konferencji Wikimania 2008! Twój formularz rejestracyjny został wysłany. Aby rejestracja została potwierdzona musisz dokonać płatności.
172172
173173 Poniżej znajduje się Twój <strong>numer rejestracji</strong>. Zanotuj go, gdyż jest on używany do sprawdzania stanu rejestracji i potwierdzenia Twojej tożsamości.
Index: trunk/wikimania/wmreg/includes/notinuse/language_it.php
@@ -14,28 +14,28 @@
1515 ',
1616 'egy' => 'Sei cittadino della Repubblica Araba d\'Egitto?',
1717 'egy1' => 'Sì, lo sono. (Per favore, immetti il tuo numero di identificazione nazionale e il tuo nome nei campi seguenti.',
18 -'egy0' => 'No, non lo sono. (Per favore, immetti il tuo numero di passaporto e il tuo nome nei campi seguenti.)',
 18+'egy0' => 'No, non lo sono. (Per favore, immetti il tuo numero di passaporto e il tuo nome nei campi seguenti.)',
1919 'surname' => 'Cognome',
2020 'given_name' => 'Nome',
21 -'sex' => 'Sesso',
 21+'sex' => 'Sesso',
2222 'sex1' => 'Maschio',
2323 'sex2' => 'Femmina',
2424 'sex3' => 'Non dichiarato',
25 -'id' => 'ID / Numero di passaporto',
26 -'country' => 'Paese / Regione',
27 -'city' => 'Stato / Città',
 25+'id' => 'ID / Numero di passaporto',
 26+'country' => 'Paese / Regione',
 27+'city' => 'Stato / Città',
2828 'birthday' => 'Data di nascita (gg/mm/aaaa)',
2929 'organization' => 'Organizzazione',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, 'Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, 'Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>Lingue conosciute</strong></p>',
38 -'langn' => 'Lingua madre',
39 -'lang' => 'Livello di conoscenza',
 38+'langn' => 'Lingua madre',
 39+'lang' => 'Livello di conoscenza',
4040 'select_lang' => 'Seleziona la lingua',
4141 'select_level' => 'Seleziona il livello di conoscenza',
4242
@@ -52,26 +52,26 @@
5353 'lang2_level' => 'Livello di conoscenza della Lingua 2',
5454 'lang3_level' => 'Livello di conoscenza della Lingua 3',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>Progetto Wikimedia e account e-mail</strong></p>
5858 <ul class="form_notice">
5959 <li>Le informazioni relative alla tua e-mail saranno usate unicamente per la registrazione e per comunicazioni urgenti relative a Wikimania 2008.</li>
6060 </ul>
61 -',
62 -'wiki_id' => 'Account del progetto Wikimedia principale',
63 -'email' => 'La tua e-mail',
 61+',
 62+'wiki_id' => 'Account del progetto Wikimedia principale',
 63+'email' => 'La tua e-mail',
6464
6565
6666 'legend2' => 'Partecipazione',
6767 'title4' =>
6868 ' <p><strong>Partecipazione, badge e varie</strong></p>
69 - <p>Per una migliore organizzazione relativa ad alloggio, conferenze e altri servizi, indicaci le tue preferenze compilando i campi seguenti.</p>
 69+ <p>Per una migliore organizzazione relativa ad alloggio, conferenze e altri servizi, indicaci le tue preferenze compilando i campi seguenti.</p>
7070 ',
7171 'join_date' => 'Date di partecipazione',
7272 'join1' => '17 luglio',
7373 'join2' => '18 luglio',
7474 'join3' => '19 luglio',
75 -'topic' => 'Tema preferito',
 75+'topic' => 'Tema preferito',
7676 'topic1' => 'Comunità Wikimedia',
7777 'topic2' => 'Conoscenza libera',
7878 'topic3' => 'Infrastrutture tecniche',
@@ -82,7 +82,7 @@
8383 'showname2' => 'Account Wikimedia',
8484 'showname3' => 'Organizazione',
8585 'showname4' => 'Altro',
86 -'size' => 'Taglia della maglietta',
 86+'size' => 'Taglia della maglietta',
8787 'food' => 'Preferenze o problemi alimentari',
8888 'food0' => '-',
8989 'food1' => 'Non mangi carne',
@@ -91,10 +91,10 @@
9292 'food4' => 'Kosher',
9393 'food5' => 'Altro',
9494 'food_other' => 'Specifica preferenze o problemi alimentari',
95 -'allegric' => 'Allergie',
96 -'transportation_assistance' => 'Assistenza relativa ai biglietti per l\'aereo',
 95+'allegric' => 'Allergie',
 96+'transportation_assistance' => 'Assistenza relativa ai biglietti per l\'aereo',
9797 'need_transportation_assistance' => 'Sì, necessito di assistenza per la prenotazione del volo',
98 -'visa_assistance' => 'Assistenza per il visto',
 98+'visa_assistance' => 'Assistenza per il visto',
9999 'need_visa_assistance' => 'Sì, necessito di assistenza per il visto',
100100 'visa_assistance_description' => ' Per favore, illustra come lo staff può aiutarti con questioni relative al visto. (in <strong>arabo</strong> o <strong>inglese</strong>)',
101101
@@ -104,17 +104,17 @@
105105 Per favore, prima di registrarti, controlla i dettagli sul <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>sito ufficiale di Wikimania</a> per informazioni precise sulla posizione e le caratteristiche degli alloggi.</p>
106106 ',
107107 'accommodation_hotel' => 'Alloggio scelto',
108 -'hotels_metropol'=> 'Hotel Metropol (60$ a notte)',
109 -'hotels_delta'=> 'Hotel Delta (30$ a notte)',
 108+'hotels_metropol' => 'Hotel Metropol (60$ a notte)',
 109+'hotels_delta' => 'Hotel Delta (30$ a notte)',
110110 'hotels_dorms' => 'Dormitori del College Saint Marc (10$ a notte)',
111111
112 -'accommodation' => 'Giorni di alloggio',
 112+'accommodation' => 'Giorni di alloggio',
113113 'night1' => '16 luglio',
114114 'night2' => '17 luglio',
115115 'night3' => '18 luglio',
116116 'night4' => '19 luglio',
117117 'night5' => '20 luglio',
118 -'room' => 'Tipologia di stanza scelta',
 118+'room' => 'Tipologia di stanza scelta',
119119 'room2' => 'Doppia',
120120 'room4' => 'Quattro persone',
121121 'room6' => 'Indifferente',
@@ -124,12 +124,12 @@
125125 <p>Puoi addebitare sul tuo conto PayPal o pagare tramite la tua carta di credito via PayPal da <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">103 paesi / regioni</a> (Egitto escluso) o con rimessa e pagamento diretto sul conto bancario intestato al team di organizzazione ad Alexandria. Nota: se sei egiziano, l\'opzione PayPal verrà scartata.</p>
126126 ',
127127
128 -'pay_method' => 'Tipo di pagamento',
 128+'pay_method' => 'Tipo di pagamento',
129129 'atm' => 'Conto bancario',
130130 'receipt' => 'Ricevuta',
131 -'need_receipt' => 'Sì, necessito di ricevuta cartacea.',
132 -'receipt_title' => 'Titolo',
133 -'receipt_address' => 'Indirizzo di spedizione',
 131+'need_receipt' => 'Sì, necessito di ricevuta cartacea.',
 132+'receipt_title' => 'Titolo',
 133+'receipt_address' => 'Indirizzo di spedizione',
134134
135135 'submit_notice' =>
136136 '<li><strong>Dopo l\'invio del modulo, hai ancora una possibilità di verificare i dati della tua registrazione.</strong></li>',
@@ -166,7 +166,7 @@
167167
168168 $lang_messages = array(
169169 'successful' => 'Registrazione completata',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p>Grazie per la tua partecipazione a Wikimania 2008! La tua registrazione è stata inviata. Per favore, nota che hai bisogno di completare il processo di pagamento affinché la registrazione possa essere confermata.
172172
173173 Il tuo <strong>numero di registrazione</strong> sarà mostrato in basso. Prendi nota del numero dato che sarà usato per controllare lo stato della tua registrazione e per confermare la tua identità in futuro.
Index: trunk/wikimania/wmreg/includes/notinuse/language_nb.php
@@ -17,25 +17,25 @@
1818 'egy0' => 'Nei, det er jeg ikke. (Vennligst skriv inn ditt passnummer og navnet i passet i følgende felt)',
1919 'surname' => 'Etternavn',
2020 'given_name' => 'Fornavn',
21 -'sex' => 'Kjønn',
 21+'sex' => 'Kjønn',
2222 'sex1' => 'Mann',
2323 'sex2' => 'Kvinne',
2424 'sex3' => 'Vil ikke oppgi',
25 -'id' => 'ID / Passnummer',
26 -'country' => 'Land / Region',
27 -'city' => 'Stat / By',
 25+'id' => 'ID / Passnummer',
 26+'country' => 'Land / Region',
 27+'city' => 'Stat / By',
2828 'birthday' => 'Fødselsdato (dd/mm/åååå)',
2929 'organization' => 'Organisasjon',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, 'januar', 'februar', 'mars', 'april', 'mai', 'juni', 'juli', 'august', 'september', 'oktober', 'november', 'desember'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, 'januar', 'februar', 'mars', 'april', 'mai', 'juni', 'juli', 'august', 'september', 'oktober', 'november', 'desember' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>Lingvistisk ferdighet</strong></p>',
38 -'langn' => 'Morsmål',
39 -'lang' => 'Ferdighetsnivå',
 38+'langn' => 'Morsmål',
 39+'lang' => 'Ferdighetsnivå',
4040 'select_lang' => 'Velg språket',
4141 'select_level' => 'Velg ferdighetsnivå',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => 'Ferdighetsnivå for språk 2',
5454 'lang3_level' => 'Ferdighetsnivå for språk 3',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>Wikimedia-prosjekt og e-postkontoer</strong></p>
5858 <ul class="form_notice">
5959 <li>Din e-postadresse blir brukt til registrering og viktige meldinger rundt Wikimania 2008.</li>
6060 </ul>
61 -',
62 -'wiki_id' => 'Ønsket Wikimedia-prosjekt-kontonavn',
63 -'email' => 'Din e-postadresse',
 61+',
 62+'wiki_id' => 'Ønsket Wikimedia-prosjekt-kontonavn',
 63+'email' => 'Din e-postadresse',
6464
6565
6666 'legend2' => 'Deltagelse',
@@ -71,7 +71,7 @@
7272 'join1' => '17. juli',
7373 'join2' => '18. juli',
7474 'join3' => '19. juli',
75 -'topic' => 'Ønsket temalinje',
 75+'topic' => 'Ønsket temalinje',
7676 'topic1' => 'Wikimedia-prosjekter',
7777 'topic2' => 'Fritt innhold',
7878 'topic3' => 'Teknisk infrastruktur',
@@ -82,7 +82,7 @@
8383 'showname2' => 'Wikimedia-konto',
8484 'showname3' => 'Organisasjon',
8585 'showname4' => 'Annet',
86 -'size' => 'T-skjortestørrelse',
 86+'size' => 'T-skjortestørrelse',
8787 'food' => 'Kostholdsrestriksjoner',
8888 'food0' => '-',
8989 'food1' => 'Ikke biff',
@@ -91,10 +91,10 @@
9292 'food4' => 'Kosher',
9393 'food5' => 'Annet',
9494 'food_other' => 'Spesifiserte kostholdsrestriksjoner',
95 -'allegric' => 'Eventuelle allergier',
 95+'allegric' => 'Eventuelle allergier',
9696 'transportation_assistance' => 'Flybillettassistanse',
9797 'need_transportation_assistance' => 'Ja, jeg trenger deres assistanse for å bestille flybillett',
98 -'visa_assistance' => 'Visumsassistanse',
 98+'visa_assistance' => 'Visumsassistanse',
9999 'need_visa_assistance' => 'Ja, jeg trenger visumsassistanse',
100100 'visa_assistance_description' => ' Vennligst spesifiser hvordan organisasjonslaget kan hjelpe deg med visumproblemer. (på <strong>arabisk</strong> eller <strong>engelsk</strong>)',
101101
@@ -104,17 +104,17 @@
105105 Vennligst se detaljer på <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>Wikimanias offisielle nettside</a> for presis plassering og spesifikasjoner for hvert valg før du registrerer.</p>
106106 ',
107107 'accommodation_hotel' => 'Ønsket hotell.',
108 -'hotels_metropol'=> 'Metropol Hotel ($60 per natt)',
109 -'hotels_delta'=> 'Delta Hotel ($30 per natt)',
 108+'hotels_metropol' => 'Metropol Hotel ($60 per natt)',
 109+'hotels_delta' => 'Delta Hotel ($30 per natt)',
110110 'hotels_dorms' => 'Saint Marc Dorms ($10 per natt)',
111111
112 -'accommodation' => 'Dag(er) du skal være',
 112+'accommodation' => 'Dag(er) du skal være',
113113 'night1' => '16. juli',
114114 'night2' => '17. juli',
115115 'night3' => '18. juli',
116116 'night4' => '19. juli',
117117 'night5' => '20. juli',
118 -'room' => 'Ønsket rom',
 118+'room' => 'Ønsket rom',
119119 'room2' => 'dobbelt-',
120120 'room4' => 'firemanns-',
121121 'room6' => 'Bryr meg ikke',
@@ -124,12 +124,12 @@
125125 <p>Du kan belaste din PayPal-konto eller betale med kredittkort via PayPal 1 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">103 land / regioner</a> (Egypt er ikke inkludert) eller via remisse og direkte betaling til bankkontoen til organisasjonslaget i Alexandria. Merk: PayPal-muligheten frafaller hvis du er egyptisk</p>
126126 ',
127127
128 -'pay_method' => 'Betalingsmåte',
 128+'pay_method' => 'Betalingsmåte',
129129 'atm' => 'Bankkontobetaling',
130130 'receipt' => 'Kvittering',
131 -'need_receipt' => 'Ja, jeg trenger papirkvittering.',
132 -'receipt_title' => 'Tittel',
133 -'receipt_address' => 'Postadresse',
 131+'need_receipt' => 'Ja, jeg trenger papirkvittering.',
 132+'receipt_title' => 'Tittel',
 133+'receipt_address' => 'Postadresse',
134134
135135 'submit_notice' =>
136136 '<li><strong>Du har fortsatt mulighet til å verifisere registreringen din etter at du har levert blanketten.</strong></li>',
@@ -166,7 +166,7 @@
167167
168168 $lang_messages = array(
169169 'successful' => 'Registrering ferdig',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p>Takk for at du deltar på Wikimania 2008! Registreringsblanketten din har blitt sendt. Vennligst merk deg at du må fullføre betalingsprossessen for at registreringen kan bekreftes.
172172
173173 <strong>Registreringsnummeret</strong> ditt vil vises nedenfor. Vennligst noter nummeret, for det vil bli brukt ved spørsmål angående registreringsstatus og for å bekrefte din indentitet fremover.
Index: trunk/wikimania/wmreg/includes/notinuse/language_pt.php
@@ -17,25 +17,25 @@
1818 'egy0' => 'Não. (Por favor escreva seu número de passaporte e seu nome tal como figura no passaporte nos seguintes campos)',
1919 'surname' => 'Sobrenome',
2020 'given_name' => 'Nome',
21 -'sex' => 'Gênero',
 21+'sex' => 'Gênero',
2222 'sex1' => 'Masculino',
2323 'sex2' => 'Feminino',
2424 'sex3' => 'Não declara',
25 -'id' => 'Número de identificação / Número de Passaporte',
26 -'country' => 'País / Região',
27 -'city' => 'Estado / Cidade',
 25+'id' => 'Número de identificação / Número de Passaporte',
 26+'country' => 'País / Região',
 27+'city' => 'Estado / Cidade',
2828 'birthday' => 'Data de Nascimento (dd/mm/aaaa)',
2929 'organization' => 'Organização',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, 'Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, 'Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>Habilidades lingüísticas</strong></p>',
38 -'langn' => 'Língua nativa',
39 -'lang' => 'Nível',
 38+'langn' => 'Língua nativa',
 39+'lang' => 'Nível',
4040 'select_lang' => 'Escolhe uma língua',
4141 'select_level' => 'Escolhe o nível',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => 'Nível da língua 2',
5454 'lang3_level' => 'Nível da língua 3',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>Projeto da Wikimedia e direções de correio eletrônico</strong></p>
5858 <ul class="form_notice">
5959 <li>Teu correio eletrônico só será utilizado para a inscrição e para notificações urgentes sobre a Wikimania 2008.</li>
6060 </ul>
61 -',
62 -'wiki_id' => 'Nome da conta de seu projeto da Wikimedia preferido',
63 -'email' => 'Teu correio eletrônico',
 61+',
 62+'wiki_id' => 'Nome da conta de seu projeto da Wikimedia preferido',
 63+'email' => 'Teu correio eletrônico',
6464
6565
6666 'legend2' => 'Participação',
@@ -71,7 +71,7 @@
7272 'join1' => '17 de julho',
7373 'join2' => '18 de julho',
7474 'join3' => '19 de julho',
75 -'topic' => 'Área preferida',
 75+'topic' => 'Área preferida',
7676 'topic1' => 'Comunidades Wikimedia',
7777 'topic2' => 'Conteúdo livre',
7878 'topic3' => 'Infra-estrutura técnica',
@@ -82,7 +82,7 @@
8383 'showname2' => 'Conta de Wikimedia',
8484 'showname3' => 'Organização',
8585 'showname4' => 'Outro',
86 -'size' => 'Número da camiseta',
 86+'size' => 'Número da camiseta',
8787 'food' => 'Restrições na dieta',
8888 'food0' => '-',
8989 'food1' => 'Não como carne',
@@ -91,10 +91,10 @@
9292 'food4' => 'Kosher',
9393 'food5' => 'Outras',
9494 'food_other' => 'Restrições especificadas na dieta',
95 -'allegric' => 'Alguma alergia',
 95+'allegric' => 'Alguma alergia',
9696 'transportation_assistance' => 'Auxílio com passagens de vôos',
9797 'need_transportation_assistance' => 'Sim, eu necessito de seu auxílio com minha reserva de vôo',
98 -'visa_assistance' => 'Ajuda para obter a visa',
 98+'visa_assistance' => 'Ajuda para obter a visa',
9999 'need_visa_assistance' => 'Sim, preciso ajuda para obter a visa',
100100 'visa_assistance_description' => 'Por favor indica-nos como pode ajudar-te a equipe de organizadores a obter a visa. (em <strong>Árabe</strong> ou <strong>Inglês</strong>)',
101101
@@ -104,17 +104,17 @@
105105 Por favor confira os detalhes no <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>site oficial de Wikimania</a> para conhecer a localização e especificações exatas de cada opção antes de registrar-se.</p>
106106 ',
107107 'accommodation_hotel' => 'Hotel preferido.',
108 -'hotels_metropol'=> 'Hotel Metropol ($60 por noite)',
109 -'hotels_delta'=> 'Hotel Delta ($30 por noite)',
 108+'hotels_metropol' => 'Hotel Metropol ($60 por noite)',
 109+'hotels_delta' => 'Hotel Delta ($30 por noite)',
110110 'hotels_dorms' => 'Dormitórios en Saint Marc ($10 por noite)',
111111
112 -'accommodation' => 'Datas de permanência',
 112+'accommodation' => 'Datas de permanência',
113113 'night1' => '16 de julho',
114114 'night2' => '17 de julho',
115115 'night3' => '18 de julho',
116116 'night4' => '19 de julho',
117117 'night5' => '20 de julho',
118 -'room' => 'Preferência de habitação',
 118+'room' => 'Preferência de habitação',
119119 'room2' => 'Duplo',
120120 'room4' => 'Quádruplo',
121121 'room6' => 'Qualquer',
@@ -124,12 +124,12 @@
125125 <p>Podes utilizar tua conta Paypal ou pagar utilizando teu cartão de crédito através de PayPal em <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">103 países / regiões</a> (Não inclui Egito) ou por transferência e pagamento direto à conta bancária do equipe organizador em Alexandria. Nota: a opção de PayPal será descartada se você é egípcio</p>
126126 ',
127127
128 -'pay_method' => 'Tipo de Pagamento',
 128+'pay_method' => 'Tipo de Pagamento',
129129 'atm' => 'Pago através de conta bancária',
130130 'receipt' => 'Recibo',
131 -'need_receipt' => 'Sim, preciso recibo impresso.',
132 -'receipt_title' => 'Título',
133 -'receipt_address' => 'Direção postal',
 131+'need_receipt' => 'Sim, preciso recibo impresso.',
 132+'receipt_title' => 'Título',
 133+'receipt_address' => 'Direção postal',
134134
135135 'submit_notice' =>
136136 '<li><strong>Depois de enviar o formulário, terás a possibilidade de verificar sua inscrição.</strong></li>',
@@ -166,7 +166,7 @@
167167
168168 $lang_messages = array(
169169 'successful' => 'Inscrição completa',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p>Obrigado por unir-se ao Wikimania 2008! Seu formulário de inscrição foi aceito. Por favor, tem em conta que precisas completar o processo de pagamento para que a inscrição possa ser confirmada.
172172
173173 Teu <strong>número de inscrição</strong> será mostrado abaixo. Por favor, anote esse número já que será utilizado para conferir o estado de sua inscrição e para confirmar sua identidade no futuro.
Index: trunk/wikimania/wmreg/includes/notinuse/language_cs.php
@@ -17,25 +17,25 @@
1818 'egy0' => 'Ne, nejsem. (Do následujících polí uveďte číslo cestovního pasu a jméno)',
1919 'surname' => 'Příjmení',
2020 'given_name' => 'Jméno',
21 -'sex' => 'Pohlaví',
 21+'sex' => 'Pohlaví',
2222 'sex1' => 'Muž',
2323 'sex2' => 'Žena',
2424 'sex3' => 'Nechci uvést',
25 -'id' => 'ID / Číslo pasu',
26 -'country' => 'Země / Region',
27 -'city' => 'Stát / Město',
 25+'id' => 'ID / Číslo pasu',
 26+'country' => 'Země / Region',
 27+'city' => 'Stát / Město',
2828 'birthday' => 'Datum narození (dd/mmm/yyyy)',
2929 'organization' => 'Organizace',
30 -'year1' => '',
31 -'year' => '',
32 -'month' => '',
33 -'months' => array(NULL, 'ledna', 'února', 'března', 'dubna', 'května', 'června', 'července', 'srpna', 'září', 'října', 'listopadu', 'prosince'),
34 -'day' => '',
 30+'year1' => '',
 31+'year' => '',
 32+'month' => '',
 33+'months' => array( NULL, 'ledna', 'února', 'března', 'dubna', 'května', 'června', 'července', 'srpna', 'září', 'října', 'listopadu', 'prosince' ),
 34+'day' => '',
3535
3636 'title2' =>
3737 ' <p><strong>Jazykové schopnosti</strong></p>',
38 -'langn' => 'Mateřský jazyk',
39 -'lang' => 'Úroveň znalosti',
 38+'langn' => 'Mateřský jazyk',
 39+'lang' => 'Úroveň znalosti',
4040 'select_lang' => 'Vyberte jazyk',
4141 'select_level' => 'Vyberte úroveň znalosti',
4242
@@ -52,14 +52,14 @@
5353 'lang2_level' => 'Úroveň znalosti jazyka 2',
5454 'lang3_level' => 'Úroveň znalosti jazyka 3',
5555
56 -'title3' =>
 56+'title3' =>
5757 ' <p><strong>Projekt Wikimedia a e-mail účtu</strong></p>
5858 <ul class="form_notice">
5959 <li>Informace o elektronické adrese budou použity pouze pro účely registrace a v případě neodkladných oznámení o Wikimanii 2008.</li>
6060 </ul>
61 -',
62 -'wiki_id' => 'Přihlašovací jméno zvoleného účtu na projektu Wikimedia',
63 -'email' => 'Váš e-mail',
 61+',
 62+'wiki_id' => 'Přihlašovací jméno zvoleného účtu na projektu Wikimedia',
 63+'email' => 'Váš e-mail',
6464
6565
6666 'legend2' => 'Účast',
@@ -71,7 +71,7 @@
7272 'join1' => '17. červenec',
7373 'join2' => '18. červenec',
7474 'join3' => '19. červenec',
75 -'topic' => 'Zájmová témata',
 75+'topic' => 'Zájmová témata',
7676 'topic1' => 'Komunity Wikimedia',
7777 'topic2' => 'Svobodná tvorba',
7878 'topic3' => 'Technická infrastruktura',
@@ -82,7 +82,7 @@
8383 'showname2' => 'Účet Wikimedia',
8484 'showname3' => 'Organizace',
8585 'showname4' => 'Ostatní',
86 -'size' => 'Velikost trička',
 86+'size' => 'Velikost trička',
8787 'food' => 'Stravovací požadavky',
8888 'food0' => '-',
8989 'food1' => 'Žádné hovězí',
@@ -91,10 +91,10 @@
9292 'food4' => 'Košer',
9393 'food5' => 'Jiné',
9494 'food_other' => 'Jiné stravovací požadavky',
95 -'allegric' => 'Žádné alergie',
 95+'allegric' => 'Žádné alergie',
9696 'transportation_assistance' => 'Pomoc s rezervací letu',
9797 'need_transportation_assistance' => 'Ano, potřebuji pomoci s rezervací letu',
98 -'visa_assistance' => 'Pomoc při získání víza',
 98+'visa_assistance' => 'Pomoc při získání víza',
9999 'need_visa_assistance' => 'Ano, potřebuji pomoc s vízem',
100100 'visa_assistance_description' => 'Uveďte, jak Vám může organizační tým pomoci se získáním víza. (v <strong>arabštině</strong> nebo <strong>angličtině</strong>)',
101101
@@ -104,17 +104,17 @@
105105 Před vyplněním formuláře si prostudujte detaily jednotlivých variant na <a href=http://wikimania2008.wikimedia.org/wiki/Accommodation>oficiální stránce Wikimanie</a>.</p>
106106 ',
107107 'accommodation_hotel' => 'Preferovaný hotel',
108 -'hotels_metropol'=> 'Hotel Metropol ($60 za noc)',
109 -'hotels_delta'=> 'Hotel Delta ($30 za noc)',
 108+'hotels_metropol' => 'Hotel Metropol ($60 za noc)',
 109+'hotels_delta' => 'Hotel Delta ($30 za noc)',
110110 'hotels_dorms' => 'Koleje Saint-Marc ($10 za noc)',
111111
112 -'accommodation' => 'Dny ubytování',
 112+'accommodation' => 'Dny ubytování',
113113 'night1' => '16. červenec',
114114 'night2' => '17. červenec',
115115 'night3' => '18. červenec',
116116 'night4' => '19. červenec',
117117 'night5' => '20. červenec',
118 -'room' => 'Preferovaný pokoj',
 118+'room' => 'Preferovaný pokoj',
119119 'room2' => '2-lůžkový',
120120 'room4' => '4-lůžkový',
121121 'room6' => 'Libovolný',
@@ -124,12 +124,12 @@
125125 <p>Můžete využít svůj PayPal účet nebo kreditní kartu prostřednictvím PayPal účtu <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_display-approved-signup-countries-outside" title="PayPal Worldwide">ve 103 státech / regionech</a> (Egypt není obsažen) nebo bankovním převodem na účet organizačního týmu v Alexandrii. Pozor: Platbu prostřednictvím Paypal účtu nemohou využít egyptští občané.</p>
126126 ',
127127
128 -'pay_method' => 'Způsob platby',
 128+'pay_method' => 'Způsob platby',
129129 'atm' => 'Bankovní převod',
130130 'receipt' => 'Potvrzení',
131 -'need_receipt' => 'Ano, potřebuji písemné potvrzení.',
132 -'receipt_title' => 'Platební titul',
133 -'receipt_address' => 'Poštovní adresa',
 131+'need_receipt' => 'Ano, potřebuji písemné potvrzení.',
 132+'receipt_title' => 'Platební titul',
 133+'receipt_address' => 'Poštovní adresa',
134134
135135 'submit_notice' =>
136136 '<li><strong>Po odeslání formuláře je možno ověřit stav registrace.</strong></li>',
@@ -166,7 +166,7 @@
167167
168168 $lang_messages = array(
169169 'successful' => 'Registrace dokončena',
170 -'successful_description' =>
 170+'successful_description' =>
171171 '<p>Děkujeme Vám za účast na Wikimanii 2008! Vaše registrace byla odeslána. Po obdržení Vaší platby bude registrace potvrzena.
172172
173173 <strong>Číslo Vaší registrace</strong> bude uvedeno níže. Toto číslo si poznamenejte, bude používáno ke kontrole stavu registrace a později k potvrzení Vaší identity.
Index: trunk/wikimania/wmreg/includes/language_he.php
@@ -11,24 +11,24 @@
1212 '<p><strong>פרטי זיהוי אישיים</strong></p>',
1313 'surname' => 'שם משפחה',
1414 'given_name' => 'שם פרטי',
15 -'sex' => 'מין',
 15+'sex' => 'מין',
1616 'sex1' => 'זכר',
1717 'sex2' => 'נקבה',
1818 'sex3' => 'מעדיף לא לציין',
19 -'passport' => 'מספר דרכון',
 19+'passport' => 'מספר דרכון',
2020 'passport_valid' => 'דרכון בתוקף עד (יום/חודש/שנה)',
2121 'passport_issued' => 'מקום הוצאת הדרכון',
22 -'country' => 'ארץ מגורים',
 22+'country' => 'ארץ מגורים',
2323 'birthday' => 'תאריך לידה (יום/חודש/שנה/)',
24 -'year1' => '',
25 -'year' => '',
26 -'month' => '',
27 -'months' => array(NULL, 'ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'),
28 -'day' => '',
 24+'year1' => '',
 25+'year' => '',
 26+'month' => '',
 27+'months' => array( NULL, 'ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר' ),
 28+'day' => '',
2929
3030 'title2' => '<p><strong>כישורי שפה</strong></p>',
31 -'langn' => 'שפת אם',
32 -'lang' => 'רמת השליטה',
 31+'langn' => 'שפת אם',
 32+'lang' => 'רמת השליטה',
3333 'select_lang' => 'בחירת השפה',
3434 'select_level' => 'בחירת רמת השליטה',
3535
@@ -45,11 +45,11 @@
4646 'lang2_level' => 'רמת שליטה לשפה 2',
4747 'lang3_level' => 'רמת שליטה לשפה 3',
4848
49 -'title3' =>
 49+'title3' =>
5050 '<p><strong>שם משתמש במיזמי ויקימדיה וכתובת דוא"ל</strong></p>
51 -<p>המידע לגבי הדוא"ל ישמש אך ורק לצורכי הרישום ולהודעות דחופות בנוגע לוויקימניה 2011.</p>',
52 -'wiki_id' => 'שם משתמש במיזם ויקימדיה ',
53 -'email' => 'כתובת דוא"ל',
 51+<p>המידע לגבי הדוא"ל ישמש אך ורק לצורכי הרישום ולהודעות דחופות בנוגע לוויקימניה 2011.</p>',
 52+'wiki_id' => 'שם משתמש במיזם ויקימדיה ',
 53+'email' => 'כתובת דוא"ל',
5454
5555 'legend2' => 'השתתפות',
5656 'title4' =>
@@ -68,17 +68,17 @@
6969 'showname1' => 'שם',
7070 'showname2' => 'שם משתמש בוויקימדיה',
7171 'showname3' => 'מידע נוסף:',
72 -'size' => 'מידת החולצה',
 72+'size' => 'מידת החולצה',
7373 'food' => 'מגבלות תזונה<br><small>כל המזון שיוגש במהלך הכנס יהיה כשר</small>',
7474 'food0' => 'אין',
7575 'food1' => 'צמחוני',
7676 'food2' => 'בשר חלאל למוסלמים',
7777 'food_other' => 'מגבלת תזונה אחרת:',
7878
79 -'title_visa' =>
 79+'title_visa' =>
8080 '<p><strong>סיוע בהנפקת אשרת כניסה</strong></p>
81 -<p>אם הינכם זקוקים לעזרה מהמארגנים בהנפקת אשרת כניסה לישראל, אנא מלאו את החלק הזה.',
82 -'visa_assistance' => 'עזרה בהנפקת אשרת כניסה',
 81+<p>אם הינכם זקוקים לעזרה מהמארגנים בהנפקת אשרת כניסה לישראל, אנא מלאו את החלק הזה.',
 82+'visa_assistance' => 'עזרה בהנפקת אשרת כניסה',
8383 'need_visa_assistance' => 'כן, אני זקוק לעזרה מהמארגנים בהנפקת אשרת כניסה לישראל',
8484 'visa_assistance_description' => 'בקשות מיוחדות הנוגעות להנפקת אשרת כניסה',
8585 'title5' =>
@@ -100,7 +100,7 @@
101101 'hotel5stars' => 'מלונות חמישה כוכבים',
102102 'hotelboutique' => 'מלונות בוטיק',
103103 'accommodation' => 'הלילות שבהם אזדקק לסידור לינה',
104 -'night1' => 'יום שני, 1 באוגוסט 2011',
 104+'night1' => 'יום שני, 1 באוגוסט 2011',
105105 'night2' => 'יום שלישי, 2 באוגוסט 2011',
106106 'night3' => 'יום רביעי, 3 באוגוסט 2011',
107107 'night4' => 'יום חמישי, 4 באוגוסט 2011',
@@ -108,7 +108,7 @@
109109 'night6' => 'יום שבת, 6 באוגוסט 2011',
110110 'night7' => 'יום ראשון, 7 באוגוסט 2011',
111111 'night8' => 'יום שני, 8 באוגוסט 2011',
112 -'room' => 'חדר מועדף',
 112+'room' => 'חדר מועדף',
113113 'room1' => 'חדר ליחיד',
114114 'room2' => 'חדר לשניים עם שותף מאותו המין שייבחר באקראי על ידי המארגנים',
115115 'room3' => 'חדר זוגי עם משתתף ספציפי (הכניסו את שמו המלא):',
@@ -145,8 +145,8 @@
146146 'color' => 'צבע חולצה',
147147 'white' => 'לבן',
148148 'black' => 'שחור',
149 -'nationality' => 'הדרכון הונפק על ידי',
150 -'countryofbirth' => 'ארץ לידה',
 149+'nationality' => 'הדרכון הונפק על ידי',
 150+'countryofbirth' => 'ארץ לידה',
151151 'homeaddress' => 'כתובת מגורים',
152152 'picktour' => 'יעד טיולים מועדף',
153153 'tour0' => 'אין העדפה',
@@ -161,7 +161,7 @@
162162
163163 $lang_messages = array(
164164 'successful' => 'הרישום הושלם',
165 -'successful_description' =>
 165+'successful_description' =>
166166 '<p>תודה על ההצטרפות לוויקימניה 2011! טופס הרישום נשלח. יש להשלים את תהליך התשלום כדי שהרישום יאושר.
167167
168168 <strong>מספר הרישום</strong> שלך מופיע להלן. נא לרשום את המספר לשם שימוש בו כדי לבדוק את מצב הרישום, וכדי להזדהות במערכת בעתיד.
Index: trunk/wikimania/wmreg/includes/language_it.php
@@ -11,26 +11,26 @@
1212 'title1' => '<p><strong>Dati anagrafici</strong></p>',
1313 'surname' => 'Cognome',
1414 'given_name' => 'Nome',
15 -'sex' => 'Sesso',
 15+'sex' => 'Sesso',
1616 'sex1' => 'Maschio',
1717 'sex2' => 'Femmina',
18 -'sex3' => 'Non dichiarato',
19 -'passport' => 'Passaporto numero',
 18+'sex3' => 'Non dichiarato',
 19+'passport' => 'Passaporto numero',
2020 'passport_valid' => 'Passaporto valido fino a (gg/mmm/aaaa)<br><small>Il tuo passaporto deve essere valido per 6 mesi.</small>',
2121 'passport_issued' => 'Luogo di rilascio del passaporto',
22 -'country' => 'Stato di residenza',
 22+'country' => 'Stato di residenza',
2323 'birthday' => 'Data di nascita (gg/mmm/aaaa)',
2424 'organization' => 'Organizzazione',
25 -'year1' => '',
26 -'year' => '',
27 -'month' => '',
28 -'months' => array(NULL, 'Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'),
29 -'day' => '',
 25+'year1' => '',
 26+'year' => '',
 27+'month' => '',
 28+'months' => array( NULL, 'Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre' ),
 29+'day' => '',
3030
3131 'title2' =>
3232 ' <p><strong>Lingue conosciute</strong></p>',
33 -'langn' => 'Lingua madre',
34 -'lang' => 'Livello di conoscenza',
 33+'langn' => 'Lingua madre',
 34+'lang' => 'Livello di conoscenza',
3535 'select_lang' => 'Seleziona la lingua',
3636 'select_level' => 'Seleziona il livello di conoscenza',
3737
@@ -47,12 +47,12 @@
4848 'lang2_level' => 'Livello di conoscenza della lingua 2',
4949 'lang3_level' => 'Livello di conoscenza della lingua 3',
5050
51 -'title3' =>
 51+'title3' =>
5252 '<p><strong>Progetto Wikimedia e indirizzo e-mail</strong></p>
5353 <p>Le informazioni relative alla tua e-mail saranno usate unicamente per la registrazione e per comunicazioni urgenti relative a Wikimania 2011.</p>
54 -',
55 -'wiki_id' => 'Nome utente del progetto Wikimedia principale',
56 -'email' => 'La tua e-mail',
 54+',
 55+'wiki_id' => 'Nome utente del progetto Wikimedia principale',
 56+'email' => 'La tua e-mail',
5757
5858
5959 'legend2' => 'Partecipazione',
@@ -71,16 +71,16 @@
7272 'showname1' => 'Nome',
7373 'showname2' => 'Nome utente',
7474 'showname3' => 'Altre informazioni:',
75 -'size' => 'Taglia della maglietta',
 75+'size' => 'Taglia della maglietta',
7676 'food' => 'Preferenze o problemi alimentari',
7777 'food0' => 'Nessuna',
7878 'food1' => 'Vegetariano',
7979 'food2' => 'Halal',
8080 'food_other' => 'Altro:',
8181
82 -'title_visa' =>
 82+'title_visa' =>
8383 '<p><strong>Assistenza per il visto</strong></p>
84 -<p>Se il tuo passaporto è rilasciato da <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>uno Stato per cui è richiesto un visto d\'ingresso in Israele</a>, compila questa sezione perché l\'organizzazione possa trasmettere i tuoi dati al Ministero degli esteri israeliano.',
 84+<p>Se il tuo passaporto è rilasciato da <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>uno Stato per cui è richiesto un visto d\'ingresso in Israele</a>, compila questa sezione perché l\'organizzazione possa trasmettere i tuoi dati al Ministero degli esteri israeliano.',
8585 'need_visa_assistance' => 'Sì, mi serve un visto d\'ingresso per Israele',
8686 'visa_assistance' => 'Assistenza per il visto',
8787 'visa_assistance_description' => 'Qualsiasi richiesta particolare di assistenza per il visto (in <strong>inglese</strong>)',
@@ -104,7 +104,7 @@
105105 'hotel5stars' => 'Alberghi a cinque stelle',
106106 'hotelboutique' => 'Alberghi eleganti',
107107
108 -'accommodation' => 'Notti per cui è necessario l\'alloggio',
 108+'accommodation' => 'Notti per cui è necessario l\'alloggio',
109109 'night1' => 'Lunedì 1º agosto 2011',
110110 'night2' => 'Martedì 2 agosto 2011',
111111 'night3' => 'Mercoledì 3 agosto 2011',
@@ -113,7 +113,7 @@
114114 'night6' => 'Sabato 6 agosto 2011',
115115 'night7' => 'Domenica 7 agosto 2011',
116116 'night8' => 'Lunedì 8 agosto 2011',
117 -'room' => 'Stanza preferita',
 117+'room' => 'Stanza preferita',
118118 'room1' => 'Singola',
119119 'room2' => 'Matrimoniale/doppia con compagno/a di stanza dello stesso sesso scelto/a a caso dall\'organizzazione',
120120 'room3' => 'Matrimoniale/doppia con compagno/a di stanza specificato/a (inserire nome completo):',
@@ -151,8 +151,8 @@
152152 'color' => 'Colore della maglietta',
153153 'white' => 'Bianca',
154154 'black' => 'Nera',
155 -'nationality' => 'Passaporto rilasciato da',
156 -'countryofbirth' => 'Stato di nascita',
 155+'nationality' => 'Passaporto rilasciato da',
 156+'countryofbirth' => 'Stato di nascita',
157157 'homeaddress' => 'Indirizzo di residenza',
158158 'picktour' => 'Destinazione turistica preferita',
159159 'tour0' => 'Nessuna',
@@ -167,7 +167,7 @@
168168
169169 $lang_messages = array(
170170 'successful' => 'Registrazione completata',
171 -'successful_description' =>
 171+'successful_description' =>
172172 '<p>Grazie per la tua partecipazione a Wikimania 2011! La tua registrazione è stata inviata. Per favore, nota che hai bisogno di completare il processo di pagamento affinché la registrazione possa essere confermata.
173173
174174 Il tuo <strong>numero di registrazione</strong> sarà mostrato in basso. Prendi nota del numero dato, che sarà usato per controllare lo stato della tua registrazione e per confermare la tua identità in futuro.
Index: trunk/wikimania/wmreg/includes/UserSession.php
@@ -2,14 +2,14 @@
33 /* ToyCastle project */
44
55 /* Rrevent hacking */
6 -if(!defined('TC_STARTED'))
7 -{ die('Hacking Attempt'); }
 6+if ( !defined( 'TC_STARTED' ) )
 7+{ die( 'Hacking Attempt' ); }
88
9 -define('TC_TABLE_MEMBER','admins');
10 -define('TC_COOKIE_SESSION_NAME', 'wikimania');
 9+define( 'TC_TABLE_MEMBER', 'admins' );
 10+define( 'TC_COOKIE_SESSION_NAME', 'wikimania' );
1111
1212 /* Class UserSession start */
13 -Class UserSession
 13+Class UserSession
1414 {
1515
1616 var $handle; /* Session ID */
@@ -18,47 +18,47 @@
1919 {
2020 $this->handle = '';
2121 }
22 -
23 - function Start($custom_session_id = '')
 22+
 23+ function Start( $custom_session_id = '' )
2424 {
2525 global $sql, $_COOKIE ;
2626
2727 /* Check SQL */
28 - if (!$sql->handle)
 28+ if ( !$sql->handle )
2929 { return false; }
3030
3131 /* If there is no Session, create it */
32 - if(!$_COOKIE[TC_COOKIE_SESSION_NAME] && ! $custom_session_id)
 32+ if ( !$_COOKIE[TC_COOKIE_SESSION_NAME] && ! $custom_session_id )
3333 { return $this->Create(); }
34 -
 34+
3535 /* Cookie Session ID as 2nd order */
36 - if (!$custom_session_id)
 36+ if ( !$custom_session_id )
3737 { $custom_session_id = $_COOKIE[TC_COOKIE_SESSION_NAME]; }
38 -
 38+
3939 /* First, check for vaild Session ID */
40 - if(preg_match('/[^0-9A-Z]/i', $custom_session_id)) return false;
41 - if(!preg_match('/^[0-9A-Z]{32}$/is', $custom_session_id)) return false;
42 -
 40+ if ( preg_match( '/[^0-9A-Z]/i', $custom_session_id ) ) return false;
 41+ if ( !preg_match( '/^[0-9A-Z]{32}$/is', $custom_session_id ) ) return false;
 42+
4343 /* Then, start Session */
44 - session_name(TC_COOKIE_SESSION_NAME);
45 - session_id($custom_session_id);
 44+ session_name( TC_COOKIE_SESSION_NAME );
 45+ session_id( $custom_session_id );
4646 session_start();
4747
4848 $this->handle = $custom_session_id;
4949
5050 /* If a logged-in user */
51 - if (array_key_exists('logged_in', $_SESSION))
 51+ if ( array_key_exists( 'logged_in', $_SESSION ) )
5252 {
5353 /* Check for vaild ID */
54 - if(preg_match('/[^0-9A-Z\_\-]/i',$_SESSION[user_id])) {
 54+ if ( preg_match( '/[^0-9A-Z\_\-]/i', $_SESSION[user_id] ) ) {
5555 $this->Destroy();
5656 return false;
5757 }
58 -
 58+
5959 /* Check for vaild login data */
60 - $result = $sql->selectData(TC_TABLE_MEMBER, array(), '`user_id`=\''.$_SESSION[user_id].'\' and `password`=\''.$sql->EscapeString($_SESSION[user_password]).'\'');
61 - $login_data = $sql->fetchArray($result);
62 - if(!$result || !$login_data)
 60+ $result = $sql->selectData( TC_TABLE_MEMBER, array(), '`user_id`=\'' . $_SESSION[user_id] . '\' and `password`=\'' . $sql->EscapeString( $_SESSION[user_password] ) . '\'' );
 61+ $login_data = $sql->fetchArray( $result );
 62+ if ( !$result || !$login_data )
6363 {
6464 $this->Destroy();
6565 return false;
@@ -68,17 +68,17 @@
6969 }
7070 else
7171 {
72 - unset($_SESSION['user_id']);
73 - unset($_SESSION['user_password']);
 72+ unset( $_SESSION['user_id'] );
 73+ unset( $_SESSION['user_password'] );
7474 return true;
7575 }
7676 }
7777
7878 function Create()
7979 {
80 - $new_sessionid = md5(uniqid(mt_rand(),true));
81 - session_name(TC_COOKIE_SESSION_NAME);
82 - session_id($new_sessionid);
 80+ $new_sessionid = md5( uniqid( mt_rand(), true ) );
 81+ session_name( TC_COOKIE_SESSION_NAME );
 82+ session_id( $new_sessionid );
8383 session_start();
8484 $this->handle = $new_sessionid;
8585 return true;
@@ -87,9 +87,9 @@
8888 function Destroy()
8989 {
9090
91 - if (isset($_COOKIE[TC_COOKIE_SESSION_NAME]))
 91+ if ( isset( $_COOKIE[TC_COOKIE_SESSION_NAME] ) )
9292 {
93 - setcookie(TC_COOKIE_SESSION_NAME, '', time()-42000, '/');
 93+ setcookie( TC_COOKIE_SESSION_NAME, '', time() -42000, '/' );
9494 }
9595
9696 session_destroy();
Index: trunk/wikimania/wmreg/includes/mail.php
@@ -1,11 +1,11 @@
22 <?php
3 -function mail_msg($to, $subject, $body)
 3+function mail_msg( $to, $subject, $body )
44 {
55 require_once "Mail.php";
66
77 // this is partly over-ridden by Gmail SMTP
88 $from = "Wikimania 2011 Registration <wikimania-registration@wikimedia.org>";
9 - $headers = array ('From' => $from,
 9+ $headers = array ( 'From' => $from,
1010 'To' => $to,
1111 'Subject' => $subject,
1212 'MIME-Version' => '1.0',
@@ -13,11 +13,11 @@
1414 'Reply-To' => 'wikimania-registration@wikimedia.org',
1515 'X-Mailer' => 'PHP/' . phpversion()
1616 );
17 - $smtp = Mail::factory('mail');
18 - $mail = $smtp->send($to, $headers, $body);
 17+ $smtp = Mail::factory( 'mail' );
 18+ $mail = $smtp->send( $to, $headers, $body );
1919
20 - if (PEAR::isError($mail)) {
21 - echo("<p>" . $mail->getMessage() . "</p>");
 20+ if ( PEAR::isError( $mail ) ) {
 21+ echo( "<p>" . $mail->getMessage() . "</p>" );
2222 return false;
2323 } else {
2424 return true;
Index: trunk/wikimania/wmreg/includes/language_ar.php
@@ -11,24 +11,24 @@
1212 '<p><strong>بيانات التحقق من الشخصية</strong></p>',
1313 'surname' => 'اسم العائلة (اللقب)',
1414 'given_name' => 'الاسم الشخصي',
15 -'sex' => 'النوع',
 15+'sex' => 'النوع',
1616 'sex1' => 'ذكر',
1717 'sex2' => 'أنثى',
1818 'sex3' => 'أفضّل عدم الإفصاح',
19 -'passport' => 'رقم جواز السفر',
 19+'passport' => 'رقم جواز السفر',
2020 'passport_valid' => 'تاريخ انتهاء صلاحية جواز السفر (يوم/شهر/سنة)',
2121 'passport_issued' => 'مكان إصدار جواز السفر',
22 -'country' => 'دولة الإقامة',
 22+'country' => 'دولة الإقامة',
2323 'birthday' => 'تاريخ الميلاد (يوم/شهر/سنة)',
24 -'year1' => '',
25 -'year' => '',
26 -'month' => '',
27 -'months' => array(NULL, 'كانون الثاني (يناير)', 'شباط (فبراير)', 'أذار (مارس)', 'نيسان (أبريل)', 'أيار (مايو)', 'حزيران (يونيو)', 'تموز (يوليو)', 'آب (أغسطس)', 'أيلول (سبتمبر)', 'تشرين الأول (أكتوبر)', 'تشرين الثاني (نوفمبر)', 'كانون الأول (ديسمبر)'),
28 -'day' => '',
 24+'year1' => '',
 25+'year' => '',
 26+'month' => '',
 27+'months' => array( NULL, 'كانون الثاني (يناير)', 'شباط (فبراير)', 'أذار (مارس)', 'نيسان (أبريل)', 'أيار (مايو)', 'حزيران (يونيو)', 'تموز (يوليو)', 'آب (أغسطس)', 'أيلول (سبتمبر)', 'تشرين الأول (أكتوبر)', 'تشرين الثاني (نوفمبر)', 'كانون الأول (ديسمبر)' ),
 28+'day' => '',
2929
3030 'title2' => '<p><strong>إتقان اللغات</strong></p>',
31 -'langn' => 'اللغة الأم',
32 -'lang' => 'المستوى',
 31+'langn' => 'اللغة الأم',
 32+'lang' => 'المستوى',
3333 'select_lang' => 'اختيار اللغة',
3434 'select_level' => 'اختيار المستوى',
3535
@@ -45,11 +45,11 @@
4646 'lang2_level' => 'المستوى فى اللغة الثانية',
4747 'lang3_level' => 'المستوى فى اللغة الثالثة',
4848
49 -'title3' =>
 49+'title3' =>
5050 '<p><strong>اسم الحساب في مشاريع ويكيميديا وعنوان البريد الإلكتروني</strong></p>
51 -<p>لن يتم استخدام معلومات بريدك الإلكتروني إلا من أجل التسجيل والتنبيهات العاجلة الخاصة بويكيمانيا 2011.</p>',
52 -'wiki_id' => 'اسم الحساب في أحد مشاريع ويكيميديا',
53 -'email' => 'عنوان البريد الإلكتروني',
 51+<p>لن يتم استخدام معلومات بريدك الإلكتروني إلا من أجل التسجيل والتنبيهات العاجلة الخاصة بويكيمانيا 2011.</p>',
 52+'wiki_id' => 'اسم الحساب في أحد مشاريع ويكيميديا',
 53+'email' => 'عنوان البريد الإلكتروني',
5454
5555 'legend2' => 'المشاركة',
5656 'title4' =>
@@ -68,17 +68,17 @@
6969 'showname1' => 'الاسم',
7070 'showname2' => 'اسم الحساب في مشاريع ويكيميديا',
7171 'showname3' => 'معلومات إضافية : ',
72 -'size' => 'مقاس القميص (التي شيرت)',
 72+'size' => 'مقاس القميص (التي شيرت)',
7373 'food' => 'تقييدات غذائية محددة<br><small>سيكون الطعام المقدم لحاضري المؤتمر "كاشير"، أي مطابق لتعاليم الديانة اليهودية.</small>',
7474 'food0' => 'لا توجد',
7575 'food1' => 'نباتي',
7676 'food2' => 'حلال',
7777 'food_other' => 'تقييدات غذائية أخرى : ',
7878
79 -'title_visa' =>
 79+'title_visa' =>
8080 '<p><strong>المساعدة في الحصول على التأشيرة</strong></p>
81 -<p>إذا صدر جواز السفر خاصتك عن <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>دولة يجب على مواطنيها الحصول على تأشيرة دخول إلى إسرائيل</a>، يرجى منك تعبئة الجزء التالي من الاستمارة لكي يتمكن منظمو المؤتمر من تحويل تفاصيلك إلى وزارة الخارجية الإسرائيلية.',
82 -'visa_assistance' => 'المساعدة في الحصول على التأشيرة',
 81+<p>إذا صدر جواز السفر خاصتك عن <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>دولة يجب على مواطنيها الحصول على تأشيرة دخول إلى إسرائيل</a>، يرجى منك تعبئة الجزء التالي من الاستمارة لكي يتمكن منظمو المؤتمر من تحويل تفاصيلك إلى وزارة الخارجية الإسرائيلية.',
 82+'visa_assistance' => 'المساعدة في الحصول على التأشيرة',
8383 'need_visa_assistance' => 'نعم، أنا بحاجة إلى مساعدة منظمي المؤتمر في ما يتعلق بالحصول على تأشيرة دخول لإسرائيل.',
8484 'visa_assistance_description' => 'طلبات خاصة متعلقة بالحصول على تأشيرة دخول',
8585 'title5' =>
@@ -100,7 +100,7 @@
101101 'hotel5stars' => 'فنادق الخمس نجمات',
102102 'hotelboutique' => 'فنادق بوتيك',
103103 'accommodation' => 'الليالي التي أحتاج فيها إلى الإقامة في فندق',
104 -'night1' => 'الاثنان، 1 آب (أغسطس) 2011',
 104+'night1' => 'الاثنان، 1 آب (أغسطس) 2011',
105105 'night2' => 'الثلاثاء، 2 آب (أغسطس) 2011',
106106 'night3' => 'الأربعاء، 3 آب (أغسطس) 2011',
107107 'night4' => 'الخميس، 4 آب (أغسطس) 2011',
@@ -108,7 +108,7 @@
109109 'night6' => 'السبت، 6 آب (أغسطس) 2011',
110110 'night7' => 'الأحد، 7 آب (أغسطس) 2011',
111111 'night8' => 'الاثنان، آب (أغسطس) 2011',
112 -'room' => 'نوع الغرفة المفضل',
 112+'room' => 'نوع الغرفة المفضل',
113113 'room1' => 'غرفة فردية',
114114 'room2' => 'غرفة مزدوجة مشاركة مع زميل من نفس الجنس يتم اختياره من قبل منظمي المؤتمر عشوائيا',
115115 'room3' => 'غرفة مزدوجة مشاركة مع شخص معين (يرجى ذكر اسمه الكامل):',
@@ -144,8 +144,8 @@
145145 'color' => 'لون القميص ',
146146 'white' => 'أبيض',
147147 'black' => 'أسود',
148 -'nationality' => 'جهة إصدار جواز السفر ',
149 -'countryofbirth' => 'دولة الميلاد ',
 148+'nationality' => 'جهة إصدار جواز السفر ',
 149+'countryofbirth' => 'دولة الميلاد ',
150150 'homeaddress' => 'العنوان الحالي ',
151151 'picktour' => 'وجهة الرحلة السياحية المفضلة ',
152152 'tour0' => 'لا يهمني',
@@ -160,7 +160,7 @@
161161
162162 $lang_messages = array(
163163 'successful' => 'اكتمل التسجيل',
164 -'successful_description' =>
 164+'successful_description' =>
165165 '<p>نشكرك على الانضمام لويكيمانيا 2011 ! تم إرسال استمارة التسجيل خاصتك. يرجى الانتباه إلى ضرورة إكمال خطوات الدفع حتى يتم تأكيد تسجيلك.
166166
167167 يظهر <strong>رقم التسجيل</strong> خاصتك بالأسفل. يرجى القيام بتدوينه من أجل الاستعلام عن حالة التسجيل ولتأكيد الهوية لاحقا.
Index: trunk/wikimania/wmreg/includes/language_en.php
@@ -12,24 +12,24 @@
1313 '<p><strong>Personal identification data</strong></p>',
1414 'surname' => 'Last name',
1515 'given_name' => 'First name',
16 -'sex' => 'Gender',
 16+'sex' => 'Gender',
1717 'sex1' => 'Male',
1818 'sex2' => 'Female',
1919 'sex3' => 'Decline to state',
20 -'passport' => 'Passport number',
 20+'passport' => 'Passport number',
2121 'passport_valid' => 'Passport valid until (dd/mmm/yyyy)<br><small>Your passport has to be valid for 6 months</small>',
2222 'passport_issued' => 'Place where passport was issued',
23 -'country' => 'Country of residence',
 23+'country' => 'Country of residence',
2424 'birthday' => 'Date of Birth (dd/mmm/yyyy)',
25 -'year1' => '',
26 -'year' => '',
27 -'month' => '',
28 -'months' => array(NULL, 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'),
29 -'day' => '',
 25+'year1' => '',
 26+'year' => '',
 27+'month' => '',
 28+'months' => array( NULL, 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ),
 29+'day' => '',
3030 'title2' =>
3131 ' <p><strong>Linguistic abilities</strong></p>',
32 -'langn' => 'Mother language',
33 -'lang' => 'Additional languages',
 32+'langn' => 'Mother language',
 33+'lang' => 'Additional languages',
3434 'select_lang' => 'Select the language',
3535 'select_level' => 'Select the skill level',
3636
@@ -46,13 +46,13 @@
4747 'lang2_level' => 'Skill level for Language 2',
4848 'lang3_level' => 'Skill level for Language 3',
4949
50 -'title3' =>
 50+'title3' =>
5151 '<p><strong>Wikimedia project and e-mail account</strong></p>
5252 <p>Your e-mail information will be used for registration and urgent notification on Wikimania 2011 only.
5353 </p>
54 -',
55 -'wiki_id' => 'Wikimedia project username',
56 -'email' => 'Your e-mail',
 54+',
 55+'wiki_id' => 'Wikimedia project username',
 56+'email' => 'Your e-mail',
5757
5858 'legend2' => 'Participation',
5959 'title4' =>
@@ -70,23 +70,23 @@
7171 'showname1' => 'Name',
7272 'showname2' => 'Wikimedia account',
7373 'showname3' => 'Additional information:',
74 -'size' => 'T-shirt size',
 74+'size' => 'T-shirt size',
7575 'food' => 'Dietary restriction<br><small>All food served during the conference will be kosher.</small>',
7676 'food0' => 'None',
7777 'food1' => 'Vegetarian',
7878 'food2' => 'Halal',
7979 'food_other' => 'Other:',
80 -
81 -'title_visa' =>
 80+
 81+'title_visa' =>
8282 '<p><strong>Visa assistance</strong></p>
83 -<p>If your passport is issued by <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>a country for which an entry visa to Israel is required</a>, please fill out this section so that the organizers can pass your details to the Israeli Ministry of Foreign Affairs.',
 83+<p>If your passport is issued by <a href=http://wikimania2011.wikimedia.org/wiki/Visas#Visa_required>a country for which an entry visa to Israel is required</a>, please fill out this section so that the organizers can pass your details to the Israeli Ministry of Foreign Affairs.',
8484 'need_visa_assistance' => 'Yes, I require an entry visa for Israel',
8585 'visa_assistance' => 'Visa assistance',
8686 'visa_assistance_description' => 'Any special request related to visa assistance (in <strong>English</strong>)',
8787
8888 'title5' =>
8989 '<p><strong>Accommodation</strong></p>
90 -<p>You can stay in a hotel or in the dormitories.
 90+<p>You can stay in a hotel or in the dormitories.
9191 Please refer to the <a href=http://wikimania2011.wikimedia.org/wiki/Accommodation>accommodation page</a> for exact <b>prices</b>, locations and other details.</p>',
9292 'accommodation_hotel' => 'Preferred accommodation<br><b><small>(<a href=http://wikimania2011.wikimedia.org/wiki/Accommodation onClick="return popup(this, \'prices\')">Prices</a>)</small></b>',
9393 'hotel1' => 'Dorm room',
@@ -103,7 +103,7 @@
104104 'hotel5stars' => 'Five star hotels',
105105 'hotelboutique' => 'Boutique hotels',
106106
107 -'accommodation' => 'Nights for which accommodation is needed',
 107+'accommodation' => 'Nights for which accommodation is needed',
108108 'night1' => 'Monday, August 1st, 2011',
109109 'night2' => 'Tuesday, August 2nd, 2011',
110110 'night3' => 'Wednesday, August 3rd, 2011',
@@ -112,7 +112,7 @@
113113 'night6' => 'Saturday, August 6th, 2011',
114114 'night7' => 'Sunday, August 7th, 2011',
115115 'night8' => 'Monday, August 8th, 2011',
116 -'room' => 'Preferred room',
 116+'room' => 'Preferred room',
117117 'room1' => 'Single occupancy',
118118 'room2' => 'Twin/double occupancy with same-gender partner randomly selected by organizers',
119119 'room3' => 'Double occupancy with specified partner (enter full name):',
@@ -148,8 +148,8 @@
149149 'color' => 'T-shirt Color',
150150 'white' => 'White',
151151 'black' => 'Black',
152 -'nationality' => 'Passport issued by',
153 -'countryofbirth' => 'Country of birth',
 152+'nationality' => 'Passport issued by',
 153+'countryofbirth' => 'Country of birth',
154154 'homeaddress' => 'Home address',
155155 'picktour' => 'Preferred tour destination',
156156 'tour0' => 'No tour preference',
@@ -165,7 +165,7 @@
166166
167167 $lang_messages = array(
168168 'successful' => 'Registration complete',
169 -'successful_description' =>
 169+'successful_description' =>
170170 '<p>Thank you for joining Wikimania 2011! Your registration form has been submitted. Please note that you need to complete the payment process so the registration can be confirmed.
171171
172172 Your <strong>registration number</strong> will be shown below. Please take a note of the number for it will be used for querying the registration status and to confirm your identity in the future.
Index: trunk/wikimania/wmreg/includes/prices.php
@@ -2,79 +2,79 @@
33
44 $attendance_costs = array(
55 'wikimedia_contributor' => array(
6 - 'very_early_bird' => array('day' => 20, 'all' => 45),
7 - 'early_bird' => array('day' => 25, 'all' => 55),
8 - 'regular' => array('day' => 35, 'all' => 75)
 6+ 'very_early_bird' => array( 'day' => 20, 'all' => 45 ),
 7+ 'early_bird' => array( 'day' => 25, 'all' => 55 ),
 8+ 'regular' => array( 'day' => 35, 'all' => 75 )
99 ),
1010 'regular_attendee' => array(
11 - 'very_early_bird' => array('day' => 30, 'all' => 70),
12 - 'early_bird' => array('day' => 40, 'all' => 90),
13 - 'regular' => array('day' => 50, 'all' => 120)
 11+ 'very_early_bird' => array( 'day' => 30, 'all' => 70 ),
 12+ 'early_bird' => array( 'day' => 40, 'all' => 90 ),
 13+ 'regular' => array( 'day' => 50, 'all' => 120 )
1414 )
1515 );
1616
1717 $accommodation_costs = array(
1818
1919 'hotel1' => array(// Dorm room
20 - 'very_early_bird' => array('1' => 20, '2' => 20),
21 - 'early_bird' => array('1' => 25, '2' => 25),
22 - 'regular' => array('1' => 30, '2' => 30)
 20+ 'very_early_bird' => array( '1' => 20, '2' => 20 ),
 21+ 'early_bird' => array( '1' => 25, '2' => 25 ),
 22+ 'regular' => array( '1' => 30, '2' => 30 )
2323 ),
2424 'hotel2' => array(// Ganei Dan
25 - 'very_early_bird' => array('1' => 84, '2' => 50),
26 - 'early_bird' => array('1' => 89, '2' => 58),
27 - 'regular' => array('1' => 97, '2' => 69),
 25+ 'very_early_bird' => array( '1' => 84, '2' => 50 ),
 26+ 'early_bird' => array( '1' => 89, '2' => 58 ),
 27+ 'regular' => array( '1' => 97, '2' => 69 ),
2828 ),
2929 'hotel3' => array(// Marom
30 - 'very_early_bird' => array('1' => 84, '2' => 50),
31 - 'early_bird' => array('1' => 89, '2' => 58),
32 - 'regular' => array('1' => 97, '2' => 69),
 30+ 'very_early_bird' => array( '1' => 84, '2' => 50 ),
 31+ 'early_bird' => array( '1' => 89, '2' => 58 ),
 32+ 'regular' => array( '1' => 97, '2' => 69 ),
3333 ),
3434 'hotel4' => array(// Har HaCarmel
35 - 'very_early_bird' => array('1' => 91, '2' => 50),
36 - 'early_bird' => array('1' => 96, '2' => 58),
37 - 'regular' => array('1' => 101, '2' => 69),
 35+ 'very_early_bird' => array( '1' => 91, '2' => 50 ),
 36+ 'early_bird' => array( '1' => 96, '2' => 58 ),
 37+ 'regular' => array( '1' => 101, '2' => 69 ),
3838 ),
3939 'hotel5' => array(// Nof
40 - 'very_early_bird' => array('1' => 100, '2' => 56),
41 - 'early_bird' => array('1' => 106, '2' => 63),
42 - 'regular' => array('1' => 116, '2' => 68),
 40+ 'very_early_bird' => array( '1' => 100, '2' => 56 ),
 41+ 'early_bird' => array( '1' => 106, '2' => 63 ),
 42+ 'regular' => array( '1' => 116, '2' => 68 ),
4343 ),
4444 'hotel6' => array(// Dan Panorama
45 - 'very_early_bird' => array('1' => 115, '2' => 70),
46 - 'early_bird' => array('1' => 125, '2' => 81),
47 - 'regular' => array('1' => 136, '2' => 91),
 45+ 'very_early_bird' => array( '1' => 115, '2' => 70 ),
 46+ 'early_bird' => array( '1' => 125, '2' => 81 ),
 47+ 'regular' => array( '1' => 136, '2' => 91 ),
4848 ),
4949 'hotel7' => array(// Crown Plaza
50 - 'very_early_bird' => array('1' => 162, '2' => 97),
51 - 'early_bird' => array('1' => 172, '2' => 108),
52 - 'regular' => array('1' => 182, '2' => 118),
 50+ 'very_early_bird' => array( '1' => 162, '2' => 97 ),
 51+ 'early_bird' => array( '1' => 172, '2' => 108 ),
 52+ 'regular' => array( '1' => 182, '2' => 118 ),
5353 ),
5454 'hotel8' => array(// Colony
55 - 'very_early_bird' => array('1' => 136, '2' => 84),
56 - 'early_bird' => array('1' => 146, '2' => 94),
57 - 'regular' => array('1' => 156, '2' => 104),
 55+ 'very_early_bird' => array( '1' => 136, '2' => 84 ),
 56+ 'early_bird' => array( '1' => 146, '2' => 94 ),
 57+ 'regular' => array( '1' => 156, '2' => 104 ),
5858 ),
5959 'hotel9' => array(// Gallery
60 - 'very_early_bird' => array('1' => 91, '2' => 58),
61 - 'early_bird' => array('1' => 96, '2' => 63),
62 - 'regular' => array('1' => 101, '2' => 68),
 60+ 'very_early_bird' => array( '1' => 91, '2' => 58 ),
 61+ 'early_bird' => array( '1' => 96, '2' => 63 ),
 62+ 'regular' => array( '1' => 101, '2' => 68 ),
6363 )
6464 );
6565
6666 $usd_to_nis = 3.6;
6767 $vat_rate = 0.16;
6868
69 -$early_registration_start = gmmktime(0, 0, 0, /*april*/ 4, /*1st*/ 1, 2011);
70 -$regular_registration_start = gmmktime(0, 0, 0, /*june*/ 6, /*1st*/ 1, 2011);
 69+$early_registration_start = gmmktime( 0, 0, 0, /*april*/ 4, /*1st*/ 1, 2011 );
 70+$regular_registration_start = gmmktime( 0, 0, 0, /*june*/ 6, /*1st*/ 1, 2011 );
7171
7272 $local_country = 'us'; /* Israel */
7373 $local_currency = 'USD'; /* New Israeli Shekel */
7474
75 -function calculate_cost($register_data)
 75+function calculate_cost( $register_data )
7676 {
7777 global $attendance_costs, $accommodation_costs, $usd_to_nis, $vat_rate, $early_registration_start,
78 - $regular_registration_start, $local_country, $local_currency;
 78+ $regular_registration_start, $local_country, $local_currency;
7979 $attendee_type = 'regular_attendee';
8080 $period = 'very_early_bird';
8181 $currency = 'USD';
@@ -84,131 +84,131 @@
8585 $n_main_days = 0;
8686 $people_in_room = 0;
8787 $hotel = '';
88 -
89 - if (in_array('3', $register_data['join_date']))
 88+
 89+ if ( in_array( '3', $register_data['join_date'] ) )
9090 $n_main_days++;
91 - if (in_array('4', $register_data['join_date']))
 91+ if ( in_array( '4', $register_data['join_date'] ) )
9292 $n_main_days++;
93 - if (in_array('5', $register_data['join_date']))
 93+ if ( in_array( '5', $register_data['join_date'] ) )
9494 $n_main_days++;
95 -
96 - if (time() > $early_registration_start)
 95+
 96+ if ( time() > $early_registration_start )
9797 $period = 'early_bird';
98 - if (time() > $regular_registration_start)
 98+ if ( time() > $regular_registration_start )
9999 $period = 'regular';
100 -
101 - if ($register_data['wiki_id'] && $register_data['wiki_language'] && $register_data['wiki_project'])
 100+
 101+ if ( $register_data['wiki_id'] && $register_data['wiki_language'] && $register_data['wiki_project'] )
102102 {
103103 $attendee_type = 'wikimedia_contributor';
104 - }
105 -
106 - if ($n_main_days == 3)
 104+ }
 105+
 106+ if ( $n_main_days == 3 )
107107 {
108108 $attendance_cost = $attendance_costs[$attendee_type][$period]['all'];
109109 }
110 - else
 110+ else
111111 {
112112 $attendance_cost = $attendance_costs[$attendee_type][$period]['day'] * $n_main_days;
113113 }
114 -
 114+
115115 $hotel = 'hotel' . $register_data['hotels'];
116 - if ($register_data['room'] == 1)
 116+ if ( $register_data['room'] == 1 )
117117 $people_in_room = '1';
118 - else if ($register_data['room'] == 2 || $register_data['room'] == 3)
 118+ else if ( $register_data['room'] == 2 || $register_data['room'] == 3 )
119119 $people_in_room = '2';
120 - $n_nights = count($register_data['nights']);
121 -
 120+ $n_nights = count( $register_data['nights'] );
 121+
122122 $accommodation_cost = $accommodation_costs[$hotel][$period][$people_in_room] * $n_nights;
123 -
124 - if ($register_data['country'] == $local_country)
 123+
 124+ if ( $register_data['country'] == $local_country )
125125 {
126126 $attendance_cost *= $usd_to_nis;
127127 $accommodation_cost *= $usd_to_nis;
128128 $vat_cost = $accommodation_cost * $vat_rate;
129129 $currency = $local_currency;
130130 }
131 -
132131
133 - if (substr($register_data['discount_code'],0,7) == 'WMFFULL'
134 - && substr(md5('HAIFA2011' . substr($register_data['discount_code'],8,2)), 0, 4) == substr($register_data['discount_code'],10,4))
 132+
 133+ if ( substr( $register_data['discount_code'], 0, 7 ) == 'WMFFULL'
 134+ && substr( md5( 'HAIFA2011' . substr( $register_data['discount_code'], 8, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 10, 4 ) )
135135 {
136136 $attendance_cost = 0;
137137 $accommodation_cost = 0;
138138 $vat_cost = 0;
139 - }
140 - else if (substr($register_data['discount_code'],0,7) == 'WMITALY'
141 - && substr(md5('HAIFA2011ITALY' . substr($register_data['discount_code'],8,2)), 0, 4) == substr($register_data['discount_code'],10,4))
 139+ }
 140+ else if ( substr( $register_data['discount_code'], 0, 7 ) == 'WMITALY'
 141+ && substr( md5( 'HAIFA2011ITALY' . substr( $register_data['discount_code'], 8, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 10, 4 ) )
142142 {
143143 $attendance_cost = 0;
144144 $accommodation_cost = 0;
145145 $vat_cost = 0;
146146 }
147 - else if (substr($register_data['discount_code'],0,7) == 'WMGRMNY'
148 - && substr(md5('HAIFA2011GERMANY' . substr($register_data['discount_code'],8,2)), 0, 4) == substr($register_data['discount_code'],10,4))
 147+ else if ( substr( $register_data['discount_code'], 0, 7 ) == 'WMGRMNY'
 148+ && substr( md5( 'HAIFA2011GERMANY' . substr( $register_data['discount_code'], 8, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 10, 4 ) )
149149 {
150150 $attendance_cost = 0;
151151 $accommodation_cost = 0;
152152 $vat_cost = 0;
153153 }
154 - else if (substr($register_data['discount_code'],0,7) == 'WMOESTR'
155 - && substr(md5('HAIFA2011AUSTRIA' . substr($register_data['discount_code'],8,2)), 0, 4) == substr($register_data['discount_code'],10,4))
 154+ else if ( substr( $register_data['discount_code'], 0, 7 ) == 'WMOESTR'
 155+ && substr( md5( 'HAIFA2011AUSTRIA' . substr( $register_data['discount_code'], 8, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 10, 4 ) )
156156 {
157157 $attendance_cost = 0;
158158 $accommodation_cost = 0;
159159 $vat_cost = 0;
160160 }
161 - else if (substr($register_data['discount_code'],0,7) == 'WMSWISS'
162 - && substr(md5('HAIFA2011SWITZERLAND' . substr($register_data['discount_code'],8,2)), 0, 4) == substr($register_data['discount_code'],10,4))
 161+ else if ( substr( $register_data['discount_code'], 0, 7 ) == 'WMSWISS'
 162+ && substr( md5( 'HAIFA2011SWITZERLAND' . substr( $register_data['discount_code'], 8, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 10, 4 ) )
163163 {
164164 $attendance_cost = 0;
165165 $accommodation_cost = 0;
166166 $vat_cost = 0;
167167 }
168 - else if (substr($register_data['discount_code'],0,7) == 'WMRUSFD'
169 - && substr(md5('HAIFA2011RUSSIA' . substr($register_data['discount_code'],8,2)), 0, 4) == substr($register_data['discount_code'],10,4))
 168+ else if ( substr( $register_data['discount_code'], 0, 7 ) == 'WMRUSFD'
 169+ && substr( md5( 'HAIFA2011RUSSIA' . substr( $register_data['discount_code'], 8, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 10, 4 ) )
170170 {
171171 $attendance_cost = 0;
172172 $accommodation_cost = 0;
173173 $vat_cost = 0;
174174 }
175 - else if (substr($register_data['discount_code'],0,7) == 'WMFRNCE'
176 - && substr(md5('HAIFA2011FRANCE' . substr($register_data['discount_code'],8,2)), 0, 4) == substr($register_data['discount_code'],10,4))
 175+ else if ( substr( $register_data['discount_code'], 0, 7 ) == 'WMFRNCE'
 176+ && substr( md5( 'HAIFA2011FRANCE' . substr( $register_data['discount_code'], 8, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 10, 4 ) )
177177 {
178178 $attendance_cost = 0;
179179 $accommodation_cost = 0;
180180 $vat_cost = 0;
181181 }
182 - else if (substr($register_data['discount_code'],0,7) == 'WMSTAFF'
183 - && substr(md5('HAIFA2011FOUNDATION' . substr($register_data['discount_code'],8,2)), 0, 4) == substr($register_data['discount_code'],10,4))
 182+ else if ( substr( $register_data['discount_code'], 0, 7 ) == 'WMSTAFF'
 183+ && substr( md5( 'HAIFA2011FOUNDATION' . substr( $register_data['discount_code'], 8, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 10, 4 ) )
184184 {
185185 $attendance_cost = 0;
186186 $accommodation_cost = 0;
187187 $vat_cost = 0;
188188 }
189 - else if (substr($register_data['discount_code'],0,5) == 'PRESS'
190 - && substr(md5('HAIFA2011PRESS' . substr($register_data['discount_code'],6,2)), 0, 4) == substr($register_data['discount_code'],8,4))
 189+ else if ( substr( $register_data['discount_code'], 0, 5 ) == 'PRESS'
 190+ && substr( md5( 'HAIFA2011PRESS' . substr( $register_data['discount_code'], 6, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 8, 4 ) )
191191 {
192192 $attendance_cost = 0;
193193 $accommodation_cost = 0;
194194 $vat_cost = 0;
195195 }
196 - else if (substr($register_data['discount_code'],0,4) == 'WMIL'
197 - && substr(md5('HAIFA2011ISRAEL' . substr($register_data['discount_code'],5,2)), 0, 4) == substr($register_data['discount_code'],7,4))
 196+ else if ( substr( $register_data['discount_code'], 0, 4 ) == 'WMIL'
 197+ && substr( md5( 'HAIFA2011ISRAEL' . substr( $register_data['discount_code'], 5, 2 ) ), 0, 4 ) == substr( $register_data['discount_code'], 7, 4 ) )
198198 {
199199 $attendance_cost = 0;
200200 $accommodation_cost = 0;
201201 $vat_cost = 0;
202202 }
203 -
204 - $attendance_cost = round($attendance_cost, 2);
205 - $accommodation_cost = round($accommodation_cost, 2);
206 - $vat_cost = round($vat_cost, 2);
207 -
 203+
 204+ $attendance_cost = round( $attendance_cost, 2 );
 205+ $accommodation_cost = round( $accommodation_cost, 2 );
 206+ $vat_cost = round( $vat_cost, 2 );
 207+
208208 $cost_total = $attendance_cost + $accommodation_cost + $vat_cost;
209 - $cost_total = round($cost_total, 2);
 209+ $cost_total = round( $cost_total, 2 );
210210
211 - return array('attendance_cost' => $attendance_cost, 'accommodation_cost' => $accommodation_cost, 'vat_cost' => $vat_cost,
212 - 'cost_total' => $cost_total, 'currency' => $currency);
 211+ return array( 'attendance_cost' => $attendance_cost, 'accommodation_cost' => $accommodation_cost, 'vat_cost' => $vat_cost,
 212+ 'cost_total' => $cost_total, 'currency' => $currency );
213213
214214 }
215215
Index: trunk/wikimania/wmreg/includes/languages.php
@@ -3,17 +3,17 @@
44 /**
55 * A list of Wikimedia Projects
66 */
7 -$WikimediaProjects = array( 'wikipedia', 'wiktionary', 'wikiquote', 'wikibooks', 'wikisource', 'wikinews', 'wikiversity', 'wikimedia', 'hamakor' /*WMIL partner organization*/);
 7+$WikimediaProjects = array( 'wikipedia', 'wiktionary', 'wikiquote', 'wikibooks', 'wikisource', 'wikinews', 'wikiversity', 'wikimedia', 'hamakor' /*WMIL partner organization*/ );
88
99 /**
1010 * URLs of some wikis are (blah).wikimedia.org, this is a list of them.
1111 */
12 -$WikimediaOrgs = array('commons', 'incubator', 'mediawiki', 'meta', 'species');
 12+$WikimediaOrgs = array( 'commons', 'incubator', 'mediawiki', 'meta', 'species' );
1313
1414 /**
1515 * A list of available language files
1616 */
17 -$available_languages = array('en' => 'English', 'he' => 'עברית', 'ar' => 'العربية', 'de' => 'Deutsch', 'es' => 'Español', 'fr' => 'Français', 'it' => 'Italiano',);
 17+$available_languages = array( 'en' => 'English', 'he' => 'עברית', 'ar' => 'العربية', 'de' => 'Deutsch', 'es' => 'Español', 'fr' => 'Français', 'it' => 'Italiano', );
1818
1919 /**
2020 * A list of Wikimedia website languages
Index: trunk/wikimania/wmreg/recaptchalib.php
@@ -35,22 +35,22 @@
3636 /**
3737 * The reCAPTCHA server URL's
3838 */
39 -define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
40 -define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
41 -define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
 39+define( "RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api" );
 40+define( "RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api" );
 41+define( "RECAPTCHA_VERIFY_SERVER", "www.google.com" );
4242
4343 /**
4444 * Encodes the given data into a query string format
4545 * @param $data - array of string elements to be encoded
4646 * @return string - encoded request
4747 */
48 -function _recaptcha_qsencode ($data) {
 48+function _recaptcha_qsencode ( $data ) {
4949 $req = "";
5050 foreach ( $data as $key => $value )
51 - $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
 51+ $req .= $key . '=' . urlencode( stripslashes( $value ) ) . '&';
5252
5353 // Cut the last '&'
54 - $req=substr($req,0,strlen($req)-1);
 54+ $req = substr( $req, 0, strlen( $req ) -1 );
5555 return $req;
5656 }
5757
@@ -64,29 +64,29 @@
6565 * @param int port
6666 * @return array response
6767 */
68 -function _recaptcha_http_post($host, $path, $data, $port = 80) {
 68+function _recaptcha_http_post( $host, $path, $data, $port = 80 ) {
6969
70 - $req = _recaptcha_qsencode ($data);
 70+ $req = _recaptcha_qsencode ( $data );
7171
7272 $http_request = "POST $path HTTP/1.0\r\n";
7373 $http_request .= "Host: $host\r\n";
7474 $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
75 - $http_request .= "Content-Length: " . strlen($req) . "\r\n";
 75+ $http_request .= "Content-Length: " . strlen( $req ) . "\r\n";
7676 $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
7777 $http_request .= "\r\n";
7878 $http_request .= $req;
7979
8080 $response = '';
81 - if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 40) ) ) {
82 - die ('Could not open socket');
 81+ if ( false == ( $fs = @fsockopen( $host, $port, $errno, $errstr, 40 ) ) ) {
 82+ die ( 'Could not open socket' );
8383 }
8484
85 - fwrite($fs, $http_request);
 85+ fwrite( $fs, $http_request );
8686
87 - while ( !feof($fs) )
88 - $response .= fgets($fs, 1160); // One TCP-IP packet
89 - fclose($fs);
90 - $response = explode("\r\n\r\n", $response, 2);
 87+ while ( !feof( $fs ) )
 88+ $response .= fgets( $fs, 1160 ); // One TCP-IP packet
 89+ fclose( $fs );
 90+ $response = explode( "\r\n\r\n", $response, 2 );
9191
9292 return $response;
9393 }
@@ -103,26 +103,26 @@
104104
105105 * @return string - The HTML to be embedded in the user's form.
106106 */
107 -function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
 107+function recaptcha_get_html ( $pubkey, $error = null, $use_ssl = false )
108108 {
109 - if ($pubkey == null || $pubkey == '') {
110 - die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
 109+ if ( $pubkey == null || $pubkey == '' ) {
 110+ die ( "To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>" );
111111 }
112 -
113 - if ($use_ssl) {
 112+
 113+ if ( $use_ssl ) {
114114 $server = RECAPTCHA_API_SECURE_SERVER;
115115 } else {
116116 $server = RECAPTCHA_API_SERVER;
117117 }
118118
119119 $errorpart = "";
120 - if ($error) {
 120+ if ( $error ) {
121121 $errorpart = "&amp;error=" . $error;
122122 }
123 - return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 123+ return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
124124
125125 <noscript>
126 - <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
 126+ <iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
127127 <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
128128 <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
129129 </noscript>';
@@ -149,27 +149,27 @@
150150 * @param array $extra_params an array of extra variables to post to the server
151151 * @return ReCaptchaResponse
152152 */
153 -function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
 153+function recaptcha_check_answer ( $privkey, $remoteip, $challenge, $response, $extra_params = array() )
154154 {
155 - if ($privkey == null || $privkey == '') {
156 - die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
 155+ if ( $privkey == null || $privkey == '' ) {
 156+ die ( "To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>" );
157157 }
158158
159 - if ($remoteip == null || $remoteip == '') {
160 - die ("For security reasons, you must pass the remote ip to reCAPTCHA");
 159+ if ( $remoteip == null || $remoteip == '' ) {
 160+ die ( "For security reasons, you must pass the remote ip to reCAPTCHA" );
161161 }
162162
163 -
164 -
165 - //discard spam submissions
166 - if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
 163+
 164+
 165+ // discard spam submissions
 166+ if ( $challenge == null || strlen( $challenge ) == 0 || $response == null || strlen( $response ) == 0 ) {
167167 $recaptcha_response = new ReCaptchaResponse();
168168 $recaptcha_response->is_valid = false;
169169 $recaptcha_response->error = 'incorrect-captcha-sol';
170170 return $recaptcha_response;
171171 }
172172
173 - $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
 173+ $response = _recaptcha_http_post ( RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
174174 array (
175175 'privatekey' => $privkey,
176176 'remoteip' => $remoteip,
@@ -178,10 +178,10 @@
179179 ) + $extra_params
180180 );
181181
182 - $answers = explode ("\n", $response [1]);
 182+ $answers = explode ( "\n", $response [1] );
183183 $recaptcha_response = new ReCaptchaResponse();
184184
185 - if (trim ($answers [0]) == 'true') {
 185+ if ( trim ( $answers [0] ) == 'true' ) {
186186 $recaptcha_response->is_valid = true;
187187 }
188188 else {
@@ -199,45 +199,45 @@
200200 * @param string $domain The domain where the page is hosted
201201 * @param string $appname The name of your application
202202 */
203 -function recaptcha_get_signup_url ($domain = null, $appname = null) {
204 - return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
 203+function recaptcha_get_signup_url ( $domain = null, $appname = null ) {
 204+ return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode ( array ( 'domains' => $domain, 'app' => $appname ) );
205205 }
206206
207 -function _recaptcha_aes_pad($val) {
 207+function _recaptcha_aes_pad( $val ) {
208208 $block_size = 16;
209 - $numpad = $block_size - (strlen ($val) % $block_size);
210 - return str_pad($val, strlen ($val) + $numpad, chr($numpad));
 209+ $numpad = $block_size - ( strlen ( $val ) % $block_size );
 210+ return str_pad( $val, strlen ( $val ) + $numpad, chr( $numpad ) );
211211 }
212212
213213 /* Mailhide related code */
214214
215 -function _recaptcha_aes_encrypt($val,$ky) {
216 - if (! function_exists ("mcrypt_encrypt")) {
217 - die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
 215+function _recaptcha_aes_encrypt( $val, $ky ) {
 216+ if ( ! function_exists ( "mcrypt_encrypt" ) ) {
 217+ die ( "To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed." );
218218 }
219 - $mode=MCRYPT_MODE_CBC;
220 - $enc=MCRYPT_RIJNDAEL_128;
221 - $val=_recaptcha_aes_pad($val);
222 - return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 219+ $mode = MCRYPT_MODE_CBC;
 220+ $enc = MCRYPT_RIJNDAEL_128;
 221+ $val = _recaptcha_aes_pad( $val );
 222+ return mcrypt_encrypt( $enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" );
223223 }
224224
225225
226 -function _recaptcha_mailhide_urlbase64 ($x) {
227 - return strtr(base64_encode ($x), '+/', '-_');
 226+function _recaptcha_mailhide_urlbase64 ( $x ) {
 227+ return strtr( base64_encode ( $x ), '+/', '-_' );
228228 }
229229
230230 /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
231 -function recaptcha_mailhide_url($pubkey, $privkey, $email) {
232 - if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
233 - die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
234 - "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
 231+function recaptcha_mailhide_url( $pubkey, $privkey, $email ) {
 232+ if ( $pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null ) {
 233+ die ( "To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
 234+ "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>" );
235235 }
236 -
237236
238 - $ky = pack('H*', $privkey);
239 - $cryptmail = _recaptcha_aes_encrypt ($email, $ky);
240 -
241 - return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
 237+
 238+ $ky = pack( 'H*', $privkey );
 239+ $cryptmail = _recaptcha_aes_encrypt ( $email, $ky );
 240+
 241+ return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ( $cryptmail );
242242 }
243243
244244 /**
@@ -245,15 +245,15 @@
246246 * eg, given johndoe@example,com return ["john", "example.com"].
247247 * the email is then displayed as john...@example.com
248248 */
249 -function _recaptcha_mailhide_email_parts ($email) {
250 - $arr = preg_split("/@/", $email );
 249+function _recaptcha_mailhide_email_parts ( $email ) {
 250+ $arr = preg_split( "/@/", $email );
251251
252 - if (strlen ($arr[0]) <= 4) {
253 - $arr[0] = substr ($arr[0], 0, 1);
254 - } else if (strlen ($arr[0]) <= 6) {
255 - $arr[0] = substr ($arr[0], 0, 3);
 252+ if ( strlen ( $arr[0] ) <= 4 ) {
 253+ $arr[0] = substr ( $arr[0], 0, 1 );
 254+ } else if ( strlen ( $arr[0] ) <= 6 ) {
 255+ $arr[0] = substr ( $arr[0], 0, 3 );
256256 } else {
257 - $arr[0] = substr ($arr[0], 0, 4);
 257+ $arr[0] = substr ( $arr[0], 0, 4 );
258258 }
259259 return $arr;
260260 }
@@ -264,14 +264,11 @@
265265 *
266266 * http://www.google.com/recaptcha/mailhide/apikey
267267 */
268 -function recaptcha_mailhide_html($pubkey, $privkey, $email) {
269 - $emailparts = _recaptcha_mailhide_email_parts ($email);
270 - $url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
271 -
272 - return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
273 - "' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
 268+function recaptcha_mailhide_html( $pubkey, $privkey, $email ) {
 269+ $emailparts = _recaptcha_mailhide_email_parts ( $email );
 270+ $url = recaptcha_mailhide_url ( $pubkey, $privkey, $email );
274271
275 -}
 272+ return htmlentities( $emailparts[0] ) . "<a href='" . htmlentities ( $url ) .
 273+ "' onclick=\"window.open('" . htmlentities ( $url ) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ( $emailparts [1] );
276274
277 -
278 -?>
 275+}
Index: trunk/wikimania/wmreg/index.php
@@ -1,5 +1,5 @@
2 -<?php
3 -/**
 2+<?php
 3+/**
44 * Wikimania 2008 Registration system
55 * Copyright (C) 2008 Littlebtc ([[zh:User:B]]), alexsh ([[zh:User:Alexsh]]), Tim ([[wm07:User:Foxkaworus]]), and others
66 *
@@ -16,48 +16,48 @@
1717 * You should have received a copy of the GNU General Public License along
1818 * with this program; if not, write to the Free Software Foundation, Inc.,
1919 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20 - *
 20+ *
2121 * Made originally for Wikimania 2007 and modified specifically for Wikimania 2008 needs by local Alexandria team.
2222 * @copyright (C) 2008 Littlebtc ([[zh:User:B]]), alexsh ([[zh:User:Alexsh]]), Tim ([[wm07:User:Foxkaworus]]), and others
2323 * @license GNU General Public License version 2
2424 */
2525
2626 /* prevent hacking */
27 -define('TC_STARTED',1);
 27+define( 'TC_STARTED', 1 );
2828
2929 /**
3030 * An array merging information from GET & POST.
3131 */
32 -$MY_REQUEST = array_merge($_GET , $_POST);
 32+$MY_REQUEST = array_merge( $_GET , $_POST );
3333
3434 /* unregister globals */
35 -if (@ini_get('register_globals'))
 35+if ( @ini_get( 'register_globals' ) )
3636 {
3737 /**
3838 * Variables that should not be removed
3939 */
40 - $chk_unset= array('_GET','_POST','_COOKIE','_REQUEST','_ENV','_FILES','_SERVER','GLOBALS');
41 - $unset_vars = array_keys(array_merge($_COOKIE , $_REQUEST , $_ENV , $_FILES , $_SERVER));
42 -
 40+ $chk_unset = array( '_GET', '_POST', '_COOKIE', '_REQUEST', '_ENV', '_FILES', '_SERVER', 'GLOBALS' );
 41+ $unset_vars = array_keys( array_merge( $_COOKIE , $_REQUEST , $_ENV , $_FILES , $_SERVER ) );
 42+
4343 /* avoid GLOBALS hijacking in PHP4*/
44 - if (in_array('GLOBALS',$unset_vars))
 44+ if ( in_array( 'GLOBALS', $unset_vars ) )
4545 {
4646 echo 'Error: GLOBALS overwrite attempt';
4747 exit;
4848 }
49 -
50 - foreach ($unset_vars as $key)
 49+
 50+ foreach ( $unset_vars as $key )
5151 {
52 - if (!in_array($key,$chk_unset) && isset($$key))
53 - { unset($$key); }
 52+ if ( !in_array( $key, $chk_unset ) && isset( $$key ) )
 53+ { unset( $$key ); }
5454 }
55 - unset($unset_vars);
56 - unset($chk_unset);
 55+ unset( $unset_vars );
 56+ unset( $chk_unset );
5757 }
5858
5959 include 'includes/SqlConnect-mysql.php';
6060 include 'includes/UserSession.php';
61 -include 'includes/languages.php';
 61+include 'includes/languages.php';
6262 include 'includes/prices.php';
6363 include 'includes/mail.php';
6464 include 'dbdata.php';
@@ -102,16 +102,16 @@
103103 /**
104104 * If no uselang is assigned in POST/GET, we try HTTP_ACCEPT_LANGUAGE
105105 */
106 -if (!array_key_exists('uselang', $MY_REQUEST) )
 106+if ( !array_key_exists( 'uselang', $MY_REQUEST ) )
107107 {
108 - $acceptLanguages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
109 -
 108+ $acceptLanguages = explode( ',', $_SERVER['HTTP_ACCEPT_LANGUAGE'] );
 109+
110110 $acceptLanguage = $acceptLanguages[0];
111 -
 111+
112112 /* zh-languages */
113 - if (preg_match('/^zh/', $acceptLanguage))
 113+ if ( preg_match( '/^zh/', $acceptLanguage ) )
114114 {
115 - if (preg_match('/^zh-(tw|hk)/', $acceptLanguage))
 115+ if ( preg_match( '/^zh-(tw|hk)/', $acceptLanguage ) )
116116 $userLanguage = 'zh-hant';
117117 else
118118 $userLanguage = 'zh-hans';
@@ -119,43 +119,43 @@
120120 /* Others */
121121 else
122122 {
123 - $acceptLanguage = preg_replace('/([^-;]+)[-|;]?(.+)?/','\\1',$acceptLanguage);
124 - if (file_exists('includes/language_'. $acceptLanguage . '.php'))
 123+ $acceptLanguage = preg_replace( '/([^-;]+)[-|;]?(.+)?/', '\\1', $acceptLanguage );
 124+ if ( file_exists( 'includes/language_' . $acceptLanguage . '.php' ) )
125125 $userLanguage = $acceptLanguage;
126126
127127 }
128128
129 - unset($acceptLanguage);
130 - unset($acceptLanguages);
 129+ unset( $acceptLanguage );
 130+ unset( $acceptLanguages );
131131
132132 }
133133
134 -elseif (!preg_match('/[^0-9A-Z\-]/i', $MY_REQUEST['uselang']))
 134+elseif ( !preg_match( '/[^0-9A-Z\-]/i', $MY_REQUEST['uselang'] ) )
135135 {
136 - if (file_exists('includes/language_'. $MY_REQUEST['uselang'] . '.php'))
 136+ if ( file_exists( 'includes/language_' . $MY_REQUEST['uselang'] . '.php' ) )
137137 $userLanguage = $MY_REQUEST['uselang'];
138138 }
139139
140 -include 'includes/language_'.$userLanguage.'.php';
 140+include 'includes/language_' . $userLanguage . '.php';
141141
142 -if (!$DB_HOST) exit;
 142+if ( !$DB_HOST ) exit;
143143
144144 $sql = new SqlConnect();
145 -if (!$sql->Start($DB_HOST, $DB_ID, $DB_PASS, $DB_NAME)) exit;
 145+if ( !$sql->Start( $DB_HOST, $DB_ID, $DB_PASS, $DB_NAME ) ) exit;
146146
147147 /* Start Session */
148148 $my_session = new UserSession();
149149
150 -if (!$_COOKIE['wikimania'] && $_POST['secret_id'])
151 -{
152 - if (!$my_session->Start($_POST['secret_id'])) exit;
 150+if ( !$_COOKIE['wikimania'] && $_POST['secret_id'] )
 151+{
 152+ if ( !$my_session->Start( $_POST['secret_id'] ) ) exit;
153153 }
154 -else
155 -{
156 - if (!$my_session->Start()) exit;
 154+else
 155+{
 156+ if ( !$my_session->Start() ) exit;
157157 }
158158
159 -switch($MY_REQUEST['action'])
 159+switch( $MY_REQUEST['action'] )
160160 {
161161 case 'submit':
162162 submission();
@@ -225,25 +225,25 @@
226226 * Transfer an error code to actual message
227227 * @todo: This should be moved to the view/skin part
228228 */
229 -function create_error($errormsg, $form1, $form2 = NULL)
 229+function create_error( $errormsg, $form1, $form2 = NULL )
230230 {
231 - global $lang_register_form, $lang_errors;
 231+ global $lang_register_form, $lang_errors;
232232
233 - if ($form2)
234 - {
235 - return preg_replace('/(.+)\t\n\t(.+)/' ,$lang_errors[$errormsg] ,$lang_register_form[$form1]."\t\n\t".$form2);
 233+ if ( $form2 )
 234+ {
 235+ return preg_replace( '/(.+)\t\n\t(.+)/' , $lang_errors[$errormsg] , $lang_register_form[$form1] . "\t\n\t" . $form2 );
236236 }
237237 else
238238 {
239 - return preg_replace('/(.+)/' ,$lang_errors[$errormsg] ,$lang_register_form[$form1]);
 239+ return preg_replace( '/(.+)/' , $lang_errors[$errormsg] , $lang_register_form[$form1] );
240240 }
241241 }
242242
243 -function isValidEmail($email)
 243+function isValidEmail( $email )
244244 {
245245 $qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]';
246246 $dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]';
247 - $atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c'.
 247+ $atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c' .
248248 '\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+';
249249 $quoted_pair = '\\x5c[\\x00-\\x7f]';
250250 $domain_literal = "\\x5b($dtext|$quoted_pair)*\\x5d";
@@ -254,14 +254,14 @@
255255 $domain = "$sub_domain(\\x2e$sub_domain)*";
256256 $local_part = "$word(\\x2e$word)*";
257257 $addr_spec = "$local_part\\x40$domain";
258 -
259 - return preg_match("!^$addr_spec$!", $email) ? true : false;
 258+
 259+ return preg_match( "!^$addr_spec$!", $email ) ? true : false;
260260 }
261261
262262 /**
263263 * Check the sent data
264264 */
265 -function check_register_data($check_captcha)
 265+function check_register_data( $check_captcha )
266266 {
267267 global $MY_REQUEST, $sql, $WikimediaLanguages, $WikimediaOrgs, $WikimediaProjects, $error_array,
268268 $error_message, $register_data, $lang_countries, $recaptcha_privatekey;
@@ -270,158 +270,158 @@
271271 * All fields needs to retrived from $MY_REQUEST
272272 * @todo This should be in a better way, like a "fields info" containing the data type in the MySQL table and output form type
273273 */
274 - $register_data_keys = array('given_name', 'surname', 'sex', 'country', 'langn', 'lang1', 'lang1-level', 'lang2', 'lang2-level', 'lang3', 'lang3-level', 'wiki_id',
 274+ $register_data_keys = array( 'given_name', 'surname', 'sex', 'country', 'langn', 'lang1', 'lang1-level', 'lang2', 'lang2-level', 'lang3', 'lang3-level', 'wiki_id',
275275 'wiki_language', 'wiki_project', 'email', 'join_date', 'tours', 'showname', 'custom_showname', 'size', 'food', 'food_other', 'visa_assistance', 'nationality', 'passport_day',
276276 'passport_month', 'passport_year', 'passport_issued', 'passport', 'day', 'month', 'year', 'countryofbirth', 'homeaddress', 'visa_assistance_description', 'nights', 'room', 'room_partner', 'room_requests', 'hotels', 'discount_code' );
277277
278 - foreach($register_data_keys as $key)
 278+ foreach ( $register_data_keys as $key )
279279 {
280 - if (isset($MY_REQUEST[$key]))
281 - {
282 - $register_data[$key] = $MY_REQUEST[$key];
 280+ if ( isset( $MY_REQUEST[$key] ) )
 281+ {
 282+ $register_data[$key] = $MY_REQUEST[$key];
283283 }
284284 }
285 - unset($register_data_keys);
 285+ unset( $register_data_keys );
286286
287287 $error_array = array();
288 -
289 - if ($check_captcha)
 288+
 289+ if ( $check_captcha )
290290 {
291 - require_once('recaptchalib.php');
292 - $resp = recaptcha_check_answer ($recaptcha_privatekey,
 291+ require_once( 'recaptchalib.php' );
 292+ $resp = recaptcha_check_answer ( $recaptcha_privatekey,
293293 $_SERVER["REMOTE_ADDR"],
294294 $_POST["recaptcha_challenge_field"],
295 - $_POST["recaptcha_response_field"]);
296 -
297 - if (!$resp->is_valid) {
298 - $error_array[] = create_error('wrong', 'captcha');
 295+ $_POST["recaptcha_response_field"] );
 296+
 297+ if ( !$resp->is_valid ) {
 298+ $error_array[] = create_error( 'wrong', 'captcha' );
299299 }
300300 }
301 -
 301+
302302 /* Record UTC / GMT Date */
303303 $register_data['signuptime'] = time();
304304
305305 /* Check input */
306 - if (!$register_data['given_name'])
 306+ if ( !$register_data['given_name'] )
307307 {
308 - $error_array[] = create_error('not_input', 'given_name');
 308+ $error_array[] = create_error( 'not_input', 'given_name' );
309309 }
310310
311 - if (mb_strlen($register_data['given_name'], 'UTF-8') > 24)
312 - {
313 - $error_array[] = create_error('too_long', 'given_name', '24');
 311+ if ( mb_strlen( $register_data['given_name'], 'UTF-8' ) > 24 )
 312+ {
 313+ $error_array[] = create_error( 'too_long', 'given_name', '24' );
314314 }
315 -
316 - if (!$register_data['surname'])
317 - {
318 - $error_array[] = create_error('not_input', 'surname');
 315+
 316+ if ( !$register_data['surname'] )
 317+ {
 318+ $error_array[] = create_error( 'not_input', 'surname' );
319319 }
320320
321 - if (mb_strlen($register_data['surname'], 'UTF-8') > 24)
322 - {
323 - $error_array[] = create_error('too_long', 'surname', '24');
 321+ if ( mb_strlen( $register_data['surname'], 'UTF-8' ) > 24 )
 322+ {
 323+ $error_array[] = create_error( 'too_long', 'surname', '24' );
324324 }
325325
326 - if (!$register_data['sex'])
327 - {
328 - $error_array[] = create_error('not_select', 'sex');
 326+ if ( !$register_data['sex'] )
 327+ {
 328+ $error_array[] = create_error( 'not_select', 'sex' );
329329 }
330 - elseif(!in_array($register_data['sex'], array('m', 'f', 'd')))
 330+ elseif ( !in_array( $register_data['sex'], array( 'm', 'f', 'd' ) ) )
331331 {
332 - $error_array[] = create_error('wrong', 'sex');
 332+ $error_array[] = create_error( 'wrong', 'sex' );
333333 }
334334
335 - if (!$register_data['country'])
336 - {
337 - $error_array[] = create_error('not_select', 'country');
 335+ if ( !$register_data['country'] )
 336+ {
 337+ $error_array[] = create_error( 'not_select', 'country' );
338338 }
339 - elseif (!in_array($register_data['country'], array_keys($lang_countries)))
340 - {
341 - $error_array[] = create_error('wrong', 'country');
 339+ elseif ( !in_array( $register_data['country'], array_keys( $lang_countries ) ) )
 340+ {
 341+ $error_array[] = create_error( 'wrong', 'country' );
342342 }
343 -
344 - if (!$register_data['langn'])
345 - {
346 - $error_array[] = create_error('not_select', 'langn'); }
347 - elseif (!in_array($register_data['langn'], array_keys($WikimediaLanguages)))
348 - {
349 - $error_array[] = create_error('wrong', 'langn');
 343+
 344+ if ( !$register_data['langn'] )
 345+ {
 346+ $error_array[] = create_error( 'not_select', 'langn' ); }
 347+ elseif ( !in_array( $register_data['langn'], array_keys( $WikimediaLanguages ) ) )
 348+ {
 349+ $error_array[] = create_error( 'wrong', 'langn' );
350350 }
351 -
352 - for ($i = 1; $i <= 3; $i++)
 351+
 352+ for ( $i = 1; $i <= 3; $i++ )
353353 {
354 - if ($register_data['lang'.$i])
 354+ if ( $register_data['lang' . $i] )
355355 {
356 - if (!in_array($register_data['lang'.$i], array_keys($WikimediaLanguages)))
357 - {
358 - $error_array[] = create_error('wrong', 'lang'.$i);
 356+ if ( !in_array( $register_data['lang' . $i], array_keys( $WikimediaLanguages ) ) )
 357+ {
 358+ $error_array[] = create_error( 'wrong', 'lang' . $i );
359359 }
360 - elseif(!$register_data['lang'.$i.'-level'])
361 - {
362 - $error_array[] = create_error('not_select', 'lang'.$i.'_level');
 360+ elseif ( !$register_data['lang' . $i . '-level'] )
 361+ {
 362+ $error_array[] = create_error( 'not_select', 'lang' . $i . '_level' );
363363 }
364 - elseif(!in_array($register_data['lang'.$i.'-level'], array('1', '2', '3', '4')))
365 - {
366 - $error_array[] = create_error('wrong', 'lang'.$i.'_level');
 364+ elseif ( !in_array( $register_data['lang' . $i . '-level'], array( '1', '2', '3', '4' ) ) )
 365+ {
 366+ $error_array[] = create_error( 'wrong', 'lang' . $i . '_level' );
367367 }
368368 }
369369 }
370 -
371 - if ($register_data['wiki_id'] || $register_data['wiki_language'] || $register_data['wiki_project'])
 370+
 371+ if ( $register_data['wiki_id'] || $register_data['wiki_language'] || $register_data['wiki_project'] )
372372 {
373 - if (!$register_data['wiki_id'] || !$register_data['wiki_language'] || !$register_data['wiki_project'])
374 - {
375 - $error_array[] = create_error('not_input_completely', 'wiki_id');
 373+ if ( !$register_data['wiki_id'] || !$register_data['wiki_language'] || !$register_data['wiki_project'] )
 374+ {
 375+ $error_array[] = create_error( 'not_input_completely', 'wiki_id' );
376376 }
377377 else
378378 {
379 - if (!in_array($register_data['wiki_language'],array_keys($WikimediaLanguages)) && !in_array($register_data['wiki_language'],$WikimediaOrgs))
380 - {
381 - $error_array[] = create_error('wrong', 'wiki_id');
 379+ if ( !in_array( $register_data['wiki_language'], array_keys( $WikimediaLanguages ) ) && !in_array( $register_data['wiki_language'], $WikimediaOrgs ) )
 380+ {
 381+ $error_array[] = create_error( 'wrong', 'wiki_id' );
382382 }
383 - elseif (!in_array($register_data['wiki_project'],$WikimediaProjects))
 383+ elseif ( !in_array( $register_data['wiki_project'], $WikimediaProjects ) )
384384 {
385 - $error_array[] = create_error('wrong', 'wiki_id');
 385+ $error_array[] = create_error( 'wrong', 'wiki_id' );
386386 }
387 - elseif (in_array($register_data['wiki_language'],$WikimediaOrgs) && $register_data['wiki_project'] != 'wikimedia')
388 - {
389 - $error_array[] = create_error('wrong', 'wiki_id');
 387+ elseif ( in_array( $register_data['wiki_language'], $WikimediaOrgs ) && $register_data['wiki_project'] != 'wikimedia' )
 388+ {
 389+ $error_array[] = create_error( 'wrong', 'wiki_id' );
390390 }
391 - elseif (!in_array($register_data['wiki_language'],$WikimediaOrgs) && $register_data['wiki_project'] == 'wikimedia')
392 - {
393 - $error_array[] = create_error('wrong', 'wiki_id');
 391+ elseif ( !in_array( $register_data['wiki_language'], $WikimediaOrgs ) && $register_data['wiki_project'] == 'wikimedia' )
 392+ {
 393+ $error_array[] = create_error( 'wrong', 'wiki_id' );
394394 }
395 - if (mb_strlen($register_data['wiki_id'], 'UTF-8') > 100)
396 - {
397 - $error_array[] = create_error('too_long', 'wiki_id', 100);
 395+ if ( mb_strlen( $register_data['wiki_id'], 'UTF-8' ) > 100 )
 396+ {
 397+ $error_array[] = create_error( 'too_long', 'wiki_id', 100 );
398398 }
399399 }
400400 }
401401
402 - if (!$register_data['email'])
403 - {
404 - $error_array[] = create_error('not_input', 'email');
 402+ if ( !$register_data['email'] )
 403+ {
 404+ $error_array[] = create_error( 'not_input', 'email' );
405405 }
406 - elseif (!isValidEmail($register_data['email']))
407 - {
408 - $error_array[] = create_error('wrong','email');
 406+ elseif ( !isValidEmail( $register_data['email'] ) )
 407+ {
 408+ $error_array[] = create_error( 'wrong', 'email' );
409409 }
410 - elseif (mb_strlen($register_data['email'], 'UTF-8') > 48)
411 - {
412 - $error_array[] = create_error('too_long', 'email', 48);
 410+ elseif ( mb_strlen( $register_data['email'], 'UTF-8' ) > 48 )
 411+ {
 412+ $error_array[] = create_error( 'too_long', 'email', 48 );
413413 }
414414
415415 $join_date_selected = 0;
416416 $main_date_selected = 0;
417417
418 - if (is_array($register_data['join_date']))
 418+ if ( is_array( $register_data['join_date'] ) )
419419 {
420 - for ($i = 1; $i <= 6; $i++)
 420+ for ( $i = 1; $i <= 6; $i++ )
421421 {
422 - if (in_array($i, $register_data['join_date']))
 422+ if ( in_array( $i, $register_data['join_date'] ) )
423423 {
424424 $join_date_selected++;
425 - if (3 <= $i && $i <= 5)
 425+ if ( 3 <= $i && $i <= 5 )
426426 {
427427 $main_date_selected++;
428428 }
@@ -429,237 +429,237 @@
430430 }
431431 }
432432
433 - if ($join_date_selected == 0)
434 - {
435 - $error_array[] = create_error('not_select', 'join_date');
 433+ if ( $join_date_selected == 0 )
 434+ {
 435+ $error_array[] = create_error( 'not_select', 'join_date' );
436436 }
437437 // if ($main_date_selected == 0)
438438 // {
439439 // $error_array[] = create_error('not_select', 'main_date');
440440 // }
441441
442 - unset($join_date_selected);
443 - unset($main_date_selected);
 442+ unset( $join_date_selected );
 443+ unset( $main_date_selected );
444444
445445 $showname_entered = false;
446 - if (is_array($register_data['showname']))
 446+ if ( is_array( $register_data['showname'] ) )
447447 {
448 - for ($i = 1; $i <= 3; $i++)
 448+ for ( $i = 1; $i <= 3; $i++ )
449449 {
450 - if (in_array($i, $register_data['showname']))
 450+ if ( in_array( $i, $register_data['showname'] ) )
451451 {
452452 $showname_entered = true;
453 -
454 - if ($i == 3 && empty($register_data['custom_showname']))
 453+
 454+ if ( $i == 3 && empty( $register_data['custom_showname'] ) )
455455 {
456 - $error_array[] = create_error('not_input', 'custom_showname');
 456+ $error_array[] = create_error( 'not_input', 'custom_showname' );
457457 }
458458 }
459459 }
460460 }
461461
462 - if (!$showname_entered)
 462+ if ( !$showname_entered )
463463 {
464 - $error_array[] = create_error('not_input', 'showname');
 464+ $error_array[] = create_error( 'not_input', 'showname' );
465465 }
466466
467 - if (mb_strlen($register_data['custom_showname'], 'UTF-8') > 30)
468 - {
469 - $error_array[] = create_error('too_long', 'custom_showname', 30);
 467+ if ( mb_strlen( $register_data['custom_showname'], 'UTF-8' ) > 30 )
 468+ {
 469+ $error_array[] = create_error( 'too_long', 'custom_showname', 30 );
470470 }
471 -
472 - if (!$register_data['size'])
473 - {
474 - $error_array[] = create_error('not_select', 'size');
 471+
 472+ if ( !$register_data['size'] )
 473+ {
 474+ $error_array[] = create_error( 'not_select', 'size' );
475475 }
476 - elseif (!in_array($register_data['size'], array('XXS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL')))
477 - {
478 - $error_array[] = create_error('wrong', 'size');
 476+ elseif ( !in_array( $register_data['size'], array( 'XXS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL' ) ) )
 477+ {
 478+ $error_array[] = create_error( 'wrong', 'size' );
479479 }
480 -
481 - if ($register_data['food'] == 3 && empty($register_data['food_other']))
 480+
 481+ if ( $register_data['food'] == 3 && empty( $register_data['food_other'] ) )
482482 {
483 - $error_array[] = create_error('not_input', 'food_other');
 483+ $error_array[] = create_error( 'not_input', 'food_other' );
484484 }
485 - if (mb_strlen($register_data['food_other'], 'UTF-8') > 64)
486 - {
487 - $error_array[] = create_error('too_long', 'food_other', 64);
 485+ if ( mb_strlen( $register_data['food_other'], 'UTF-8' ) > 64 )
 486+ {
 487+ $error_array[] = create_error( 'too_long', 'food_other', 64 );
488488 }
489 -
490 - if (!$register_data['visa_assistance'])
491 - {
492 - $register_data['visa_assistance'] = 0;
 489+
 490+ if ( !$register_data['visa_assistance'] )
 491+ {
 492+ $register_data['visa_assistance'] = 0;
493493 }
494494 else
495495 {
496 - if (!$register_data['nationality'])
497 - {
498 - $error_array[] = create_error('not_select', 'nationality');
 496+ if ( !$register_data['nationality'] )
 497+ {
 498+ $error_array[] = create_error( 'not_select', 'nationality' );
499499 }
500 - elseif (!in_array($register_data['nationality'], array_keys($lang_countries)))
501 - {
502 - $error_array[] = create_error('wrong', 'nationality');
 500+ elseif ( !in_array( $register_data['nationality'], array_keys( $lang_countries ) ) )
 501+ {
 502+ $error_array[] = create_error( 'wrong', 'nationality' );
503503 }
504 - if (!$register_data['passport'])
505 - {
506 - $error_array[] = create_error('not_input', 'passport');
 504+ if ( !$register_data['passport'] )
 505+ {
 506+ $error_array[] = create_error( 'not_input', 'passport' );
507507 }
508508
509 - if (mb_strlen($register_data['passport'], 'UTF-8') > 30)
510 - {
511 - $error_array[] = create_error('too_long', 'passport', 30);
 509+ if ( mb_strlen( $register_data['passport'], 'UTF-8' ) > 30 )
 510+ {
 511+ $error_array[] = create_error( 'too_long', 'passport', 30 );
512512 }
513 -
514 - if (!$register_data['passport_year'] || !$register_data['passport_month'] || !$register_data['passport_day'])
515 - {
516 - $error_array[] = create_error('not_input_completely', 'passport_valid');
 513+
 514+ if ( !$register_data['passport_year'] || !$register_data['passport_month'] || !$register_data['passport_day'] )
 515+ {
 516+ $error_array[] = create_error( 'not_input_completely', 'passport_valid' );
517517 }
518518
519 - elseif ($register_data['passport_month'] < 1 || $register_data['passport_day'] < 1 || $register_data['passport_year'] < 2011 || $register_data['year'] > 2050)
520 - {
521 - $error_array[] = create_error('incorrect', 'passport_valid');
 519+ elseif ( $register_data['passport_month'] < 1 || $register_data['passport_day'] < 1 || $register_data['passport_year'] < 2011 || $register_data['year'] > 2050 )
 520+ {
 521+ $error_array[] = create_error( 'incorrect', 'passport_valid' );
522522 }
523523 else
524524 {
525 - $register_data['passport_year'] = intval($register_data['passport_year']);
526 - $register_data['passport_month'] = intval($register_data['passport_month']);
527 - $register_data['passport_day'] = intval($register_data['passport_day']);
528 - if (!checkdate($register_data['passport_month'] , $register_data['passport_day'] , $register_data['passport_year']))
529 - {
530 - $error_array[] = create_error('incorrect', 'passport_valid');
 525+ $register_data['passport_year'] = intval( $register_data['passport_year'] );
 526+ $register_data['passport_month'] = intval( $register_data['passport_month'] );
 527+ $register_data['passport_day'] = intval( $register_data['passport_day'] );
 528+ if ( !checkdate( $register_data['passport_month'] , $register_data['passport_day'] , $register_data['passport_year'] ) )
 529+ {
 530+ $error_array[] = create_error( 'incorrect', 'passport_valid' );
531531 }
532532 }
533 -
534 - $register_data['passport_valid'] = $register_data['passport_year'].'-'.$register_data['passport_month'].'-'.$register_data['passport_day'];
535533
536 - if (!$register_data['passport_issued'])
537 - {
538 - $error_array[] = create_error('not_input', 'passport_issued');
 534+ $register_data['passport_valid'] = $register_data['passport_year'] . '-' . $register_data['passport_month'] . '-' . $register_data['passport_day'];
 535+
 536+ if ( !$register_data['passport_issued'] )
 537+ {
 538+ $error_array[] = create_error( 'not_input', 'passport_issued' );
539539 }
540540
541 - if (mb_strlen($register_data['passport_issued'], 'UTF-8') > 30)
542 - {
543 - $error_array[] = create_error('too_long', 'passport_issued', 30);
 541+ if ( mb_strlen( $register_data['passport_issued'], 'UTF-8' ) > 30 )
 542+ {
 543+ $error_array[] = create_error( 'too_long', 'passport_issued', 30 );
544544 }
545 -
546 - if (!$register_data['year'] || !$register_data['month'] || !$register_data['day'])
547 - {
548 - $error_array[] = create_error('not_input_completely', 'birthday');
 545+
 546+ if ( !$register_data['year'] || !$register_data['month'] || !$register_data['day'] )
 547+ {
 548+ $error_array[] = create_error( 'not_input_completely', 'birthday' );
549549 }
550550
551 - elseif ($register_data['month'] < 1 || $register_data['day'] < 1 || $register_data['year'] < 1900 || $register_data['year'] > 2011)
552 - {
553 - $error_array[] = create_error('incorrect', 'birthday');
 551+ elseif ( $register_data['month'] < 1 || $register_data['day'] < 1 || $register_data['year'] < 1900 || $register_data['year'] > 2011 )
 552+ {
 553+ $error_array[] = create_error( 'incorrect', 'birthday' );
554554 }
555555 else
556556 {
557 - $register_data['year'] = intval($register_data['year']);
558 - $register_data['month'] = intval($register_data['month']);
559 - $register_data['day'] = intval($register_data['day']);
560 - if (!checkdate($register_data['month'] , $register_data['day'] , $register_data['year']))
561 - {
562 - $error_array[] = create_error('incorrect', 'birthday');
 557+ $register_data['year'] = intval( $register_data['year'] );
 558+ $register_data['month'] = intval( $register_data['month'] );
 559+ $register_data['day'] = intval( $register_data['day'] );
 560+ if ( !checkdate( $register_data['month'] , $register_data['day'] , $register_data['year'] ) )
 561+ {
 562+ $error_array[] = create_error( 'incorrect', 'birthday' );
563563 }
564564 }
565 -
566 - $register_data['birthday'] = $register_data['year'].'-'.$register_data['month'].'-'.$register_data['day'];
567565
568 - if (!$register_data['countryofbirth'])
569 - {
570 - $error_array[] = create_error('not_select', 'countryofbirth');
 566+ $register_data['birthday'] = $register_data['year'] . '-' . $register_data['month'] . '-' . $register_data['day'];
 567+
 568+ if ( !$register_data['countryofbirth'] )
 569+ {
 570+ $error_array[] = create_error( 'not_select', 'countryofbirth' );
571571 }
572 - elseif (!in_array($register_data['countryofbirth'], array_keys($lang_countries)))
573 - {
574 - $error_array[] = create_error('wrong', 'countryofbirth');
 572+ elseif ( !in_array( $register_data['countryofbirth'], array_keys( $lang_countries ) ) )
 573+ {
 574+ $error_array[] = create_error( 'wrong', 'countryofbirth' );
575575 }
576 - if (!$register_data['homeaddress'])
 576+ if ( !$register_data['homeaddress'] )
577577 {
578 - $error_array[] = create_error('not_input', 'homeaddress');
 578+ $error_array[] = create_error( 'not_input', 'homeaddress' );
579579 }
580 - elseif (mb_strlen($register_data['homeaddress'], 'UTF-8') > 500)
581 - {
582 - $error_array[] = create_error('too_long', 'homeaddress', 500);
 580+ elseif ( mb_strlen( $register_data['homeaddress'], 'UTF-8' ) > 500 )
 581+ {
 582+ $error_array[] = create_error( 'too_long', 'homeaddress', 500 );
583583 }
584 - if (mb_strlen($register_data['visa_assistance_description'], 'UTF-8') > 500)
585 - {
586 - $error_array[] = create_error('too_long', 'visa_assistance_description', 500);
 584+ if ( mb_strlen( $register_data['visa_assistance_description'], 'UTF-8' ) > 500 )
 585+ {
 586+ $error_array[] = create_error( 'too_long', 'visa_assistance_description', 500 );
587587 }
588588 }
589 -
 589+
590590 $nights_selected = 0;
591 - if (is_array($register_data['nights']))
 591+ if ( is_array( $register_data['nights'] ) )
592592 {
593 - for ($i = 1; $i <= 8; $i++)
 593+ for ( $i = 1; $i <= 8; $i++ )
594594 {
595 - if (in_array($i, $register_data['nights']))
 595+ if ( in_array( $i, $register_data['nights'] ) )
596596 {
597597 $nights_selected++;
598598 }
599599 }
600600 }
601601 $room_selected = false;
602 - for ($i = 1; $i <= 3; $i++)
 602+ for ( $i = 1; $i <= 3; $i++ )
603603 {
604 - if ($register_data['room'] == $i)
 604+ if ( $register_data['room'] == $i )
605605 {
606606 $room_selected = true;
607607 }
608608 }
609 - if ($room_selected == false && $nights_selected > 0)
610 - {
611 - $error_array[] = create_error('not_select', 'room');
 609+ if ( $room_selected == false && $nights_selected > 0 )
 610+ {
 611+ $error_array[] = create_error( 'not_select', 'room' );
612612 }
613 - if ($register_data['room'] == 3 && empty($register_data['room_partner']))
 613+ if ( $register_data['room'] == 3 && empty( $register_data['room_partner'] ) )
614614 {
615 - $error_array[] = create_error('not_input', 'room_partner');
 615+ $error_array[] = create_error( 'not_input', 'room_partner' );
616616 }
617 - if (mb_strlen($register_data['room_partner'], 'UTF-8') > 64)
618 - {
619 - $error_array[] = create_error('too_long', 'room_partner', 64);
 617+ if ( mb_strlen( $register_data['room_partner'], 'UTF-8' ) > 64 )
 618+ {
 619+ $error_array[] = create_error( 'too_long', 'room_partner', 64 );
620620 }
621621
622 - if (mb_strlen($register_data['room_requests'], 'UTF-8') > 500)
623 - {
624 - $error_array[] = create_error('too_long', 'room_requests', 500);
 622+ if ( mb_strlen( $register_data['room_requests'], 'UTF-8' ) > 500 )
 623+ {
 624+ $error_array[] = create_error( 'too_long', 'room_requests', 500 );
625625 }
626 -
 626+
627627 $hotel_selected = false;
628 - for ($i = 1; $i <= 9; $i++)
 628+ for ( $i = 1; $i <= 9; $i++ )
629629 {
630 - if ($register_data['hotels'] == $i)
 630+ if ( $register_data['hotels'] == $i )
631631 {
632632 $hotel_selected = true;
633633 }
634634 }
635 - if ($hotel_selected == false && $nights_selected > 0)
636 - {
637 - $error_array[] = create_error('not_select', 'accommodation_hotel');
 635+ if ( $hotel_selected == false && $nights_selected > 0 )
 636+ {
 637+ $error_array[] = create_error( 'not_select', 'accommodation_hotel' );
638638 }
639 -
640 - unset($room_selected);
641 - unset($nights_selected);
642 - unset($hotel_selected);
643639
644 -
645 -
646 - if (mb_strlen($register_data['discount_code'], 'UTF-8') > 18)
647 - {
648 - $error_array[] = create_error('too_long', 'discount_code', 18);
 640+ unset( $room_selected );
 641+ unset( $nights_selected );
 642+ unset( $hotel_selected );
 643+
 644+
 645+
 646+ if ( mb_strlen( $register_data['discount_code'], 'UTF-8' ) > 18 )
 647+ {
 648+ $error_array[] = create_error( 'too_long', 'discount_code', 18 );
649649 }
650 -
651 - if (!empty($error_array))
 650+
 651+ if ( !empty( $error_array ) )
652652 {
653 - $error_message = '<ul>'."\n".'<li>' . implode('</li>'."\n".'<li>', $error_array) . '</li>'."\n".'</ul>';
 653+ $error_message = '<ul>' . "\n" . '<li>' . implode( '</li>' . "\n" . '<li>', $error_array ) . '</li>' . "\n" . '</ul>';
654654 regform();
655 - unset($error_array);
 655+ unset( $error_array );
656656 return 0;
657657 }
658658
659659 /* calculate all costs!
660660 * seems like a weird place to do it, but as it is required by both the confirmation and submission phase
661661 * it actually makes some sense */
662 - $cost = calculate_cost($register_data);
663 - $register_data = array_merge($register_data, $cost);
 662+ $cost = calculate_cost( $register_data );
 663+ $register_data = array_merge( $register_data, $cost );
664664 return 1;
665665 }
666666
@@ -670,14 +670,14 @@
671671 {
672672 global $register_data;
673673
674 - if (!$_SESSION['register_form']) exit; // Avoid something bad :(
 674+ if ( !$_SESSION['register_form'] ) exit; // Avoid something bad :(
675675
676676 /* Get data checked!! */
677 - if (!check_register_data(true)) return;
 677+ if ( !check_register_data( true ) ) return;
678678
679679 /* Create Secret ID2 */
680 - $_SESSION['secret'] = md5($register_data['signuptime']);
681 -
 680+ $_SESSION['secret'] = md5( $register_data['signuptime'] );
 681+
682682 /* Show result */
683683 include 'skin/html_header.php';
684684 include 'skin/confirm_data.php';
@@ -692,114 +692,114 @@
693693 {
694694 global $sql, $WikimediaLanguages, $WikimediaOrgs, $WikimediaProjects, $error_array, $error_message, $register_data, $wikimania_cost, $accommodation_cost, $other_cost, $user_cost, $lang_errors, $lang_register_form;
695695
696 - if (!$_SESSION['register_form']) exit; // Avoid something bad :(
 696+ if ( !$_SESSION['register_form'] ) exit; // Avoid something bad :(
697697
698698 /* Get data checked!! */
699 - if (!check_register_data(false)) {
700 - die('Problem with data.');
 699+ if ( !check_register_data( false ) ) {
 700+ die( 'Problem with data.' );
701701 }
702702
703703 /* Reset? */
704 - if ($_POST['submit']==$lang_register_form['reset'])
 704+ if ( $_POST['submit'] == $lang_register_form['reset'] )
705705 {
706706 regform();
707707 return;
708708 }
709709
710710 /* Hacking attempt? */
711 - if ($_SESSION['secret'] != $_POST['secret_id2'] && (!empty($_POST['secret_id2'])))
 711+ if ( $_SESSION['secret'] != $_POST['secret_id2'] && ( !empty( $_POST['secret_id2'] ) ) )
712712 {
713 - die( 'Hacking attempt or session recording error. Try turning on cookies and try again.');
 713+ die( 'Hacking attempt or session recording error. Try turning on cookies and try again.' );
714714 }
715715 /* No Repeat */
716 - $test_code_result = $sql->selectData('registration', array(), '`surname`=\''.$sql->EscapeString($register_data['surname']).'\''.
717 - ' AND `given_name`=\''.$sql->EscapeString($register_data['given_name']).'\''.
718 - ' AND `email`=\''.$sql->EscapeString($register_data['email']).'\'');
719 - if (is_array($sql->fetchArray($test_code_result)))
 716+ $test_code_result = $sql->selectData( 'registration', array(), '`surname`=\'' . $sql->EscapeString( $register_data['surname'] ) . '\'' .
 717+ ' AND `given_name`=\'' . $sql->EscapeString( $register_data['given_name'] ) . '\'' .
 718+ ' AND `email`=\'' . $sql->EscapeString( $register_data['email'] ) . '\'' );
 719+ if ( is_array( $sql->fetchArray( $test_code_result ) ) )
720720 {
721721 echo $lang_errors['repeat'];
722722 return;
723723 }
724 - mysql_free_result($test_code_result);
725 -
 724+ mysql_free_result( $test_code_result );
 725+
726726 /* format sign-up time */
727 - $register_data['signuptime'] = gmdate('Y-m-d H:i:s', $register_data['signuptime'] );
 727+ $register_data['signuptime'] = gmdate( 'Y-m-d H:i:s', $register_data['signuptime'] );
728728
729729 /* Unset input data that is covered by other fields (birthday, passport_valid) */
730 - unset($register_data['year']);
731 - unset($register_data['month']);
732 - unset($register_data['day']);
733 - unset($register_data['passport_year']);
734 - unset($register_data['passport_month']);
735 - unset($register_data['passport_day']);
736 -
 730+ unset( $register_data['year'] );
 731+ unset( $register_data['month'] );
 732+ unset( $register_data['day'] );
 733+ unset( $register_data['passport_year'] );
 734+ unset( $register_data['passport_month'] );
 735+ unset( $register_data['passport_day'] );
 736+
737737 /* Transform arrays into comma-delimited strings for use with SET type fields */
738 - if (array_key_exists('join_date', $register_data))
739 - $register_data['join_date'] = implode(',', $register_data['join_date']);
740 - if (array_key_exists('showname', $register_data))
741 - $register_data['showname'] = implode(',', $register_data['showname']);
742 - if (array_key_exists('nights', $register_data))
743 - $register_data['nights'] = implode(',', $register_data['nights']);
744 -
 738+ if ( array_key_exists( 'join_date', $register_data ) )
 739+ $register_data['join_date'] = implode( ',', $register_data['join_date'] );
 740+ if ( array_key_exists( 'showname', $register_data ) )
 741+ $register_data['showname'] = implode( ',', $register_data['showname'] );
 742+ if ( array_key_exists( 'nights', $register_data ) )
 743+ $register_data['nights'] = implode( ',', $register_data['nights'] );
 744+
745745 /* Create Unique Data, avoid repeat */
746 - for ($i=1; $i<=100; $i++) /* 100 times are too much... */
 746+ for ( $i = 1; $i <= 100; $i++ ) /* 100 times are too much... */
747747 {
748 - $register_data['unique_code'] = substr(md5(uniqid(mt_rand(),true)), 3, 5);
749 - $test_code_result = $sql->selectData('registration', array(), '`unique_code`=\''.$register_data['unique_code'].'\'');
750 - if (!is_array($sql->fetchArray($test_code_result)))
 748+ $register_data['unique_code'] = substr( md5( uniqid( mt_rand(), true ) ), 3, 5 );
 749+ $test_code_result = $sql->selectData( 'registration', array(), '`unique_code`=\'' . $register_data['unique_code'] . '\'' );
 750+ if ( !is_array( $sql->fetchArray( $test_code_result ) ) )
751751 break; /* successfully found the code that is not same */
752752 }
753753
754754 /* Write into database */
755 - $result = $sql->insertData('registration', $register_data);
756 - if (!$result)
 755+ $result = $sql->insertData( 'registration', $register_data );
 756+ if ( !$result )
757757 {
758 - die('Registration system error, please contact the Wikimania team.');
 758+ die( 'Registration system error, please contact the Wikimania team.' );
759759 }
760760
761761 /* Send mail */
762762 include 'skin/mail_successful.php';
763 - $mail_successful_content = preg_replace('/\$1/',$register_data['given_name'].' '.$register_data['surname'], $mail_successful_content);
764 - $mail_successful_content = preg_replace('/\$2/',$register_data['unique_code'], $mail_successful_content);
765 - $mail_successful_content = preg_replace('/\$3/',$register_data['email'], $mail_successful_content);
766 -
767 - $to = $register_data['given_name'].' '.$register_data['surname'].' <'.$register_data['email'].'>';
768 - if (!mail_msg($to, 'Wikimania 2011 - Registration Received', $mail_successful_content))
 763+ $mail_successful_content = preg_replace( '/\$1/', $register_data['given_name'] . ' ' . $register_data['surname'], $mail_successful_content );
 764+ $mail_successful_content = preg_replace( '/\$2/', $register_data['unique_code'], $mail_successful_content );
 765+ $mail_successful_content = preg_replace( '/\$3/', $register_data['email'], $mail_successful_content );
 766+
 767+ $to = $register_data['given_name'] . ' ' . $register_data['surname'] . ' <' . $register_data['email'] . '>';
 768+ if ( !mail_msg( $to, 'Wikimania 2011 - Registration Received', $mail_successful_content ) )
769769 {
770770 echo 'Notice: Mail delivery error. Contact Wikimania team.';
771771 }
772 -
 772+
773773 /* Show result */
774774 include 'skin/html_header.php';
775775 include 'skin/register_successful.php';
776 - include 'skin/paypal.php';
 776+ include 'skin/paypal.php';
777777 include 'skin/html_footer.php';
778778 }
779779
780780 /**
781 - * After PayPal transmission successful, display a message
 781+ * After PayPal transmission successful, display a message
782782 */
783783 function paypal_successful()
784784 {
785785 global $MY_REQUEST, $sql;
786 - if (!$MY_REQUEST['unique_code'] || empty($MY_REQUEST['unique_code']) || preg_match('/[^0-9A-Z]/i', $MY_REQUEST['unique_code']))
 786+ if ( !$MY_REQUEST['unique_code'] || empty( $MY_REQUEST['unique_code'] ) || preg_match( '/[^0-9A-Z]/i', $MY_REQUEST['unique_code'] ) )
787787 {
788788 exit; /* invaild information? bye bye :) */
789789 }
790790 /* Hacking attempt? */
791 - if ((md5($_SESSION['secret'] . $MY_REQUEST['unique_code']) != $MY_REQUEST['nonce']) || (empty($MY_REQUEST['nonce'])))
 791+ if ( ( md5( $_SESSION['secret'] . $MY_REQUEST['unique_code'] ) != $MY_REQUEST['nonce'] ) || ( empty( $MY_REQUEST['nonce'] ) ) )
792792 {
793 - die( 'Hacking attempt or session recording error. Please contact the Wikimania team.');
 793+ die( 'Hacking attempt or session recording error. Please contact the Wikimania team.' );
794794 }
795795
796 - $test_code_result = $sql->selectData('registration', array(), '`unique_code`=\''.$MY_REQUEST['unique_code'].'\'');
797 - $test_code_array = $sql->fetchArray($test_code_result);
798 - if (!is_array($test_code_array)) {exit;} /* didn't find vaild unique id */
 796+ $test_code_result = $sql->selectData( 'registration', array(), '`unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' );
 797+ $test_code_array = $sql->fetchArray( $test_code_result );
 798+ if ( !is_array( $test_code_array ) ) { exit; } /* didn't find vaild unique id */
799799
800 - if ($test_code_array['paypal']) exit;
 800+ if ( $test_code_array['paypal'] ) exit;
801801
802802 /* OK, now write paypal ok :) */
803 - if (!$sql->updateData('registration', array('paypal' => '1'), '`unique_code`=\''.$MY_REQUEST['unique_code'].'\''))
 803+ if ( !$sql->updateData( 'registration', array( 'paypal' => '1' ), '`unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' ) )
804804 { echo 'SYSTEM ERROR'; return; }
805805
806806 include 'skin/html_header.php';
@@ -808,21 +808,21 @@
809809 }
810810
811811 /**
812 - * After PayPal transmission failed, display a message
 812+ * After PayPal transmission failed, display a message
813813 */
814814 function paypal_failed()
815815 {
816816 global $MY_REQUEST, $sql;
817 - if (!$MY_REQUEST['unique_code'] || empty($MY_REQUEST['unique_code']) || preg_match('/[^0-9A-Z]/i', $MY_REQUEST['unique_code']))
 817+ if ( !$MY_REQUEST['unique_code'] || empty( $MY_REQUEST['unique_code'] ) || preg_match( '/[^0-9A-Z]/i', $MY_REQUEST['unique_code'] ) )
818818 {
819819 exit; /* invaild information? bye bye :) */
820820 }
821821
822 - $test_code_result = $sql->selectData('registration', array(), '`unique_code`=\''.$MY_REQUEST['unique_code'].'\'');
823 - $test_code_array = $sql->fetchArray($test_code_result);
824 - if (!is_array($test_code_array)) {exit;} /* found vaild unique id */
 822+ $test_code_result = $sql->selectData( 'registration', array(), '`unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' );
 823+ $test_code_array = $sql->fetchArray( $test_code_result );
 824+ if ( !is_array( $test_code_array ) ) { exit; } /* found vaild unique id */
825825
826 - if ($test_code_array['paypal']) exit;
 826+ if ( $test_code_array['paypal'] ) exit;
827827
828828 $register_data = $test_code_array;
829829 include 'skin/html_header.php';
@@ -834,190 +834,190 @@
835835
836836 function administration()
837837 {
838 - global $_SESSION, $sql, $register_data, $MY_REQUEST, $table_data, $error_array,
839 - $error_message, $lang_countries, $lang_register_form;
 838+ global $_SESSION, $sql, $register_data, $MY_REQUEST, $table_data, $error_array,
 839+ $error_message, $lang_countries, $lang_register_form;
840840
841841 /* check for login. If not, show login form */
842 - if (!$_SESSION['logged_in'])
 842+ if ( !$_SESSION['logged_in'] )
843843 {
844 - header('Location:'.$myself_url.'index.php?action=login');
 844+ header( 'Location:' . $myself_url . 'index.php?action=login' );
845845 return;
846846 }
847847
848848 /* No strange mode */
849 - if (!in_array($MY_REQUEST['mode'], array(NULL, 'topic', 'accommodation', 'visa', 'pay')))
 849+ if ( !in_array( $MY_REQUEST['mode'], array( NULL, 'topic', 'accommodation', 'visa', 'pay' ) ) )
850850 return;
851851
852852 /* Admin options first */
853 - switch ($MY_REQUEST['modification'])
 853+ switch ( $MY_REQUEST['modification'] )
854854 {
855855 case 'edit_user':
856856
857 - if (!$MY_REQUEST['unique_code'] || empty($MY_REQUEST['unique_code']) || preg_match('/[^0-9A-Z]/i', $MY_REQUEST['unique_code']))
 857+ if ( !$MY_REQUEST['unique_code'] || empty( $MY_REQUEST['unique_code'] ) || preg_match( '/[^0-9A-Z]/i', $MY_REQUEST['unique_code'] ) )
858858 {
859859 $error_array[] = 'filled out the wrong code'; /* invaild information */
860860 break;
861861 }
862 -
 862+
863863 /* Get Data */
864 - $result = $sql->selectData('registration', array(), '`surname`=\''.$sql->EscapeString($MY_REQUEST['surname']).'\' AND `given_name` = \''.$sql->EscapeString($MY_REQUEST['given_name']).'\' AND `unique_code`=\''.$MY_REQUEST['unique_code'].'\'');
865 - if (!$data = $sql->fetchAssoc($result))
 864+ $result = $sql->selectData( 'registration', array(), '`surname`=\'' . $sql->EscapeString( $MY_REQUEST['surname'] ) . '\' AND `given_name` = \'' . $sql->EscapeString( $MY_REQUEST['given_name'] ) . '\' AND `unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' );
 865+ if ( !$data = $sql->fetchAssoc( $result ) )
866866 {
867 - $error_array[] = '';
 867+ $error_array[] = '';
868868 break;
869869 }
870 - mysql_free_result($result);
 870+ mysql_free_result( $result );
871871
872 - if ($MY_REQUEST['item'] == 1)
 872+ if ( $MY_REQUEST['item'] == 1 )
873873 {
874 - $MY_REQUEST['cost_paid'] = round($MY_REQUEST['cost_paid'], 2);
875 - if ($MY_REQUEST['cost_paid'] == 0)
 874+ $MY_REQUEST['cost_paid'] = round( $MY_REQUEST['cost_paid'], 2 );
 875+ if ( $MY_REQUEST['cost_paid'] == 0 )
876876 {
877877 $error_array[] = 'Received a wrong amount or zero.'; /* invaild information */
878878 break;
879 - }
880 -
 879+ }
 880+
881881 /* Send data */
882882 // add or substract the input sum
883 - if(!$sql->updateData('registration', array('cost_paid'=>($data['cost_paid']+$MY_REQUEST['cost_paid'])), '`unique_code`=\''.$MY_REQUEST['unique_code'].'\''))
884 - {echo 'SYSTEM ERROR'; return;}
 883+ if ( !$sql->updateData( 'registration', array( 'cost_paid' => ( $data['cost_paid'] + $MY_REQUEST['cost_paid'] ) ), '`unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' ) )
 884+ { echo 'SYSTEM ERROR'; return; }
885885
886 - $error_array[] = $MY_REQUEST['given_name'].' '. $MY_REQUEST['surname'] .': Payment adjustment has been completed';
 886+ $error_array[] = $MY_REQUEST['given_name'] . ' ' . $MY_REQUEST['surname'] . ': Payment adjustment has been completed';
887887 $MY_REQUEST['cost_paid'] = 0;
888888 $MY_REQUEST['unique_code'] = '';
889889 $MY_REQUEST['surname'] = '';
890890 $MY_REQUEST['given_name'] = '';
891891 }
892892 // @todo finish this
893 - elseif ($MY_REQUEST['item'] == 2)
 893+ elseif ( $MY_REQUEST['item'] == 2 )
894894 {
895895 $register_data = array(
896 - 'join_date' => implode(',', $MY_REQUEST['join_date']),
897 - 'nights' => implode(',', $MY_REQUEST['nights']),
 896+ 'join_date' => implode( ',', $MY_REQUEST['join_date'] ),
 897+ 'nights' => implode( ',', $MY_REQUEST['nights'] ),
898898 'hotels' => $MY_REQUEST['hotels'],
899899 'room_number' => $MY_REQUEST['room_number']
900900 );
901901 }
902 - elseif ($MY_REQUEST['item'] == 3)
 902+ elseif ( $MY_REQUEST['item'] == 3 )
903903 {
904 - var_dump($MY_REQUEST);
 904+ var_dump( $MY_REQUEST );
905905 $register_data = array(
906906 );
907907 }
908908
909 - if ($MY_REQUEST['item'] == 2 || $MY_REQUEST['item'] == 3)
 909+ if ( $MY_REQUEST['item'] == 2 || $MY_REQUEST['item'] == 3 )
910910 {
911911 /* Send data */
912 - if(!$sql->updateData('registration', $register_data, '`unique_code`=\''.$MY_REQUEST['unique_code'].'\''))
913 - {echo 'SYSTEM ERROR'; return;}
914 - if ($MY_REQUEST['item'] == 2)
915 - { $error_array[] = $MY_REQUEST['given_name'].' '. $MY_REQUEST['surname'] .': Accommodation modification has been completed successfully';}
916 - elseif ($MY_REQUEST['item'] == 3)
917 - { $error_array[] = $MY_REQUEST['given_name'].' '. $MY_REQUEST['surname'] .': Tag and identity modification has been completed successfully';}
 912+ if ( !$sql->updateData( 'registration', $register_data, '`unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' ) )
 913+ { echo 'SYSTEM ERROR'; return; }
 914+ if ( $MY_REQUEST['item'] == 2 )
 915+ { $error_array[] = $MY_REQUEST['given_name'] . ' ' . $MY_REQUEST['surname'] . ': Accommodation modification has been completed successfully'; }
 916+ elseif ( $MY_REQUEST['item'] == 3 )
 917+ { $error_array[] = $MY_REQUEST['given_name'] . ' ' . $MY_REQUEST['surname'] . ': Tag and identity modification has been completed successfully'; }
918918 }
919919 break;
920 -
 920+
921921 case 'change_status':
922 -
923 - $MY_REQUEST['status'] = intval($MY_REQUEST['status']);
924 - if ($MY_REQUEST['status'] != 1 && $MY_REQUEST['status'] != 2 )
 922+
 923+ $MY_REQUEST['status'] = intval( $MY_REQUEST['status'] );
 924+ if ( $MY_REQUEST['status'] != 1 && $MY_REQUEST['status'] != 2 )
925925 { break; }
926 -
927 - if (!is_array($MY_REQUEST['no']))
 926+
 927+ if ( !is_array( $MY_REQUEST['no'] ) )
928928 { break; }
929 -
930 - foreach ($MY_REQUEST['no'] as $no)
 929+
 930+ foreach ( $MY_REQUEST['no'] as $no )
931931 {
932932 /* Accepted, rejected, or even not exist? */
933 - $result = $sql->selectData('registration',NULL,'`unique_code`=\''.$no.'\'');
934 - if (!($data = $sql->fetchArray($result)))
 933+ $result = $sql->selectData( 'registration', NULL, '`unique_code`=\'' . $no . '\'' );
 934+ if ( !( $data = $sql->fetchArray( $result ) ) )
935935 {
936 - $error_array[] = 'Couldn\'t find the registration of information of #'.$no ;
 936+ $error_array[] = 'Couldn\'t find the registration of information of #' . $no ;
937937 continue;
938938 }
939 -
940 - if($data['status'] != 0)
 939+
 940+ if ( $data['status'] != 0 )
941941 {
942 - $error_array[] = $data['given_name'].' '. $data['surname'].'(No. '.$no.') has been accepted or rejected, so the change couldn\'t be done.';
 942+ $error_array[] = $data['given_name'] . ' ' . $data['surname'] . '(No. ' . $no . ') has been accepted or rejected, so the change couldn\'t be done.';
943943 continue;
944944 }
945 -
946 - if ($MY_REQUEST['status'] == 1 && $data['cost_total'] > $data['cost_paid'])
 945+
 946+ if ( $MY_REQUEST['status'] == 1 && $data['cost_total'] > $data['cost_paid'] )
947947 {
948 - $error_array[] = $data['given_name'].' '. $data['surname'].' ('.$no.') hasn\'t completed payment, so registration couldn\'t be confirmed.';
 948+ $error_array[] = $data['given_name'] . ' ' . $data['surname'] . ' (' . $no . ') hasn\'t completed payment, so registration couldn\'t be confirmed.';
949949 continue;
950950 }
951 -
952 - if ($MY_REQUEST['status'] == 1)
 951+
 952+ if ( $MY_REQUEST['status'] == 1 )
953953 {
954 - if ($sql->updateData('registration', array('status'=>$MY_REQUEST['status']), '`unique_code`=\''.$no.'\''))
955 - { $error_array[] =$data['given_name'].' '. $data['surname'].'('.$no.') has been confirmed successfully.'; }
 954+ if ( $sql->updateData( 'registration', array( 'status' => $MY_REQUEST['status'] ), '`unique_code`=\'' . $no . '\'' ) )
 955+ { $error_array[] = $data['given_name'] . ' ' . $data['surname'] . '(' . $no . ') has been confirmed successfully.'; }
956956 else
957 - { $error_array[] =$data['given_name'].' '. $data['surname'].'('.$no.') is not confirmed due to databse error.'; }
 957+ { $error_array[] = $data['given_name'] . ' ' . $data['surname'] . '(' . $no . ') is not confirmed due to databse error.'; }
958958 }
959 - else if ($MY_REQUEST['status'] == 2)
 959+ else if ( $MY_REQUEST['status'] == 2 )
960960 {
961 - if ($sql->updateData('registration', array('status'=>$MY_REQUEST['status']), '`unique_code`=\''.$no.'\''))
962 - { $error_array[] =$data['given_name'].' '. $data['surname'].'('.$no.') has been rejected successfully.'; }
 961+ if ( $sql->updateData( 'registration', array( 'status' => $MY_REQUEST['status'] ), '`unique_code`=\'' . $no . '\'' ) )
 962+ { $error_array[] = $data['given_name'] . ' ' . $data['surname'] . '(' . $no . ') has been rejected successfully.'; }
963963 else
964 - { $error_array[] =$data['given_name'].' '. $data['surname'].'('.$no.') is not rejected due to database error.'; }
965 - }
966 -
967 - if ($MY_REQUEST['status'] == 1)
 964+ { $error_array[] = $data['given_name'] . ' ' . $data['surname'] . '(' . $no . ') is not rejected due to database error.'; }
 965+ }
 966+
 967+ if ( $MY_REQUEST['status'] == 1 )
968968 {
969969 /* Send mail */
970970 // $temp_accommodation = '';
971971 // $temp_nights = array(NULL, 'July 16', 'July 17', 'July 18', 'July 19');
972 -//
 972+//
973973 // for ($i = 1; $i <= 4; $i++)
974974 // {
975975 // if ($data['night'.$i])
976976 // { $temp_accommodation = $temp_accommodation . $temp_nights[$i].', '; }
977977 // }
978978 // unset($temp_nights);
979 -//
 979+//
980980 // if (!empty($temp_accommodation))
981981 // {$temp_accommodation = substr($temp_accommodation, 0, -2);}
982 -//
 982+//
983983 // include 'skin/mail_confirmed.php';
984984 // $mail_confirmed_content = preg_replace('/\$1/',$data['given_name'].' '.$data['surname'], $mail_confirmed_content);
985985 // $mail_confirmed_content = preg_replace('/\$2/',$data['unique_code'], $mail_confirmed_content);
986986 // $mail_confirmed_content = preg_replace('/\$4/',$data['email'], $mail_confirmed_content);
987987 // //$mail_confirmed_content = preg_replace('/\$5/',$temp_accommodation, $mail_confirmed_content);
988988 // //$mail_successful_content = preg_replace('/\$6/',$register_data['hotelname'], $mail_confirmed_content);
989 -//
 989+//
990990 // $to = $data['given_name'].' '.$data['surname'].' <'.$data['email'].'>';
991991 // mail_msg($to, 'Wikimania 2011 - Registration Confirmed', $mail_confirmed_content);
992 -//
 992+//
993993 // unset($temp_accommodation);
994994 }
995 -
 995+
996996 }
997997 break;
998 -
999 -
 998+
 999+
10001000 case 'get_data':
1001 - header('Content-type: text/download; charset=utf-8');
1002 - header('Content-Disposition: attachment; filename="registration_data_' . gmdate('ymd_Hi', time() ) . '.txt"');
1003 - $result = $sql->selectData('registration', NULL, '', array('signuptime'), array('asc' => true));
1004 -
 1001+ header( 'Content-type: text/download; charset=utf-8' );
 1002+ header( 'Content-Disposition: attachment; filename="registration_data_' . gmdate( 'ymd_Hi', time() ) . '.txt"' );
 1003+ $result = $sql->selectData( 'registration', NULL, '', array( 'signuptime' ), array( 'asc' => true ) );
 1004+
10051005 $fields = array(
10061006 'unique_code' => 'Code',
10071007 'signuptime' => 'Sign-up',
10081008 'given_name' => 'Given name',
10091009 'surname' => 'Surname',
10101010 'sex' => 'Sex',
1011 - 'country'=>'Country',
1012 - 'langn'=>'LangN',
1013 - 'lang1'=>'Lang1',
1014 - 'lang1-level'=>'Lang1lv',
1015 - 'lang2'=>'Lang2',
1016 - 'lang2-level'=>'Lang2lv',
1017 - 'lang3'=>'Lang3',
1018 - 'lang3-level'=>'Lang3lv',
1019 - 'wiki_id'=>'Wiki ID',
1020 - 'wiki_language'=>'Wiki Lang',
1021 - 'wiki_project'=>'Wiki project',
 1011+ 'country' => 'Country',
 1012+ 'langn' => 'LangN',
 1013+ 'lang1' => 'Lang1',
 1014+ 'lang1-level' => 'Lang1lv',
 1015+ 'lang2' => 'Lang2',
 1016+ 'lang2-level' => 'Lang2lv',
 1017+ 'lang3' => 'Lang3',
 1018+ 'lang3-level' => 'Lang3lv',
 1019+ 'wiki_id' => 'Wiki ID',
 1020+ 'wiki_language' => 'Wiki Lang',
 1021+ 'wiki_project' => 'Wiki project',
10221022 'email' => 'E-mail',
10231023 'j1' => 'Aug 2',
10241024 'j2' => 'Aug 3',
@@ -1064,115 +1064,115 @@
10651065 'paypal' => 'Paypal',
10661066 'cost_paid' => 'Cost paid',
10671067 'status' => 'Status'
1068 - );
1069 -
1070 - echo implode("\t",$fields)."\r\n";
1071 -
1072 - while($data = $sql->fetchAssoc($result))
 1068+ );
 1069+
 1070+ echo implode( "\t", $fields ) . "\r\n";
 1071+
 1072+ while ( $data = $sql->fetchAssoc( $result ) )
10731073 {
1074 - for ($i = 1; $i <= 3; $i++)
 1074+ for ( $i = 1; $i <= 3; $i++ )
10751075 {
1076 - if (!(strpos($data['showname'], (string)$i) === false)) $data['s'.$i] = 'X';
 1076+ if ( !( strpos( $data['showname'], (string)$i ) === false ) ) $data['s' . $i] = 'X';
10771077 }
1078 - for ($i = 1; $i <= 6; $i++)
 1078+ for ( $i = 1; $i <= 6; $i++ )
10791079 {
1080 - if (!(strpos($data['join_date'], (string)$i) === false)) $data['j'.$i] = 'X';
 1080+ if ( !( strpos( $data['join_date'], (string)$i ) === false ) ) $data['j' . $i] = 'X';
10811081 }
1082 - for ($i = 1; $i <= 8; $i++)
 1082+ for ( $i = 1; $i <= 8; $i++ )
10831083 {
1084 - if (!(strpos($data['nights'], (string)$i) === false)) $data['n'.$i] = 'X';
 1084+ if ( !( strpos( $data['nights'], (string)$i ) === false ) ) $data['n' . $i] = 'X';
10851085 }
10861086 $data['hotelname'] = $lang_register_form['hotel' . $data['hotels']];
1087 - $data['country'] = $lang_countries[strtolower($data['country'])];
1088 - $data['nationality'] = $lang_countries[strtolower($data['nationality'])];
1089 - $data['countryofbirth'] = $lang_countries[strtolower($data['countryofbirth'])];
1090 - foreach($fields as $field => $field_alias)
 1087+ $data['country'] = $lang_countries[strtolower( $data['country'] )];
 1088+ $data['nationality'] = $lang_countries[strtolower( $data['nationality'] )];
 1089+ $data['countryofbirth'] = $lang_countries[strtolower( $data['countryofbirth'] )];
 1090+ foreach ( $fields as $field => $field_alias )
10911091 {
1092 - $data[$field] = preg_replace('/\t/',' ',$data[$field]);
1093 - $data[$field] = preg_replace('/\n/','.',$data[$field]);
1094 - $data[$field] = preg_replace('/\r/',' ',$data[$field]);
 1092+ $data[$field] = preg_replace( '/\t/', ' ', $data[$field] );
 1093+ $data[$field] = preg_replace( '/\n/', '.', $data[$field] );
 1094+ $data[$field] = preg_replace( '/\r/', ' ', $data[$field] );
10951095 echo $data[$field];
1096 - if ($field!=$fields[(count($fields)-1)]) echo "\t";
 1096+ if ( $field != $fields[( count( $fields ) -1 )] ) echo "\t";
10971097 }
10981098 echo "\r\n";
10991099 }
11001100 return;
11011101 break;
1102 -
 1102+
11031103 case 'set_data':
1104 -
1105 - if (!move_uploaded_file($_FILES['accommodation_file']['tmp_name'], 'upload/tmp_accomodation.txt'))
 1104+
 1105+ if ( !move_uploaded_file( $_FILES['accommodation_file']['tmp_name'], 'upload/tmp_accomodation.txt' ) )
11061106 { return; }
1107 -
1108 - $file_handle = @fopen("upload/tmp_accomodation.txt", "r");
1109 - if (!$file_handle || @feof($file_handle))
 1107+
 1108+ $file_handle = @fopen( "upload/tmp_accomodation.txt", "r" );
 1109+ if ( !$file_handle || @feof( $file_handle ) )
11101110 { return; }
1111 - $firstline = trim(fgets($file_handle, 4096));
1112 - $fields = explode("\t", $firstline);
1113 -
1114 - while (!feof($file_handle))
 1111+ $firstline = trim( fgets( $file_handle, 4096 ) );
 1112+ $fields = explode( "\t", $firstline );
 1113+
 1114+ while ( !feof( $file_handle ) )
11151115 {
1116 - $buffer = trim(fgets($file_handle, 4096));
1117 - if (!$buffer)
 1116+ $buffer = trim( fgets( $file_handle, 4096 ) );
 1117+ if ( !$buffer )
11181118 { continue; }
11191119 $data = array();
1120 -
1121 - $values = explode("\t", $buffer);
1122 - $data = array_combine($fields, $values);
1123 -
 1120+
 1121+ $values = explode( "\t", $buffer );
 1122+ $data = array_combine( $fields, $values );
 1123+
11241124 /* Get Data */
1125 - $result = $sql->selectData('registration', array(), '`no`=\''.$sql->EscapeString($data['no']).'\''.
1126 - ' AND `unique_code`=\''.$sql->EscapeString($data['unique_code']).'\'');
1127 - if (!$sql_data = $sql->fetchAssoc($result))
 1125+ $result = $sql->selectData( 'registration', array(), '`no`=\'' . $sql->EscapeString( $data['no'] ) . '\'' .
 1126+ ' AND `unique_code`=\'' . $sql->EscapeString( $data['unique_code'] ) . '\'' );
 1127+ if ( !$sql_data = $sql->fetchAssoc( $result ) )
11281128 {
1129 - $error_array[] = 'Find #'.$data['no'].' Text file may be corrupted, please re-confirm ';
 1129+ $error_array[] = 'Find #' . $data['no'] . ' Text file may be corrupted, please re-confirm ';
11301130 continue;
1131 - }
1132 - if ($data['room_num1']+$data['room_num2']+$data['room_num3']+
1133 - $data['room_num4']+$data['room_num5'] == 0)
1134 - {echo 'Skip No.'.$data['no'].' '; continue; }
1135 -
1136 - echo '<p>Preparing to write No.'.$data['no'].'Accommodation info '.$data['room_num1'].'/'.$data['room_num2'].'/'.$data['room_num3'].'/'.$data['room_num4'].'/'.$data['room_num5'].'...';
1137 -
 1131+ }
 1132+ if ( $data['room_num1'] + $data['room_num2'] + $data['room_num3'] +
 1133+ $data['room_num4'] + $data['room_num5'] == 0 )
 1134+ { echo 'Skip No.' . $data['no'] . ' '; continue; }
 1135+
 1136+ echo '<p>Preparing to write No.' . $data['no'] . 'Accommodation info ' . $data['room_num1'] . '/' . $data['room_num2'] . '/' . $data['room_num3'] . '/' . $data['room_num4'] . '/' . $data['room_num5'] . '...';
 1137+
11381138 /* Write Data */
1139 - if(!$sql->updateData('registration',array(
1140 - 'room_num1'=>$data['room_num1'],
1141 - 'room_num2'=>$data['room_num2'],
1142 - 'room_num3'=>$data['room_num3'],
1143 - 'room_num4'=>$data['room_num4'],
1144 - 'room_num5'=>$data['room_num5'],
1145 - ), '`no`=\''.$sql->EscapeString($data['no']).'\''.
1146 - ' AND `unique_code`=\''.$sql->EscapeString($data['unique_code']).'\''))
1147 - {echo 'SYSTEM ERROR</p>'; continue;}
 1139+ if ( !$sql->updateData( 'registration', array(
 1140+ 'room_num1' => $data['room_num1'],
 1141+ 'room_num2' => $data['room_num2'],
 1142+ 'room_num3' => $data['room_num3'],
 1143+ 'room_num4' => $data['room_num4'],
 1144+ 'room_num5' => $data['room_num5'],
 1145+ ), '`no`=\'' . $sql->EscapeString( $data['no'] ) . '\'' .
 1146+ ' AND `unique_code`=\'' . $sql->EscapeString( $data['unique_code'] ) . '\'' ) )
 1147+ { echo 'SYSTEM ERROR</p>'; continue; }
11481148 echo 'OK! </p>';
11491149 $buffer = '';
11501150 }
1151 - fclose($file_handle);
 1151+ fclose( $file_handle );
11521152 $error_array[] = 'Registration has been completed.';
1153 - unlink('upload/tmp_accomodation.txt');
1154 - break;
 1153+ unlink( 'upload/tmp_accomodation.txt' );
 1154+ break;
11551155 }
1156 - if (!empty($error_array))
 1156+ if ( !empty( $error_array ) )
11571157 {
1158 - $error_message = '<ul>'."\n".'<li>' . implode('</li>'."\n".'<li>', $error_array) . '</li>'."\n".'</ul>';
 1158+ $error_message = '<ul>' . "\n" . '<li>' . implode( '</li>' . "\n" . '<li>', $error_array ) . '</li>' . "\n" . '</ul>';
11591159 }
11601160
1161 -
 1161+
11621162 /////////////////////// /////////////////////// ///////////////////////
11631163 // END OF ADMIN OPTIONS
11641164 /////////////////////// /////////////////////// ///////////////////////
1165 -
 1165+
11661166 /* How many people joined? */
1167 - $result = $sql->selectData('registration',NULL,'',NULL,array('count' => 1));
1168 - $data = $sql->fetchArray($result);
 1167+ $result = $sql->selectData( 'registration', NULL, '', NULL, array( 'count' => 1 ) );
 1168+ $data = $sql->fetchArray( $result );
11691169 $register_data['total_people'] = $data['COUNT(*)'];
1170 - mysql_free_result($result);
 1170+ mysql_free_result( $result );
11711171
11721172 /* How many people joined and confirmed? */
1173 - $result = $sql->selectData('registration',NULL,'`status` = 1',NULL,array('count' => 1));
1174 - $data = $sql->fetchArray($result);
 1173+ $result = $sql->selectData( 'registration', NULL, '`status` = 1', NULL, array( 'count' => 1 ) );
 1174+ $data = $sql->fetchArray( $result );
11751175 $register_data['total_people_confirmed'] = $data['COUNT(*)'];
1176 - mysql_free_result($result);
 1176+ mysql_free_result( $result );
11771177 //
11781178 // /* How many people accommodation? */
11791179 // $result = $sql->selectData('registration',NULL,' `night1` + `night2` + `night3` + `night4` > 0 AND `status` = 1',NULL,array('count' => 1));
@@ -1180,158 +1180,158 @@
11811181 // $register_data['total_accommodation'] = $data['COUNT(*)'];
11821182 // mysql_free_result($result);
11831183 //
1184 -
1185 - switch ($MY_REQUEST['mode'])
 1184+
 1185+ switch ( $MY_REQUEST['mode'] )
11861186 {
11871187 case NULL:
11881188 /* How many countries? */
1189 - $result = $sql->selectData('registration',array('country'),'',NULL,array('count' => 1, 'distinct' => 1));
1190 - $data = $sql->fetchArray($result);
 1189+ $result = $sql->selectData( 'registration', array( 'country' ), '', NULL, array( 'count' => 1, 'distinct' => 1 ) );
 1190+ $data = $sql->fetchArray( $result );
11911191 $register_data['total_countries'] = $data[0];
1192 - mysql_free_result($result);
 1192+ mysql_free_result( $result );
11931193
11941194 /* How about sex? */
1195 - $result = $sql->selectData('registration',NULL,'`sex` = \'m\'',NULL,array('count' => 1));
1196 - $data = $sql->fetchArray($result);
 1195+ $result = $sql->selectData( 'registration', NULL, '`sex` = \'m\'', NULL, array( 'count' => 1 ) );
 1196+ $data = $sql->fetchArray( $result );
11971197 $register_data['total_male'] = $data[0];
1198 - mysql_free_result($result);
 1198+ mysql_free_result( $result );
11991199
1200 - $result = $sql->selectData('registration',NULL,'`sex` = \'f\'',NULL,array('count' => 1));
1201 - $data = $sql->fetchArray($result);
 1200+ $result = $sql->selectData( 'registration', NULL, '`sex` = \'f\'', NULL, array( 'count' => 1 ) );
 1201+ $data = $sql->fetchArray( $result );
12021202 $register_data['total_female'] = $data[0];
1203 - mysql_free_result($result);
1204 -
1205 - $result = $sql->selectData('registration',NULL,'`sex` = \'d\'',NULL,array('count' => 1));
1206 - $data = $sql->fetchArray($result);
 1203+ mysql_free_result( $result );
 1204+
 1205+ $result = $sql->selectData( 'registration', NULL, '`sex` = \'d\'', NULL, array( 'count' => 1 ) );
 1206+ $data = $sql->fetchArray( $result );
12071207 $register_data['total_sex_other'] = $data[0];
1208 - mysql_free_result($result);
1209 -
1210 - $result = $sql->selectData('registration',NULL,'`wiki_id` != \'\'',NULL,array('count' => 1));
1211 - $data = $sql->fetchArray($result);
 1208+ mysql_free_result( $result );
 1209+
 1210+ $result = $sql->selectData( 'registration', NULL, '`wiki_id` != \'\'', NULL, array( 'count' => 1 ) );
 1211+ $data = $sql->fetchArray( $result );
12121212 $register_data['total_wikimedians'] = $data['COUNT(*)'];
1213 - mysql_free_result($result);
 1213+ mysql_free_result( $result );
12141214
12151215 case 'topic':
1216 -
1217 - /* How many people join for 1 day, for 2 days etc. */
1218 - for ($i = 1; $i <= 6; $i++) {
1219 - $result = $sql->Query('SELECT COUNT(*) FROM `registration` WHERE BIT_COUNT(`join_date`) = ' . $i);
1220 - $data = $sql->fetchArray($result);
1221 - $register_data['total_'.$i.'days'] = $data[0];
1222 - unset($data);
1223 - mysql_free_result($result);
1224 - }
12251216
 1217+ /* How many people join for 1 day, for 2 days etc. */
 1218+ for ( $i = 1; $i <= 6; $i++ ) {
 1219+ $result = $sql->Query( 'SELECT COUNT(*) FROM `registration` WHERE BIT_COUNT(`join_date`) = ' . $i );
 1220+ $data = $sql->fetchArray( $result );
 1221+ $register_data['total_' . $i . 'days'] = $data[0];
 1222+ unset( $data );
 1223+ mysql_free_result( $result );
 1224+ }
 1225+
12261226 /* People per day */
1227 - for ($i = 1; $i <= 6; $i++)
 1227+ for ( $i = 1; $i <= 6; $i++ )
12281228 {
1229 - $result = $sql->Query('SELECT COUNT(*) FROM `registration` WHERE `join_date` LIKE \'%' . $i .'%\'');
1230 - $data = $sql->fetchArray($result);
1231 - $register_data['total_day'.$i] = $data[0];
1232 - mysql_free_result($result);
 1229+ $result = $sql->Query( 'SELECT COUNT(*) FROM `registration` WHERE `join_date` LIKE \'%' . $i . '%\'' );
 1230+ $data = $sql->fetchArray( $result );
 1231+ $register_data['total_day' . $i] = $data[0];
 1232+ mysql_free_result( $result );
12331233 }
12341234
12351235 case 'accommodation':
12361236 /* How many people stay 0 night, 1 night etc. */
1237 - for ($i = 0; $i <= 8; $i++) {
1238 - $result = $sql->Query('SELECT COUNT(*) FROM `registration` WHERE BIT_COUNT(`nights`) = ' . $i);
1239 - $data = $sql->fetchArray($result);
1240 - $register_data['total_'.$i.'nights'] = $data[0];
1241 - unset($data);
1242 - mysql_free_result($result);
 1237+ for ( $i = 0; $i <= 8; $i++ ) {
 1238+ $result = $sql->Query( 'SELECT COUNT(*) FROM `registration` WHERE BIT_COUNT(`nights`) = ' . $i );
 1239+ $data = $sql->fetchArray( $result );
 1240+ $register_data['total_' . $i . 'nights'] = $data[0];
 1241+ unset( $data );
 1242+ mysql_free_result( $result );
12431243 }
1244 -
1245 - for ($i = 1; $i <= 9; $i++) {
1246 - $result = $sql->Query('SELECT COUNT(*) FROM `registration` WHERE `hotels` = \'' . $i . '\'');
1247 - $data = $sql->fetchArray($result);
 1244+
 1245+ for ( $i = 1; $i <= 9; $i++ ) {
 1246+ $result = $sql->Query( 'SELECT COUNT(*) FROM `registration` WHERE `hotels` = \'' . $i . '\'' );
 1247+ $data = $sql->fetchArray( $result );
12481248 $register_data['total_hotel' . $i] = $data[0];
1249 - unset($data);
1250 - mysql_free_result($result);
 1249+ unset( $data );
 1250+ mysql_free_result( $result );
12511251 }
1252 -
1253 - for ($i = 1; $i <= 9; $i++) {
1254 - $result = $sql->Query('SELECT COUNT(DISTINCT(`room_number`)) FROM `registration` WHERE `hotels` = \'' . $i . '\' AND `room_number` is not NULL AND `room_number` != \'\'');
1255 - $data = $sql->fetchArray($result);
 1252+
 1253+ for ( $i = 1; $i <= 9; $i++ ) {
 1254+ $result = $sql->Query( 'SELECT COUNT(DISTINCT(`room_number`)) FROM `registration` WHERE `hotels` = \'' . $i . '\' AND `room_number` is not NULL AND `room_number` != \'\'' );
 1255+ $data = $sql->fetchArray( $result );
12561256 $register_data['rooms_hotel' . $i] = $data[0];
1257 - mysql_free_result($result);
 1257+ mysql_free_result( $result );
12581258 }
1259 -
 1259+
12601260 case 'visa':
1261 - $result = $sql->selectData('registration',NULL,'`visa_assistance` = \'1\'' ,NULL,array('count' => 1));
1262 - $data = $sql->fetchArray($result);
 1261+ $result = $sql->selectData( 'registration', NULL, '`visa_assistance` = \'1\'' , NULL, array( 'count' => 1 ) );
 1262+ $data = $sql->fetchArray( $result );
12631263 $register_data['total_assist'] = $data[0];
1264 - unset($data);
1265 - mysql_free_result($result);
 1264+ unset( $data );
 1265+ mysql_free_result( $result );
12661266
12671267 }
12681268 /* page process */
1269 - $register_data['per_page'] = intval($MY_REQUEST['per_page']);
1270 - if ($register_data['per_page'] <= 0)
 1269+ $register_data['per_page'] = intval( $MY_REQUEST['per_page'] );
 1270+ if ( $register_data['per_page'] <= 0 )
12711271 { $register_data['per_page'] = 20; }
12721272
1273 - $register_data['page'] = intval($MY_REQUEST['page']);
1274 - if ($register_data['page'] <= 0)
 1273+ $register_data['page'] = intval( $MY_REQUEST['page'] );
 1274+ if ( $register_data['page'] <= 0 )
12751275 { $register_data['page'] = 1; }
12761276
1277 - $select_start = ($register_data['page'] - 1) * $register_data['per_page'];
1278 - if ($select_start + 1 > $register_data['total_people'])
1279 - {$select_start = 0; $register_data['page'] = 1;}
 1277+ $select_start = ( $register_data['page'] - 1 ) * $register_data['per_page'];
 1278+ if ( $select_start + 1 > $register_data['total_people'] )
 1279+ { $select_start = 0; $register_data['page'] = 1; }
12801280
1281 - if ($MY_REQUEST['keyword'] && is_string($MY_REQUEST['keyword']))
 1281+ if ( $MY_REQUEST['keyword'] && is_string( $MY_REQUEST['keyword'] ) )
12821282 {
1283 - $keyword_temp = $sql->EscapeString($MY_REQUEST['keyword']);
1284 - $keyword_temp = preg_replace('/\_/', '\\\_', $keyword_temp);
1285 - $keyword_temp = preg_replace('/\%/', '\\\%', $keyword_temp);
1286 -
 1283+ $keyword_temp = $sql->EscapeString( $MY_REQUEST['keyword'] );
 1284+ $keyword_temp = preg_replace( '/\_/', '\\\_', $keyword_temp );
 1285+ $keyword_temp = preg_replace( '/\%/', '\\\%', $keyword_temp );
 1286+
12871287 $query = '';
12881288
1289 - switch ($MY_REQUEST['filter'])
 1289+ switch ( $MY_REQUEST['filter'] )
12901290 {
12911291 case 'name':
1292 - $query = '`surname` LIKE \'%'. $keyword_temp .'%\' '.
1293 - 'OR `given_name` LIKE \'%'. $keyword_temp .'%\' '.
1294 - 'OR `wiki_id` LIKE \'%'. $keyword_temp .'%\' '.
1295 - 'OR `custom_showname` LIKE \'%'. $keyword_temp .'%\' ';
 1292+ $query = '`surname` LIKE \'%' . $keyword_temp . '%\' ' .
 1293+ 'OR `given_name` LIKE \'%' . $keyword_temp . '%\' ' .
 1294+ 'OR `wiki_id` LIKE \'%' . $keyword_temp . '%\' ' .
 1295+ 'OR `custom_showname` LIKE \'%' . $keyword_temp . '%\' ';
12961296 break;
12971297
12981298 case 'email':
1299 - $query = '`email` LIKE \'%'. $keyword_temp .'%\' ';
 1299+ $query = '`email` LIKE \'%' . $keyword_temp . '%\' ';
13001300 break;
13011301
13021302 case 'unique_code':
1303 - $query = '`unique_code` LIKE \'%'. $keyword_temp .'%\' ';
 1303+ $query = '`unique_code` LIKE \'%' . $keyword_temp . '%\' ';
13041304 break;
13051305
13061306 default:
13071307 }
1308 - if ($MY_REQUEST['real'])
 1308+ if ( $MY_REQUEST['real'] )
13091309 $query = $query . ' AND `status`=1';
1310 -
1311 - $result = $sql->selectData('registration',NULL,$query, array('signuptime'), array('asc'=>false));
1312 - $data = $sql->fetchArray($result);
1313 - $register_data['total_keyword'] = mysql_num_rows($result);
1314 - mysql_free_result($result);
1315 - $result = $sql->selectData('registration',NULL,$query,array('signuptime'), array('asc'=>false, 'start' => $select_start, 'total' => $register_data['per_page']));
 1310+
 1311+ $result = $sql->selectData( 'registration', NULL, $query, array( 'signuptime' ), array( 'asc' => false ) );
 1312+ $data = $sql->fetchArray( $result );
 1313+ $register_data['total_keyword'] = mysql_num_rows( $result );
 1314+ mysql_free_result( $result );
 1315+ $result = $sql->selectData( 'registration', NULL, $query, array( 'signuptime' ), array( 'asc' => false, 'start' => $select_start, 'total' => $register_data['per_page'] ) );
13161316 }
13171317 else
13181318 {
13191319 $MY_REQUEST['keyword'] = NULL;
1320 - if ($MY_REQUEST['real'])
1321 - $result = $sql->selectData('registration',NULL,'`status`=1',array('signuptime'), array('asc'=>false,'start' => $select_start, 'total' => $register_data['per_page']));
 1320+ if ( $MY_REQUEST['real'] )
 1321+ $result = $sql->selectData( 'registration', NULL, '`status`=1', array( 'signuptime' ), array( 'asc' => false, 'start' => $select_start, 'total' => $register_data['per_page'] ) );
13221322 else
1323 - $result = $sql->selectData('registration',NULL,'',array('signuptime'), array('asc'=>false,'start' => $select_start, 'total' => $register_data['per_page']));
 1323+ $result = $sql->selectData( 'registration', NULL, '', array( 'signuptime' ), array( 'asc' => false, 'start' => $select_start, 'total' => $register_data['per_page'] ) );
13241324 }
13251325
1326 - while ($data = $sql->fetchAssoc($result))
 1326+ while ( $data = $sql->fetchAssoc( $result ) )
13271327 {
13281328 /* Write Data */
13291329 $table_data[] = $data;
13301330 }
1331 - mysql_free_result($result);
 1331+ mysql_free_result( $result );
13321332
13331333 include 'skin/html_header.php';
13341334 include 'skin/admin_interface.php';
1335 - include 'skin/html_footer.php';
 1335+ include 'skin/html_footer.php';
13361336
13371337 }
13381338
@@ -1344,51 +1344,51 @@
13451345
13461346 function process_login()
13471347 {
1348 - global $_POST, $sql, $error_message, $register_data;
1349 -
 1348+ global $_POST, $sql, $error_message, $register_data;
 1349+
13501350 $error_message = '';
13511351
13521352 /* Check for vaild ID */
1353 - if(preg_match('/[^0-9A-Z\_\-]/i',$_POST['user_id'])) {
 1353+ if ( preg_match( '/[^0-9A-Z\_\-]/i', $_POST['user_id'] ) ) {
13541354 $error_message = 1;
1355 - $register_data = array('user_id' => $_POST['user_id'], 'password' => $_POST['password']);
 1355+ $register_data = array( 'user_id' => $_POST['user_id'], 'password' => $_POST['password'] );
13561356 include 'skin/html_header.php';
13571357 include 'skin/login_form.php';
1358 - include 'skin/html_footer.php';
 1358+ include 'skin/html_footer.php';
13591359 return;
13601360 }
13611361
13621362 /* Check for vaild login data */
1363 - $result = $sql->selectData('admins', array(), '`user_id`=\''./* Filtered */ $_POST['user_id'].'\' and `password`=\''./* no need to escape */md5($_POST['password']).'\'');
1364 - $login_data = $sql->fetchArray($result);
1365 - if(!$result || !$login_data)
 1363+ $result = $sql->selectData( 'admins', array(), '`user_id`=\'' . /* Filtered */ $_POST['user_id'] . '\' and `password`=\'' . /* no need to escape */md5( $_POST['password'] ) . '\'' );
 1364+ $login_data = $sql->fetchArray( $result );
 1365+ if ( !$result || !$login_data )
13661366 {
13671367 $error_message = 1;
1368 - $register_data = array('user_id' => $_POST['user_id'], 'password' => $_POST['password']);
 1368+ $register_data = array( 'user_id' => $_POST['user_id'], 'password' => $_POST['password'] );
13691369 include 'skin/html_header.php';
13701370 include 'skin/login_form.php';
1371 - include 'skin/html_footer.php';
 1371+ include 'skin/html_footer.php';
13721372 return;
13731373 }
13741374
13751375 $_SESSION['logged_in'] = 1;
13761376 $_SESSION['user_id'] = $_POST['user_id'];
1377 - $_SESSION['user_password'] = md5($_POST['password']);
 1377+ $_SESSION['user_password'] = md5( $_POST['password'] );
13781378
1379 - header('Location:'.$myself_url.'index.php?action=admin');
 1379+ header( 'Location:' . $myself_url . 'index.php?action=admin' );
13801380 }
13811381
13821382 function logout()
13831383 {
13841384 /* login user only */
1385 - if (!$_SESSION['logged_in'])
 1385+ if ( !$_SESSION['logged_in'] )
13861386 { return; }
13871387
1388 - unset($_SESSION['logged_in']);
1389 - unset($_SESSION['user_id']);
1390 - unset($_SESSION['user_password']);
 1388+ unset( $_SESSION['logged_in'] );
 1389+ unset( $_SESSION['user_id'] );
 1390+ unset( $_SESSION['user_password'] );
13911391
1392 - header('Location:'.$myself_url.'index.php');
 1392+ header( 'Location:' . $myself_url . 'index.php' );
13931393
13941394 }
13951395
@@ -1397,36 +1397,35 @@
13981398 include 'skin/html_header.php';
13991399 include 'skin/query.php';
14001400 include 'skin/html_footer.php';
1401 -
14021401 }
14031402
14041403 function query_result()
14051404 {
14061405 global $MY_REQUEST, $sql, $error_message, $register_data;
1407 - if (!$MY_REQUEST['unique_code'] || empty($MY_REQUEST['unique_code']) || preg_match('/[^0-9A-Z]/i', $MY_REQUEST['unique_code']))
 1406+ if ( !$MY_REQUEST['unique_code'] || empty( $MY_REQUEST['unique_code'] ) || preg_match( '/[^0-9A-Z]/i', $MY_REQUEST['unique_code'] ) )
14081407 {
14091408 /* Wrong? */
14101409 $error_message = 1;
1411 - $register_data = array('surname'=>$MY_REQUEST['surname'], 'given_name'=>$MY_REQUEST['given_name'], 'unique_code'=>$MY_REQUEST['unique_code']);
 1410+ $register_data = array( 'surname' => $MY_REQUEST['surname'], 'given_name' => $MY_REQUEST['given_name'], 'unique_code' => $MY_REQUEST['unique_code'] );
14121411 include 'skin/html_header.php';
14131412 include 'skin/query.php';
14141413 include 'skin/html_footer.php';
1415 - return;
 1414+ return;
14161415 }
14171416
1418 - $test_code_result = $sql->selectData('registration', array(), '`surname`=\''.$sql->EscapeString($MY_REQUEST['surname']).'\' AND `given_name` = \''.$sql->EscapeString($MY_REQUEST['given_name']).'\' AND `unique_code`=\''.$MY_REQUEST['unique_code'].'\'');
1419 - $test_code_array = $sql->fetchArray($test_code_result);
1420 -
1421 - if (!is_array($test_code_array)) {
 1417+ $test_code_result = $sql->selectData( 'registration', array(), '`surname`=\'' . $sql->EscapeString( $MY_REQUEST['surname'] ) . '\' AND `given_name` = \'' . $sql->EscapeString( $MY_REQUEST['given_name'] ) . '\' AND `unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' );
 1418+ $test_code_array = $sql->fetchArray( $test_code_result );
 1419+
 1420+ if ( !is_array( $test_code_array ) ) {
14221421 /* Wrong? */
14231422 $error_message = 2;
1424 - $register_data = array('surname'=>$MY_REQUEST['surname'], 'given_name'=>$MY_REQUEST['given_name'], 'unique_code'=>$MY_REQUEST['unique_code']);
 1423+ $register_data = array( 'surname' => $MY_REQUEST['surname'], 'given_name' => $MY_REQUEST['given_name'], 'unique_code' => $MY_REQUEST['unique_code'] );
14251424 include 'skin/html_header.php';
14261425 include 'skin/query.php';
14271426 include 'skin/html_footer.php';
1428 - return;
 1427+ return;
14291428
1430 - }
 1429+ }
14311430 $register_data = $test_code_array;
14321431 include 'skin/html_header.php';
14331432 include 'skin/query_result.php';
@@ -1445,91 +1444,91 @@
14461445 {
14471446 global $MY_REQUEST, $sql, $error_message, $register_data, $coupon_vip, $coupon_median,
14481447 $coupon_volunteer, $wikimania_cost_wikimedian, $accommodation_limit_people_Metropol,
1449 - $accommodation_limit_people_Delta, $accommodation_limit_people_Dorms, $accommodation_cost_metropol,
 1448+ $accommodation_limit_people_Delta, $accommodation_limit_people_Dorms, $accommodation_cost_metropol,
14501449 $accommodation_cost_delta, $accommodation_cost_dorms;
1451 -
1452 - if (!$MY_REQUEST['unique_code'] || empty($MY_REQUEST['unique_code']) || preg_match('/[^0-9A-Z]/i', $MY_REQUEST['unique_code'])
1453 - || !$MY_REQUEST['coupon_id'] || empty($MY_REQUEST['coupon_id']) || preg_match('/[^0-9A-Z]/i', $MY_REQUEST['coupon_id']))
 1450+
 1451+ if ( !$MY_REQUEST['unique_code'] || empty( $MY_REQUEST['unique_code'] ) || preg_match( '/[^0-9A-Z]/i', $MY_REQUEST['unique_code'] )
 1452+ || !$MY_REQUEST['coupon_id'] || empty( $MY_REQUEST['coupon_id'] ) || preg_match( '/[^0-9A-Z]/i', $MY_REQUEST['coupon_id'] ) )
14541453 {
14551454 /* Wrong? */
14561455 $error_message = 1;
1457 - $register_data = array('surname'=>$MY_REQUEST['surname'], 'given_name'=>$MY_REQUEST['given_name'], 'unique_code'=>$MY_REQUEST['unique_code'], 'coupon_id'=>$MY_REQUEST['coupon_id']);
 1456+ $register_data = array( 'surname' => $MY_REQUEST['surname'], 'given_name' => $MY_REQUEST['given_name'], 'unique_code' => $MY_REQUEST['unique_code'], 'coupon_id' => $MY_REQUEST['coupon_id'] );
14581457 include 'skin/html_header.php';
14591458 include 'skin/coupon.php';
14601459 include 'skin/html_footer.php';
1461 - return;
 1460+ return;
14621461 }
14631462
14641463
14651464 /* Find who is the coupon activator */
1466 - $test_code_result = $sql->selectData(registration, array(), '`surname`=\''.$sql->EscapeString($MY_REQUEST['surname']).'\' AND `given_name` = \''.$sql->EscapeString($MY_REQUEST['given_name']).'\' AND `unique_code`=\''.$MY_REQUEST['unique_code'].'\'');
1467 - $test_code_array = $sql->fetchArray($test_code_result);
1468 - if (!is_array($test_code_array)||$test_code_array['status']) {
 1465+ $test_code_result = $sql->selectData( registration, array(), '`surname`=\'' . $sql->EscapeString( $MY_REQUEST['surname'] ) . '\' AND `given_name` = \'' . $sql->EscapeString( $MY_REQUEST['given_name'] ) . '\' AND `unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' );
 1466+ $test_code_array = $sql->fetchArray( $test_code_result );
 1467+ if ( !is_array( $test_code_array ) || $test_code_array['status'] ) {
14691468 /* Wrong? */
14701469 $error_message = 1;
1471 - $register_data = array('surname'=>$MY_REQUEST['surname'], 'given_name'=>$MY_REQUEST['given_name'], 'unique_code'=>$MY_REQUEST['unique_code']);
 1470+ $register_data = array( 'surname' => $MY_REQUEST['surname'], 'given_name' => $MY_REQUEST['given_name'], 'unique_code' => $MY_REQUEST['unique_code'] );
14721471 include 'skin/html_header.php';
14731472 include 'skin/coupon.php';
14741473 include 'skin/html_footer.php';
1475 - return;
 1474+ return;
14761475
1477 - }
1478 -
 1476+ }
 1477+
14791478 $register_data = $test_code_array;
14801479
14811480 /* Activate coupon */
1482 - if($MY_REQUEST['coupon_id'] == $coupon_vip)
 1481+ if ( $MY_REQUEST['coupon_id'] == $coupon_vip )
14831482 {
14841483 $register_data['vip_status'] = 1;
14851484 $register_data['cost_total'] = 0;
14861485 }
1487 - elseif ($MY_REQUEST['coupon_id'] == $coupon_median)
 1486+ elseif ( $MY_REQUEST['coupon_id'] == $coupon_median )
14881487 {
14891488 $register_data['vip_status'] = 2;
14901489 $register_data['cost_total'] = 0;
1491 - $register_data['cost_total'] += $wikimania_cost_wikimedian[$register_data['join1']+$register_data['join2']+$register_data['join3']];
1492 -
 1490+ $register_data['cost_total'] += $wikimania_cost_wikimedian[$register_data['join1'] + $register_data['join2'] + $register_data['join3']];
 1491+
14931492 $night_selected = $register_data['night1'] + $register_data['night2'] + $register_data['night3'] + $register_data['night4'];
14941493
1495 - if ($register_data['hotelname'] == 'metropol' )
 1494+ if ( $register_data['hotelname'] == 'metropol' )
14961495 { $register_data['cost_total'] += $accommodation_cost_metropol * $night_selected; }
1497 - elseif ($register_data['hotelname'] == 'delta' )
 1496+ elseif ( $register_data['hotelname'] == 'delta' )
14981497 { $register_data['cost_total'] += $accommodation_cost_delta * $night_selected; }
1499 - elseif ($register_data['hotelname'] == 'dorms' )
 1498+ elseif ( $register_data['hotelname'] == 'dorms' )
15001499 { $register_data['cost_total'] += $accommodation_cost_dorms * $night_selected; }
1501 - else
 1500+ else
15021501 { $register_data['cost_total'] += 0; }
15031502
15041503 }
1505 - elseif ($MY_REQUEST['coupon_id'] == $coupon_volunteer)
 1504+ elseif ( $MY_REQUEST['coupon_id'] == $coupon_volunteer )
15061505 {
15071506 $register_data['vip_status'] = 3;
15081507 $register_data['cost_total'] = 0;
15091508
15101509 $night_selected = $register_data['night1'] + $register_data['night2'] + $register_data['night3'] + $register_data['night4'];
15111510
1512 - if ($register_data['hotelname'] == 'metropol' )
 1511+ if ( $register_data['hotelname'] == 'metropol' )
15131512 { $register_data['cost_total'] += $accommodation_cost_metropol * $night_selected; }
1514 - elseif ($register_data['hotelname'] == 'delta' )
 1513+ elseif ( $register_data['hotelname'] == 'delta' )
15151514 { $register_data['cost_total'] += $accommodation_cost_delta * $night_selected; }
1516 - elseif ($register_data['hotelname'] == 'dorms' )
 1515+ elseif ( $register_data['hotelname'] == 'dorms' )
15171516 { $register_data['cost_total'] += $accommodation_cost_dorms * $night_selected; }
1518 - else
 1517+ else
15191518 { $register_data['cost_total'] += 0; }
15201519 }
15211520 else
15221521 {
15231522 /* Wrong? */
15241523 $error_message = 1;
1525 - $register_data = array('surname'=>$MY_REQUEST['surname'], 'given_name'=>$MY_REQUEST['given_name'], 'unique_code'=>$MY_REQUEST['unique_code']);
 1524+ $register_data = array( 'surname' => $MY_REQUEST['surname'], 'given_name' => $MY_REQUEST['given_name'], 'unique_code' => $MY_REQUEST['unique_code'] );
15261525 include 'skin/html_header.php';
15271526 include 'skin/coupon.php';
15281527 include 'skin/html_footer.php';
1529 - return;
 1528+ return;
15301529 }
15311530
15321531 /* Write data */
1533 - if (!$sql->updateData('registration', array('vip_status' => $register_data['vip_status'], 'cost_total' => $register_data['cost_total']), '`surname`=\''.$sql->EscapeString($MY_REQUEST['surname']).'\' AND `given_name` = \''.$sql->EscapeString($MY_REQUEST['given_name']).'\' AND `unique_code`=\''.$MY_REQUEST['unique_code'].'\''))
 1532+ if ( !$sql->updateData( 'registration', array( 'vip_status' => $register_data['vip_status'], 'cost_total' => $register_data['cost_total'] ), '`surname`=\'' . $sql->EscapeString( $MY_REQUEST['surname'] ) . '\' AND `given_name` = \'' . $sql->EscapeString( $MY_REQUEST['given_name'] ) . '\' AND `unique_code`=\'' . $MY_REQUEST['unique_code'] . '\'' ) )
15341533 { echo 'SYSTEM ERROR'; return; }
15351534 $error_message = 'Coupon activated.';
15361535 include 'skin/html_header.php';

Status & tagging log