Completed
Pull Request — 1.10.x (#1499)
by
unknown
66:17 queued 37:29
created
main/auth/inscription.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
         if (api_get_setting('registration', 'email') != 'true') {
91 91
             $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
92 92
         }
93
-        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
93
+        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
94 94
         $form->addRule('email', get_lang('UserTaken'), 'username_available');
95 95
     }
96 96
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         $form->addElement('text', 'username', get_lang('UserName'), array('id' => 'username', 'size' => USERNAME_MAX_LENGTH));
124 124
         $form->applyFilter('username', 'trim');
125 125
         $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
126
-        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
126
+        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
127 127
         $form->addRule('username', get_lang('UsernameWrong'), 'username');
128 128
         $form->addRule('username', get_lang('UserTaken'), 'username_available');
129 129
     }
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     if (CHECK_PASS_EASY_TO_FIND) {
145 145
         $form->addRule(
146 146
             'password1',
147
-            get_lang('PassTooEasy') . ': ' . api_generate_password(),
147
+            get_lang('PassTooEasy').': '.api_generate_password(),
148 148
             'callback',
149 149
             'api_check_password'
150 150
         );
@@ -209,13 +209,13 @@  discard block
 block discarded – undo
209 209
             'sessionVar'   => basename(__FILE__, '.php'),
210 210
             'imageOptions' => array(
211 211
                 'font_size' => 20,
212
-                'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
212
+                'font_path' => api_get_path(SYS_FONTS_PATH).'opensans/',
213 213
                 'font_file' => 'OpenSans-Regular.ttf',
214 214
                     //'output' => 'gif'
215 215
             )
216 216
         );
217 217
 
218
-        $captcha_question =  $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
218
+        $captcha_question = $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
219 219
         $form->addElement('static', null, null, get_lang('ClickOnTheImageForANewOne'));
220 220
 
221 221
         $form->addElement('text', 'captcha', get_lang('EnterTheLettersYouSee'), array('size' => 40));
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
         }
334 334
     }
335 335
 
336
-    $tool_name = get_lang('Registration', null, (!empty($_POST['language'])?$_POST['language']: $_user['language']));
336
+    $tool_name = get_lang('Registration', null, (!empty($_POST['language']) ? $_POST['language'] : $_user['language']));
337 337
 
338 338
     if (api_get_setting('allow_terms_conditions') == 'true' && $user_already_registered_show_terms) {
339 339
         $tool_name = get_lang('TermsAndConditions');
@@ -354,11 +354,11 @@  discard block
 block discarded – undo
354 354
     }
355 355
 
356 356
     if (file_exists($home.'register_top_'.$user_selected_language.'.html')) {
357
-        $home_top_temp = @(string)file_get_contents($home.'register_top_'.$user_selected_language.'.html');
357
+        $home_top_temp = @(string) file_get_contents($home.'register_top_'.$user_selected_language.'.html');
358 358
         $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
359 359
         $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
360 360
         if (!empty($open)) {
361
-            $content =  '<div class="well_border">'.$open.'</div>';
361
+            $content = '<div class="well_border">'.$open.'</div>';
362 362
         }
363 363
     }
364 364
 
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
             null,
408 408
             get_lang('IHaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>'
409 409
         );
410
-        $form->addRule('legal_accept',  get_lang('ThisFieldIsRequired'), 'required');
410
+        $form->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required');
411 411
     } else {
412 412
         $preview = LegalManager::show_last_condition($term_preview);
413 413
         $form->addElement('label', null, $preview);
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
                 Database::query($sql);
581 581
 
582 582
                 // 2. Send mail to all platform admin
583
-                $emailsubject  = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
583
+                $emailsubject = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
584 584
                 $emailbody = get_lang('ApprovalForNewAccount', null, $values['language'])."\n";
585 585
                 $emailbody .= get_lang('UserName', null, $values['language']).': '.$values['username']."\n";
586 586
 
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
         '<p>'.
668 668
         get_lang('Dear', null, $_user['language']).' '.
669 669
         stripslashes(Security::remove_XSS($recipient_name)).',<br /><br />'.
670
-        get_lang('PersonalSettings',null,$_user['language']).".</p>";
670
+        get_lang('PersonalSettings', null, $_user['language']).".</p>";
671 671
 
672 672
     $form_data = array(
673 673
         'button' => Display::button('next', get_lang('Next', null, $_user['language']), array('class' => 'btn btn-primary btn-large')),
@@ -680,14 +680,14 @@  discard block
 block discarded – undo
680 680
     } else {
681 681
 
682 682
         if (!empty($values['email'])) {
683
-            $text_after_registration.= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
683
+            $text_after_registration .= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
684 684
         }
685 685
 
686 686
         if ($is_allowedCreateCourse) {
687 687
             if ($usersCanCreateCourse) {
688
-                $form_data['message'] = '<p>'. get_lang('NowGoCreateYourCourse', null, $_user['language']). "</p>";
688
+                $form_data['message'] = '<p>'.get_lang('NowGoCreateYourCourse', null, $_user['language'])."</p>";
689 689
             }
690
-            $form_data['action']  = '../create_course/add_course.php';
690
+            $form_data['action'] = '../create_course/add_course.php';
691 691
 
692 692
             if (api_get_setting('course_validation') == 'true') {
693 693
                 $form_data['button'] = Display::button(
@@ -707,7 +707,7 @@  discard block
 block discarded – undo
707 707
         } else {
708 708
             if (api_get_setting('allow_students_to_browse_courses') == 'true') {
709 709
                 $form_data['action'] = 'courses.php?action=subscribe';
710
-                $form_data['message'] = '<p>'. get_lang('NowGoChooseYourCourses', null, $_user['language']). ".</p>";
710
+                $form_data['message'] = '<p>'.get_lang('NowGoChooseYourCourses', null, $_user['language']).".</p>";
711 711
             } else {
712 712
                 $form_data['action'] = api_get_path(WEB_PATH).'user_portal.php';
713 713
             }
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
         }
720 720
     }
721 721
 
722
-    if(!empty($_SESSION['urlReturn'])){
722
+    if (!empty($_SESSION['urlReturn'])) {
723 723
         $form_data['action'] = api_get_path(WEB_PATH).$_SESSION['urlReturn'];
724 724
         Session::erase('urlReturn');
725 725
     }
Please login to merge, or discard this patch.