View GitHub Repository chamilo-lms

Schedule Inspection
Subscribe
Passed
Push — 1.10.x ( ffa1de...5c22eb )
by Yannick
1010:23 queued 946:48
created
Status
Category
Toggle Patches
custompages/index-unlogged-dist.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -79,7 +79,7 @@
 
 block discarded – undo
79 79 
 		<div id="login-form-box" class="form-box">
80 80 
             <div id="login-form-info" class="form-info">
81 81 
             <?php if (isset($content['info']) && !empty($content['info'])) {
82 
-              echo $content['info'];
82 
+                echo $content['info'];
83 83 
             }
84 84 
             ?>
85 85 
             </div>
Please login to merge, or discard this patch.
custompages/first_login-dist.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch 
@@ -1,20 +1,20 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 /* For licensing terms, see /license.txt */
3 3 
 /**
4 
- * Quick page to react to first login cases
5 
- * @package chamilo.custompages
6 
- */
4 
+             * Quick page to react to first login cases
5 
+             * @package chamilo.custompages
6 
+             */
7 7 
 /**
8 
- * Initialization
9 
- */
8 
+             * Initialization
9 
+             */
10 10 
 require_once('language.php');
11 11 
 require_once(dirname(__FILE__).'/../main/inc/global.inc.php');
12 12 
 require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
13 13 
 /**
14 
- * Security checks
15 
- */
14 
+             * Security checks
15 
+             */
16 16 
 if (! isset($_SESSION['conditional_login']['uid']))
17 
-  die("Not Authorised");
17 
+    die("Not Authorised");
18 18
19 19 
 if (isset($_POST['password'])) {
20 20 
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
 
@@ -27,26 +27,26 @@  discard block
 
 block discarded – undo
27 27 
         exit();
28 28 
     }
29 29 
     $password = $_POST['password'];
30 
-	$updated = UserManager::update_user(
31 
-		$u['user_id'],
32 
-		$u['firstname'],
33 
-		$u['lastname'],
34 
-		$u['username'],
35 
-		$password,
36 
-		$u['auth_source'],
37 
-		$u['email'],
38 
-		$u['status'],
39 
-		$u['official_code'],
40 
-		$u['phone'],
41 
-		$u['picture_uri'],
42 
-		$u['expiration_date'],
43 
-		$u['active'],
44 
-		$u['creator_id'],
45 
-		$u['hr_dept_id'],
46 
-		null,
47 
-		$u['language'],
48 
-		''
49 
-	);
30 
+    $updated = UserManager::update_user(
31 
+        $u['user_id'],
32 
+        $u['firstname'],
33 
+        $u['lastname'],
34 
+        $u['username'],
35 
+        $password,
36 
+        $u['auth_source'],
37 
+        $u['email'],
38 
+        $u['status'],
39 
+        $u['official_code'],
40 
+        $u['phone'],
41 
+        $u['picture_uri'],
42 
+        $u['expiration_date'],
43 
+        $u['active'],
44 
+        $u['creator_id'],
45 
+        $u['hr_dept_id'],
46 
+        null,
47 
+        $u['language'],
48 
+        ''
49 
+    );
50 50
51 51 
     if ($updated) {
52 52 
         UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true');
 
@@ -61,8 +61,8 @@  discard block
 
 block discarded – undo
61 61 
 }
62 62 
 $www = api_get_path('WEB_PATH');
63 63 
 /**
64 
- * HTML output
65 
- */
64 
+     * HTML output
65 
+     */
66 66 
 ?>
67 67 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
68 68 
 <html>
 
@@ -104,8 +104,8 @@  discard block
 
 block discarded – undo
104 104 
 		<div id="changepassword-form-box" class="form-box">
105 105 
       <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
106 106 
 		<?php if (isset($error_message)) {
107 
-			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
108 
-		}?>
107 
+            echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
108 
+        }?>
109 109 
 			<form id="changepassword-form" class="form" method="post">
110 110 
 				<div>
111 111 
           <label for="password">*<?php echo custompages_get_lang('Password');?></label>
Please login to merge, or discard this patch.
custompages/language.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch 
@@ -9,30 +9,30 @@  discard block
 
 block discarded – undo
9 9 
  * Get the preferred language base on the browser headers
10 10 
  */
11 11 
 function get_preferred_language($available_langs) {
12 
-	$langs = array();
13 
-	foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
14 
-		$rawlang = explode(';q=', $httplang);
15 
-		if (strpos($rawlang[0], '-') !== FALSE) {
16 
-			$rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
17 
-		}
18 
-		if (count($rawlang) == 1) {
19 
-			$rawlang[1] = 1.0;
20 
-		}
21 
-		$langs[$rawlang[1]] = $rawlang[0];
22 
-	}
23 
-	krsort($langs, SORT_NUMERIC);
24 
-	foreach($langs as $weight => $code) {
25 
-		if (in_array($code, $available_langs)) {
26 
-			return $code;
27 
-		}
28 
-	}
29 
-	return null;
12 
+    $langs = array();
13 
+    foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
14 
+        $rawlang = explode(';q=', $httplang);
15 
+        if (strpos($rawlang[0], '-') !== FALSE) {
16 
+            $rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
17 
+        }
18 
+        if (count($rawlang) == 1) {
19 
+            $rawlang[1] = 1.0;
20 
+        }
21 
+        $langs[$rawlang[1]] = $rawlang[0];
22 
+    }
23 
+    krsort($langs, SORT_NUMERIC);
24 
+    foreach($langs as $weight => $code) {
25 
+        if (in_array($code, $available_langs)) {
26 
+            return $code;
27 
+        }
28 
+    }
29 
+    return null;
30 30 
 }
31 31 
 /**
32 
- * Get a language variable in a specific language
33 
- */
32 
+     * Get a language variable in a specific language
33 
+     */
34 34 
 function custompages_get_lang($variable) {
35 
-	return get_lang($variable, null, $_SESSION['user_language_choice']);
35 
+    return get_lang($variable, null, $_SESSION['user_language_choice']);
36 36 
 }
37 37
38 38 
 $available_langs = array('en', 'fr', 'es', 'gl', 'eu');
 
@@ -49,15 +49,15 @@  discard block
 
 block discarded – undo
49 49 
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
50 50 
 // recover previous value ...
51 51 
 if (isset($_SESSION['user_language_choice']))
52 
-	$lang_match = $_SESSION['user_language_choice'];
52 
+    $lang_match = $_SESSION['user_language_choice'];
53 53
54 54 
 // Chamilo parameter, on logout
55 55 
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
56 
-	$lang_match = $_REQUEST['language'];
56 
+    $lang_match = $_REQUEST['language'];
57 57 
 }
58 58 
 // Incoming link parameter
59 59 
 if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) {
60 
-	$lang_match = $chamilo_langs[$_REQUEST['lang']];
60 
+    $lang_match = $chamilo_langs[$_REQUEST['lang']];
61 61 
 }
62 62
63 63 
 $detect = api_get_setting('auto_detect_language_custom_pages');
Please login to merge, or discard this patch.
app/Resources/public/assets/ckeditor/samples/old/assets/posteddata.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -27,22 +27,22 @@
 
 block discarded – undo
27 27
28 28 
 if (!empty($_POST))
29 29 
 {
30 
-	foreach ( $_POST as $key => $value )
31 
-	{
32 
-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
33 
-			continue;
30 
+    foreach ( $_POST as $key => $value )
31 
+    {
32 
+        if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
33 
+            continue;
34 34
35 
-		if ( get_magic_quotes_gpc() )
36 
-			$value = htmlspecialchars( stripslashes((string)$value) );
37 
-		else
38 
-			$value = htmlspecialchars( (string)$value );
35 
+        if ( get_magic_quotes_gpc() )
36 
+            $value = htmlspecialchars( stripslashes((string)$value) );
37 
+        else
38 
+            $value = htmlspecialchars( (string)$value );
39 39 
 ?>
40 40 
 		<tr>
41 41 
 			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>
42 42 
 			<td><pre class="samples"><?php echo $value; ?></pre></td>
43 43 
 		</tr>
44 44 
 	<?php
45 
-	}
45 
+    }
46 46 
 }
47 47 
 ?>
48 48 
 	</table>
Please login to merge, or discard this patch.
app/Migrations/Schema/V110/Version20150528103216.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@
 
 block discarded – undo
16 16 
      */
17 17 
     public function up(Schema $schema)
18 18 
     {
19 
-  	    $this->addSql('ALTER TABLE session ADD COLUMN access_start_date datetime');
19 
+            $this->addSql('ALTER TABLE session ADD COLUMN access_start_date datetime');
20 20 
         $this->addSql('ALTER TABLE session ADD COLUMN access_end_date datetime');
21 21 
         $this->addSql('ALTER TABLE session ADD COLUMN coach_access_start_date datetime');
22 22 
         $this->addSql('ALTER TABLE session ADD COLUMN coach_access_end_date datetime');
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 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.