Minor - Update from 1.11.x

pull/3282/head
Julio Montoya 5 years ago
parent f178cdcb87
commit f93a4252b6
  1. 1403
      public/main/inc/lib/CoursesAndSessionsCatalog.class.php
  2. 1
      public/main/inc/lib/message.lib.php
  3. 3
      public/main/inc/lib/webservices/RestResponse.php
  4. 1
      public/main/inc/lib/webservices/WebService.class.php
  5. 17
      public/main/inc/lib/xajax/xajax.inc.php

File diff suppressed because it is too large Load Diff

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Message; use Chamilo\CoreBundle\Entity\Message;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
@ -10,10 +11,12 @@ class RestResponse
* @var bool * @var bool
*/ */
private $error; private $error;
/** /**
* @var string * @var string
*/ */
private $errorMessage; private $errorMessage;
/** /**
* @var array * @var array
*/ */

@ -14,6 +14,7 @@ class WebService
* @var User * @var User
*/ */
protected $user; protected $user;
/** /**
* @var string * @var string
*/ */

@ -606,11 +606,6 @@ class xajax
{ {
for ($i = 0; $i < sizeof($aArgs); $i++) for ($i = 0; $i < sizeof($aArgs); $i++)
{ {
// If magic quotes is on, then we need to strip the slashes from the args
if (get_magic_quotes_gpc() == 1 && is_string($aArgs[$i])) {
$aArgs[$i] = stripslashes($aArgs[$i]);
}
if (stristr($aArgs[$i],"<xjxobj>") != false) if (stristr($aArgs[$i],"<xjxobj>") != false)
{ {
$aArgs[$i] = $this->_xmlToArray("xjxobj",$aArgs[$i]); $aArgs[$i] = $this->_xmlToArray("xjxobj",$aArgs[$i]);
@ -1073,18 +1068,6 @@ class xajax
$aArray[$key] = $this->_decodeUTF8Data($value); $aArray[$key] = $this->_decodeUTF8Data($value);
} }
} }
// If magic quotes is on, then we need to strip the slashes from the
// array values because of the parse_str pass which adds slashes
if (get_magic_quotes_gpc() == 1) {
$newArray = array();
foreach ($aArray as $sKey => $sValue) {
if (is_string($sValue))
$newArray[$sKey] = stripslashes($sValue);
else
$newArray[$sKey] = $sValue;
}
$aArray = $newArray;
}
} }
return $aArray; return $aArray;

Loading…
Cancel
Save