@@ -56,40 +56,40 @@ discard block |
||
56 | 56 | $theme = 'chamilo'; |
57 | 57 | } |
58 | 58 | |
59 | - $css_path = 'app/Resources/public/css/'; |
|
60 | - $css_web_assets = 'web/assets/'; |
|
61 | - $css_web_path = 'web/css/'; |
|
59 | + $css_path = 'app/Resources/public/css/'; |
|
60 | + $css_web_assets = 'web/assets/'; |
|
61 | + $css_web_path = 'web/css/'; |
|
62 | 62 | $themePath = $css_path.'themes/'.$theme.'/default.css'; |
63 | 63 | $css_web_fontawesome = $css_web_assets.'fontawesome/css/font-awesome.css'; |
64 | - $bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css'; |
|
65 | - $css_base_file = $css_web_path.'base.css'; |
|
64 | + $bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css'; |
|
65 | + $css_base_file = $css_web_path.'base.css'; |
|
66 | 66 | |
67 | 67 | $css_list = array($bootstrap_file, $css_base_file, $themePath); |
68 | 68 | |
69 | 69 | $web_img = 'main/img'; |
70 | - $root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/'; |
|
71 | - $root_rel = htmlentities($_SERVER['PHP_SELF']); |
|
72 | - if (!empty($root_rel)) { |
|
73 | - $pos = strrpos($root_rel, '/'); |
|
74 | - $root_rel = substr($root_rel, 0, $pos - strlen($root_rel) + 1); |
|
75 | - if (strpos($root_rel, '/main/') !== false) { |
|
76 | - $pos = 0; |
|
77 | - while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/main/')) !== false) { |
|
78 | - $pos = $test_pos + 1; |
|
79 | - } |
|
80 | - $root_rel = substr($root_rel, 0, $pos); |
|
81 | - } elseif (strpos($root_rel, '/courses/') !== false) { |
|
82 | - $pos = 0; |
|
83 | - while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/courses/')) !== false) { |
|
84 | - $pos = $test_pos + 1; |
|
85 | - } |
|
86 | - $root_rel = substr($root_rel, 0, $pos); |
|
87 | - } |
|
88 | - } |
|
89 | - |
|
90 | - $installation_guide_url = $root_rel.'documentation/installation_guide.html'; |
|
91 | - |
|
92 | - $css_def = ''; |
|
70 | + $root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/'; |
|
71 | + $root_rel = htmlentities($_SERVER['PHP_SELF']); |
|
72 | + if (!empty($root_rel)) { |
|
73 | + $pos = strrpos($root_rel, '/'); |
|
74 | + $root_rel = substr($root_rel, 0, $pos - strlen($root_rel) + 1); |
|
75 | + if (strpos($root_rel, '/main/') !== false) { |
|
76 | + $pos = 0; |
|
77 | + while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/main/')) !== false) { |
|
78 | + $pos = $test_pos + 1; |
|
79 | + } |
|
80 | + $root_rel = substr($root_rel, 0, $pos); |
|
81 | + } elseif (strpos($root_rel, '/courses/') !== false) { |
|
82 | + $pos = 0; |
|
83 | + while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/courses/')) !== false) { |
|
84 | + $pos = $test_pos + 1; |
|
85 | + } |
|
86 | + $root_rel = substr($root_rel, 0, $pos); |
|
87 | + } |
|
88 | + } |
|
89 | + |
|
90 | + $installation_guide_url = $root_rel.'documentation/installation_guide.html'; |
|
91 | + |
|
92 | + $css_def = ''; |
|
93 | 93 | foreach ($css_list as $css_item) { |
94 | 94 | $css_base_chamilo_file = $root_sys.$css_item; |
95 | 95 | if (file_exists($css_base_chamilo_file)) { |
@@ -97,33 +97,33 @@ discard block |
||
97 | 97 | } |
98 | 98 | } |
99 | 99 | |
100 | - $global_error_message = array(); |
|
101 | - |
|
102 | - switch ($global_error_code) { |
|
103 | - case 1: |
|
104 | - $global_error_message['section'] = $SectionSystemRequirementsProblem; |
|
105 | - $global_error_message['title'] = $IncorrectPhpVersionTitle; |
|
106 | - $php_version = function_exists('phpversion') ? phpversion() : (defined('PHP_VERSION') ? PHP_VERSION : ''); |
|
107 | - $php_version = empty($php_version) ? '' : '(PHP '.$php_version.')'; |
|
108 | - $IncorrectPhpVersionDescription = str_replace('%s1', $php_version, $IncorrectPhpVersionDescription); |
|
109 | - $IncorrectPhpVersionDescription = str_replace('%s2', REQUIRED_PHP_VERSION, $IncorrectPhpVersionDescription); |
|
110 | - $pos = strpos($IncorrectPhpVersionDescription, '%s3'); |
|
111 | - if ($pos !== false) { |
|
112 | - $length = strlen($IncorrectPhpVersionDescription); |
|
113 | - $read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length); |
|
114 | - $IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos); |
|
115 | - $IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>'; |
|
116 | - } |
|
117 | - $global_error_message['description'] = $IncorrectPhpVersionDescription; |
|
118 | - break; |
|
119 | - case 2: |
|
120 | - $global_error_message['section'] = $SectionInstallation; |
|
121 | - $global_error_message['title'] = $InstallationTitle; |
|
122 | - if (($pos = strpos($InstallationDescription, '%s')) === false) { |
|
123 | - $InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide'; |
|
124 | - } |
|
125 | - $read_installation_guide = substr($InstallationDescription, $pos + 2); |
|
126 | - $InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get"> |
|
100 | + $global_error_message = array(); |
|
101 | + |
|
102 | + switch ($global_error_code) { |
|
103 | + case 1: |
|
104 | + $global_error_message['section'] = $SectionSystemRequirementsProblem; |
|
105 | + $global_error_message['title'] = $IncorrectPhpVersionTitle; |
|
106 | + $php_version = function_exists('phpversion') ? phpversion() : (defined('PHP_VERSION') ? PHP_VERSION : ''); |
|
107 | + $php_version = empty($php_version) ? '' : '(PHP '.$php_version.')'; |
|
108 | + $IncorrectPhpVersionDescription = str_replace('%s1', $php_version, $IncorrectPhpVersionDescription); |
|
109 | + $IncorrectPhpVersionDescription = str_replace('%s2', REQUIRED_PHP_VERSION, $IncorrectPhpVersionDescription); |
|
110 | + $pos = strpos($IncorrectPhpVersionDescription, '%s3'); |
|
111 | + if ($pos !== false) { |
|
112 | + $length = strlen($IncorrectPhpVersionDescription); |
|
113 | + $read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length); |
|
114 | + $IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos); |
|
115 | + $IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>'; |
|
116 | + } |
|
117 | + $global_error_message['description'] = $IncorrectPhpVersionDescription; |
|
118 | + break; |
|
119 | + case 2: |
|
120 | + $global_error_message['section'] = $SectionInstallation; |
|
121 | + $global_error_message['title'] = $InstallationTitle; |
|
122 | + if (($pos = strpos($InstallationDescription, '%s')) === false) { |
|
123 | + $InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide'; |
|
124 | + } |
|
125 | + $read_installation_guide = substr($InstallationDescription, $pos + 2); |
|
126 | + $InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get"> |
|
127 | 127 | <div class="row"><div class="col-md-12"> |
128 | 128 | |
129 | 129 | <div class="office"> |
@@ -135,38 +135,38 @@ discard block |
||
135 | 135 | </p> |
136 | 136 | </div> |
137 | 137 | </form>'; |
138 | - $global_error_message['description'] = $InstallationDescription; |
|
139 | - break; |
|
140 | - case 3: |
|
141 | - case 4: |
|
142 | - case 5: |
|
143 | - $global_error_message['section'] = $SectionDatabaseUnavailable; |
|
144 | - $global_error_message['title'] = $DatabaseUnavailableTitle; |
|
145 | - $global_error_message['description'] = $DatabaseUnavailableDescription; |
|
146 | - break; |
|
147 | - case 6: |
|
148 | - $global_error_message['section'] = $SectionProtection; |
|
149 | - $global_error_message['title'] = $AlreadyInstalledTitle; |
|
150 | - $global_error_message['description'] = $AlreadyInstalledDescription; |
|
151 | - break; |
|
152 | - default: |
|
153 | - $global_error_message['section'] = $SectionTechnicalIssues; |
|
154 | - $global_error_message['title'] = $TechnicalIssuesTitle; |
|
155 | - $global_error_message['description'] = $TechnicalIssuesDescription; |
|
156 | - break; |
|
157 | - } |
|
158 | - |
|
159 | - $show_error_codes = defined('SHOW_ERROR_CODES') && SHOW_ERROR_CODES && $global_error_code != 2; |
|
160 | - $global_error_message['code'] = $show_error_codes ? $ErrorCode.': '.$global_error_code.'<br /><br />' : ''; |
|
161 | - $global_error_message['details'] = empty($global_error_message['details']) ? '' : ($show_error_codes ? ': '.$global_error_message['details'] : $global_error_message['details']); |
|
162 | - $global_error_message['organisation'] = $Organisation; |
|
163 | - $global_error_message['powered_by'] = $PoweredBy; |
|
164 | - $global_error_message['encoding'] = 'UTF-8'; |
|
165 | - $global_error_message['chamilo_logo'] = "data:image/png;base64,".base64_encode(file_get_contents($root_sys.'web/css/themes/'.$theme.'/images/header-logo.png')); |
|
138 | + $global_error_message['description'] = $InstallationDescription; |
|
139 | + break; |
|
140 | + case 3: |
|
141 | + case 4: |
|
142 | + case 5: |
|
143 | + $global_error_message['section'] = $SectionDatabaseUnavailable; |
|
144 | + $global_error_message['title'] = $DatabaseUnavailableTitle; |
|
145 | + $global_error_message['description'] = $DatabaseUnavailableDescription; |
|
146 | + break; |
|
147 | + case 6: |
|
148 | + $global_error_message['section'] = $SectionProtection; |
|
149 | + $global_error_message['title'] = $AlreadyInstalledTitle; |
|
150 | + $global_error_message['description'] = $AlreadyInstalledDescription; |
|
151 | + break; |
|
152 | + default: |
|
153 | + $global_error_message['section'] = $SectionTechnicalIssues; |
|
154 | + $global_error_message['title'] = $TechnicalIssuesTitle; |
|
155 | + $global_error_message['description'] = $TechnicalIssuesDescription; |
|
156 | + break; |
|
157 | + } |
|
158 | + |
|
159 | + $show_error_codes = defined('SHOW_ERROR_CODES') && SHOW_ERROR_CODES && $global_error_code != 2; |
|
160 | + $global_error_message['code'] = $show_error_codes ? $ErrorCode.': '.$global_error_code.'<br /><br />' : ''; |
|
161 | + $global_error_message['details'] = empty($global_error_message['details']) ? '' : ($show_error_codes ? ': '.$global_error_message['details'] : $global_error_message['details']); |
|
162 | + $global_error_message['organisation'] = $Organisation; |
|
163 | + $global_error_message['powered_by'] = $PoweredBy; |
|
164 | + $global_error_message['encoding'] = 'UTF-8'; |
|
165 | + $global_error_message['chamilo_logo'] = "data:image/png;base64,".base64_encode(file_get_contents($root_sys.'web/css/themes/'.$theme.'/images/header-logo.png')); |
|
166 | 166 | |
167 | 167 | $installChamiloImage = base64_encode(file_get_contents("$root_sys/main/img/install-chamilo.gif")); |
168 | 168 | |
169 | - $global_error_message_page = |
|
169 | + $global_error_message_page = |
|
170 | 170 | <<<EOM |
171 | 171 | <!DOCTYPE html> |
172 | 172 | <html> |
@@ -236,9 +236,9 @@ discard block |
||
236 | 236 | </body> |
237 | 237 | </html> |
238 | 238 | EOM; |
239 | - foreach ($global_error_message as $key => $value) { |
|
240 | - $global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page); |
|
241 | - } |
|
242 | - header('Content-Type: text/html; charset='.$global_error_message['encoding']); |
|
243 | - die($global_error_message_page); |
|
239 | + foreach ($global_error_message as $key => $value) { |
|
240 | + $global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page); |
|
241 | + } |
|
242 | + header('Content-Type: text/html; charset='.$global_error_message['encoding']); |
|
243 | + die($global_error_message_page); |
|
244 | 244 | } |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * Responses to AJAX calls |
|
5 | - */ |
|
4 | + * Responses to AJAX calls |
|
5 | + */ |
|
6 | 6 | |
7 | 7 | require_once '../global.inc.php'; |
8 | 8 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | //$gradebook['name'] = $gradebook['name']; |
56 | 56 | //$gradebook_list[] = $gradebook; |
57 | 57 | } else { |
58 | - // $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name']; |
|
58 | + // $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name']; |
|
59 | 59 | //$gradebook_list[] = $gradebook; |
60 | 60 | } |
61 | 61 | } |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /chamilo_license.txt */ |
3 | 3 | /** |
4 | - * Responses to AJAX calls for install |
|
5 | - */ |
|
4 | + * Responses to AJAX calls for install |
|
5 | + */ |
|
6 | 6 | |
7 | 7 | //require_once '../global.inc.php'; |
8 | 8 | |
9 | 9 | $action = $_GET['a']; |
10 | 10 | |
11 | 11 | switch ($action) { |
12 | - case 'send_contact_information': |
|
12 | + case 'send_contact_information': |
|
13 | 13 | if (!empty($_POST)) { |
14 | 14 | // get params from contact form |
15 | 15 | $person_name = $_POST['person_name']; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | } |
62 | 62 | break; |
63 | - default: |
|
64 | - echo ''; |
|
63 | + default: |
|
64 | + echo ''; |
|
65 | 65 | } |
66 | 66 | exit; |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * Responses to AJAX calls |
|
5 | - */ |
|
4 | + * Responses to AJAX calls |
|
5 | + */ |
|
6 | 6 | require_once '../global.inc.php'; |
7 | 7 | |
8 | 8 | //@todo for some reason nanogong doesn't like this variables |
@@ -16,84 +16,84 @@ discard block |
||
16 | 16 | //Fix in order to add the exe_id |
17 | 17 | |
18 | 18 | if (isset($_REQUEST['from_htaccess'])) { |
19 | - if (isset($_REQUEST['file'])) { |
|
20 | - $fileinfo = pathinfo($_REQUEST['file']); |
|
21 | - $items = explode('-', $fileinfo['filename']); |
|
22 | - $_REQUEST['exe_id'] = $items[5]; |
|
23 | - } |
|
19 | + if (isset($_REQUEST['file'])) { |
|
20 | + $fileinfo = pathinfo($_REQUEST['file']); |
|
21 | + $items = explode('-', $fileinfo['filename']); |
|
22 | + $_REQUEST['exe_id'] = $items[5]; |
|
23 | + } |
|
24 | 24 | } |
25 | 25 | $nano = new Nanogong($_REQUEST); |
26 | 26 | $is_nano = false; |
27 | 27 | |
28 | 28 | if (isset($_REQUEST['is_nano'])) { |
29 | - $is_nano = true; |
|
29 | + $is_nano = true; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | switch ($action) { |
33 | - case 'get_file': |
|
34 | - if ($nano->get_param_value('user_id') == api_get_user_id() || api_is_allowed_to_edit()) { |
|
35 | - $file_path = $nano->load_filename_if_exists(); |
|
36 | - //$file_path = '/var/www/rocio/courses/GREAT123/exercises/0/2/5/1/1-0-1-2-5-38.mp3'; |
|
37 | - if ($file_path) { |
|
38 | - $info = pathinfo($file_path); |
|
39 | - $user_info = api_get_user_info($nano->params['user_id']); |
|
40 | - $name = get_lang('Quiz').'-'.$user_info['firstname'].'-'.$user_info['lastname'].'.'.$info['extension']; |
|
41 | - $download = true; |
|
42 | - if (isset($_REQUEST['download']) && $_REQUEST['download'] == 0) { |
|
43 | - $download = false; |
|
44 | - } |
|
45 | - DocumentManager::file_send_for_download($file_path, $download); |
|
46 | - exit; |
|
47 | - } |
|
48 | - } |
|
49 | - break; |
|
50 | - case 'show_audio': |
|
51 | - if (!$is_nano) { |
|
52 | - echo $nano->return_js($_REQUEST); |
|
53 | - } |
|
54 | - echo $nano->show_audio_file($is_nano); |
|
55 | - break; |
|
56 | - case 'delete': |
|
57 | - $return = $nano->delete_files(); |
|
58 | - if ($return == 1) { |
|
59 | - //cant' do this because the post that nano send doesnt take into account the session |
|
60 | - Display::display_confirmation_message(get_lang('FileDeleted')); |
|
61 | - } else { |
|
62 | - Display::display_confirmation_message(get_lang('FileNotFound')); |
|
63 | - } |
|
64 | - break; |
|
65 | - case 'show_form': |
|
66 | - api_protect_course_script(true); |
|
67 | - Display::display_reduced_header(); |
|
68 | - echo $nano->return_js($_REQUEST); |
|
69 | - echo $nano->return_form(); |
|
70 | - break; |
|
33 | + case 'get_file': |
|
34 | + if ($nano->get_param_value('user_id') == api_get_user_id() || api_is_allowed_to_edit()) { |
|
35 | + $file_path = $nano->load_filename_if_exists(); |
|
36 | + //$file_path = '/var/www/rocio/courses/GREAT123/exercises/0/2/5/1/1-0-1-2-5-38.mp3'; |
|
37 | + if ($file_path) { |
|
38 | + $info = pathinfo($file_path); |
|
39 | + $user_info = api_get_user_info($nano->params['user_id']); |
|
40 | + $name = get_lang('Quiz').'-'.$user_info['firstname'].'-'.$user_info['lastname'].'.'.$info['extension']; |
|
41 | + $download = true; |
|
42 | + if (isset($_REQUEST['download']) && $_REQUEST['download'] == 0) { |
|
43 | + $download = false; |
|
44 | + } |
|
45 | + DocumentManager::file_send_for_download($file_path, $download); |
|
46 | + exit; |
|
47 | + } |
|
48 | + } |
|
49 | + break; |
|
50 | + case 'show_audio': |
|
51 | + if (!$is_nano) { |
|
52 | + echo $nano->return_js($_REQUEST); |
|
53 | + } |
|
54 | + echo $nano->show_audio_file($is_nano); |
|
55 | + break; |
|
56 | + case 'delete': |
|
57 | + $return = $nano->delete_files(); |
|
58 | + if ($return == 1) { |
|
59 | + //cant' do this because the post that nano send doesnt take into account the session |
|
60 | + Display::display_confirmation_message(get_lang('FileDeleted')); |
|
61 | + } else { |
|
62 | + Display::display_confirmation_message(get_lang('FileNotFound')); |
|
63 | + } |
|
64 | + break; |
|
65 | + case 'show_form': |
|
66 | + api_protect_course_script(true); |
|
67 | + Display::display_reduced_header(); |
|
68 | + echo $nano->return_js($_REQUEST); |
|
69 | + echo $nano->return_form(); |
|
70 | + break; |
|
71 | 71 | case 'save_file': |
72 | - //User access same as upload.php |
|
72 | + //User access same as upload.php |
|
73 | 73 | |
74 | - $return = $nano->upload_file($is_nano); |
|
74 | + $return = $nano->upload_file($is_nano); |
|
75 | 75 | |
76 | - if ($is_nano) { |
|
77 | - //nano looks for numbers |
|
78 | - if ($return == 1) { |
|
79 | - //cant' do this because the post that nano send doesnt take into account the session |
|
80 | - echo 1; //Display::display_confirmation_message(get_lang('UplUploadSucceeded')); |
|
81 | - } else { |
|
82 | - echo 0; |
|
83 | - //Display::display_warning_message(get_lang('UplUnableToSaveFileFilteredExtension')); |
|
84 | - } |
|
85 | - } else { |
|
86 | - Display::display_reduced_header(); |
|
87 | - echo $nano->return_js($_REQUEST); |
|
88 | - //normal form |
|
89 | - if ($return == 1) { |
|
90 | - //cant' do this because the post that nano send doesnt take into account the session |
|
91 | - $message = Display::return_message(get_lang('UplUploadSucceeded'), 'confirm'); |
|
92 | - } else { |
|
93 | - $message = Display::return_message(get_lang('UplUnableToSaveFileFilteredExtension'), 'warning'); |
|
94 | - } |
|
95 | - echo $nano->return_form($message); |
|
96 | - } |
|
76 | + if ($is_nano) { |
|
77 | + //nano looks for numbers |
|
78 | + if ($return == 1) { |
|
79 | + //cant' do this because the post that nano send doesnt take into account the session |
|
80 | + echo 1; //Display::display_confirmation_message(get_lang('UplUploadSucceeded')); |
|
81 | + } else { |
|
82 | + echo 0; |
|
83 | + //Display::display_warning_message(get_lang('UplUnableToSaveFileFilteredExtension')); |
|
84 | + } |
|
85 | + } else { |
|
86 | + Display::display_reduced_header(); |
|
87 | + echo $nano->return_js($_REQUEST); |
|
88 | + //normal form |
|
89 | + if ($return == 1) { |
|
90 | + //cant' do this because the post that nano send doesnt take into account the session |
|
91 | + $message = Display::return_message(get_lang('UplUploadSucceeded'), 'confirm'); |
|
92 | + } else { |
|
93 | + $message = Display::return_message(get_lang('UplUnableToSaveFileFilteredExtension'), 'warning'); |
|
94 | + } |
|
95 | + echo $nano->return_form($message); |
|
96 | + } |
|
97 | 97 | break; |
98 | 98 | default: |
99 | 99 | echo ''; |
@@ -488,7 +488,7 @@ |
||
488 | 488 | $remind_list |
489 | 489 | ); |
490 | 490 | |
491 | - // Destruction of the Question object |
|
491 | + // Destruction of the Question object |
|
492 | 492 | unset($objQuestionTmp); |
493 | 493 | if ($debug) { |
494 | 494 | error_log(" -- end question -- "); |
@@ -11,8 +11,8 @@ discard block |
||
11 | 11 | $thematic = new Thematic(); |
12 | 12 | |
13 | 13 | switch ($action) { |
14 | - case 'save_thematic_plan': |
|
15 | - /*$title_list = $_REQUEST['title']; |
|
14 | + case 'save_thematic_plan': |
|
15 | + /*$title_list = $_REQUEST['title']; |
|
16 | 16 | $description_list = $_REQUEST['desc']; |
17 | 17 | //$description_list = $_REQUEST['description']; |
18 | 18 | $description_type = $_REQUEST['description_type']; |
@@ -25,13 +25,13 @@ discard block |
||
25 | 25 | $thematic_plan_data = $thematic->get_thematic_plan_data(); |
26 | 26 | $return = $thematic->get_thematic_plan_div($thematic_plan_data); |
27 | 27 | echo $return[$_REQUEST['thematic_id']];*/ |
28 | - break; |
|
29 | - case 'save_thematic_advance': |
|
30 | - if (!api_is_allowed_to_edit(null, true)) { |
|
31 | - echo ''; |
|
32 | - exit; |
|
33 | - } |
|
34 | - /* |
|
28 | + break; |
|
29 | + case 'save_thematic_advance': |
|
30 | + if (!api_is_allowed_to_edit(null, true)) { |
|
31 | + echo ''; |
|
32 | + exit; |
|
33 | + } |
|
34 | + /* |
|
35 | 35 | if (($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) || (!empty($_REQUEST['duration_in_hours']) && !is_numeric($_REQUEST['duration_in_hours'])) ) { |
36 | 36 | if ($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) { |
37 | 37 | $start_date_error = true; |
@@ -79,80 +79,80 @@ discard block |
||
79 | 79 | $thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true); |
80 | 80 | $return = $thematic->get_thematic_advance_div($thematic_advance_data); |
81 | 81 | echo $return[$_REQUEST['thematic_id']][$_REQUEST['thematic_advance_id']];*/ |
82 | - break; |
|
83 | - case 'get_datetime_by_attendance': |
|
84 | - $attendance_id = intval($_REQUEST['attendance_id']); |
|
85 | - $thematic_advance_id = intval($_REQUEST['thematic_advance_id']); |
|
82 | + break; |
|
83 | + case 'get_datetime_by_attendance': |
|
84 | + $attendance_id = intval($_REQUEST['attendance_id']); |
|
85 | + $thematic_advance_id = intval($_REQUEST['thematic_advance_id']); |
|
86 | 86 | |
87 | - $label = ''; |
|
88 | - $input_select = ''; |
|
89 | - if (!empty($attendance_id)) { |
|
90 | - $attendance = new Attendance(); |
|
91 | - $thematic = new Thematic(); |
|
92 | - $thematic_list = $thematic->get_thematic_list(); |
|
87 | + $label = ''; |
|
88 | + $input_select = ''; |
|
89 | + if (!empty($attendance_id)) { |
|
90 | + $attendance = new Attendance(); |
|
91 | + $thematic = new Thematic(); |
|
92 | + $thematic_list = $thematic->get_thematic_list(); |
|
93 | 93 | |
94 | - $my_list = $thematic_list_temp = array(); |
|
95 | - foreach ($thematic_list as $item) { |
|
96 | - $my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']); |
|
97 | - $thematic_list_temp = array_merge($my_list, $thematic_list_temp); |
|
98 | - } |
|
99 | - $new_thematic_list = array(); |
|
94 | + $my_list = $thematic_list_temp = array(); |
|
95 | + foreach ($thematic_list as $item) { |
|
96 | + $my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']); |
|
97 | + $thematic_list_temp = array_merge($my_list, $thematic_list_temp); |
|
98 | + } |
|
99 | + $new_thematic_list = array(); |
|
100 | 100 | |
101 | - foreach($thematic_list_temp as $item) { |
|
102 | - if (!empty($item['attendance_id']) ) { |
|
103 | - $new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']); |
|
104 | - } |
|
105 | - } |
|
101 | + foreach($thematic_list_temp as $item) { |
|
102 | + if (!empty($item['attendance_id']) ) { |
|
103 | + $new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']); |
|
104 | + } |
|
105 | + } |
|
106 | 106 | |
107 | - $attendance_calendar = $attendance->get_attendance_calendar($attendance_id); |
|
107 | + $attendance_calendar = $attendance->get_attendance_calendar($attendance_id); |
|
108 | 108 | |
109 | - $label = get_lang('StartDate'); |
|
110 | - if (!empty($attendance_calendar)) { |
|
111 | - $input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">'; |
|
112 | - foreach ($attendance_calendar as $calendar) { |
|
113 | - $selected = null; |
|
114 | - $insert = true; |
|
115 | - //checking if was already taken |
|
116 | - foreach ($new_thematic_list as $key => $thematic_item) { |
|
117 | - //if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) { |
|
118 | - if ($calendar['db_date_time'] == $thematic_item['start_date'] ) { |
|
119 | - $insert = false; |
|
120 | - if ($thematic_advance_id == $key) { |
|
121 | - $insert = true; |
|
122 | - $selected = 'selected'; |
|
123 | - } |
|
124 | - break; |
|
125 | - } |
|
126 | - } |
|
127 | - if ($insert == true) { |
|
128 | - $input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>'; |
|
129 | - } |
|
130 | - } |
|
131 | - $input_select .= '</select>'; |
|
132 | - } else { |
|
133 | - $input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>'; |
|
134 | - } |
|
135 | - } |
|
136 | - ?> |
|
109 | + $label = get_lang('StartDate'); |
|
110 | + if (!empty($attendance_calendar)) { |
|
111 | + $input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">'; |
|
112 | + foreach ($attendance_calendar as $calendar) { |
|
113 | + $selected = null; |
|
114 | + $insert = true; |
|
115 | + //checking if was already taken |
|
116 | + foreach ($new_thematic_list as $key => $thematic_item) { |
|
117 | + //if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) { |
|
118 | + if ($calendar['db_date_time'] == $thematic_item['start_date'] ) { |
|
119 | + $insert = false; |
|
120 | + if ($thematic_advance_id == $key) { |
|
121 | + $insert = true; |
|
122 | + $selected = 'selected'; |
|
123 | + } |
|
124 | + break; |
|
125 | + } |
|
126 | + } |
|
127 | + if ($insert == true) { |
|
128 | + $input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>'; |
|
129 | + } |
|
130 | + } |
|
131 | + $input_select .= '</select>'; |
|
132 | + } else { |
|
133 | + $input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>'; |
|
134 | + } |
|
135 | + } |
|
136 | + ?> |
|
137 | 137 | <div class="form-group"> |
138 | 138 | <label class="col-sm-2 control-label"><?php echo $label ?></label> |
139 | 139 | <div class="col-sm-10"><?php echo $input_select ?></div> |
140 | 140 | </div> |
141 | 141 | <?php |
142 | - break; |
|
143 | - case 'update_done_thematic_advance': |
|
144 | - $thematic_advance_id = intval($_GET['thematic_advance_id']); |
|
145 | - $total_average = 0; |
|
146 | - if (!empty($thematic_advance_id)) { |
|
147 | - $thematic = new Thematic(); |
|
148 | - $affected_rows = $thematic->update_done_thematic_advances($thematic_advance_id); |
|
149 | - //if ($affected_rows) { |
|
150 | - $total_average = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id()); |
|
151 | - //} |
|
152 | - } |
|
153 | - echo $total_average; |
|
154 | - break; |
|
155 | - default: |
|
156 | - echo ''; |
|
142 | + break; |
|
143 | + case 'update_done_thematic_advance': |
|
144 | + $thematic_advance_id = intval($_GET['thematic_advance_id']); |
|
145 | + $total_average = 0; |
|
146 | + if (!empty($thematic_advance_id)) { |
|
147 | + $thematic = new Thematic(); |
|
148 | + $affected_rows = $thematic->update_done_thematic_advances($thematic_advance_id); |
|
149 | + //if ($affected_rows) { |
|
150 | + $total_average = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id()); |
|
151 | + //} |
|
152 | + } |
|
153 | + echo $total_average; |
|
154 | + break; |
|
155 | + default: |
|
156 | + echo ''; |
|
157 | 157 | } |
158 | 158 | exit; |
@@ -731,7 +731,7 @@ discard block |
||
731 | 731 | } |
732 | 732 | |
733 | 733 | break; |
734 | - case 'get_user_skill_ranking': |
|
734 | + case 'get_user_skill_ranking': |
|
735 | 735 | $columns = array('photo', 'firstname', 'lastname', 'skills_acquired', 'currently_learning', 'rank'); |
736 | 736 | $result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $whereCondition); |
737 | 737 | $result = msort($result, 'skills_acquired', 'asc'); |
@@ -1281,7 +1281,7 @@ discard block |
||
1281 | 1281 | |
1282 | 1282 | if (!empty($item['certif_min_score']) && !empty($item['document_id'])) { |
1283 | 1283 | $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), ICON_SIZE_SMALL); |
1284 | - $item['has_certificates'] = '1'; |
|
1284 | + $item['has_certificates'] = '1'; |
|
1285 | 1285 | } else { |
1286 | 1286 | $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), ICON_SIZE_SMALL); |
1287 | 1287 | $item['has_certificates'] = '0'; |
@@ -758,7 +758,7 @@ |
||
758 | 758 | // $gidReset = true; |
759 | 759 | } // end else |
760 | 760 | |
761 | - // Now check for anonymous user mode |
|
761 | + // Now check for anonymous user mode |
|
762 | 762 | if (isset($use_anonymous) && $use_anonymous) { |
763 | 763 | //if anonymous mode is set, then try to set the current user as anonymous |
764 | 764 | //if he doesn't have a login yet |
@@ -1229,13 +1229,13 @@ discard block |
||
1229 | 1229 | } |
1230 | 1230 | |
1231 | 1231 | /** |
1232 | - * Get the users by ID |
|
1233 | - * @param array $ids student ids |
|
1234 | - * @param string $active |
|
1235 | - * @param string $order |
|
1236 | - * @param string $limit |
|
1237 | - * @return array $result student information |
|
1238 | - */ |
|
1232 | + * Get the users by ID |
|
1233 | + * @param array $ids student ids |
|
1234 | + * @param string $active |
|
1235 | + * @param string $order |
|
1236 | + * @param string $limit |
|
1237 | + * @return array $result student information |
|
1238 | + */ |
|
1239 | 1239 | public static function get_user_list_by_ids($ids = array(), $active = null, $order = null, $limit = null) |
1240 | 1240 | { |
1241 | 1241 | if (empty($ids)) { |
@@ -3332,12 +3332,12 @@ discard block |
||
3332 | 3332 | if ($tag_id == 0) { |
3333 | 3333 | //the tag doesn't exist |
3334 | 3334 | $sql = "INSERT INTO $table_user_tag (tag, field_id,count) VALUES ('$tag','$field_id', count + 1)"; |
3335 | - Database::query($sql); |
|
3335 | + Database::query($sql); |
|
3336 | 3336 | $last_insert_id = Database::insert_id(); |
3337 | 3337 | } else { |
3338 | 3338 | //the tag exists we update it |
3339 | 3339 | $sql = "UPDATE $table_user_tag SET count = count + 1 WHERE id = $tag_id"; |
3340 | - Database::query($sql); |
|
3340 | + Database::query($sql); |
|
3341 | 3341 | $last_insert_id = $tag_id; |
3342 | 3342 | } |
3343 | 3343 | |
@@ -3532,9 +3532,9 @@ discard block |
||
3532 | 3532 | } |
3533 | 3533 | |
3534 | 3534 | /** |
3535 | - * Get extra filtrable user fields (only type select) |
|
3536 | - * @return array |
|
3537 | - */ |
|
3535 | + * Get extra filtrable user fields (only type select) |
|
3536 | + * @return array |
|
3537 | + */ |
|
3538 | 3538 | public static function get_extra_filtrable_fields() |
3539 | 3539 | { |
3540 | 3540 | $extraFieldList = UserManager::get_extra_fields(); |
@@ -3559,9 +3559,9 @@ discard block |
||
3559 | 3559 | } |
3560 | 3560 | |
3561 | 3561 | /** |
3562 | - * Get extra where clauses for finding users based on extra filtrable user fields (type select) |
|
3563 | - * @return string With AND clauses based on user's ID which have the values to search in extra user fields |
|
3564 | - */ |
|
3562 | + * Get extra where clauses for finding users based on extra filtrable user fields (type select) |
|
3563 | + * @return string With AND clauses based on user's ID which have the values to search in extra user fields |
|
3564 | + */ |
|
3565 | 3565 | public static function get_search_form_where_extra_fields() |
3566 | 3566 | { |
3567 | 3567 | $useExtraFields = false; |
@@ -3869,23 +3869,23 @@ discard block |
||
3869 | 3869 | } |
3870 | 3870 | |
3871 | 3871 | /** |
3872 | - * Get users followed by human resource manager |
|
3873 | - * @param int $userId |
|
3874 | - * @param int $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc) |
|
3875 | - * @param bool $getOnlyUserId |
|
3876 | - * @param bool $getSql |
|
3877 | - * @param bool $getCount |
|
3878 | - * @param int $from |
|
3879 | - * @param int $numberItems |
|
3880 | - * @param int $column |
|
3881 | - * @param string $direction |
|
3882 | - * @param int $active |
|
3883 | - * @param string $lastConnectionDate |
|
3884 | - * @param int $status the function is called by who? COURSEMANAGER, DRH? |
|
3885 | - * @param string $keyword |
|
3872 | + * Get users followed by human resource manager |
|
3873 | + * @param int $userId |
|
3874 | + * @param int $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc) |
|
3875 | + * @param bool $getOnlyUserId |
|
3876 | + * @param bool $getSql |
|
3877 | + * @param bool $getCount |
|
3878 | + * @param int $from |
|
3879 | + * @param int $numberItems |
|
3880 | + * @param int $column |
|
3881 | + * @param string $direction |
|
3882 | + * @param int $active |
|
3883 | + * @param string $lastConnectionDate |
|
3884 | + * @param int $status the function is called by who? COURSEMANAGER, DRH? |
|
3885 | + * @param string $keyword |
|
3886 | 3886 | * |
3887 | - * @return array user list |
|
3888 | - */ |
|
3887 | + * @return array user list |
|
3888 | + */ |
|
3889 | 3889 | public static function getUsersFollowedByUser( |
3890 | 3890 | $userId, |
3891 | 3891 | $userStatus = null, |