@@ -11,7 +11,7 @@ |
||
| 11 | 11 | $cidReset = true; |
| 12 | 12 | require_once '../inc/global.inc.php'; |
| 13 | 13 | $this_section = SECTION_COURSES; |
| 14 | -$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null; |
|
| 14 | +$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null; |
|
| 15 | 15 | $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null; |
| 16 | 16 | $user_id = api_get_user_id(); |
| 17 | 17 | |
@@ -684,7 +684,7 @@ |
||
| 684 | 684 | |
| 685 | 685 | foreach ($user_data as $key => $value) { |
| 686 | 686 | if (substr($key, 0, 6) == 'extra_') { //an extra field |
| 687 | - continue; |
|
| 687 | + continue; |
|
| 688 | 688 | } elseif (strpos($key, 'remove_extra_') !== false) { |
| 689 | 689 | } else { |
| 690 | 690 | if (in_array($key, $available_values_to_modify)) { |
@@ -33,8 +33,8 @@ discard block |
||
| 33 | 33 | $userGeolocalization = api_get_setting('enable_profile_user_address_geolocalization') == 'true'; |
| 34 | 34 | |
| 35 | 35 | $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1'); |
| 36 | -$htmlHeadXtra[] = '<link href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">'; |
|
| 37 | -$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>'; |
|
| 36 | +$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">'; |
|
| 37 | +$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>'; |
|
| 38 | 38 | $htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true" ></script>'; |
| 39 | 39 | $htmlHeadXtra[] = '<script> |
| 40 | 40 | $(document).ready(function() { |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $htmlHeadXtra[] = '<script> |
| 153 | 153 | $(document).ready(function() { |
| 154 | 154 | |
| 155 | - var address = "' . $user_data['address'] . '"; |
|
| 155 | + var address = "' . $user_data['address'].'"; |
|
| 156 | 156 | initializeGeo(address, false); |
| 157 | 157 | |
| 158 | 158 | $("#geolocalization").on("click", function() { |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | }; |
| 185 | 185 | |
| 186 | 186 | var geoError = function(error) { |
| 187 | - alert("Geocode ' . get_lang('Error') . ': " + error); |
|
| 187 | + alert("Geocode ' . get_lang('Error').': " + error); |
|
| 188 | 188 | }; |
| 189 | 189 | |
| 190 | 190 | var geoOptions = { |
@@ -235,11 +235,11 @@ discard block |
||
| 235 | 235 | infowindow.open(map, marker); |
| 236 | 236 | }); |
| 237 | 237 | } else { |
| 238 | - alert("' . get_lang("NotFound") . '"); |
|
| 238 | + alert("' . get_lang("NotFound").'"); |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | } else { |
| 242 | - alert("Geocode ' . get_lang('Error') . ': " + status); |
|
| 242 | + alert("Geocode ' . get_lang('Error').': " + status); |
|
| 243 | 243 | } |
| 244 | 244 | }); |
| 245 | 245 | } |
@@ -269,10 +269,10 @@ discard block |
||
| 269 | 269 | if (api_is_western_name_order()) { |
| 270 | 270 | // FIRST NAME and LAST NAME |
| 271 | 271 | $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40)); |
| 272 | - $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40)); |
|
| 272 | + $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40)); |
|
| 273 | 273 | } else { |
| 274 | 274 | // LAST NAME and FIRST NAME |
| 275 | - $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40)); |
|
| 275 | + $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40)); |
|
| 276 | 276 | $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40)); |
| 277 | 277 | } |
| 278 | 278 | if (api_get_setting('profile', 'name') !== 'true') { |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | $form->applyFilter(array('lastname', 'firstname'), 'stripslashes'); |
| 282 | 282 | $form->applyFilter(array('lastname', 'firstname'), 'trim'); |
| 283 | 283 | $form->applyFilter(array('lastname', 'firstname'), 'html_filter'); |
| 284 | -$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required'); |
|
| 284 | +$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required'); |
|
| 285 | 285 | $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required'); |
| 286 | 286 | |
| 287 | 287 | // USERNAME |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | $form->freeze('email'); |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | -if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') { |
|
| 327 | +if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') { |
|
| 328 | 328 | $form->applyFilter('email', 'stripslashes'); |
| 329 | 329 | $form->applyFilter('email', 'trim'); |
| 330 | 330 | $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required'); |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | |
| 518 | 518 | // the $jquery_ready_content variable collects all functions that |
| 519 | 519 | // will be load in the $(document).ready javascript function |
| 520 | -$htmlHeadXtra[] ='<script> |
|
| 520 | +$htmlHeadXtra[] = '<script> |
|
| 521 | 521 | $(document).ready(function(){ |
| 522 | 522 | '.$jquery_ready_content.' |
| 523 | 523 | }); |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | |
| 674 | 674 | if (!check_user_email($user_data['email']) && |
| 675 | 675 | empty($user_data['password0']) |
| 676 | - ){ |
|
| 676 | + ) { |
|
| 677 | 677 | Display::addFlash( |
| 678 | 678 | Display:: return_message( |
| 679 | 679 | get_lang('ToChangeYourEmailMustTypeYourPassword'), |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | $available_values_to_modify = array(); |
| 783 | 783 | foreach ($profile_list as $key => $status) { |
| 784 | 784 | if ($status == 'true') { |
| 785 | - switch($key) { |
|
| 785 | + switch ($key) { |
|
| 786 | 786 | case 'login': |
| 787 | 787 | $available_values_to_modify[] = 'username'; |
| 788 | 788 | break; |
@@ -9,5 +9,5 @@ |
||
| 9 | 9 | require_once('authcas.php'); |
| 10 | 10 | global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri; |
| 11 | 11 | |
| 12 | -phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri); |
|
| 12 | +phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri); |
|
| 13 | 13 | phpCAS::logout(); |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | $firstpage = $_GET['firstpage']; |
| 40 | 40 | setcookie("GotoCourse", $firstpage); |
| 41 | 41 | } |
| 42 | - if (!is_object($PHPCAS_CLIENT) ) { |
|
| 42 | + if (!is_object($PHPCAS_CLIENT)) { |
|
| 43 | 43 | phpCAS::client( |
| 44 | 44 | $cas_auth_ver, |
| 45 | 45 | $cas_auth_server, |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | $limit |
| 204 | 204 | ); |
| 205 | 205 | } else { |
| 206 | - header('Location: ' . api_get_self()); |
|
| 206 | + header('Location: '.api_get_self()); |
|
| 207 | 207 | } |
| 208 | 208 | break; |
| 209 | 209 | case 'display_random_courses': |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData); |
| 279 | 279 | |
| 280 | 280 | if (!$continueWithSubscription) { |
| 281 | - header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/courses.php'); |
|
| 281 | + header('Location: '.api_get_path(WEB_CODE_PATH).'auth/courses.php'); |
|
| 282 | 282 | exit; |
| 283 | 283 | } |
| 284 | 284 | } |
@@ -296,16 +296,16 @@ discard block |
||
| 296 | 296 | |
| 297 | 297 | if ($count <= 0) { |
| 298 | 298 | // no course in session -> return to catalog |
| 299 | - $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php'; |
|
| 299 | + $url = api_get_path(WEB_CODE_PATH).'auth/courses.php'; |
|
| 300 | 300 | } elseif ($count == 1) { |
| 301 | 301 | // only one course, so redirect directly to this course |
| 302 | 302 | foreach ($coursesList as $course) { |
| 303 | - $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']); |
|
| 303 | + $url = api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.intval($_GET['session_id']); |
|
| 304 | 304 | } |
| 305 | 305 | } else { |
| 306 | - $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']); |
|
| 306 | + $url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.intval($_GET['session_id']); |
|
| 307 | 307 | } |
| 308 | - header('Location: ' . $url); |
|
| 308 | + header('Location: '.$url); |
|
| 309 | 309 | exit; |
| 310 | 310 | } |
| 311 | 311 | //else show error message? |
@@ -171,28 +171,52 @@ discard block |
||
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | switch ($action) { |
| 174 | - case 'subscribe_user_with_password': |
|
| 175 | - $courses_controller->subscribe_user( |
|
| 176 | - isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '', |
|
| 177 | - isset($_POST['search_term']) ? $_POST['search_term'] : '', |
|
| 178 | - isset($_POST['category_code']) ? $_POST['category_code'] : '' |
|
| 179 | - ); |
|
| 180 | - break; |
|
| 181 | - case 'createcoursecategory': |
|
| 182 | - $courses_controller->categories_list($action); |
|
| 183 | - break; |
|
| 184 | - case 'deletecoursecategory': |
|
| 185 | - $courses_controller->courses_list($action); |
|
| 186 | - break; |
|
| 187 | - case 'sortmycourses': |
|
| 188 | - $courses_controller->courses_list($action); |
|
| 189 | - break; |
|
| 190 | - case 'subscribe': |
|
| 191 | - if (!$user_can_view_page) { |
|
| 192 | - api_not_allowed(true); |
|
| 193 | - } |
|
| 194 | - |
|
| 195 | - if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) { |
|
| 174 | + case 'subscribe_user_with_password': |
|
| 175 | + $courses_controller->subscribe_user( |
|
| 176 | + isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '', |
|
| 177 | + isset($_POST['search_term']) ? $_POST['search_term'] : '', |
|
| 178 | + isset($_POST['category_code']) ? $_POST['category_code'] : '' |
|
| 179 | + ); |
|
| 180 | + break; |
|
| 181 | + case 'createcoursecategory': |
|
| 182 | + $courses_controller->categories_list($action); |
|
| 183 | + break; |
|
| 184 | + case 'deletecoursecategory': |
|
| 185 | + $courses_controller->courses_list($action); |
|
| 186 | + break; |
|
| 187 | + case 'sortmycourses': |
|
| 188 | + $courses_controller->courses_list($action); |
|
| 189 | + break; |
|
| 190 | + case 'subscribe': |
|
| 191 | + if (!$user_can_view_page) { |
|
| 192 | + api_not_allowed(true); |
|
| 193 | + } |
|
| 194 | + |
|
| 195 | + if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) { |
|
| 196 | + $courses_controller->courses_categories( |
|
| 197 | + $action, |
|
| 198 | + $categoryCode, |
|
| 199 | + null, |
|
| 200 | + null, |
|
| 201 | + null, |
|
| 202 | + $limit |
|
| 203 | + ); |
|
| 204 | + } else { |
|
| 205 | + header('Location: ' . api_get_self()); |
|
| 206 | + } |
|
| 207 | + break; |
|
| 208 | + case 'display_random_courses': |
|
| 209 | + if (!$user_can_view_page) { |
|
| 210 | + api_not_allowed(true); |
|
| 211 | + } |
|
| 212 | + |
|
| 213 | + $courses_controller->courses_categories($action); |
|
| 214 | + break; |
|
| 215 | + case 'display_courses': |
|
| 216 | + if (!$user_can_view_page) { |
|
| 217 | + api_not_allowed(true); |
|
| 218 | + } |
|
| 219 | + |
|
| 196 | 220 | $courses_controller->courses_categories( |
| 197 | 221 | $action, |
| 198 | 222 | $categoryCode, |
@@ -201,126 +225,102 @@ discard block |
||
| 201 | 225 | null, |
| 202 | 226 | $limit |
| 203 | 227 | ); |
| 204 | - } else { |
|
| 205 | - header('Location: ' . api_get_self()); |
|
| 206 | - } |
|
| 207 | - break; |
|
| 208 | - case 'display_random_courses': |
|
| 209 | - if (!$user_can_view_page) { |
|
| 210 | - api_not_allowed(true); |
|
| 211 | - } |
|
| 212 | - |
|
| 213 | - $courses_controller->courses_categories($action); |
|
| 214 | - break; |
|
| 215 | - case 'display_courses': |
|
| 216 | - if (!$user_can_view_page) { |
|
| 217 | - api_not_allowed(true); |
|
| 218 | - } |
|
| 219 | - |
|
| 220 | - $courses_controller->courses_categories( |
|
| 221 | - $action, |
|
| 222 | - $categoryCode, |
|
| 223 | - null, |
|
| 224 | - null, |
|
| 225 | - null, |
|
| 226 | - $limit |
|
| 227 | - ); |
|
| 228 | - break; |
|
| 229 | - case 'display_sessions': |
|
| 230 | - if (!$user_can_view_page) { |
|
| 231 | - api_not_allowed(true); |
|
| 232 | - } |
|
| 233 | - |
|
| 234 | - $courses_controller->sessionsList($action, $nameTools, $limit); |
|
| 235 | - break; |
|
| 236 | - case 'subscribe_to_session': |
|
| 237 | - if (!$user_can_view_page) { |
|
| 238 | - api_not_allowed(true); |
|
| 239 | - } |
|
| 240 | - |
|
| 241 | - $userId = api_get_user_id(); |
|
| 242 | - $confirmed = isset($_GET['confirm']); |
|
| 243 | - $sessionId = intval($_GET['session_id']); |
|
| 244 | - |
|
| 245 | - if (empty($userId)) { |
|
| 246 | - api_not_allowed(); |
|
| 247 | - exit; |
|
| 248 | - } |
|
| 249 | - |
|
| 250 | - if (!$confirmed) { |
|
| 251 | - $template = new Template(null, false, false, false, false, false); |
|
| 252 | - $template->assign('session_id', $sessionId); |
|
| 253 | - |
|
| 254 | - $layout = $template->get_template('auth/confirm_session_subscription.tpl'); |
|
| 255 | - |
|
| 256 | - echo $template->fetch($layout); |
|
| 257 | - exit; |
|
| 258 | - } |
|
| 259 | - |
|
| 260 | - $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription'); |
|
| 261 | - if ($registrationAllowed === 'true') { |
|
| 262 | - $entityManager = Database::getManager(); |
|
| 263 | - $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource'); |
|
| 264 | - |
|
| 265 | - $sequences = $repository->getRequirements( |
|
| 266 | - $sessionId, |
|
| 267 | - SequenceResource::SESSION_TYPE |
|
| 268 | - ); |
|
| 228 | + break; |
|
| 229 | + case 'display_sessions': |
|
| 230 | + if (!$user_can_view_page) { |
|
| 231 | + api_not_allowed(true); |
|
| 232 | + } |
|
| 233 | + |
|
| 234 | + $courses_controller->sessionsList($action, $nameTools, $limit); |
|
| 235 | + break; |
|
| 236 | + case 'subscribe_to_session': |
|
| 237 | + if (!$user_can_view_page) { |
|
| 238 | + api_not_allowed(true); |
|
| 239 | + } |
|
| 269 | 240 | |
| 270 | - if (count($sequences) > 0) { |
|
| 271 | - $requirementsData = SequenceResourceManager::checkRequirementsForUser( |
|
| 272 | - $sequences, |
|
| 273 | - SequenceResource::SESSION_TYPE, |
|
| 274 | - $userId |
|
| 241 | + $userId = api_get_user_id(); |
|
| 242 | + $confirmed = isset($_GET['confirm']); |
|
| 243 | + $sessionId = intval($_GET['session_id']); |
|
| 244 | + |
|
| 245 | + if (empty($userId)) { |
|
| 246 | + api_not_allowed(); |
|
| 247 | + exit; |
|
| 248 | + } |
|
| 249 | + |
|
| 250 | + if (!$confirmed) { |
|
| 251 | + $template = new Template(null, false, false, false, false, false); |
|
| 252 | + $template->assign('session_id', $sessionId); |
|
| 253 | + |
|
| 254 | + $layout = $template->get_template('auth/confirm_session_subscription.tpl'); |
|
| 255 | + |
|
| 256 | + echo $template->fetch($layout); |
|
| 257 | + exit; |
|
| 258 | + } |
|
| 259 | + |
|
| 260 | + $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription'); |
|
| 261 | + if ($registrationAllowed === 'true') { |
|
| 262 | + $entityManager = Database::getManager(); |
|
| 263 | + $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource'); |
|
| 264 | + |
|
| 265 | + $sequences = $repository->getRequirements( |
|
| 266 | + $sessionId, |
|
| 267 | + SequenceResource::SESSION_TYPE |
|
| 275 | 268 | ); |
| 276 | 269 | |
| 277 | - $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData); |
|
| 270 | + if (count($sequences) > 0) { |
|
| 271 | + $requirementsData = SequenceResourceManager::checkRequirementsForUser( |
|
| 272 | + $sequences, |
|
| 273 | + SequenceResource::SESSION_TYPE, |
|
| 274 | + $userId |
|
| 275 | + ); |
|
| 276 | + |
|
| 277 | + $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData); |
|
| 278 | 278 | |
| 279 | - if (!$continueWithSubscription) { |
|
| 280 | - header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/courses.php'); |
|
| 281 | - exit; |
|
| 279 | + if (!$continueWithSubscription) { |
|
| 280 | + header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/courses.php'); |
|
| 281 | + exit; |
|
| 282 | + } |
|
| 282 | 283 | } |
| 283 | - } |
|
| 284 | 284 | |
| 285 | - SessionManager::suscribe_users_to_session( |
|
| 286 | - $_GET['session_id'], |
|
| 287 | - array($userId), |
|
| 288 | - SESSION_VISIBLE_READ_ONLY, |
|
| 289 | - false |
|
| 290 | - ); |
|
| 285 | + SessionManager::suscribe_users_to_session( |
|
| 286 | + $_GET['session_id'], |
|
| 287 | + array($userId), |
|
| 288 | + SESSION_VISIBLE_READ_ONLY, |
|
| 289 | + false |
|
| 290 | + ); |
|
| 291 | 291 | |
| 292 | - $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']); |
|
| 293 | - $count = count($coursesList); |
|
| 294 | - $url = ''; |
|
| 295 | - |
|
| 296 | - if ($count <= 0) { |
|
| 297 | - // no course in session -> return to catalog |
|
| 298 | - $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php'; |
|
| 299 | - } elseif ($count == 1) { |
|
| 300 | - // only one course, so redirect directly to this course |
|
| 301 | - foreach ($coursesList as $course) { |
|
| 302 | - $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']); |
|
| 292 | + $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']); |
|
| 293 | + $count = count($coursesList); |
|
| 294 | + $url = ''; |
|
| 295 | + |
|
| 296 | + if ($count <= 0) { |
|
| 297 | + // no course in session -> return to catalog |
|
| 298 | + $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php'; |
|
| 299 | + } elseif ($count == 1) { |
|
| 300 | + // only one course, so redirect directly to this course |
|
| 301 | + foreach ($coursesList as $course) { |
|
| 302 | + $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']); |
|
| 303 | + } |
|
| 304 | + } else { |
|
| 305 | + $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']); |
|
| 303 | 306 | } |
| 304 | - } else { |
|
| 305 | - $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']); |
|
| 307 | + header('Location: ' . $url); |
|
| 308 | + exit; |
|
| 306 | 309 | } |
| 307 | - header('Location: ' . $url); |
|
| 308 | - exit; |
|
| 309 | - } |
|
| 310 | - //else show error message? |
|
| 311 | - break; |
|
| 312 | - case 'search_tag': |
|
| 313 | - if (!$user_can_view_page) { |
|
| 314 | - api_not_allowed(true); |
|
| 315 | - } |
|
| 316 | - |
|
| 317 | - $courses_controller->sessionsListByCoursesTag($limit); |
|
| 318 | - break; |
|
| 319 | - case 'search_session': |
|
| 320 | - if (!$user_can_view_page) { |
|
| 321 | - api_not_allowed(true); |
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - $courses_controller->sessionListBySearch($limit); |
|
| 325 | - break; |
|
| 310 | + //else show error message? |
|
| 311 | + break; |
|
| 312 | + case 'search_tag': |
|
| 313 | + if (!$user_can_view_page) { |
|
| 314 | + api_not_allowed(true); |
|
| 315 | + } |
|
| 316 | + |
|
| 317 | + $courses_controller->sessionsListByCoursesTag($limit); |
|
| 318 | + break; |
|
| 319 | + case 'search_session': |
|
| 320 | + if (!$user_can_view_page) { |
|
| 321 | + api_not_allowed(true); |
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + $courses_controller->sessionListBySearch($limit); |
|
| 325 | + break; |
|
| 326 | 326 | } |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | |
| 42 | 42 | $msg .= '<div class="well_login">'; |
| 43 | 43 | $msg .= $form->return_form(); |
| 44 | - $msg .='</div>'; |
|
| 44 | + $msg .= '</div>'; |
|
| 45 | 45 | if (api_is_cas_activated()) {
|
| 46 | 46 | $msg .= "</div>"; |
| 47 | 47 | } |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | $url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php'; |
| 6 | 6 | |
| 7 | 7 | if (! isset($_SESSION['conditional_login']['uid'])) |
| 8 | - die("Not Authorised"); |
|
| 8 | + die("Not Authorised"); |
|
| 9 | 9 | ?> |
| 10 | 10 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 11 | 11 | <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml"> |
@@ -2,9 +2,9 @@ discard block |
||
| 2 | 2 | /* For licensing terms, see /license.txt */ |
| 3 | 3 | |
| 4 | 4 | require_once dirname(__FILE__).'/../../inc/global.inc.php'; |
| 5 | -$url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php'; |
|
| 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 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | </body> |
| 21 | 21 | </html> |
| 22 | 22 | <?php |
| 23 | -if (isset($_POST['submit'])){ |
|
| 23 | +if (isset($_POST['submit'])) { |
|
| 24 | 24 | $u = api_get_user_info($_SESSION['conditional_login']['uid']); |
| 25 | 25 | $u['phone'] = $_POST['phone_number']; |
| 26 | 26 | $password = null; // we don't want to change the password |
@@ -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"> |
@@ -54,16 +54,16 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | $course_info = api_get_course_info_by_id($result['c_id']); |
| 56 | 56 | $course_image = '<img src="'.$course_info['course_image_large'].'">'; |
| 57 | - $dates .= '<li><a href="#'.$login.'">' . api_convert_and_format_date($login, DATE_FORMAT_SHORT) . '</a></li>'; |
|
| 57 | + $dates .= '<li><a href="#'.$login.'">'.api_convert_and_format_date($login, DATE_FORMAT_SHORT).'</a></li>'; |
|
| 58 | 58 | $issues .= '<li id ="'.$login.'">'; |
| 59 | 59 | $issues .= '<div class="img-course">'.$course_image.'</div>'; |
| 60 | 60 | |
| 61 | 61 | $issues .= '<div class="text-course">'; |
| 62 | - $issues .= '<p>' . sprintf( |
|
| 62 | + $issues .= '<p>'.sprintf( |
|
| 63 | 63 | get_lang('YouHaveEnteredTheCourseXInY'), |
| 64 | - '" '. $courseInfo['name'] .' "', |
|
| 64 | + '" '.$courseInfo['name'].' "', |
|
| 65 | 65 | api_convert_and_format_date($login, DATE_TIME_FORMAT_LONG) |
| 66 | - ) . '</p>'; |
|
| 66 | + ).'</p>'; |
|
| 67 | 67 | $issues .= '</div>'; |
| 68 | 68 | $issues .= '</li>'; |
| 69 | 69 | $count++; |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | $content .= '<div class="row">'; |
| 83 | 83 | $content .= '<div class="col-md-12">'; |
| 84 | 84 | $content .= '<div id="my_timeline">'; |
| 85 | - $content .= '<ul id="dates">' . $dates . '</ul>'; |
|
| 86 | - $content .= '<ul id="issues">' . $issues . '</ul>'; |
|
| 85 | + $content .= '<ul id="dates">'.$dates.'</ul>'; |
|
| 86 | + $content .= '<ul id="issues">'.$issues.'</ul>'; |
|
| 87 | 87 | $content .= '<div id="grad_left"></div>'; |
| 88 | 88 | $content .= '<div id="grad_right"></div>'; |
| 89 | 89 | $content .= '<a href="#" id="prev"></a>'; |
@@ -32,135 +32,135 @@ |
||
| 32 | 32 | abstract class FacebookSignedRequestFromInputHelper |
| 33 | 33 | { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @var \Facebook\Entities\SignedRequest|null |
|
| 37 | - */ |
|
| 38 | - protected $signedRequest; |
|
| 39 | - |
|
| 40 | - /** |
|
| 41 | - * @var string the app id |
|
| 42 | - */ |
|
| 43 | - protected $appId; |
|
| 44 | - |
|
| 45 | - /** |
|
| 46 | - * @var string the app secret |
|
| 47 | - */ |
|
| 48 | - protected $appSecret; |
|
| 49 | - |
|
| 50 | - /** |
|
| 51 | - * @var string|null Random string to prevent CSRF. |
|
| 52 | - */ |
|
| 53 | - public $state = null; |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * Initialize the helper and process available signed request data. |
|
| 57 | - * |
|
| 58 | - * @param string|null $appId |
|
| 59 | - * @param string|null $appSecret |
|
| 60 | - */ |
|
| 61 | - public function __construct($appId = null, $appSecret = null) |
|
| 62 | - { |
|
| 35 | + /** |
|
| 36 | + * @var \Facebook\Entities\SignedRequest|null |
|
| 37 | + */ |
|
| 38 | + protected $signedRequest; |
|
| 39 | + |
|
| 40 | + /** |
|
| 41 | + * @var string the app id |
|
| 42 | + */ |
|
| 43 | + protected $appId; |
|
| 44 | + |
|
| 45 | + /** |
|
| 46 | + * @var string the app secret |
|
| 47 | + */ |
|
| 48 | + protected $appSecret; |
|
| 49 | + |
|
| 50 | + /** |
|
| 51 | + * @var string|null Random string to prevent CSRF. |
|
| 52 | + */ |
|
| 53 | + public $state = null; |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * Initialize the helper and process available signed request data. |
|
| 57 | + * |
|
| 58 | + * @param string|null $appId |
|
| 59 | + * @param string|null $appSecret |
|
| 60 | + */ |
|
| 61 | + public function __construct($appId = null, $appSecret = null) |
|
| 62 | + { |
|
| 63 | 63 | $this->appId = FacebookSession::_getTargetAppId($appId); |
| 64 | 64 | $this->appSecret = FacebookSession::_getTargetAppSecret($appSecret); |
| 65 | 65 | |
| 66 | 66 | $this->instantiateSignedRequest(); |
| 67 | - } |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * Instantiates a new SignedRequest entity. |
|
| 71 | - * |
|
| 72 | - * @param string|null |
|
| 73 | - */ |
|
| 74 | - public function instantiateSignedRequest($rawSignedRequest = null) |
|
| 75 | - { |
|
| 67 | + } |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * Instantiates a new SignedRequest entity. |
|
| 71 | + * |
|
| 72 | + * @param string|null |
|
| 73 | + */ |
|
| 74 | + public function instantiateSignedRequest($rawSignedRequest = null) |
|
| 75 | + { |
|
| 76 | 76 | $rawSignedRequest = $rawSignedRequest ?: $this->getRawSignedRequest(); |
| 77 | 77 | |
| 78 | 78 | if (!$rawSignedRequest) { |
| 79 | - return; |
|
| 79 | + return; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | $this->signedRequest = new SignedRequest($rawSignedRequest, $this->state, $this->appSecret); |
| 83 | - } |
|
| 84 | - |
|
| 85 | - /** |
|
| 86 | - * Instantiates a FacebookSession from the signed request from input. |
|
| 87 | - * |
|
| 88 | - * @return FacebookSession|null |
|
| 89 | - */ |
|
| 90 | - public function getSession() |
|
| 91 | - { |
|
| 83 | + } |
|
| 84 | + |
|
| 85 | + /** |
|
| 86 | + * Instantiates a FacebookSession from the signed request from input. |
|
| 87 | + * |
|
| 88 | + * @return FacebookSession|null |
|
| 89 | + */ |
|
| 90 | + public function getSession() |
|
| 91 | + { |
|
| 92 | 92 | if ($this->signedRequest && $this->signedRequest->hasOAuthData()) { |
| 93 | - return FacebookSession::newSessionFromSignedRequest($this->signedRequest); |
|
| 93 | + return FacebookSession::newSessionFromSignedRequest($this->signedRequest); |
|
| 94 | 94 | } |
| 95 | 95 | return null; |
| 96 | - } |
|
| 97 | - |
|
| 98 | - /** |
|
| 99 | - * Returns the SignedRequest entity. |
|
| 100 | - * |
|
| 101 | - * @return \Facebook\Entities\SignedRequest|null |
|
| 102 | - */ |
|
| 103 | - public function getSignedRequest() |
|
| 104 | - { |
|
| 96 | + } |
|
| 97 | + |
|
| 98 | + /** |
|
| 99 | + * Returns the SignedRequest entity. |
|
| 100 | + * |
|
| 101 | + * @return \Facebook\Entities\SignedRequest|null |
|
| 102 | + */ |
|
| 103 | + public function getSignedRequest() |
|
| 104 | + { |
|
| 105 | 105 | return $this->signedRequest; |
| 106 | - } |
|
| 107 | - |
|
| 108 | - /** |
|
| 109 | - * Returns the user_id if available. |
|
| 110 | - * |
|
| 111 | - * @return string|null |
|
| 112 | - */ |
|
| 113 | - public function getUserId() |
|
| 114 | - { |
|
| 106 | + } |
|
| 107 | + |
|
| 108 | + /** |
|
| 109 | + * Returns the user_id if available. |
|
| 110 | + * |
|
| 111 | + * @return string|null |
|
| 112 | + */ |
|
| 113 | + public function getUserId() |
|
| 114 | + { |
|
| 115 | 115 | return $this->signedRequest ? $this->signedRequest->getUserId() : null; |
| 116 | - } |
|
| 117 | - |
|
| 118 | - /** |
|
| 119 | - * Get raw signed request from input. |
|
| 120 | - * |
|
| 121 | - * @return string|null |
|
| 122 | - */ |
|
| 123 | - abstract public function getRawSignedRequest(); |
|
| 124 | - |
|
| 125 | - /** |
|
| 126 | - * Get raw signed request from GET input. |
|
| 127 | - * |
|
| 128 | - * @return string|null |
|
| 129 | - */ |
|
| 130 | - public function getRawSignedRequestFromGet() |
|
| 131 | - { |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + /** |
|
| 119 | + * Get raw signed request from input. |
|
| 120 | + * |
|
| 121 | + * @return string|null |
|
| 122 | + */ |
|
| 123 | + abstract public function getRawSignedRequest(); |
|
| 124 | + |
|
| 125 | + /** |
|
| 126 | + * Get raw signed request from GET input. |
|
| 127 | + * |
|
| 128 | + * @return string|null |
|
| 129 | + */ |
|
| 130 | + public function getRawSignedRequestFromGet() |
|
| 131 | + { |
|
| 132 | 132 | if (isset($_GET['signed_request'])) { |
| 133 | - return $_GET['signed_request']; |
|
| 133 | + return $_GET['signed_request']; |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | return null; |
| 137 | - } |
|
| 138 | - |
|
| 139 | - /** |
|
| 140 | - * Get raw signed request from POST input. |
|
| 141 | - * |
|
| 142 | - * @return string|null |
|
| 143 | - */ |
|
| 144 | - public function getRawSignedRequestFromPost() |
|
| 145 | - { |
|
| 137 | + } |
|
| 138 | + |
|
| 139 | + /** |
|
| 140 | + * Get raw signed request from POST input. |
|
| 141 | + * |
|
| 142 | + * @return string|null |
|
| 143 | + */ |
|
| 144 | + public function getRawSignedRequestFromPost() |
|
| 145 | + { |
|
| 146 | 146 | if (isset($_POST['signed_request'])) { |
| 147 | - return $_POST['signed_request']; |
|
| 147 | + return $_POST['signed_request']; |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | return null; |
| 151 | - } |
|
| 152 | - |
|
| 153 | - /** |
|
| 154 | - * Get raw signed request from cookie set from the Javascript SDK. |
|
| 155 | - * |
|
| 156 | - * @return string|null |
|
| 157 | - */ |
|
| 158 | - public function getRawSignedRequestFromCookie() |
|
| 159 | - { |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + /** |
|
| 154 | + * Get raw signed request from cookie set from the Javascript SDK. |
|
| 155 | + * |
|
| 156 | + * @return string|null |
|
| 157 | + */ |
|
| 158 | + public function getRawSignedRequestFromCookie() |
|
| 159 | + { |
|
| 160 | 160 | if (isset($_COOKIE['fbsr_' . $this->appId])) { |
| 161 | - return $_COOKIE['fbsr_' . $this->appId]; |
|
| 161 | + return $_COOKIE['fbsr_' . $this->appId]; |
|
| 162 | 162 | } |
| 163 | 163 | return null; |
| 164 | - } |
|
| 164 | + } |
|
| 165 | 165 | |
| 166 | 166 | } |
@@ -157,8 +157,8 @@ |
||
| 157 | 157 | */ |
| 158 | 158 | public function getRawSignedRequestFromCookie() |
| 159 | 159 | { |
| 160 | - if (isset($_COOKIE['fbsr_' . $this->appId])) { |
|
| 161 | - return $_COOKIE['fbsr_' . $this->appId]; |
|
| 160 | + if (isset($_COOKIE['fbsr_'.$this->appId])) { |
|
| 161 | + return $_COOKIE['fbsr_'.$this->appId]; |
|
| 162 | 162 | } |
| 163 | 163 | return null; |
| 164 | 164 | } |