mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Merging revisions #r8352, #r8353, #r8354 and #r8355
git-svn-id: file:///svn/phpbb/trunk@8356 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
parent
4b5fab372f
commit
48ed77f046
4 changed files with 190 additions and 172 deletions
|
|
@ -108,11 +108,14 @@
|
|||
<li>[Fix] Fix possible database transaction errors if code returns on error and rollback happened (Bug #17025)</li>
|
||||
<li>[Change] Allow numbers in permission names for modifications, as well as uppercase letters for the request_ part (Bug #20125)</li>
|
||||
<li>[Fix] Use HTTP_HOST in favor of SERVER_NAME for determining server url for redirection and installation (Bug #19955)</li>
|
||||
<li>Removing s_watching_img from watch_topic_forum() function (Bug #20445)</li>
|
||||
<li>Changing order for post review if more than one post affected (Bug #15249)</li>
|
||||
<li>Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479)</li>
|
||||
<li>Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738)</li>
|
||||
<li>Tiny code fixes (Bug #20165, #20025, #19795, #14804)</li>
|
||||
<li>[Fix] Removing s_watching_img from watch_topic_forum() function (Bug #20445)</li>
|
||||
<li>[Fix] Changing order for post review if more than one post affected (Bug #15249)</li>
|
||||
<li>[Fix] Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479)</li>
|
||||
<li>[Fix] Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738)</li>
|
||||
<li>[Fix] Tiny code fixes (Bug #20165, #20025, #19795, #14804)</li>
|
||||
<li>[Fix] Prepend phpbb_root_path to ranks path for displaying ranks (Bug #19075)</li>
|
||||
<li>[Fix] Allow forum notifications if topic notifications are disabled but forum notifications enabled (Bug #14765)</li>
|
||||
<li>[Fix] Fixing realpath issues for provider returning the passed value instead of disabling it. This fixes issues with confirm boxes for those hosted on Network Solutions for example. (Bug #20435)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3>
|
||||
|
|
|
|||
|
|
@ -422,177 +422,175 @@ function _hash_crypt_private($password, $setting, &$itoa64)
|
|||
return $output;
|
||||
}
|
||||
|
||||
if (!function_exists('realpath'))
|
||||
/**
|
||||
* Checks if a path ($path) is absolute or relative
|
||||
*
|
||||
* @param string $path Path to check absoluteness of
|
||||
* @return boolean
|
||||
*/
|
||||
function is_absolute($path)
|
||||
{
|
||||
/**
|
||||
* Checks if a path ($path) is absolute or relative
|
||||
*
|
||||
* @param string $path Path to check absoluteness of
|
||||
* @return boolean
|
||||
*/
|
||||
function is_absolute($path)
|
||||
return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:/#i', $path))) ? true : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @author Chris Smith <chris@project-minerva.org>
|
||||
* @copyright 2006 Project Minerva Team
|
||||
* @param string $path The path which we should attempt to resolve.
|
||||
* @return mixed
|
||||
*/
|
||||
function phpbb_own_realpath($path)
|
||||
{
|
||||
// Now to perform funky shizzle
|
||||
|
||||
// Switch to use UNIX slashes
|
||||
$path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
|
||||
$path_prefix = '';
|
||||
|
||||
// Determine what sort of path we have
|
||||
if (is_absolute($path))
|
||||
{
|
||||
return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:/#i', $path))) ? true : false;
|
||||
}
|
||||
$absolute = true;
|
||||
|
||||
/**
|
||||
* @author Chris Smith <chris@project-minerva.org>
|
||||
* @copyright 2006 Project Minerva Team
|
||||
* @param string $path The path which we should attempt to resolve.
|
||||
* @return mixed
|
||||
*/
|
||||
function phpbb_realpath($path)
|
||||
{
|
||||
// Now to perform funky shizzle
|
||||
|
||||
// Switch to use UNIX slashes
|
||||
$path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
|
||||
$path_prefix = '';
|
||||
|
||||
// Determine what sort of path we have
|
||||
if (is_absolute($path))
|
||||
if ($path[0] == '/')
|
||||
{
|
||||
// Absolute path, *NIX style
|
||||
$path_prefix = '';
|
||||
}
|
||||
else
|
||||
{
|
||||
// Absolute path, Windows style
|
||||
// Remove the drive letter and colon
|
||||
$path_prefix = $path[0] . ':';
|
||||
$path = substr($path, 2);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Relative Path
|
||||
// Prepend the current working directory
|
||||
if (function_exists('getcwd'))
|
||||
{
|
||||
// This is the best method, hopefully it is enabled!
|
||||
$path = str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . '/' . $path;
|
||||
$absolute = true;
|
||||
|
||||
if ($path[0] == '/')
|
||||
if (preg_match('#^[a-z]:#i', $path))
|
||||
{
|
||||
// Absolute path, *NIX style
|
||||
$path_prefix = '';
|
||||
$path_prefix = $path[0] . ':';
|
||||
$path = substr($path, 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Absolute path, Windows style
|
||||
// Remove the drive letter and colon
|
||||
$path_prefix = $path[0] . ':';
|
||||
$path = substr($path, 2);
|
||||
$path_prefix = '';
|
||||
}
|
||||
}
|
||||
else if (isset($_SERVER['SCRIPT_FILENAME']) && !empty($_SERVER['SCRIPT_FILENAME']))
|
||||
{
|
||||
// Warning: If chdir() has been used this will lie!
|
||||
// Warning: This has some problems sometime (CLI can create them easily)
|
||||
$path = str_replace(DIRECTORY_SEPARATOR, '/', dirname($_SERVER['SCRIPT_FILENAME'])) . '/' . $path;
|
||||
$absolute = true;
|
||||
$path_prefix = '';
|
||||
}
|
||||
else
|
||||
{
|
||||
// We have no way of getting the absolute path, just run on using relative ones.
|
||||
$absolute = false;
|
||||
$path_prefix = '.';
|
||||
}
|
||||
}
|
||||
|
||||
// Remove any repeated slashes
|
||||
$path = preg_replace('#/{2,}#', '/', $path);
|
||||
|
||||
// Remove the slashes from the start and end of the path
|
||||
$path = trim($path, '/');
|
||||
|
||||
// Break the string into little bits for us to nibble on
|
||||
$bits = explode('/', $path);
|
||||
|
||||
// Remove any . in the path, renumber array for the loop below
|
||||
$bits = array_values(array_diff($bits, array('.')));
|
||||
|
||||
// Lets get looping, run over and resolve any .. (up directory)
|
||||
for ($i = 0, $max = sizeof($bits); $i < $max; $i++)
|
||||
{
|
||||
// @todo Optimise
|
||||
if ($bits[$i] == '..' )
|
||||
{
|
||||
if (isset($bits[$i - 1]))
|
||||
{
|
||||
if ($bits[$i - 1] != '..')
|
||||
{
|
||||
// We found a .. and we are able to traverse upwards, lets do it!
|
||||
unset($bits[$i]);
|
||||
unset($bits[$i - 1]);
|
||||
$i -= 2;
|
||||
$max -= 2;
|
||||
$bits = array_values($bits);
|
||||
}
|
||||
}
|
||||
else if ($absolute) // ie. !isset($bits[$i - 1]) && $absolute
|
||||
{
|
||||
// We have an absolute path trying to descend above the root of the filesystem
|
||||
// ... Error!
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Prepend the path prefix
|
||||
array_unshift($bits, $path_prefix);
|
||||
|
||||
$resolved = '';
|
||||
|
||||
$max = sizeof($bits) - 1;
|
||||
|
||||
// Check if we are able to resolve symlinks, Windows cannot.
|
||||
$symlink_resolve = (function_exists('readlink')) ? true : false;
|
||||
|
||||
foreach ($bits as $i => $bit)
|
||||
{
|
||||
if (@is_dir("$resolved/$bit") || ($i == $max && @is_file("$resolved/$bit")))
|
||||
{
|
||||
// Path Exists
|
||||
if ($symlink_resolve && is_link("$resolved/$bit") && ($link = readlink("$resolved/$bit")))
|
||||
{
|
||||
// Resolved a symlink.
|
||||
$resolved = $link . (($i == $max) ? '' : '/');
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Relative Path
|
||||
// Prepend the current working directory
|
||||
if (function_exists('getcwd'))
|
||||
{
|
||||
// This is the best method, hopefully it is enabled!
|
||||
$path = str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . '/' . $path;
|
||||
$absolute = true;
|
||||
if (preg_match('#^[a-z]:#i', $path))
|
||||
{
|
||||
$path_prefix = $path[0] . ':';
|
||||
$path = substr($path, 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
$path_prefix = '';
|
||||
}
|
||||
}
|
||||
else if (isset($_SERVER['SCRIPT_FILENAME']) && !empty($_SERVER['SCRIPT_FILENAME']))
|
||||
{
|
||||
// Warning: If chdir() has been used this will lie!
|
||||
// Warning: This has some problems sometime (CLI can create them easily)
|
||||
$path = str_replace(DIRECTORY_SEPARATOR, '/', dirname($_SERVER['SCRIPT_FILENAME'])) . '/' . $path;
|
||||
$absolute = true;
|
||||
$path_prefix = '';
|
||||
}
|
||||
else
|
||||
{
|
||||
// We have no way of getting the absolute path, just run on using relative ones.
|
||||
$absolute = false;
|
||||
$path_prefix = '.';
|
||||
}
|
||||
// Something doesn't exist here!
|
||||
// This is correct realpath() behaviour but sadly open_basedir and safe_mode make this problematic
|
||||
// return false;
|
||||
}
|
||||
|
||||
// Remove any repeated slashes
|
||||
$path = preg_replace('#/{2,}#', '/', $path);
|
||||
|
||||
// Remove the slashes from the start and end of the path
|
||||
$path = trim($path, '/');
|
||||
|
||||
// Break the string into little bits for us to nibble on
|
||||
$bits = explode('/', $path);
|
||||
|
||||
// Remove any . in the path, renumber array for the loop below
|
||||
$bits = array_values(array_diff($bits, array('.')));
|
||||
|
||||
// Lets get looping, run over and resolve any .. (up directory)
|
||||
for ($i = 0, $max = sizeof($bits); $i < $max; $i++)
|
||||
{
|
||||
// @todo Optimise
|
||||
if ($bits[$i] == '..' )
|
||||
{
|
||||
if (isset($bits[$i - 1]))
|
||||
{
|
||||
if ($bits[$i - 1] != '..')
|
||||
{
|
||||
// We found a .. and we are able to traverse upwards, lets do it!
|
||||
unset($bits[$i]);
|
||||
unset($bits[$i - 1]);
|
||||
$i -= 2;
|
||||
$max -= 2;
|
||||
$bits = array_values($bits);
|
||||
}
|
||||
}
|
||||
else if ($absolute) // ie. !isset($bits[$i - 1]) && $absolute
|
||||
{
|
||||
// We have an absolute path trying to descend above the root of the filesystem
|
||||
// ... Error!
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Prepend the path prefix
|
||||
array_unshift($bits, $path_prefix);
|
||||
|
||||
$resolved = '';
|
||||
|
||||
$max = sizeof($bits) - 1;
|
||||
|
||||
// Check if we are able to resolve symlinks, Windows cannot.
|
||||
$symlink_resolve = (function_exists('readlink')) ? true : false;
|
||||
|
||||
foreach ($bits as $i => $bit)
|
||||
{
|
||||
if (@is_dir("$resolved/$bit") || ($i == $max && @is_file("$resolved/$bit")))
|
||||
{
|
||||
// Path Exists
|
||||
if ($symlink_resolve && is_link("$resolved/$bit") && ($link = readlink("$resolved/$bit")))
|
||||
{
|
||||
// Resolved a symlink.
|
||||
$resolved = $link . (($i == $max) ? '' : '/');
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Something doesn't exist here!
|
||||
// This is correct realpath() behaviour but sadly open_basedir and safe_mode make this problematic
|
||||
// return false;
|
||||
}
|
||||
$resolved .= $bit . (($i == $max) ? '' : '/');
|
||||
}
|
||||
|
||||
// @todo If the file exists fine and open_basedir only has one path we should be able to prepend it
|
||||
// because we must be inside that basedir, the question is where...
|
||||
// @internal The slash in is_dir() gets around an open_basedir restriction
|
||||
if (!@file_exists($resolved) || (!is_dir($resolved . '/') && !is_file($resolved)))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Put the slashes back to the native operating systems slashes
|
||||
$resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved);
|
||||
|
||||
// Check for DIRECTORY_SEPARATOR at the end (and remove it!)
|
||||
if (substr($resolved, -1) == DIRECTORY_SEPARATOR)
|
||||
{
|
||||
return substr($resolved, 0, -1);
|
||||
}
|
||||
|
||||
return $resolved; // We got here, in the end!
|
||||
$resolved .= $bit . (($i == $max) ? '' : '/');
|
||||
}
|
||||
|
||||
// @todo If the file exists fine and open_basedir only has one path we should be able to prepend it
|
||||
// because we must be inside that basedir, the question is where...
|
||||
// @internal The slash in is_dir() gets around an open_basedir restriction
|
||||
if (!@file_exists($resolved) || (!is_dir($resolved . '/') && !is_file($resolved)))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Put the slashes back to the native operating systems slashes
|
||||
$resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved);
|
||||
|
||||
// Check for DIRECTORY_SEPARATOR at the end (and remove it!)
|
||||
if (substr($resolved, -1) == DIRECTORY_SEPARATOR)
|
||||
{
|
||||
return substr($resolved, 0, -1);
|
||||
}
|
||||
|
||||
return $resolved; // We got here, in the end!
|
||||
}
|
||||
else
|
||||
|
||||
if (!function_exists('realpath'))
|
||||
{
|
||||
/**
|
||||
* A wrapper for realpath
|
||||
|
|
@ -600,15 +598,32 @@ else
|
|||
*/
|
||||
function phpbb_realpath($path)
|
||||
{
|
||||
$path = realpath($path);
|
||||
return phpbb_own_realpath($path);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/**
|
||||
* A wrapper for realpath
|
||||
*/
|
||||
function phpbb_realpath($path)
|
||||
{
|
||||
$realpath = realpath($path);
|
||||
|
||||
// Check for DIRECTORY_SEPARATOR at the end (and remove it!)
|
||||
if (substr($path, -1) == DIRECTORY_SEPARATOR)
|
||||
// Strangely there are provider not disabling realpath but returning strange values. :o
|
||||
// We at least try to cope with them.
|
||||
if ($realpath === $path || $realpath === false)
|
||||
{
|
||||
return substr($path, 0, -1);
|
||||
return phpbb_own_realpath($path);
|
||||
}
|
||||
|
||||
return $path;
|
||||
// Check for DIRECTORY_SEPARATOR at the end (and remove it!)
|
||||
if (substr($realpath, -1) == DIRECTORY_SEPARATOR)
|
||||
{
|
||||
$realpath = substr($realpath, 0, -1);
|
||||
}
|
||||
|
||||
return $realpath;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1102,7 +1102,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
|
|||
*/
|
||||
function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src)
|
||||
{
|
||||
global $ranks, $config;
|
||||
global $ranks, $config, $phpbb_root_path;
|
||||
|
||||
if (empty($ranks))
|
||||
{
|
||||
|
|
@ -1113,8 +1113,8 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
|
|||
if (!empty($user_rank))
|
||||
{
|
||||
$rank_title = (isset($ranks['special'][$user_rank]['rank_title'])) ? $ranks['special'][$user_rank]['rank_title'] : '';
|
||||
$rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '" />' : '';
|
||||
$rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] : '';
|
||||
$rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . $phpbb_root_path . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '" />' : '';
|
||||
$rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? $phpbb_root_path . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] : '';
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1125,8 +1125,8 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
|
|||
if ($user_posts >= $rank['rank_min'])
|
||||
{
|
||||
$rank_title = $rank['rank_title'];
|
||||
$rank_img = (!empty($rank['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $rank['rank_image'] . '" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" />' : '';
|
||||
$rank_img_src = (!empty($rank['rank_image'])) ? $config['ranks_path'] . '/' . $rank['rank_image'] : '';
|
||||
$rank_img = (!empty($rank['rank_image'])) ? '<img src="' . $phpbb_root_path . $config['ranks_path'] . '/' . $rank['rank_image'] . '" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" />' : '';
|
||||
$rank_img_src = (!empty($rank['rank_image'])) ? $phpbb_root_path . $config['ranks_path'] . '/' . $rank['rank_image'] : '';
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -939,7 +939,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
|
|||
WHERE p.topic_id = $topic_id
|
||||
" . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . '
|
||||
' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
|
||||
ORDER BY p.post_time';
|
||||
ORDER BY p.post_time ';
|
||||
$sql .= ($mode == 'post_review') ? 'ASC' : 'DESC';
|
||||
$result = $db->sql_query_limit($sql, $config['posts_per_page']);
|
||||
|
||||
|
|
@ -1111,7 +1111,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
|
|||
trigger_error('WRONG_NOTIFICATION_MODE');
|
||||
}
|
||||
|
||||
if (!$config['allow_topic_notify'])
|
||||
if (($topic_notification && !$config['allow_topic_notify']) || ($forum_notification && !$config['allow_forum_notify']))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue