Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into nuevo

1.9.x
Julio Montoya 12 years ago
commit 621a9ad1a6
  1. 3
      main/inc/lib/main_api.lib.php
  2. 2
      main/webservices/testip.php
  3. 2
      main/webservices/webservice.php

@ -2256,6 +2256,9 @@ function api_is_allowed_to_create_course() {
* @return boolean True if current user is a course administrator
*/
function api_is_course_admin() {
if (api_is_platform_admin()) {
return true;
}
return $_SESSION['is_courseAdmin'];
}

@ -5,7 +5,7 @@
*/
$ip = trim($_SERVER['REMOTE_ADDR']);
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
$ip = trim($ip1);
}
echo htmlentities($ip);

@ -112,7 +112,7 @@ class WS {
// if we are behind a reverse proxy, assume it will send the
// HTTP_X_FORWARDED_FOR header and use this IP instead
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
$ip = trim($ip1);
}
$security_key = $ip.$this->_configuration['security_key'];

Loading…
Cancel
Save