mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

PHP7 fixes

Browse Source
This commit is contained in:
Cameron
2019-01-18 14:07:59 -08:00
parent 221f12088b
commit 27d12c0ab6
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_handlers/xml_class.php
View File

@@ -452,7 +452,7 @@ class xmlClass
* *
* @param string $xml [optional] * @param string $xml [optional]
* @param boolean $simple [optional] false - use xml2array(), true - use xml_convert_to_array() * @param boolean $simple [optional] false - use xml2array(), true - use xml_convert_to_array()
* @return string * @return array|string
*/ */
function parseXml($xmlData = '', $simple = true) function parseXml($xmlData = '', $simple = true)
{ {
@@ -478,7 +478,14 @@ class xmlClass
); );
$xmlData = str_replace(array_keys($extendedTypes), array_values($extendedTypes), $xmlData); $xmlData = str_replace(array_keys($extendedTypes), array_values($extendedTypes), $xmlData);
if(strpos($xmlData,'<html lang=')!==false)
{
$this->errors = "HTML cannot be parsed as XML";
return false;
}
if(!$xml = simplexml_load_string($xmlData, 'SimpleXMLElement', LIBXML_NOCDATA)) if(!$xml = simplexml_load_string($xmlData, 'SimpleXMLElement', LIBXML_NOCDATA))
{ {
$this->errors = $this->getErrors($xmlData); $this->errors = $this->getErrors($xmlData);

12
e107_plugins/linkwords/e_tohtml.php
View File

@@ -200,9 +200,15 @@ class e_tohtml_linkwords
if(is_string($this->area_opts)) if(is_string($this->area_opts))
{ {
$this->area_opts = e107::unserialize($this->area_opts); $this->area_opts = e107::unserialize($this->area_opts);
} }
if (!$this->lw_enabled || !count($this->area_opts) || !array_key_exists($area,$this->area_opts) || !$this->area_opts[$area]) return $text; // No linkwords in disabled areas if($this->area_opts === null)
{
$this->area_opts = array();
}
if (!$this->lw_enabled || empty($this->area_opts) || !array_key_exists($area,$this->area_opts) || !$this->area_opts[$area]) return $text; // No linkwords in disabled areas
// Split up by HTML tags and process the odd bits here // Split up by HTML tags and process the odd bits here
$ptext = ""; $ptext = "";

4
e107_plugins/login_menu/login_menu_shortcodes.php
View File

@@ -92,11 +92,11 @@ e107::getLanguage()->bcDefs($bcDefs);
$mode = varset($parm['mode']); $mode = varset($parm['mode']);
if($mode === 'usersettings' && e_PAGE === 'usersettings.php') if($mode === 'usersettings' && defset('e_PAGE') === 'usersettings.php')
{ {
return 'active'; return 'active';
} }
elseif($mode === 'profile' && e_PAGE === 'user.php') elseif($mode === 'profile' && defset('e_PAGE') === 'user.php')
{ {
return 'active'; return 'active';
} }