@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * Shows who is online in a specific session |
|
5 | - * @package chamilo.main |
|
6 | - */ |
|
4 | + * Shows who is online in a specific session |
|
5 | + * @package chamilo.main |
|
6 | + */ |
|
7 | 7 | |
8 | 8 | include_once './main/inc/global.inc.php'; |
9 | 9 | api_block_anonymous_users(); |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | </th> |
42 | 42 | </tr> |
43 | 43 | <?php |
44 | - $session_is_coach = array(); |
|
45 | - if (isset($_user['user_id']) && $_user['user_id'] != '') { |
|
46 | - $_user['user_id'] = intval($_user['user_id']); |
|
47 | - $sql = "SELECT DISTINCT session.id, |
|
44 | + $session_is_coach = array(); |
|
45 | + if (isset($_user['user_id']) && $_user['user_id'] != '') { |
|
46 | + $_user['user_id'] = intval($_user['user_id']); |
|
47 | + $sql = "SELECT DISTINCT session.id, |
|
48 | 48 | name, |
49 | 49 | access_start_date, |
50 | 50 | access_end_date |
@@ -53,13 +53,13 @@ discard block |
||
53 | 53 | ON srcru.user_id = ".$_user['user_id']." AND srcru.status=2 |
54 | 54 | AND session.id = srcru.session_id |
55 | 55 | ORDER BY access_start_date, access_end_date, name"; |
56 | - $result = Database::query($sql); |
|
56 | + $result = Database::query($sql); |
|
57 | 57 | |
58 | - while ($session = Database:: fetch_array($result)) { |
|
59 | - $session_is_coach[$session['id']] = $session; |
|
60 | - } |
|
58 | + while ($session = Database:: fetch_array($result)) { |
|
59 | + $session_is_coach[$session['id']] = $session; |
|
60 | + } |
|
61 | 61 | |
62 | - $sql = "SELECT DISTINCT session.id, |
|
62 | + $sql = "SELECT DISTINCT session.id, |
|
63 | 63 | name, |
64 | 64 | access_start_date, |
65 | 65 | access_end_date |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | WHERE session.id_coach = ".$_user['user_id']." |
68 | 68 | ORDER BY access_start_date, access_end_date, name"; |
69 | 69 | $result = Database::query($sql); |
70 | - while ($session = Database:: fetch_array($result)) { |
|
71 | - $session_is_coach[$session['id']] = $session; |
|
72 | - } |
|
70 | + while ($session = Database:: fetch_array($result)) { |
|
71 | + $session_is_coach[$session['id']] = $session; |
|
72 | + } |
|
73 | 73 | |
74 | 74 | if (empty($time_limit)) { |
75 | 75 | $time_limit = api_get_setting('time_limit_whosonline'); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | $students_online = array(); |
84 | 84 | foreach ($session_is_coach as $session) { |
85 | - $sql = "SELECT DISTINCT last_access.access_user_id, |
|
85 | + $sql = "SELECT DISTINCT last_access.access_user_id, |
|
86 | 86 | last_access.access_date, |
87 | 87 | last_access.c_id, |
88 | 88 | last_access.access_session_id, |
@@ -95,49 +95,49 @@ discard block |
||
95 | 95 | AND access_date >= '$current_date' |
96 | 96 | GROUP BY access_user_id"; |
97 | 97 | |
98 | - $result = Database::query($sql); |
|
98 | + $result = Database::query($sql); |
|
99 | 99 | |
100 | - while($user_list = Database::fetch_array($result)) { |
|
101 | - $students_online[$user_list['access_user_id']] = $user_list; |
|
102 | - } |
|
103 | - } |
|
100 | + while($user_list = Database::fetch_array($result)) { |
|
101 | + $students_online[$user_list['access_user_id']] = $user_list; |
|
102 | + } |
|
103 | + } |
|
104 | 104 | |
105 | - if (count($students_online) > 0) { |
|
106 | - foreach ($students_online as $student_online) { |
|
107 | - echo "<tr> |
|
105 | + if (count($students_online) > 0) { |
|
106 | + foreach ($students_online as $student_online) { |
|
107 | + echo "<tr> |
|
108 | 108 | <td> |
109 | 109 | "; |
110 | - echo $student_online['name']; |
|
111 | - echo " </td> |
|
110 | + echo $student_online['name']; |
|
111 | + echo " </td> |
|
112 | 112 | <td align='center'> |
113 | 113 | "; |
114 | - $courseInfo = api_get_course_info_by_id($student_online['c_id']); |
|
115 | - echo $courseInfo['title']; |
|
116 | - echo " </td> |
|
114 | + $courseInfo = api_get_course_info_by_id($student_online['c_id']); |
|
115 | + echo $courseInfo['title']; |
|
116 | + echo " </td> |
|
117 | 117 | <td align='center'> |
118 | 118 | "; |
119 | - if (!empty($student_online['email'])) { |
|
120 | - echo $student_online['email']; |
|
121 | - } else { |
|
122 | - echo get_lang('NoEmail'); |
|
123 | - } |
|
124 | - echo " </td> |
|
119 | + if (!empty($student_online['email'])) { |
|
120 | + echo $student_online['email']; |
|
121 | + } else { |
|
122 | + echo get_lang('NoEmail'); |
|
123 | + } |
|
124 | + echo " </td> |
|
125 | 125 | <td align='center'> |
126 | 126 | "; |
127 | - echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>'; |
|
128 | - echo " </td> |
|
127 | + echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>'; |
|
128 | + echo " </td> |
|
129 | 129 | </tr> |
130 | 130 | "; |
131 | - } |
|
132 | - } else { |
|
133 | - echo ' <tr> |
|
131 | + } |
|
132 | + } else { |
|
133 | + echo ' <tr> |
|
134 | 134 | <td colspan="4"> |
135 | 135 | '.get_lang('NoOnlineStudents').' |
136 | 136 | </td> |
137 | 137 | </tr> |
138 | 138 | '; |
139 | - } |
|
140 | - } |
|
139 | + } |
|
140 | + } |
|
141 | 141 | ?> |
142 | 142 | </table> |
143 | 143 | <?php |
@@ -27,18 +27,18 @@ |
||
27 | 27 | $array_keys = array_keys($_GET); |
28 | 28 | |
29 | 29 | if (!empty($array_keys)) { |
30 | - $username = substr($array_keys[0],0,20); // max len of an username |
|
31 | - $friend_id = UserManager::get_user_id_from_username($username); |
|
30 | + $username = substr($array_keys[0],0,20); // max len of an username |
|
31 | + $friend_id = UserManager::get_user_id_from_username($username); |
|
32 | 32 | |
33 | - if ($friend_id) { |
|
34 | - SocialManager::display_individual_user($friend_id); |
|
35 | - } else { |
|
36 | - // we cant find your friend |
|
37 | - header('Location: whoisonline.php'); |
|
38 | - exit; |
|
39 | - } |
|
33 | + if ($friend_id) { |
|
34 | + SocialManager::display_individual_user($friend_id); |
|
35 | + } else { |
|
36 | + // we cant find your friend |
|
37 | + header('Location: whoisonline.php'); |
|
38 | + exit; |
|
39 | + } |
|
40 | 40 | } else { |
41 | - // we cant find your friend |
|
42 | - header('Location: whoisonline.php'); |
|
43 | - exit; |
|
41 | + // we cant find your friend |
|
42 | + header('Location: whoisonline.php'); |
|
43 | + exit; |
|
44 | 44 | } |
@@ -1,20 +1,20 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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> |
@@ -16,7 +16,7 @@ |
||
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'); |
@@ -19,11 +19,11 @@ |
||
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 |
@@ -39,29 +39,29 @@ |
||
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 |
@@ -188,7 +188,7 @@ |
||
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']); |
@@ -7,7 +7,7 @@ |
||
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 |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * OpenID |
|
5 | - * @package chamilo.auth.openid |
|
6 | - */ |
|
4 | + * OpenID |
|
5 | + * @package chamilo.auth.openid |
|
6 | + */ |
|
7 | 7 | /** |
8 | - * Code |
|
9 | - */ |
|
8 | + * Code |
|
9 | + */ |
|
10 | 10 | require_once '../../inc/global.inc.php'; |
11 | 11 | Display::display_header('OpenID', NULL); |
12 | 12 | echo Display::page_header(get_lang('OpenIDWhatIs')); |