aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-05-04 14:47:49 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-05-04 14:47:49 +0000
commiteb664ddafba53883666e4755afb7eca51ef89cf5 (patch)
treea40f2b1ef829f8975f1ef5122d3158feece75862 /phpBB
parent771fd3696d2f729476399d5acf92a68dd154d78d (diff)
downloadforums-eb664ddafba53883666e4755afb7eca51ef89cf5.tar
forums-eb664ddafba53883666e4755afb7eca51ef89cf5.tar.gz
forums-eb664ddafba53883666e4755afb7eca51ef89cf5.tar.bz2
forums-eb664ddafba53883666e4755afb7eca51ef89cf5.tar.xz
forums-eb664ddafba53883666e4755afb7eca51ef89cf5.zip
some missing merges...
git-svn-id: file:///svn/phpbb/trunk@8545 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_database.php27
-rw-r--r--phpBB/includes/functions_admin.php4
-rw-r--r--phpBB/includes/functions_compress.php34
-rw-r--r--phpBB/includes/functions_install.php2
-rw-r--r--phpBB/includes/session.php6
-rw-r--r--phpBB/includes/utf/utf_tools.php2
-rw-r--r--phpBB/styles/prosilver/theme/bidi.css5
7 files changed, 60 insertions, 20 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index cd877ae31d..98c2decbf6 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -173,6 +173,7 @@ class acp_database
default:
include($phpbb_root_path . 'includes/functions_install.' . $phpEx);
$tables = get_tables($db);
+ asort($tables);
foreach ($tables as $table_name)
{
if (strlen($table_prefix) === 0 || stripos($table_name, $table_prefix) === 0)
@@ -346,7 +347,25 @@ class acp_database
while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false)
{
$query = trim($sql);
- $db->sql_query($query);
+
+ if (substr($query, 0, 13) == 'CREATE DOMAIN')
+ {
+ list(, , $domain) = explode(' ', $query);
+ $sql = "SELECT domain_name
+ FROM information_schema.domains
+ WHERE domain_name = '$domain';";
+ $result = $db->sql_query($sql);
+ if (!$db->sql_fetchrow($result))
+ {
+ $db->sql_query($query);
+ }
+ $db->sql_freeresult($result);
+ }
+ else
+ {
+ $db->sql_query($query);
+ }
+
if (substr($query, 0, 4) == 'COPY')
{
while (($sub = $fgetd($fp, "\n", $read, $seek, $eof)) !== '\.')
@@ -971,7 +990,7 @@ class postgres_extractor extends base_extractor
}
$sql_data = '-- Table: ' . $table_name . "\n";
- //$sql_data .= "DROP TABLE $table_name;\n";
+ $sql_data .= "DROP TABLE $table_name;\n";
// PGSQL does not "tightly" bind sequences and tables, we must guess...
$sql = "SELECT relname
FROM pg_class
@@ -1040,7 +1059,7 @@ class postgres_extractor extends base_extractor
$line .= ')';
}
- if (!empty($row['rowdefault']))
+ if (isset($row['rowdefault']))
{
$line .= ' DEFAULT ' . $row['rowdefault'];
}
@@ -2337,4 +2356,4 @@ function fgetd_seekless(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
return false;
}
-?> \ No newline at end of file
+?>
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 1e85adff9b..52e266befb 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1536,7 +1536,8 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
$sql = 'SELECT SUM(t.topic_replies + 1) AS forum_posts
FROM ' . TOPICS_TABLE . ' t
WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
- AND t.topic_approved = 1';
+ AND t.topic_approved = 1
+ AND t.topic_status <> ' . ITEM_MOVED;
}
else
{
@@ -1544,6 +1545,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
FROM ' . TOPICS_TABLE . ' t
WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
AND t.topic_approved = 1
+ AND t.topic_status <> ' . ITEM_MOVED . '
GROUP BY t.forum_id';
}
diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php
index 9537bd1ed1..c439ed8390 100644
--- a/phpBB/includes/functions_compress.php
+++ b/phpBB/includes/functions_compress.php
@@ -231,7 +231,7 @@ class compress_zip extends compress
}
else
{
- // Some archivers are punks, they don't don't include folders in their archives!
+ // Some archivers are punks, they don't include folders in their archives!
$str = '';
$folders = explode('/', pathinfo($target_filename, PATHINFO_DIRNAME));
@@ -507,12 +507,14 @@ class compress_tar extends compress
$tmp = unpack('A12size', substr($buffer, 124, 12));
$filesize = octdec((int) trim($tmp['size']));
+ $target_filename = "$dst$filename";
+
if ($filetype == 5)
{
- if (!is_dir("$dst$filename"))
+ if (!is_dir($target_filename))
{
$str = '';
- $folders = explode('/', "$dst$filename");
+ $folders = explode('/', $target_filename);
// Create and folders and subfolders if they do not exist
foreach ($folders as $folder)
@@ -529,17 +531,35 @@ class compress_tar extends compress
}
}
}
- else if ($filesize != 0 && ($filetype == 0 || $filetype == "\0"))
+ else if ($filesize >= 0 && ($filetype == 0 || $filetype == "\0"))
{
+ // Some archivers are punks, they don't properly order the folders in their archives!
+ $str = '';
+ $folders = explode('/', pathinfo($target_filename, PATHINFO_DIRNAME));
+
+ // Create and folders and subfolders if they do not exist
+ foreach ($folders as $folder)
+ {
+ $str = (!empty($str)) ? $str . '/' . $folder : $folder;
+ if (!is_dir($str))
+ {
+ if (!@mkdir($str, 0777))
+ {
+ trigger_error("Could not create directory $folder");
+ }
+ @chmod($str, 0777);
+ }
+ }
+
// Write out the files
- if (!($fp = fopen("$dst$filename", 'wb')))
+ if (!($fp = fopen($target_filename, 'wb')))
{
trigger_error("Couldn't create file $filename");
}
- @chmod("$dst$filename", 0777);
+ @chmod($target_filename, 0777);
// Grab the file contents
- fwrite($fp, $fzread($this->fp, ($filesize + 511) &~ 511), $filesize);
+ fwrite($fp, ($filesize) ? $fzread($this->fp, ($filesize + 511) &~ 511) : '', $filesize);
fclose($fp);
}
}
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index cdd62b6d9e..84b1fb66c2 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -311,7 +311,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
{
case 'mysql':
case 'mysqli':
- if (strpos($table_prefix, '-') !== false || strpos($table_prefix, '.') !== false)
+ if (strspn($table_prefix, '-./\\') !== 0)
{
$error[] = $lang['INST_ERR_PREFIX_INVALID'];
return false;
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index f6b1c61b20..53d3bcb9cc 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -68,7 +68,7 @@ class session
foreach ($args as $key => $argument)
{
- if (strpos($argument, 'sid=') === 0 || strpos($argument, '_f_=') === 0)
+ if (strpos($argument, 'sid=') === 0)
{
continue;
}
@@ -219,9 +219,9 @@ class session
// Load limit check (if applicable)
if ($config['limit_load'] || $config['limit_search_load'])
{
- if ($load = @file_get_contents('/proc/loadavg'))
+ if ((function_exists('sys_getloadavg') && $load = sys_getloadavg()) || ($load = explode(' ', @file_get_contents('/proc/loadavg'))))
{
- $this->load = array_slice(explode(' ', $load), 0, 1);
+ $this->load = array_slice($load, 0, 1);
$this->load = floatval($this->load[0]);
}
else
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index 1a4446ca65..5345cc746d 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -1440,7 +1440,7 @@ function utf8_clean_string($text)
/**
* A wrapper for htmlspecialchars($value, ENT_COMPAT, 'UTF-8')
*/
-function utf8_htmlspecialchars(&$value)
+function utf8_htmlspecialchars($value)
{
return htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
}
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index fc0b306a6c..3cc34f46d7 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -253,9 +253,8 @@
}
.rtl ul.topiclist li.row dt a.subforum {
- padding: 0 0 0 12px;
- background-position: 100% 100%;
- position: static;
+ padding-right: 12px;
+ background-position: right;
}
.rtl .forum-image {
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-27 03:03:26 +0000