chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature #272 - A specific statement has been made to process https addresses too.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent e42f24dfac
commit 65b4d27349
5 changed files with 21 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      index.php
  2. 7
      main/admin/configure_homepage.php
  3. 5
      main/admin/configure_inscription.php
  4. 13
      main/auth/inscription.php
  5. 5
      main/inc/banner.inc.php

7
index.php
Unescape View File

@ -192,12 +192,13 @@ if ($_configuration['multiple_access_urls']) {
if ($access_url_id != -1){ if ($access_url_id != -1){
$url_info = api_get_access_url($access_url_id); $url_info = api_get_access_url($access_url_id);
// "http://" and the final "/" replaced // "http://" and the final "/" replaced
$url = substr($url_info['url'], 7, strlen($url_info['url']) - 8); //$url = substr($url_info['url'], 7, strlen($url_info['url']) - 8);
$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
$clean_url = replace_dangerous_char($url); $clean_url = replace_dangerous_char($url);
$clean_url = str_replace('/', '-', $clean_url); $clean_url = str_replace('/', '-', $clean_url);
$clean_url = $clean_url.'/'; $clean_url .= '/';
$home_old = 'home/'; $home_old = 'home/';
$home= 'home/'.$clean_url; $home = 'home/'.$clean_url;
} }
} }

7
main/admin/configure_homepage.php
Unescape View File

@ -28,7 +28,7 @@ $language_file = array ('admin', 'accessibility');
$cidReset=true; $cidReset=true;
include('../inc/global.inc.php'); require '../inc/global.inc.php';
$this_section=SECTION_PLATFORM_ADMIN; $this_section=SECTION_PLATFORM_ADMIN;
$_SESSION['this_section']=$this_section; $_SESSION['this_section']=$this_section;
@ -107,10 +107,11 @@ if ($_configuration['multiple_access_urls']==true) {
if ($access_url_id != -1){ if ($access_url_id != -1){
$url_info = api_get_access_url($access_url_id); $url_info = api_get_access_url($access_url_id);
// "http://" and the final "/" replaced // "http://" and the final "/" replaced
$url = substr($url_info['url'],7,strlen($url_info['url'])-8); //$url = substr($url_info['url'],7,strlen($url_info['url'])-8);
$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
$clean_url = replace_dangerous_char($url); $clean_url = replace_dangerous_char($url);
$clean_url = str_replace('/','-',$clean_url); $clean_url = str_replace('/','-',$clean_url);
$clean_url = $clean_url.'/'; $clean_url .= '/';
$homep = '../../home/'; //homep for Home Path $homep = '../../home/'; //homep for Home Path
$homep_new = '../../home/'.$clean_url; //homep for Home Path added the url $homep_new = '../../home/'.$clean_url; //homep for Home Path added the url

5
main/admin/configure_inscription.php
Unescape View File

@ -78,10 +78,11 @@ if ($_configuration['multiple_access_urls']==true) {
if ($access_url_id != -1){ if ($access_url_id != -1){
$url_info = api_get_access_url($access_url_id); $url_info = api_get_access_url($access_url_id);
// "http://" and the final "/" replaced // "http://" and the final "/" replaced
$url = substr($url_info['url'],7,strlen($url_info['url'])-8); //$url = substr($url_info['url'],7,strlen($url_info['url'])-8);
$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
$clean_url = replace_dangerous_char($url); $clean_url = replace_dangerous_char($url);
$clean_url = str_replace('/','-',$clean_url); $clean_url = str_replace('/','-',$clean_url);
$clean_url = $clean_url.'/'; $clean_url .= '/';
$homep = '../../home/'; //homep for Home Path $homep = '../../home/'; //homep for Home Path
$homep_new = '../../home/'.$clean_url; //homep for Home Path added the url $homep_new = '../../home/'.$clean_url; //homep for Home Path added the url

13
main/auth/inscription.php
Unescape View File

@ -69,10 +69,11 @@ if ($_configuration['multiple_access_urls']==true) {
if ($access_url_id != -1){ if ($access_url_id != -1){
$url_info = api_get_access_url($access_url_id); $url_info = api_get_access_url($access_url_id);
// "http://" and the final "/" replaced // "http://" and the final "/" replaced
$url = substr($url_info['url'],7,strlen($url_info['url'])-8); //$url = substr($url_info['url'],7,strlen($url_info['url'])-8);
$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
$clean_url = replace_dangerous_char($url); $clean_url = replace_dangerous_char($url);
$clean_url = str_replace('/','-',$clean_url); $clean_url = str_replace('/','-',$clean_url);
$clean_url = $clean_url.'/'; $clean_url .= '/';
$home_old = '../../home/'; $home_old = '../../home/';
$home= '../../home/'.$clean_url; $home= '../../home/'.$clean_url;
} }
@ -572,12 +573,12 @@ if ($form->validate()) {
$action_url = "../create_course/add_course.php"; $action_url = "../create_course/add_course.php";
$button_text = get_lang('CourseCreate'); $button_text = get_lang('CourseCreate');
} else { } else {
if (api_get_setting('allow_students_to_browse_courses') == 'true') if (api_get_setting('allow_students_to_browse_courses') == 'true')
$action_url = "courses.php?action=subscribe"; $action_url = "courses.php?action=subscribe";
else else
$action_url = api_get_path(WEB_PATH).'user_portal.php'; $action_url = api_get_path(WEB_PATH).'user_portal.php';
echo "<p>", get_lang('NowGoChooseYourCourses'), ".</p>\n"; echo "<p>", get_lang('NowGoChooseYourCourses'), ".</p>\n";
$button_text = get_lang('Next'); $button_text = get_lang('Next');
} }
// ?uidReset=true&uidReq=$_user['user_id'] // ?uidReset=true&uidReq=$_user['user_id']

5
main/inc/banner.inc.php
Unescape View File

@ -288,10 +288,11 @@ if ($_configuration['multiple_access_urls']==true) {
$access_url_id = api_get_current_access_url_id(); $access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){ if ($access_url_id != -1){
$url_info = api_get_access_url($access_url_id); $url_info = api_get_access_url($access_url_id);
$url = substr($url_info['url'],7,strlen($url_info['url'])-8); //$url = substr($url_info['url'],7,strlen($url_info['url'])-8);
$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
$clean_url = replace_dangerous_char($url); $clean_url = replace_dangerous_char($url);
$clean_url = str_replace('/','-',$clean_url); $clean_url = str_replace('/','-',$clean_url);
$clean_url = $clean_url.'/'; $clean_url .= '/';
$homep = '../../home/'; //homep for Home Path $homep = '../../home/'; //homep for Home Path
$homep_new = '../../home/'.$clean_url; //homep for Home Path added the url $homep_new = '../../home/'.$clean_url; //homep for Home Path added the url
$new_url_dir = api_get_path(SYS_PATH).'home/'.$clean_url; $new_url_dir = api_get_path(SYS_PATH).'home/'.$clean_url;

Write Preview
Loading…
Cancel
Save