From 3585dbd42c114a63d585e68e14f52f2a2918632a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 14 Jul 2007 15:44:10 +0000
Subject: a bunch of fixes

git-svn-id: file:///svn/phpbb/trunk@7884 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions_admin.php')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 5e94b0d9e0..64358cbdf4 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -365,14 +365,14 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
 
 	if (!is_dir($rootdir . $dir))
 	{
-		return false;
+		return $matches;
 	}
 
 	$dh = @opendir($rootdir . $dir);
 
 	if (!$dh)
 	{
-		return false;
+		return $matches;
 	}
 
 	while (($fname = readdir($dh)) !== false)
-- 
cgit v1.2.1


From acf0c0ddebf13b6075b6dac81c7675dd04d4a692 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 27 Jul 2007 17:33:27 +0000
Subject: err, forgot to commit

git-svn-id: file:///svn/phpbb/trunk@7961 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_admin.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes/functions_admin.php')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 64358cbdf4..7074f21f25 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1079,8 +1079,8 @@ function update_posted_info(&$topic_ids)
 		foreach ($topic_row as $topic_id)
 		{
 			$sql_ary[] = array(
-				'user_id'		=> $user_id,
-				'topic_id'		=> $topic_id,
+				'user_id'		=> (int) $user_id,
+				'topic_id'		=> (int) $topic_id,
 				'topic_posted'	=> 1,
 			);
 		}
@@ -2244,9 +2244,9 @@ function cache_moderators()
 				foreach ($forum_id_ary as $forum_id => $auth_ary)
 				{
 					$sql_ary[] = array(
-						'forum_id'		=> $forum_id,
-						'user_id'		=> $user_id,
-						'username'		=> $usernames_ary[$user_id],
+						'forum_id'		=> (int) $forum_id,
+						'user_id'		=> (int) $user_id,
+						'username'		=> (string) $usernames_ary[$user_id],
 						'group_id'		=> 0,
 						'group_name'	=> ''
 					);
@@ -2307,11 +2307,11 @@ function cache_moderators()
 				}
 
 				$sql_ary[] = array(
-					'forum_id'		=> $forum_id,
+					'forum_id'		=> (int) $forum_id,
 					'user_id'		=> 0,
 					'username'		=> '',
-					'group_id'		=> $group_id,
-					'group_name'	=> $groupnames_ary[$group_id]
+					'group_id'		=> (int) $group_id,
+					'group_name'	=> (string) $groupnames_ary[$group_id]
 				);
 			}
 		}
-- 
cgit v1.2.1


From 75dc0e86378882727ff8f9100de6456580424343 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 27 Jul 2007 18:03:55 +0000
Subject: do not output notices on viewing the log if log language variables
 changed their information between versions...

git-svn-id: file:///svn/phpbb/trunk@7962 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_admin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_admin.php')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 7074f21f25..2c3eb61dce 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2423,7 +2423,8 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 
 			if (isset($user->lang[$row['log_operation']]))
 			{
-				$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
+				// We supress the warning about inappropiate number of passed parameters here due to possible changes within LOG strings from one version to another.
+				$log[$i]['action'] = @vsprintf($log[$i]['action'], $log_data_ary);
 
 				// If within the admin panel we do not censor text out
 				if (defined('IN_ADMIN'))
-- 
cgit v1.2.1


From a935f6e5f9b2e9b2002f2f5bd76c95413e2954bb Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Sat, 28 Jul 2007 04:05:43 +0000
Subject: - add database size for Firebird

git-svn-id: file:///svn/phpbb/trunk@7965 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_admin.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/includes/functions_admin.php')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 2c3eb61dce..29d52406da 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2792,6 +2792,17 @@ function get_database_size()
 			}
 		break;
 
+		case 'firebird':
+			global $dbname;
+
+			// if it on the local machine, we can get lucky
+			if (file_exists($dbname))
+			{
+				$database_size = filesize($dbname);
+			}
+
+		break;
+
 		case 'sqlite':
 			global $dbhost;
 
-- 
cgit v1.2.1