@@ -61,7 +61,7 @@ |
||
61 | 61 | if (!isset($_GET['id'])) { |
62 | 62 | if (api_get_setting('allow_social_tool') == 'true') { |
63 | 63 | if (!api_is_anonymous()) { |
64 | - $query = isset($_GET['q']) ? $_GET['q']: null; |
|
64 | + $query = isset($_GET['q']) ? $_GET['q'] : null; |
|
65 | 65 | $social_search = UserManager::get_search_form($query); |
66 | 66 | } |
67 | 67 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $time_limit = 60; |
78 | 78 | } |
79 | 79 | |
80 | - $online_time = time() - $time_limit*60; |
|
80 | + $online_time = time() - $time_limit * 60; |
|
81 | 81 | $current_date = api_get_utc_datetime($online_time); |
82 | 82 | |
83 | 83 | $students_online = array(); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | $result = Database::query($sql); |
99 | 99 | |
100 | - while($user_list = Database::fetch_array($result)) { |
|
100 | + while ($user_list = Database::fetch_array($result)) { |
|
101 | 101 | $students_online[$user_list['access_user_id']] = $user_list; |
102 | 102 | } |
103 | 103 | } |
@@ -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 | } |
@@ -27,8 +27,8 @@ |
||
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 | 33 | if ($friend_id) { |
34 | 34 | SocialManager::display_individual_user($friend_id); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | ?> |
12 | 12 | <html> |
13 | 13 | <head> |
14 | - <title><?php echo custompages_get_lang('LostPassword');?></title> |
|
14 | + <title><?php echo custompages_get_lang('LostPassword'); ?></title> |
|
15 | 15 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> |
16 | 16 | <!--[if !IE 6]><!--> |
17 | 17 | <link rel="stylesheet" type="text/css" href="../../custompages/style.css" /> |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | <div id="lostpassword-form-box" class="form-box"> |
44 | 44 | <?php |
45 | 45 | if (isset($content['info']) && !empty($content['info'])) { |
46 | - echo '<div id="registration-form-error" class="form-error"><ul>' . $content['info'] . '</ul></div>'; |
|
46 | + echo '<div id="registration-form-error" class="form-error"><ul>'.$content['info'].'</ul></div>'; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | echo isset($content['form']) ? $content['form'] : '' |
@@ -81,7 +81,7 @@ |
||
81 | 81 | ?> |
82 | 82 | <html> |
83 | 83 | <head> |
84 | - <title><?php echo custompages_get_lang('Registration');?></title> |
|
84 | + <title><?php echo custompages_get_lang('Registration'); ?></title> |
|
85 | 85 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> |
86 | 86 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
87 | 87 | <meta name="viewport" content="width=device-width, initial-scale=1.0"> |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | } |
29 | 29 | krsort($langs, SORT_NUMERIC); |
30 | 30 | // Choosing the best match |
31 | - foreach($langs as $weight => $codes) { |
|
31 | + foreach ($langs as $weight => $codes) { |
|
32 | 32 | foreach ($codes as $code) { |
33 | 33 | if (in_array($code, $available_langs)) { |
34 | 34 | return $code; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $chamilo_langs = array(null => 'english', 'en' => 'english', 'fr' => 'french', 'es' => 'spanish'); |
57 | 57 | |
58 | 58 | // Which of these can we actually pick from ? |
59 | -$available_langs = array('en','fr'); |
|
59 | +$available_langs = array('en', 'fr'); |
|
60 | 60 | |
61 | 61 | // Let's find out which language to serve to this particular browser |
62 | 62 | $lang_match = $chamilo_langs[get_preferred_language($available_langs)]; |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | krsort($langs, SORT_NUMERIC); |
30 | 30 | // Choosing the best match |
31 | 31 | foreach($langs as $weight => $codes) { |
32 | - foreach ($codes as $code) { |
|
33 | - if (in_array($code, $available_langs)) { |
|
34 | - return $code; |
|
35 | - } |
|
36 | - } |
|
32 | + foreach ($codes as $code) { |
|
33 | + if (in_array($code, $available_langs)) { |
|
34 | + return $code; |
|
35 | + } |
|
36 | + } |
|
37 | 37 | } |
38 | 38 | // No match |
39 | 39 | return null; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * use this if you want to avoid translation caching issues |
45 | 45 | */ |
46 | 46 | function cp_get_lang($variable) { |
47 | - return get_lang($variable, null, $_SESSION['user_language_choice']); |
|
47 | + return get_lang($variable, null, $_SESSION['user_language_choice']); |
|
48 | 48 | } |
49 | 49 | /** |
50 | 50 | * Code |
@@ -63,12 +63,12 @@ discard block |
||
63 | 63 | |
64 | 64 | // Chamilo overrides this parameters at some places, e.g. in the logout link |
65 | 65 | if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) { |
66 | - $lang_match = $_REQUEST['language']; |
|
66 | + $lang_match = $_REQUEST['language']; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | // Maybe a language had already been selected, we should honor this |
70 | 70 | if (isset($_SESSION['user_language_choice']) && in_array($_SESSION['user_language_choice'], $chamilo_langs)) { |
71 | - $lang_match = $_SESSION['user_language_choice']; |
|
71 | + $lang_match = $_SESSION['user_language_choice']; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | // We need to set the relevant session variables to the best match, to use Chamilo's i18n lib. |
@@ -79,7 +79,7 @@ |
||
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> |
@@ -89,14 +89,14 @@ |
||
89 | 89 | ?> |
90 | 90 | <form id="login-form" class="form" action="<?php echo api_get_path(WEB_PATH)?>index.php" method="post"> |
91 | 91 | <div> |
92 | - <label for="login">*<?php echo custompages_get_lang('User');?></label> |
|
92 | + <label for="login">*<?php echo custompages_get_lang('User'); ?></label> |
|
93 | 93 | <input name="login" type="text" /><br /> |
94 | - <label for="password">*<?php echo custompages_get_lang('Password');?></label> |
|
94 | + <label for="password">*<?php echo custompages_get_lang('Password'); ?></label> |
|
95 | 95 | <input name="password" type="password" /><br /> |
96 | 96 | </div> |
97 | 97 | </form> |
98 | 98 | <div id="login-form-submit" class="form-submit" onclick="document.forms['login-form'].submit();"> |
99 | - <span><?php echo custompages_get_lang('LoginEnter');?></span> |
|
99 | + <span><?php echo custompages_get_lang('LoginEnter'); ?></span> |
|
100 | 100 | </div> <!-- #form-submit --> |
101 | 101 | <div id="links"> |
102 | 102 |
@@ -13,17 +13,17 @@ discard block |
||
13 | 13 | /** |
14 | 14 | * Security checks |
15 | 15 | */ |
16 | -if (! isset($_SESSION['conditional_login']['uid'])) |
|
16 | +if (!isset($_SESSION['conditional_login']['uid'])) |
|
17 | 17 | die("Not Authorised"); |
18 | 18 | |
19 | 19 | if (isset($_POST['password'])) { |
20 | 20 | $u = api_get_user_info($_SESSION['conditional_login']['uid']); |
21 | 21 | if ($_POST['password'] != $_POST['password2']) { |
22 | - header('Location: '. api_get_self().'?invalid=2'); |
|
22 | + header('Location: '.api_get_self().'?invalid=2'); |
|
23 | 23 | exit(); |
24 | 24 | } |
25 | - if (empty($_POST['password'])){ //|| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters |
|
26 | - header('Location: '. api_get_self().'?invalid=1'); |
|
25 | + if (empty($_POST['password'])) { //|| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters |
|
26 | + header('Location: '.api_get_self().'?invalid=1'); |
|
27 | 27 | exit(); |
28 | 28 | } |
29 | 29 | $password = $_POST['password']; |
@@ -99,23 +99,23 @@ discard block |
||
99 | 99 | <div id="header"> |
100 | 100 | <img src="/custompages/images/header.png" alt="Logo" /> |
101 | 101 | </div> <!-- #header --> |
102 | - <h2> <?php echo custompages_get_lang('FirstLogin');?> </h2> |
|
102 | + <h2> <?php echo custompages_get_lang('FirstLogin'); ?> </h2> |
|
103 | 103 | |
104 | 104 | <div id="changepassword-form-box" class="form-box"> |
105 | - <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div> |
|
105 | + <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword'); ?> </div> |
|
106 | 106 | <?php if (isset($error_message)) { |
107 | 107 | echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>'; |
108 | 108 | }?> |
109 | 109 | <form id="changepassword-form" class="form" method="post"> |
110 | 110 | <div> |
111 | - <label for="password">*<?php echo custompages_get_lang('Password');?></label> |
|
111 | + <label for="password">*<?php echo custompages_get_lang('Password'); ?></label> |
|
112 | 112 | <input name="password" type="password" /><br /> |
113 | - <label for="password2">*<?php echo custompages_get_lang('Password');?></label> |
|
113 | + <label for="password2">*<?php echo custompages_get_lang('Password'); ?></label> |
|
114 | 114 | <input name="password2" type="password" /><br /> |
115 | 115 | </div> |
116 | 116 | </form> |
117 | 117 | <div id="changepassword-form-submit" class="form-submit" onclick="document.forms['changepassword-form'].submit();"> |
118 | - <span><?php echo custompages_get_lang('LoginEnter');?></span> |
|
118 | + <span><?php echo custompages_get_lang('LoginEnter'); ?></span> |
|
119 | 119 | </div> <!-- #form-submit --> |
120 | 120 | </div> <!-- #form --> |
121 | 121 | <div id="footer"> |
@@ -4,8 +4,9 @@ |
||
4 | 4 | require_once dirname(__FILE__).'/../../inc/global.inc.php'; |
5 | 5 | $url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php'; |
6 | 6 | |
7 | -if (! isset($_SESSION['conditional_login']['uid'])) |
|
7 | +if (! isset($_SESSION['conditional_login']['uid'])) { |
|
8 | 8 | die("Not Authorised"); |
9 | +} |
|
9 | 10 | ?> |
10 | 11 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
11 | 12 | <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml"> |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * Security checks |
15 | 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 !== false) { |
52 | 52 | UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true'); |
@@ -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> |
@@ -52,7 +52,7 @@ |
||
52 | 52 | You have been logged out. |
53 | 53 | </div> |
54 | 54 | </div> |
55 | - <a href="<?php echo $www . 'user_portal.php'; ?>">Go to your portal</a> |
|
55 | + <a href="<?php echo $www.'user_portal.php'; ?>">Go to your portal</a> |
|
56 | 56 | <div id="footer"> |
57 | 57 | <img src="<?php echo $www ?>/custompages/images/footer.png" alt="footer"/> |
58 | 58 | </div> |