Completed
Push — 1.10.x ( e39098...d9ba33 )
by Julito
34:46
created
custompages/registration-feedback-dist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 ?>
14 14
 <html>
15 15
 <head>
16
-    <title><?php echo custompages_get_lang('Registration');?></title>
16
+    <title><?php echo custompages_get_lang('Registration'); ?></title>
17 17
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
18 18
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
19 19
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
                     </div>
40 40
                     <div id="registration-form-box" class="form-box">
41 41
                         <div class="block-form-login">
42
-                            <?php   echo $content['info'];  ?>
42
+                            <?php   echo $content['info']; ?>
43 43
                         </div>
44 44
                     </div>
45 45
                     <div id="footer">
Please login to merge, or discard this patch.
bin/doctrine.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,26 +19,26 @@  discard block
 block discarded – undo
19 19
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
20 20
 use Symfony\Component\Console\Helper\HelperSet;
21 21
 
22
-(@include_once __DIR__ . '/../vendor/autoload.php') || @include_once __DIR__ . '/../../../autoload.php';
22
+(@include_once __DIR__.'/../vendor/autoload.php') || @include_once __DIR__.'/../../../autoload.php';
23 23
 
24
-$directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config');
24
+$directories = array(getcwd(), getcwd().DIRECTORY_SEPARATOR.'config');
25 25
 
26 26
 $configFile = null;
27 27
 foreach ($directories as $directory) {
28
-    $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
28
+    $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php';
29 29
 
30 30
     if (file_exists($configFile)) {
31 31
         break;
32 32
     }
33 33
 }
34 34
 
35
-if ( ! file_exists($configFile)) {
35
+if (!file_exists($configFile)) {
36 36
     ConsoleRunner::printCliConfigTemplate();
37 37
     exit(1);
38 38
 }
39 39
 
40
-if ( ! is_readable($configFile)) {
41
-    echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n";
40
+if (!is_readable($configFile)) {
41
+    echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n";
42 42
     exit(1);
43 43
 }
44 44
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 $helperSet = require $configFile;
56 56
 
57
-if ( ! ($helperSet instanceof HelperSet)) {
57
+if (!($helperSet instanceof HelperSet)) {
58 58
     foreach ($GLOBALS as $helperSetCandidate) {
59 59
         if ($helperSetCandidate instanceof HelperSet) {
60 60
             $helperSet = $helperSetCandidate;
Please login to merge, or discard this patch.
app/config/events.conf.dist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         'self_sent' => false, // this key states that we can't add user to this event through the admin panel
24 24
         'name_lang_var' => get_lang('PortalHomepageEdited'),
25 25
         'desc_lang_var' => get_lang('PortalHomepageEdited'),
26
-        'available_keyvars' => array (// keys used for the mail template
26
+        'available_keyvars' => array(// keys used for the mail template
27 27
             'url'           => 'portal',
28 28
             'sitename'      => 'sitename',
29 29
             'firstname'     => 'firstname',
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
         'self_sent' => true, // this key states that we can't add user to this event through the admin panel
46 46
         'name_lang_var' => get_lang('UserRegistrationTitle'),
47 47
         'desc_lang_var' => get_lang('UserRegistrationComment'),
48
-        'available_keyvars' => array (// keys used for the mail template
48
+        'available_keyvars' => array(// keys used for the mail template
49 49
             'url'           => 'portal',
50 50
             'sitename'      => 'sitename',
51 51
             'firstname'     => 'firstname',
Please login to merge, or discard this patch.
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 2 patches
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
   //String used to search the user in ldap. %username will ber replaced by the username.
58 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
60
+  'user_search' => 'uid=%username%', // no () arround the string
61 61
   //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62 62
   'encoding' => 'UTF-8',
63 63
   //Set to true if user info have to be update at each login
Please login to merge, or discard this patch.
user_portal.php 2 patches
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.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     $folder_icon = api_get_path(WEB_IMG_PATH).'icons/22/folder.png';
49 49
     $close_icon = api_get_path(WEB_IMG_PATH).'loading1.gif';
50 50
 
51
-    $htmlHeadXtra[] =  '<script type="text/javascript">
51
+    $htmlHeadXtra[] = '<script type="text/javascript">
52 52
 	$(document).ready(function() {
53 53
 		$(".document_preview_container").hide();
54 54
 		$(".document_preview").click(function() {
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 if ($displayMyCourseViewBySessionLink) {
82 82
     $htmlHeadXtra[] = '
83 83
     <script type="text/javascript">
84
-        userId = ' . $userId . '
84
+        userId = ' . $userId.'
85 85
         $(document).ready(function() {
86 86
             changeMyCoursesView($.cookie("defaultMyCourseView"+userId));
87 87
         });
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         function changeMyCoursesView(inView)
94 94
         {
95 95
             $.cookie("defaultMyCourseView"+userId, inView, { expires: 365 });
96
-            if (inView == ' . IndexManager::VIEW_BY_SESSION . ') {
96
+            if (inView == ' . IndexManager::VIEW_BY_SESSION.') {
97 97
                 $("#viewBySession").addClass("btn-primary");
98 98
                 $("#viewByDefault").removeClass("btn-primary");
99 99
             } else {
@@ -153,16 +153,16 @@  discard block
 block discarded – undo
153 153
             if (isset($sessionInfo['courses']) && count($sessionInfo['courses']) == 1) {
154 154
                 $courseCode = $sessionInfo['courses'][0]['code'];
155 155
                 $courseInfo = api_get_course_info_by_id($sessionInfo['courses'][0]['real_id']);
156
-                $courseUrl = $courseInfo['course_public_url'] . '?id_session=' . $sessionInfo['session_id'];
157
-                header('Location:' . $courseUrl);
156
+                $courseUrl = $courseInfo['course_public_url'].'?id_session='.$sessionInfo['session_id'];
157
+                header('Location:'.$courseUrl);
158 158
                 exit;
159 159
             }
160 160
 
161 161
             // Session has many courses.
162 162
             if (isset($sessionInfo['session_id'])) {
163
-                $url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . $sessionInfo['session_id'];
163
+                $url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$sessionInfo['session_id'];
164 164
 
165
-                header('Location:' . $url);
165
+                header('Location:'.$url);
166 166
                 exit;
167 167
             }
168 168
         }
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
             $courseInfo = api_get_course_info_by_id($courses[0]['real_id']);
179 179
             if (!empty($courseInfo)) {
180 180
                 $courseUrl = $courseInfo['course_public_url'];
181
-                header('Location:' . $courseUrl);
181
+                header('Location:'.$courseUrl);
182 182
                 exit;
183 183
             }
184 184
         }
Please login to merge, or discard this patch.
news_list.php 2 patches
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 }
19 19
 
20 20
 if (!isset($_GET['id']) || empty($_GET['id'])) {
21
-    $content =  SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
21
+    $content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
22 22
 } else {
23 23
     $content = SystemAnnouncementManager::displayAnnouncement($_GET['id'], $visibility);
24 24
 }
Please login to merge, or discard this patch.
main/gamification/my_progress.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     $UserIsSubscribedToSession = SessionManager::isUserSubscribedAsStudent($lastSessionId, $user->getId());
43 43
 
44 44
     if (!empty($lastSessionId) && $UserIsSubscribedToSession) {
45
-        $urlWithSession = api_get_self() . '?' . http_build_query([
45
+        $urlWithSession = api_get_self().'?'.http_build_query([
46 46
             'session_id' => $lastCourseAccess->getSessionId()
47 47
         ]);
48 48
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
         foreach ($learningPathList->list as $learningPathId => $learningPath) {
117 117
             $courseData['stats'][] = [
118 118
                 $learningPath['lp_name'],
119
-                'newscorm/lp_controller.php?' . http_build_query([
119
+                'newscorm/lp_controller.php?'.http_build_query([
120 120
                     'action' => 'stats',
121 121
                     'cidReq' => $course->getCode(),
122 122
                     'id_session' => $currentSession->getId(),
123 123
                     'gidReq' => 0,
124 124
                     'lp_id' => $learningPathId
125
-                ]) . api_get_cidreq()
125
+                ]).api_get_cidreq()
126 126
             ];
127 127
         }
128 128
 
Please login to merge, or discard this patch.
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.