makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14285] Move deprecated functions to functions_compatibility.php

Browse source 
PHPBB3-14285
This commit is contained in:
rubencm 2019-06-22 04:56:02 +00:00
parent e6c6d01e0a
commit 925502a92f
2 changed files with 83 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
phpBB/includes/functions_compatibility.php
View file

@ -894,17 +894,14 @@ function parse_cfg_file($filename, $lines = false)
{ {
$parsed_items = array(); $parsed_items = array();
if ($lines === false) if ($lines === false) {
{
$lines = file($filename); $lines = file($filename);
} }
foreach ($lines as $line) foreach ($lines as $line) {
{
$line = trim($line); $line = trim($line);
if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false) if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false) {
{
continue; continue;
} }
@ -912,34 +909,97 @@ function parse_cfg_file($filename, $lines = false)
$key = htmlspecialchars(strtolower(trim(substr($line, 0, $delim_pos))), ENT_COMPAT); $key = htmlspecialchars(strtolower(trim(substr($line, 0, $delim_pos))), ENT_COMPAT);
$value = trim(substr($line, $delim_pos + 1)); $value = trim(substr($line, $delim_pos + 1));
if (in_array($value, array('off', 'false', '0'))) if (in_array($value, array('off', 'false', '0'))) {
{
$value = false; $value = false;
} } else if (in_array($value, array('on', 'true', '1'))) {
else if (in_array($value, array('on', 'true', '1')))
{
$value = true; $value = true;
} } else if (!trim($value)) {
else if (!trim($value))
{
$value = ''; $value = '';
} } else if (($value[0] == "'" && $value[strlen($value) - 1] == "'") || ($value[0] == '"' && $value[strlen($value) - 1] == '"')) {
else if (($value[0] == "'" && $value[strlen($value) - 1] == "'") || ($value[0] == '"' && $value[strlen($value) - 1] == '"')) $value = htmlspecialchars(substr($value, 1, strlen($value) - 2), ENT_COMPAT);
{ } else {
$value = htmlspecialchars(substr($value, 1, strlen($value)-2), ENT_COMPAT);
}
else
{
$value = htmlspecialchars($value, ENT_COMPAT); $value = htmlspecialchars($value, ENT_COMPAT);
} }
$parsed_items[$key] = $value; $parsed_items[$key] = $value;
} }
if (isset($parsed_items['parent']) && isset($parsed_items['name']) && $parsed_items['parent'] == $parsed_items['name']) if (isset($parsed_items['parent']) && isset($parsed_items['name']) && $parsed_items['parent'] == $parsed_items['name']) {
{
unset($parsed_items['parent']); unset($parsed_items['parent']);
} }
return $parsed_items; return $parsed_items;
} }
/**
* Wraps an url into a simple html page. Used to display attachments in IE.
* this is a workaround for now; might be moved to template system later
* direct any complaints to 1 Microsoft Way, Redmond
*
* @deprecated: 3.3.0-dev (To be removed: 4.0.0)
*/
function wrap_img_in_html($src, $title)
{
echo '<!DOCTYPE html>';
echo '<html>';
echo '<head>';
echo '<meta charset="utf-8">';
echo '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
echo '<title>' . $title . '</title>';
echo '</head>';
echo '<body>';
echo '<div>';
echo '<img src="' . $src . '" alt="' . $title . '" />';
echo '</div>';
echo '</body>';
echo '</html>';
}
/**
* Garbage Collection
*
* @param bool $exit Whether to die or not.
*
* @return null
*
* @deprecated: 3.3.0-dev (To be removed: 4.0.0)
*/
function file_gc($exit = true)
{
global $cache, $db;
if (!empty($cache))
{
$cache->unload();
}
$db->sql_close();
if ($exit)
{
exit;
}
}
/**
* Check if the browser is internet explorer version 7+
*
* @param string $user_agent User agent HTTP header
* @param int $version IE version to check against
*
* @return bool true if internet explorer version is greater than $version
*
* @deprecated: 3.3.0-dev (To be removed: 4.0.0)
*/
function phpbb_is_greater_ie_version($user_agent, $version)
{
if (preg_match('/msie (\d+)/', strtolower($user_agent), $matches))
{
$ie_version = (int) $matches[1];
return ($ie_version > $version);
}
else
{
return false;
}
}

93
phpBB/includes/functions_download.php
View file

@ -1,93 +0,0 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Wraps an url into a simple html page. Used to display attachments in IE.
* this is a workaround for now; might be moved to template system later
* direct any complaints to 1 Microsoft Way, Redmond
*
* @deprecated: 3.3.0-dev (To be removed: 4.0.0)
*/
function wrap_img_in_html($src, $title)
{
echo '<!DOCTYPE html>';
echo '<html>';
echo '<head>';
echo '<meta charset="utf-8">';
echo '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
echo '<title>' . $title . '</title>';
echo '</head>';
echo '<body>';
echo '<div>';
echo '<img src="' . $src . '" alt="' . $title . '" />';
echo '</div>';
echo '</body>';
echo '</html>';
}
/**
* Garbage Collection
*
* @param bool $exit Whether to die or not.
*
* @return null
*
* @deprecated: 3.3.0-dev (To be removed: 4.0.0)
*/
function file_gc($exit = true)
{
global $cache, $db;
if (!empty($cache))
{
$cache->unload();
}
$db->sql_close();
if ($exit)
{
exit;
}
}
/**
* Check if the browser is internet explorer version 7+
*
* @param string $user_agent User agent HTTP header
* @param int $version IE version to check against
*
* @return bool true if internet explorer version is greater than $version
*
* @deprecated: 3.3.0-dev (To be removed: 4.0.0)
*/
function phpbb_is_greater_ie_version($user_agent, $version)
{
if (preg_match('/msie (\d+)/', strtolower($user_agent), $matches))
{
$ie_version = (int) $matches[1];
return ($ie_version > $version);
}
else
{
return false;
}
}