Completed
Push — 1.10.x ( f2aaaf...ef00db )
by Yannick
241:15 queued 197:35
created
main/auth/openid/xrds.lib.php 3 patches
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -16,70 +16,70 @@
 block discarded – undo
16 16
  * Main entry point for parsing XRDS documents
17 17
  */
18 18
 function xrds_parse($xml) {
19
-  global $xrds_services;
19
+    global $xrds_services;
20 20
 
21
-  $parser = xml_parser_create_ns();
22
-  xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
23
-  xml_set_character_data_handler($parser, '_xrds_cdata');
21
+    $parser = xml_parser_create_ns();
22
+    xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
23
+    xml_set_character_data_handler($parser, '_xrds_cdata');
24 24
 
25
-  xml_parse($parser, $xml);
26
-  xml_parser_free($parser);
25
+    xml_parse($parser, $xml);
26
+    xml_parser_free($parser);
27 27
 
28
-  return $xrds_services;
28
+    return $xrds_services;
29 29
 }
30 30
 
31 31
 /**
32 32
  * Parser callback functions
33 33
  */
34 34
 function _xrds_element_start(&$parser, $name, $attribs) {
35
-  global $xrds_open_elements;
35
+    global $xrds_open_elements;
36 36
 
37
-  $xrds_open_elements[] = _xrds_strip_namespace($name);
37
+    $xrds_open_elements[] = _xrds_strip_namespace($name);
38 38
 }
39 39
 
40 40
 function _xrds_element_end(&$parser, $name) {
41
-  global $xrds_open_elements, $xrds_services, $xrds_current_service;
41
+    global $xrds_open_elements, $xrds_services, $xrds_current_service;
42 42
 
43
-  $name = _xrds_strip_namespace($name);
44
-  if ($name == 'SERVICE') {
43
+    $name = _xrds_strip_namespace($name);
44
+    if ($name == 'SERVICE') {
45 45
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
46 46
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
47
-      $xrds_current_service['version'] = 2;
47
+        $xrds_current_service['version'] = 2;
48 48
     }
49 49
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
50 50
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
51
-      $xrds_current_service['version'] = 1;
51
+        $xrds_current_service['version'] = 1;
52 52
     }
53 53
     if (!empty($xrds_current_service['version'])) {
54
-      $xrds_services[] = $xrds_current_service;
54
+        $xrds_services[] = $xrds_current_service;
55 55
     }
56 56
     $xrds_current_service = array();
57
-  }
58
-  array_pop($xrds_open_elements);
57
+    }
58
+    array_pop($xrds_open_elements);
59 59
 }
60 60
 
61 61
 function _xrds_cdata(&$parser, $data) {
62
-  global $xrds_open_elements, $xrds_services, $xrds_current_service;
63
-  $path = strtoupper(implode('/', $xrds_open_elements));
64
-  switch ($path) {
62
+    global $xrds_open_elements, $xrds_services, $xrds_current_service;
63
+    $path = strtoupper(implode('/', $xrds_open_elements));
64
+    switch ($path) {
65 65
     case 'XRDS/XRD/SERVICE/TYPE':
66 66
       $xrds_current_service['types'][] = $data;
67
-      break;
67
+        break;
68 68
     case 'XRDS/XRD/SERVICE/URI':
69 69
       $xrds_current_service['uri'] = $data;
70
-      break;
70
+        break;
71 71
     case 'XRDS/XRD/SERVICE/DELEGATE':
72 72
       $xrds_current_service['delegate'] = $data;
73
-      break;
74
-  }
73
+        break;
74
+    }
75 75
 }
76 76
 
77 77
 function _xrds_strip_namespace($name) {
78
-  // Strip namespacing.
79
-  $pos = strrpos($name, ':');
80
-  if ($pos !== FALSE) {
78
+    // Strip namespacing.
79
+    $pos = strrpos($name, ':');
80
+    if ($pos !== FALSE) {
81 81
     $name = substr($name, $pos + 1, strlen($name));
82
-  }
82
+    }
83 83
 
84
-  return $name;
84
+    return $name;
85 85
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@
 block discarded – undo
42 42
 
43 43
   $name = _xrds_strip_namespace($name);
44 44
   if ($name == 'SERVICE') {
45
-    if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
46
-        in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
45
+    if (in_array(OPENID_NS_2_0.'/signon', $xrds_current_service['types']) ||
46
+        in_array(OPENID_NS_2_0.'/server', $xrds_current_service['types'])) {
47 47
       $xrds_current_service['version'] = 2;
48 48
     }
49 49
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,8 +45,7 @@
 block discarded – undo
45 45
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
46 46
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
47 47
       $xrds_current_service['version'] = 2;
48
-    }
49
-    elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
48
+    } elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
50 49
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
51 50
       $xrds_current_service['version'] = 1;
52 51
     }
Please login to merge, or discard this patch.
main/auth/set_temp_password.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 $cidReset = true;
12 12
 require_once '../inc/global.inc.php';
13 13
 $this_section = SECTION_COURSES;
14
-$course_id = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
14
+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
15 15
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
16 16
 $user_id = api_get_user_id();
17 17
 
Please login to merge, or discard this patch.
main/auth/inscription.php 1 patch
Spacing   +15 added lines, -15 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
             }
Please login to merge, or discard this patch.
main/auth/profile.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -684,7 +684,7 @@
 block discarded – undo
684 684
 
685 685
     foreach ($user_data as $key => $value) {
686 686
         if (substr($key, 0, 6) == 'extra_') { //an extra field
687
-           continue;
687
+            continue;
688 688
         } elseif (strpos($key, 'remove_extra_') !== false) {
689 689
         } else {
690 690
             if (in_array($key, $available_values_to_modify)) {
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 }
32 32
 
33 33
 $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
34
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
35
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
34
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
35
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
36 36
 $htmlHeadXtra[] = '<script>
37 37
 $(document).ready(function() {
38 38
     var $image = $("#previewImage");
@@ -168,10 +168,10 @@  discard block
 block discarded – undo
168 168
 if (api_is_western_name_order()) {
169 169
     //    FIRST NAME and LAST NAME
170 170
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
171
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
171
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
172 172
 } else {
173 173
     //    LAST NAME and FIRST NAME
174
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
174
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
175 175
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
176 176
 }
177 177
 if (api_get_setting('profile', 'name') !== 'true') {
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
 $form->applyFilter(array('lastname', 'firstname'), 'stripslashes');
181 181
 $form->applyFilter(array('lastname', 'firstname'), 'trim');
182 182
 $form->applyFilter(array('lastname', 'firstname'), 'html_filter');
183
-$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required');
183
+$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
184 184
 $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
185 185
 
186 186
 //    USERNAME
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
     $form->freeze('email');
224 224
 }
225 225
 
226
-if (api_get_setting('registration', 'email') == 'true' &&  api_get_setting('profile', 'email') == 'true') {
226
+if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
227 227
     $form->applyFilter('email', 'stripslashes');
228 228
     $form->applyFilter('email', 'trim');
229 229
     $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 
390 390
 // the $jquery_ready_content variable collects all functions that
391 391
 // will be load in the $(document).ready javascript function
392
-$htmlHeadXtra[] ='<script>
392
+$htmlHeadXtra[] = '<script>
393 393
 $(document).ready(function(){
394 394
     '.$jquery_ready_content.'
395 395
 });
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
 
546 546
             if (!check_user_email($user_data['email']) &&
547 547
                 empty($user_data['password0'])
548
-            ){
548
+            ) {
549 549
                 Display::addFlash(
550 550
                     Display:: return_message(
551 551
                         get_lang('ToChangeYourEmailMustTypeYourPassword'),
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
     $available_values_to_modify = array();
655 655
     foreach ($profile_list as $key => $status) {
656 656
         if ($status == 'true') {
657
-            switch($key) {
657
+            switch ($key) {
658 658
                 case 'login':
659 659
                     $available_values_to_modify[] = 'username';
660 660
                     break;
@@ -787,10 +787,10 @@  discard block
 block discarded – undo
787 787
 
788 788
         if (isset($_GET['type']) && $_GET['type'] == 'extended') {
789 789
             $actions .= '<a href="profile.php?type=reduced'.$show.'">'.
790
-                Display::return_icon('edit.png', get_lang('EditNormalProfile'),'',16).'</a>';
790
+                Display::return_icon('edit.png', get_lang('EditNormalProfile'), '', 16).'</a>';
791 791
         } else {
792 792
             $actions .= '<a href="profile.php?type=extended'.$show.'">'.
793
-                Display::return_icon('edit.png', get_lang('EditExtendProfile'),'',16).'</a>';
793
+                Display::return_icon('edit.png', get_lang('EditExtendProfile'), '', 16).'</a>';
794 794
         }
795 795
         $actions .= '</div>';
796 796
     }
Please login to merge, or discard this patch.
main/auth/cas/logout.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,5 +9,5 @@
 block discarded – undo
9 9
 require_once('authcas.php');
10 10
 global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
11 11
 
12
-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
12
+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
13 13
 phpCAS::logout();
Please login to merge, or discard this patch.
main/auth/cas/logincas.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
         $firstpage = $_GET['firstpage'];
40 40
         setcookie("GotoCourse", $firstpage);
41 41
     }
42
-    if (!is_object($PHPCAS_CLIENT) ) {
42
+    if (!is_object($PHPCAS_CLIENT)) {
43 43
         phpCAS::client(
44 44
             $cas_auth_ver,
45 45
             $cas_auth_server,
Please login to merge, or discard this patch.
main/auth/cas/lib/CAS/languages/german.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -8,20 +8,20 @@
 block discarded – undo
8 8
  */
9 9
 
10 10
 $this->_strings = array(
11
- CAS_STR_USING_SERVER 
12
- => 'via Server',
13
- CAS_STR_AUTHENTICATION_WANTED 
14
- => 'CAS Authentifizierung erforderlich!',
15
- CAS_STR_LOGOUT 
16
- => 'CAS Abmeldung!',
17
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
18
- => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
19
- CAS_STR_AUTHENTICATION_FAILED 
20
- => 'CAS Anmeldung fehlgeschlagen!',
21
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
22
- => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
23
- CAS_STR_SERVICE_UNAVAILABLE
24
- => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
11
+    CAS_STR_USING_SERVER 
12
+    => 'via Server',
13
+    CAS_STR_AUTHENTICATION_WANTED 
14
+    => 'CAS Authentifizierung erforderlich!',
15
+    CAS_STR_LOGOUT 
16
+    => 'CAS Abmeldung!',
17
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
18
+    => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
19
+    CAS_STR_AUTHENTICATION_FAILED 
20
+    => 'CAS Anmeldung fehlgeschlagen!',
21
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
22
+    => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
23
+    CAS_STR_SERVICE_UNAVAILABLE
24
+    => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
25 25
 );
26 26
 
27 27
 ?>
28 28
\ No newline at end of file
Please login to merge, or discard this patch.
main/auth/cas/lib/CAS/languages/catalan.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -8,20 +8,20 @@
 block discarded – undo
8 8
  */
9 9
 
10 10
 $this->_strings = array(
11
- CAS_STR_USING_SERVER 
12
- => 'usant servidor',
13
- CAS_STR_AUTHENTICATION_WANTED 
14
- => 'Autentificació CAS necessària!',
15
- CAS_STR_LOGOUT 
16
- => 'Sortida de CAS necessària!',
17
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
18
- => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click <a href="%s">aquí</a> per a continuar.',
19
- CAS_STR_AUTHENTICATION_FAILED 
20
- => 'Autentificació CAS fallida!',
21
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
22
- => '<p>No estàs autentificat.</p><p>Pots tornar a intentar-ho fent click <a href="%s">aquí</a>.</p><p>Si el problema persisteix hauría de contactar amb l\'<a href="mailto:%s">administrador d\'aquest llocc</a>.</p>',
23
- CAS_STR_SERVICE_UNAVAILABLE
24
- => 'El servei `<b>%s</b>\' no està disponible (<b>%s</b>).'
11
+    CAS_STR_USING_SERVER 
12
+    => 'usant servidor',
13
+    CAS_STR_AUTHENTICATION_WANTED 
14
+    => 'Autentificació CAS necessària!',
15
+    CAS_STR_LOGOUT 
16
+    => 'Sortida de CAS necessària!',
17
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
18
+    => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click <a href="%s">aquí</a> per a continuar.',
19
+    CAS_STR_AUTHENTICATION_FAILED 
20
+    => 'Autentificació CAS fallida!',
21
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
22
+    => '<p>No estàs autentificat.</p><p>Pots tornar a intentar-ho fent click <a href="%s">aquí</a>.</p><p>Si el problema persisteix hauría de contactar amb l\'<a href="mailto:%s">administrador d\'aquest llocc</a>.</p>',
23
+    CAS_STR_SERVICE_UNAVAILABLE
24
+    => 'El servei `<b>%s</b>\' no està disponible (<b>%s</b>).'
25 25
 );
26 26
 
27 27
 ?>
Please login to merge, or discard this patch.
main/auth/cas/lib/CAS/languages/english.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -8,20 +8,20 @@
 block discarded – undo
8 8
  */
9 9
 
10 10
 $this->_strings = array(
11
- CAS_STR_USING_SERVER 
12
- => 'using server',
13
- CAS_STR_AUTHENTICATION_WANTED 
14
- => 'CAS Authentication wanted!',
15
- CAS_STR_LOGOUT 
16
- => 'CAS logout wanted!',
17
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
18
- => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
19
- CAS_STR_AUTHENTICATION_FAILED 
20
- => 'CAS Authentication failed!',
21
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
22
- => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
23
- CAS_STR_SERVICE_UNAVAILABLE
24
- => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
11
+    CAS_STR_USING_SERVER 
12
+    => 'using server',
13
+    CAS_STR_AUTHENTICATION_WANTED 
14
+    => 'CAS Authentication wanted!',
15
+    CAS_STR_LOGOUT 
16
+    => 'CAS logout wanted!',
17
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
18
+    => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
19
+    CAS_STR_AUTHENTICATION_FAILED 
20
+    => 'CAS Authentication failed!',
21
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
22
+    => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
23
+    CAS_STR_SERVICE_UNAVAILABLE
24
+    => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
25 25
 );
26 26
 
27 27
 ?>
28 28
\ No newline at end of file
Please login to merge, or discard this patch.