Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1042 → Rev 1043

/trunk/plugins/viathinksoft/adminPages/400_oidinfo_export/oidinfo_api.inc.php
3,7 → 3,7
/*
* OID-Info.com API for PHP
* Copyright 2019-2022 Daniel Marschall, ViaThinkSoft
* Version 2022-03-24
* Version 2022-12-09
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
574,13 → 574,13
}
// End request by O.D. 26. August 2019
 
if ($params['auto_extract_name'] || $params['auto_extract_url']) {
if (($params['auto_extract_name'] != '') || ($params['auto_extract_url'] != '')) {
if (!empty($elements['information'])) $elements['information'] .= '<br /><br />';
if ($params['auto_extract_name'] || $params['auto_extract_url']) {
if (($params['auto_extract_name'] != '') || ($params['auto_extract_url'] != '')) {
$elements['information'] .= 'Automatically extracted from <a href="'.$params['auto_extract_url'].'">'.$params['auto_extract_name'].'</a>.';
} else if ($params['auto_extract_name']) {
} else if ($params['auto_extract_name'] != '') {
$elements['information'] .= 'Automatically extracted from '.$params['auto_extract_name'];
} else if ($params['auto_extract_url']) {
} else if ($params['auto_extract_url'] != '') {
$hr_url = $params['auto_extract_url'];
// $hr_url = preg_replace('@^https{0,1}://@ismU', '', $hr_url);
$hr_url = preg_replace('@^http://@ismU', '', $hr_url);
/trunk/vendor/symfony/polyfill-mbstring/Mbstring.php
79,9 → 79,7
 
public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
{
// Daniel Marschall Hotfix 09 Dec 2022 to support PHP 8.2
//if (\is_array($fromEncoding) || false !== strpos($fromEncoding, ',')) {
if (!is_null($fromEncoding) && ((\is_array($fromEncoding) || false !== strpos($fromEncoding, ',')))) {
if (\is_array($fromEncoding) || false !== strpos($fromEncoding, ',')) {
$fromEncoding = self::mb_detect_encoding($s, $fromEncoding);
} else {
$fromEncoding = self::getEncoding($fromEncoding);