Completed
Push — 1.10.x ( fe0e5a...3a6f9c )
by Yannick
134:15 queued 86:39
created
app/config/profile.conf.dist.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,11 +19,11 @@
 block discarded – undo
19 19
 
20 20
 // Replacing user photos
21 21
 define('KEEP_THE_NAME_WHEN_CHANGE_IMAGE', true);
22
-	// true  -> the new image have the name of previous.
23
-	// false -> a new name is build for each upladed image.
22
+    // true  -> the new image have the name of previous.
23
+    // false -> a new name is build for each upladed image.
24 24
 define('KEEP_THE_OLD_IMAGE_AFTER_CHANGE', true);
25
-	// true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
26
-	// false -> only the last image still on server.
25
+    // true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
26
+    // false -> only the last image still on server.
27 27
 
28 28
 // Official code
29 29
 // Don't forget to change name of offical code in your organization
Please login to merge, or discard this patch.
app/config/auth.conf.dist.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -39,29 +39,29 @@
 block discarded – undo
39 39
  * Array of connection parameters
40 40
  **/
41 41
 $extldap_config = array(
42
-  //base dommain string
43
-  'base_dn' => 'DC=cblue,DC=be',
44
-  //admin distinguished name
45
-  'admin_dn' => 'CN=admin,dc=cblue,dc=be',
46
-  //admin password
47
-  'admin_password' => 'pass',
48
-  //ldap host
49
-  'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
50
-  // filter
42
+    //base dommain string
43
+    'base_dn' => 'DC=cblue,DC=be',
44
+    //admin distinguished name
45
+    'admin_dn' => 'CN=admin,dc=cblue,dc=be',
46
+    //admin password
47
+    'admin_password' => 'pass',
48
+    //ldap host
49
+    'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
50
+    // filter
51 51
 //  'filter' => '', // no () arround the string
52
-  //'port' => , default on 389
53
-  //protocl version (2 or 3)
54
-  'protocol_version' => 3,
55
-  // set this to 0 to connect to AD server
56
-  'referrals' => 0,
57
-  //String used to search the user in ldap. %username will ber replaced by the username.
58
-  //See extldap_get_user_search_string() function below
52
+    //'port' => , default on 389
53
+    //protocl version (2 or 3)
54
+    'protocol_version' => 3,
55
+    // set this to 0 to connect to AD server
56
+    'referrals' => 0,
57
+    //String used to search the user in ldap. %username will ber replaced by the username.
58
+    //See extldap_get_user_search_string() function below
59 59
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
60
-  'user_search' => 'uid=%username%',  // no () arround the string
61
-  //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62
-  'encoding' => 'UTF-8',
63
-  //Set to true if user info have to be update at each login
64
-  'update_userinfo' => true
60
+    'user_search' => 'uid=%username%',  // no () arround the string
61
+    //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62
+    'encoding' => 'UTF-8',
63
+    //Set to true if user info have to be update at each login
64
+    'update_userinfo' => true
65 65
 );
66 66
 
67 67
 
Please login to merge, or discard this patch.
user_portal.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@
 block discarded – undo
188 188
 
189 189
 //Show the chamilo mascot
190 190
 if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
191
-	$controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
191
+    $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
192 192
 }
193 193
 
194 194
 $controller->tpl->assign('content', $courseAndSessions['html']);
Please login to merge, or discard this patch.
news_list.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 
8 8
 $actions = '';
9 9
 if (api_is_platform_admin()) {
10
-	$actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
10
+    $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
11 11
         Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
12 12
 }
13 13
 
Please login to merge, or discard this patch.
main/auth/openid/xrds.lib.php 1 patch
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.
main/auth/profile.php 1 patch
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.
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.