Tagging the "Run, bugs, run! Bertie is coming!" 3.0.7 release.

git-svn-id: file:///svn/phpbb/tags/release_3_0_7@10557 89ea8834-ac86-4346-8a33-228a782c2dd0

build/build_diff.php

@@ -0,0 +1,408 @@
+#!/usr/bin/env php
+<?php
+/**
+*
+* @package build
+* @version $Id$
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+// CONFIG - Begin
+$substitute_old = '3.0.6';
+$substitute_new = '3.0.7';
+$simple_name_old = 'phpbb306';
+$simple_name_new = 'phpbb307';
+$echo_changes = false;
+// Set this to true to just compress the changes and do not build them again
+// This should be used for building custom modified txt file. ;)
+$package_changed_files = false;
+// CONFIG - End
+
+//$debug_file = 'includes/functions_user.php'; //'styles/prosilver/style.cfg';
+$debug_file = false;
+
+if ($debug_file !== false)
+{
+	$echo_changes = false;
+}
+
+$s_name = 'save_' . $substitute_old . '_to_' . $substitute_new;
+
+$location = dirname(__FILE__);
+
+if (!$package_changed_files)
+{
+	if (!$echo_changes)
+	{
+		// Cleanup...
+		run_command("rm -R $location/save/*");
+
+		// Create directory...
+		run_command("mkdir $location/save/{$s_name}");
+		run_command("mkdir $location/save/{$s_name}/language");
+		run_command("mkdir $location/save/{$s_name}/prosilver");
+		run_command("mkdir $location/save/{$s_name}/subsilver2");
+	}
+}
+
+// Build code changes and place them into 'save'
+if (!$package_changed_files)
+{
+	build_code_changes('language');
+	build_code_changes('prosilver');
+	build_code_changes('subsilver2');
+}
+
+// Package code changes
+$code_changes_filename = 'phpBB-' . $substitute_old . '_to_' . $substitute_new . '-codechanges';
+
+if (!$echo_changes)
+{
+	// Now compress the files...
+	// Build Main phpBB Release
+	$compress_programs = array(
+//		'tar.gz'	=> 'tar -czf',
+		'tar.bz2'	=> 'tar -cjf',
+		'zip'		=> 'zip -r'
+	);
+
+	chdir($location . '/save/' . $s_name);
+	foreach ($compress_programs as $extension => $compress_command)
+	{
+		echo "Packaging code changes for $extension\n";
+		run_command("rm ./../../release_files/{$code_changes_filename}.{$extension}");
+		flush();
+
+		// Build Package
+		run_command("$compress_command ./../../release_files/{$code_changes_filename}.{$extension} *");
+
+		// Build MD5 Sum
+		run_command("md5sum ./../../release_files/{$code_changes_filename}.{$extension} > ./../../release_files/{$code_changes_filename}.{$extension}.md5");
+		flush();
+	}
+}
+
+/**
+* $output_format can be: language, prosilver and subsilver2
+*/
+function build_code_changes($output_format)
+{
+	global $substitute_new, $substitute_old, $simple_name_old, $simple_name_new, $echo_changes, $package_changed_files, $location, $debug_file, $s_name;
+
+	// Global array holding the data entries
+	$data = array(
+		'header'		=> array(),
+		'diff'			=> array(),
+	);
+
+	// Read diff file and prepare the output filedata...
+	//$patch_filename = '../new_version/patches/phpBB-' . $substitute_old . '_to_' . $substitute_new . '.patch';
+	$release_filename = 'phpbb-' . $substitute_old . '_to_' . $substitute_new . '_' . $output_format . '.txt';
+
+	if (!$package_changed_files)
+	{
+		if (!$echo_changes)
+		{
+			$fp = fopen('save/' . $s_name . '/' . $output_format . '/' . $release_filename, 'wb');
+
+			if (!$fp)
+			{
+				die('Unable to create ' . $release_filename);
+			}
+		}
+	}
+
+	include_once($location . '/build_helper.php');
+	$package = new build_package(array($substitute_old, $substitute_new), false);
+
+	$titles = array(
+		'language'		=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' Language Pack Changes',
+		'prosilver'		=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' prosilver Changes',
+		'subsilver2'	=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' subsilver2 Changes',
+	);
+
+	$data['header'] = array(
+		'title'		=> $titles[$output_format],
+		'intro'		=> '
+
+These are the ' . $titles[$output_format] . ' summed up into a little Mod. These changes are only partial and do not include any code changes, therefore not meant for updating phpBB.
+
+	',
+		'included_files'	=> array(),
+	);
+
+	// We collect the files we want to diff first (ironically we grab this from a diff file)
+	if (!$echo_changes)
+	{
+		echo "\n\nCollecting Filenames:";
+	}
+
+	// We re-create the patch file
+	foreach ($package->old_packages as $_package_name => $dest_package_filename)
+	{
+		chdir($package->locations['old_versions']);
+
+		if (!$echo_changes)
+		{
+			echo "\n\n" . 'Creating patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number');
+		}
+
+		$dest_package_filename = $location . '/save/' . $s_name . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch';
+		$package->run_command('diff ' . $package->diff_options . ' ' . $_package_name . ' ' . $package->get('simple_name') . ' > ' . $dest_package_filename);
+
+		// Parse this diff to determine file changes from the checked versions and save them
+		$result = $package->collect_diff_files($dest_package_filename, $_package_name);
+		$package->run_command('rm ' . $dest_package_filename);
+	}
+
+	chdir($location);
+
+	$filenames = array();
+	foreach ($result['files'] as $filename)
+	{
+		if ($debug_file !== false && $filename != $debug_file)
+		{
+			continue;
+		}
+
+		// Decide which files to compare...
+		switch ($output_format)
+		{
+			case 'language':
+				if (strpos($filename, 'language/en/') !== 0)
+				{
+					continue 2;
+				}
+			break;
+
+			case 'prosilver':
+				if (strpos($filename, 'styles/prosilver/') !== 0)
+				{
+					continue 2;
+				}
+			break;
+
+			case 'subsilver2':
+				if (strpos($filename, 'styles/subsilver2/') !== 0)
+				{
+					continue 2;
+				}
+			break;
+		}
+
+		if (!file_exists($location . '/old_versions/' . $simple_name_old . '/' . $filename))
+		{
+			// New file... include it
+			$data['header']['included_files'][] = array(
+				'old'				=> $location . '/old_versions/' . $simple_name_old . '/' . $filename,
+				'new'				=> $location . '/old_versions/' . $simple_name_new . '/' . $filename,
+				'phpbb_filename'	=> $filename,
+			);
+			continue;
+		}
+
+		$filenames[] = array(
+			'old'				=> $location . '/old_versions/' . $simple_name_old . '/' . $filename,
+			'new'				=> $location . '/old_versions/' . $simple_name_new . '/' . $filename,
+			'phpbb_filename'	=> $filename,
+		);
+	}
+
+	// Now let us go through the filenames list and create a more comprehensive diff
+	if (!$echo_changes)
+	{
+		fwrite($fp, build_header($output_format, $filenames, $data['header']));
+	}
+	else
+	{
+		//echo build_header('text', $filenames, $data['header']);
+	}
+
+	// Copy files...
+	$files_to_copy = array();
+
+	foreach ($data['header']['included_files'] as $filename)
+	{
+		$files_to_copy[] = $filename['phpbb_filename'];
+	}
+
+	// First step is to copy the new version over (clean structure)
+	if (!$echo_changes && sizeof($files_to_copy))
+	{
+		foreach ($files_to_copy as $file)
+		{
+			// Create directory?
+			$dirname = dirname($file);
+
+			if ($dirname)
+			{
+				$dirname = explode('/', $dirname);
+				$__dir = array();
+
+				foreach ($dirname as $i => $dir)
+				{
+					$__dir[] = $dir;
+					run_command("mkdir -p $location/save/" . $s_name . '/' . $output_format . '/' . implode('/', $__dir));
+				}
+			}
+
+			$source_file = $location . '/new_version/phpBB3/' . $file;
+			$dest_file = $location . '/save/' . $s_name . '/' . $output_format . '/';
+			$dest_file .= $file;
+
+			$command = "cp -p $source_file $dest_file";
+			$result = trim(`$command`);
+			echo "- Copied File: " . $source_file . " -> " . $dest_file . "\n";
+		}
+	}
+
+	include_once('diff_class.php');
+
+	if (!$echo_changes)
+	{
+		echo "\n\nDiffing Codebases:";
+	}
+
+	foreach ($filenames as $file_ary)
+	{
+		if (!file_exists($file_ary['old']))
+		{
+			$lines1 = array();
+		}
+		else
+		{
+			$lines1 = file($file_ary['old']);
+		}
+		$lines2 = file($file_ary['new']);
+
+		if (!sizeof($lines1))
+		{
+			// New File
+		}
+		else
+		{
+			$diff = new Diff($lines1, $lines2);
+			$fmt = new BBCodeDiffFormatter(false, 5, $debug_file);
+
+			if (!$echo_changes)
+			{
+				fwrite($fp, $fmt->format_open($file_ary['phpbb_filename']));
+				fwrite($fp, $fmt->format($diff, $lines1));
+				fwrite($fp, $fmt->format_close($file_ary['phpbb_filename']));
+			}
+			else
+			{
+				echo $fmt->format_open($file_ary['phpbb_filename']);
+				echo $fmt->format($diff, $lines1);
+				echo $fmt->format_close($file_ary['phpbb_filename']);
+			}
+
+			if ($debug_file !== false)
+			{
+				echo $fmt->format_open($file_ary['phpbb_filename']);
+				echo $fmt->format($diff, $lines1);
+				echo $fmt->format_close($file_ary['phpbb_filename']);
+				exit;
+			}
+		}
+	}
+
+	if (!$echo_changes)
+	{
+		fwrite($fp, build_footer($output_format));
+
+		// Close file
+		fclose($fp);
+
+		chmod('save/' . $s_name . '/' . $output_format . '/' . $release_filename, 0666);
+	}
+	else
+	{
+		echo build_footer($output_format);
+	}
+}
+
+/**
+* Build Footer
+*/
+function build_footer($mode)
+{
+	$html = '';
+
+	$html .= "# \n";
+	$html .= "#-----[ SAVE/CLOSE ALL FILES ]------------------------------------------ \n";
+	$html .= "# \n";
+	$html .= "# EoM";
+
+	return $html;
+}
+
+/**
+* Build Header
+*/
+function build_header($mode, $filenames, $header)
+{
+	global $substitute_old;
+
+	$html = '';
+
+	$html .= "############################################################## \n";
+	$html .= "## Title: " . $header['title'] . "\n";
+	$html .= "## Author: naderman < naderman@phpbb.com > (Nils Adermann) http://www.phpbb.com \n";
+	$html .= "## Description: \n";
+
+	$intr = explode("\n", $header['intro']);
+	$introduction = '';
+	foreach ($intr as $_line)
+	{
+		$introduction .= wordwrap($_line, 80) . "\n";
+	}
+	$intr = explode("\n", $introduction);
+
+	foreach ($intr as $_line)
+	{
+		$html .= "##		" . $_line . "\n";
+	}
+	$html .= "## \n";
+	$html .= "## Files To Edit: \n";
+
+	foreach ($filenames as $file_ary)
+	{
+		$html .= "##		" . $file_ary['phpbb_filename'] . "\n";
+	}
+	$html .= "##\n";
+	if (sizeof($header['included_files']))
+	{
+		$html .= "## Included Files: \n";
+		foreach ($header['included_files'] as $filename)
+		{
+			$html .= "##		{$filename['phpbb_filename']}\n";
+		}
+	}
+	$html .= "## License: http://opensource.org/licenses/gpl-license.php GNU General Public License v2 \n";
+	$html .= "############################################################## \n";
+	$html .= "\n";
+
+	// COPY Statement?
+	if (sizeof($header['included_files']))
+	{
+		$html .= "#\n#-----[ COPY ]------------------------------------------\n#\n";
+		foreach ($header['included_files'] as $filename)
+		{
+			$html .= "copy {$filename['phpbb_filename']} to {$filename['phpbb_filename']}\n";
+		}
+		$html .= "\n";
+	}
+
+	return $html;
+}
+
+function run_command($command)
+{
+	$result = trim(`$command`);
+	echo "\n- Command Run: " . $command . "\n";
+}
+
+?>

build/build_helper.php

@@ -0,0 +1,485 @@
+<?php
+/**
+*
+* @package build
+* @version $Id$
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class build_package
+{
+	var $package_infos;
+	var $old_packages;
+	var $versions;
+	var $locations;
+	var $clean_directory_structure;
+	var $files_to_copy;
+	var $files_to_remove;
+	var $remove_from_diff_structure;
+
+	// -c - context diff
+	// -r - compare recursive
+	// -N - Treat missing files as empty
+	// -E - Ignore tab expansions
+	//		not used: -b - Ignore space changes.
+	// -w - Ignore all whitespace
+	// -B - Ignore blank lines
+	// -d - Try to find smaller set of changes
+	var $diff_options = '-crNEBwd';
+	var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;)
+
+	var $verbose = false;
+	var $status_begun = false;
+	var $num_dots = 0;
+
+	function build_package($versions, $verbose = false)
+	{
+		$this->versions = $versions;
+		$this->verbose = $verbose;
+
+		// Get last two entries
+		$_latest = $this->versions[sizeof($this->versions) - 1];
+		$_before = $this->versions[sizeof($this->versions) - 2];
+
+		$this->locations = array(
+			'new_version'	=> dirname(dirname(__FILE__)) . '/phpBB/',
+			'old_versions'	=> dirname(__FILE__) . '/old_versions/',
+			'root'			=> dirname(__FILE__) . '/',
+			'package_dir'	=> dirname(__FILE__) . '/new_version/'
+		);
+
+		$this->package_infos = array(
+			'package_name'			=> 'phpBB3',
+			'name_prefix'			=> 'phpbb',
+			'simple_name'			=> 'phpbb' . str_replace('.', '', $_latest),
+			'new_version_number'	=> $_latest,
+			'short_version_number'	=> str_replace('.', '', $_latest),
+			'release_filename'		=> 'phpBB-' . $_latest,
+			'last_version'			=> 'phpbb' . str_replace('.', '', $_before),
+			'last_version_number'	=> $_before,
+		);
+
+		$this->package_infos['dest_dir'] = $this->locations['package_dir'] . $this->package_infos['package_name'];
+		$this->package_infos['diff_dir'] = $this->locations['old_versions'] . $this->package_infos['simple_name'];
+		$this->package_infos['patch_directory'] = $this->locations['package_dir'] . 'patches';
+		$this->package_infos['files_directory'] = $this->locations['package_dir'] . 'files';
+		$this->package_infos['update_directory'] = $this->locations['package_dir'] . 'update';
+		$this->package_infos['release_directory'] = $this->locations['package_dir'] . 'release_files';
+
+		// Old packages always exclude the latest version. ;)
+		$this->old_packages = array();
+
+		foreach ($this->versions as $package_version)
+		{
+			if ($package_version == $_latest)
+			{
+				continue;
+			}
+
+			$this->old_packages['phpbb' . str_replace('.', '', $package_version)] = $package_version . '_to_';
+		}
+
+		// We need to make sure this is up to date with the latest version
+		$this->clean_directory_structure = array(
+			'adm'		=> array(
+				'images'	=> '',
+				'style'		=> '',
+			),
+			'cache'		=> '',
+			'docs'		=> '',
+			'download'	=> '',
+			'files'		=> '',
+			'images'	=> array(
+				'avatars'	=> array(
+					'gallery'	=> '',
+					'upload'	=> '',
+				),
+				'icons'		=> array(
+					'misc'	=> '',
+					'smile'	=> '',
+				),
+				'ranks'			=> '',
+				'smilies'		=> '',
+				'upload_icons'	=> '',
+			),
+			'includes'		=> array(
+				'acm'		=> '',
+				'acp'		=> array(
+					'info'	=> '',
+				),
+				'auth'		=> '',
+				'captcha'	=> array(
+					'plugins'	=> '',
+				),
+				'diff'		=> '',
+				'db'		=> '',
+				'hooks'		=> '',
+				'mcp'		=> array(
+					'info'	=> '',
+				),
+				'questionnaire' => '',
+				'search'	=> '',
+				'ucp'		=> array(
+					'info'	=> '',
+				),
+				'utf'		=> array(
+					'data'	=> '',
+				),
+			),
+			'install'		=> array(
+				'convertors'=> '',
+				'schemas'	=> '',
+//				'data'		=> '',
+			),
+			'language'		=> array(
+				'en'		=> array(
+					'acp'		=> '',
+					'email'		=> '',
+					'mods'		=> '',
+				),
+			),
+			'store'			=> '',
+			'styles'		=> array(
+				'subsilver2'	=> array(
+					'imageset'		=> array(
+						'en'	=> '',
+					),
+					'template'	=> '',
+					'theme'		=> array(
+						'images'	=> '',
+					),
+				),
+				'prosilver'	=> array(
+					'imageset'		=> array(
+						'en'	=> '',
+					),
+					'template'	=> '',
+					'theme'		=> array(
+						'images'	=> '',
+					),
+				),
+			),
+		);
+
+		// Files to remove (not include within package)
+		$this->files_to_remove = array(); //array('includes/utf/data/recode_cjk.php');
+
+		// Files within the main directory to copy - do not include config.php
+		$this->files_to_copy = array(
+			'.htaccess', 'common.php', 'cron.php', 'faq.php', 'feed.php', 'index.php', 'mcp.php', 'memberlist.php', 'posting.php', 'report.php',
+			'search.php', 'style.php', 'ucp.php', 'viewforum.php', 'viewonline.php', 'viewtopic.php'
+		);
+
+		// These files/directories will be removed and not used for creating the patch files
+		$this->remove_from_diff_structure = array(
+			'config.php', 'cache', 'docs', 'files', 'install', 'store', 'develop'
+		);
+
+		// Writeable directories
+		$this->writeable = array('cache', 'store', 'images/avatars/upload', 'files');
+
+		// Fill the rest of the files_to_copy array
+		foreach ($this->clean_directory_structure as $cur_dir => $dir_struct)
+		{
+			$this->_fill_files_to_copy($this->locations['new_version'] . $cur_dir, $cur_dir, $dir_struct);
+		}
+	}
+
+	function get($var)
+	{
+		return $this->package_infos[$var];
+	}
+
+	function _fill_files_to_copy($directory, $cur_dir, $dir_struct)
+	{
+		$dh = opendir($directory);
+
+		while ($file = readdir($dh))
+		{
+			if (is_file($directory . '/' . $file) && $file != '.' && $file != '..')
+			{
+				$_loc = str_replace($this->locations['new_version'], '', $directory . '/' . $file);
+
+				if (in_array($_loc, $this->files_to_remove))
+				{
+					continue;
+				}
+
+				$this->files_to_copy[] = $cur_dir . '/' . $file;
+			}
+		}
+		closedir($dh);
+
+		if (is_array($dir_struct))
+		{
+			foreach ($dir_struct as $_cur_dir => $_dir_struct)
+			{
+				$this->_fill_files_to_copy($directory . '/' . $_cur_dir, $cur_dir . '/' . $_cur_dir, $_dir_struct);
+			}
+		}
+	}
+
+	function adjust_permissions($directory)
+	{
+		$dh = opendir($directory);
+
+		while ($file = readdir($dh))
+		{
+			if ($file == '.' || $file == '..' || $file == '.svn')
+			{
+				continue;
+			}
+
+			// If file, then 644
+			if (is_file($directory . '/' . $file))
+			{
+				chmod($directory . '/' . $file, 0644);
+			}
+			else if (is_dir($directory . '/' . $file))
+			{
+				$_loc = str_replace($this->package_infos['dest_dir'] . '/', '', $directory . '/' . $file);
+
+				// If directory is within the writeable chmod to 777, else 755
+				$mode = (in_array($_loc, $this->writeable)) ? 0777 : 0755;
+				chmod($directory . '/' . $file, $mode);
+
+				// Now traverse to the directory
+				$this->adjust_permissions($directory . '/' . $file);
+			}
+		}
+		closedir($dh);
+	}
+
+	function begin_status($headline)
+	{
+		if ($this->status_begun)
+		{
+			echo "\nDone.\n\n";
+		}
+
+		$this->num_dots = 0;
+
+		echo $headline . "\n    ";
+
+		$this->status_begun = true;
+	}
+
+	function run_command($command)
+	{
+		$result = trim(`$command`);
+
+		if ($this->verbose)
+		{
+			echo "    command : " . getcwd() . '$ ' . $command . "\n";
+			echo "    result  : " . $result . "\n";
+		}
+		else
+		{
+			if ($this->num_dots > 70)
+			{
+				echo "\n";
+				$this->num_dots = 0;
+			}
+			echo '.';
+			$this->num_dots++;
+		}
+
+		flush();
+	}
+
+	function create_directory($directory, $dir_struct)
+	{
+		if (!file_exists($directory))
+		{
+			$this->run_command("mkdir $directory");
+		}
+
+		if (is_array($dir_struct))
+		{
+			foreach ($dir_struct as $_dir => $_dir_struct)
+			{
+				$this->create_directory($directory . '/' . $_dir, $_dir_struct);
+			}
+		}
+	}
+
+	function collect_diff_files($diff_filename, $package_name)
+	{
+		$diff_result = $binary = array();
+		$diff_contents = file($diff_filename);
+
+		$special_diff_contents = array();
+
+		foreach ($diff_contents as $num => $line)
+		{
+			$line = trim($line);
+
+			if (!$line)
+			{
+				continue;
+			}
+
+			// Special diff content?
+			if (strpos($line, 'diff ' . $this->diff_options . ' ') === 0 || strpos($line, '*** ') === 0 || strpos($line, '--- ') === 0 || (strpos($line, ' Exp $') !== false && strpos($line, '$Id:') !== false))
+			{
+				$special_diff_contents[] = $line;
+			}
+			else if (strpos($line, 'diff ' . $this->diff_options . ' ') === 0 || strpos($line, '*** ') === 0 || strpos($line, '--- ') === 0 || (strpos($line, ' Exp $') !== false && strpos($line, '$Id:') !== false) || (strpos($line, ' $') !== false && strpos($line, '$Id:') !== false))
+			{
+				$special_diff_contents[] = $line;
+			}
+
+			// Is diffing line?
+			if (strstr($line, 'diff ' . $this->diff_options . ' '))
+			{
+				$next_line = $diff_contents[$num+1];
+				if (strpos($next_line, '***') === 0)
+				{
+	//			*** phpbb208/admin/admin_board.php	Sat Jul 10 20:16:26 2004
+					$next_line = explode("\t", $next_line);
+					$next_line = trim($next_line[0]);
+					$next_line = str_replace('*** ' . $package_name . '/', '', $next_line);
+					$diff_result[] = $next_line;
+				}
+			}
+
+			// Is binary?
+			if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9_-]+\/\1 differ/i', $line, $match))
+			{
+				$binary[] = trim($match[1]);
+			}
+		}
+
+		// Now go through the list again and find out which files have how many changes...
+		$num_changes = array();
+
+	/*  [1070] => diff -crN phpbb200/includes/usercp_avatar.php phpbb2023/includes/usercp_avatar.php
+		[1071] => *** phpbb200/includes/usercp_avatar.php	Sat Jul 10 20:16:13 2004
+		[1072] => --- phpbb2023/includes/usercp_avatar.php	Wed Feb  6 22:28:04 2008
+		[1073] => *** 6,12 ****
+		[1074] => !  *   $Id$
+		[1075] => --- 6,12 ----
+		[1076] => *** 51,59 ****
+		[1077] => --- 51,60 ----
+		[1078] => *** 62,80 ****
+		[1079] => --- 63,108 ----
+		[1080] => *** 87,97 ****
+	*/
+		while (($line = array_shift($special_diff_contents)) !== NULL)
+		{
+			$line = trim($line);
+
+			if (!$line)
+			{
+				continue;
+			}
+
+			// Is diffing line?
+			if (strstr($line, 'diff ' . $this->diff_options . ' '))
+			{
+				$next_line = array_shift($special_diff_contents);
+				if (strpos($next_line, '*** ') === 0)
+				{
+	//			*** phpbb208/admin/admin_board.php	Sat Jul 10 20:16:26 2004
+					$next_line = explode("\t", $next_line);
+					$next_line = trim($next_line[0]);
+					$next_line = str_replace('*** ' . $package_name . '/', '', $next_line);
+
+					$is_reached = false;
+					$prev_line = '';
+
+					while (!$is_reached)
+					{
+						$line = array_shift($special_diff_contents);
+
+						if (strpos($line, 'diff ' . $this->diff_options) === 0 || empty($special_diff_contents))
+						{
+							$is_reached = true;
+							array_unshift($special_diff_contents, $line);
+							continue;
+						}
+
+						if (strpos($line, '*** ') === 0 && strpos($line, ' ****') !== false)
+						{
+							$is_comment = false;
+							while (!(strpos($line, '--- ') === 0 && strpos($line, ' ----') !== false))
+							{
+								$line = array_shift($special_diff_contents);
+								if (strpos($line, ' Exp $') !== false || strpos($line, '$Id:') !== false)
+								{
+									$is_comment = true;
+								}
+							}
+
+							if (!$is_comment)
+							{
+								if (!isset($num_changes[$next_line]))
+								{
+									$num_changes[$next_line] = 1;
+								}
+								else
+								{
+									$num_changes[$next_line]++;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Now remove those results not having changes
+		$return = array();
+
+		foreach ($diff_result as $key => $value)
+		{
+			if (isset($num_changes[$value]))
+			{
+				$return[] = $value;
+			}
+		}
+
+		foreach ($binary as $value)
+		{
+			$return[] = $value;
+		}
+
+		$diff_result = $return;
+		unset($return);
+		unset($special_diff_contents);
+
+		$result = array(
+			'files'		=> array(),
+			'binary'	=> array(),
+			'all'		=> $diff_result,
+		);
+
+		$binary_extensions = array('gif', 'jpg', 'jpeg', 'png', 'ttf');
+
+		// Split into file and binary
+		foreach ($diff_result as $filename)
+		{
+			if (strpos($filename, '.') === false)
+			{
+				$result['files'][] = $filename;
+				continue;
+			}
+
+			$extension = explode('.', $filename);
+			$extension = array_pop($extension);
+
+			if (in_array($extension, $binary_extensions))
+			{
+				$result['binary'][] = $filename;
+			}
+			else
+			{
+				$result['files'][] = $filename;
+			}
+		}
+
+		return $result;
+	}
+}

build/compare.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+orig_dir="../../phpBB"
+
+
+rm -rf test_release_files
+mkdir test_release_files
+cd test_release_files
+
+for ext in "tar.bz2" "zip"
+do
+	cp "../new_version/release_files/$1.$ext" ./
+
+	if [ "$ext" = "tar.bz2" ]
+	then
+		command="tar -xjf"
+	else
+		command="unzip -q"
+	fi
+
+	$command "$1.$ext"
+
+	for file in `find phpBB3 -name '.svn' -prune -o -type f -print`
+	do
+		orig_file="${file/#phpBB3/$orig_dir}"
+		diff_result=`diff $orig_file $file`
+
+		if [ -n "$diff_result" ]
+		then
+			echo "Difference in package $1.$ext"
+			echo $diff_result
+		fi
+	done
+
+	rm -rf phpBB3
+done
+
+cd ..
+rm -rf test_release_files
+

build/package.php

@@ -0,0 +1,526 @@
+#!/usr/bin/env php
+<?php
+/**
+*
+* @package build
+* @version $Id$
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+// The only thing i need to adjust. ;)
+// Please always add the latest version number to the end
+// Only have 5 releases here...
+// If RC8 drops remove the install/data directory
+//$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3');
+//$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7');
+$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7-RC2', '3.0.7');
+$verbose = false;
+
+require('build_helper.php');
+
+$package = new build_package($versions, $verbose);
+
+echo "Building Release Packages\n";
+echo "Now all three package types (patch, files, release) are built as well as the update package (update).\n";
+
+$package->begin_status('Remove temporary files');
+
+// Cleanup...
+$package->run_command('rm -Rv ' . $package->get('dest_dir'));
+$package->run_command('rm -Rv ' . $package->get('diff_dir'));
+$package->run_command('rm -Rv ' . $package->get('patch_directory'));
+$package->run_command('rm -Rv ' . $package->get('files_directory'));
+$package->run_command('rm -Rv ' . $package->get('update_directory'));
+$package->run_command('rm -Rv ' . $package->get('release_directory'));
+
+$package->begin_status('Create new directories');
+
+// Make sure the directories got removed
+while (file_exists($package->get('update_directory')))
+{
+	sleep(1);
+}
+
+if (!file_exists($package->get('dest_dir')))
+{
+	$package->run_command('mkdir ' . $package->get('dest_dir'));
+}
+
+if (!file_exists($package->get('diff_dir')))
+{
+	$package->run_command('mkdir ' . $package->get('diff_dir'));
+}
+
+if (!file_exists($package->get('patch_directory')))
+{
+	$package->run_command('mkdir ' . $package->get('patch_directory'));
+}
+
+if (!file_exists($package->get('files_directory')))
+{
+	$package->run_command('mkdir ' . $package->get('files_directory'));
+}
+
+if (!file_exists($package->get('update_directory')))
+{
+	$package->run_command('mkdir ' . $package->get('update_directory'));
+}
+
+if (!file_exists($package->get('release_directory')))
+{
+	$package->run_command('mkdir ' . $package->get('release_directory'));
+}
+
+$package->begin_status('Copy release files to clean release directory');
+
+// Create config.php file
+$package->run_command('touch ' . $package->get('dest_dir') . '/config.php');
+//$package->run_command('sudo chown www-data:www-data ' . $package->get('dest_dir') . '/config.php');
+
+// Create new directory structure
+foreach ($package->clean_directory_structure as $dir => $dir_struct)
+{
+	$package->create_directory($package->get('dest_dir') . '/' . $dir, $dir_struct);
+}
+
+// First step is to copy the new version over (clean structure)
+foreach ($package->files_to_copy as $file)
+{
+	$source_file = $package->locations['new_version'] . $file;
+	$dest_file = $package->get('dest_dir') . '/' . $file;
+
+	$package->run_command("cp -p $source_file $dest_file");
+}
+
+// fix line endings
+chdir($package->get('dest_dir'));
+$package->run_command($package->locations['new_version'] . 'develop/fix_files.sh');
+
+// Now clean up the permissions
+$package->begin_status('Adjust permissions');
+
+$package->adjust_permissions($package->get('dest_dir'));
+
+// Now create a version for diffing the version - copy the tree over to old_versions...
+$package->begin_status('Create diff directory for obtaining file differences');
+
+$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/* ' . $package->get('diff_dir'));
+$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/.htaccess ' . $package->get('diff_dir'));
+
+// Cleanup diff directory (only contents to diff)
+foreach ($package->remove_from_diff_structure as $remove_dir)
+{
+	$package->run_command('rm -Rv ' . $package->get('diff_dir') . '/' . $remove_dir);
+}
+
+// Now, first of all we need to rebuild all old packages we want to support
+foreach ($package->old_packages as $package_name => $tag_name)
+{
+	$package->begin_status('Create old packages directory for diffing to ' . $package_name);
+
+	chdir($package->locations['old_versions']);
+
+	if (is_dir($package->locations['old_versions'] . $package_name))
+	{
+		$package->run_command('rm -Rv ' . $package->locations['old_versions'] . $package_name);
+	}
+
+	// Now, create a new one...
+	$tag_name = 'release_' . str_replace(array('.', '_to_'), array('_', ''), $tag_name);
+
+	$package->run_command('svn export --non-interactive http://code.phpbb.com/svn/phpbb/tags/' . $tag_name . '/phpBB/ ' . $package_name);
+
+	$location = $package->locations['old_versions'] . $package_name;
+	chdir($location . '/');
+
+	$package->run_command($package->locations['new_version'] . 'develop/fix_files.sh');
+
+	// Now clean up the permissions
+	$package->begin_status('Adjust permissions for package ' . $package_name);
+
+	$package->adjust_permissions($location);
+
+	// Cleanup diff directory (only contents to diff)
+	foreach ($package->remove_from_diff_structure as $remove_dir)
+	{
+		$package->run_command('rm -Rv ' . $location . '/' . $remove_dir);
+	}
+}
+
+// Go trough all versions making a diff if we even have old versions
+// For phpBB 3.0.x we might choose a different update method, rendering the things below useless...
+if (sizeof($package->old_packages))
+{
+	chdir($package->locations['old_versions']);
+
+	// This array is for holding the filenames change
+	$diff_file_changes = array();
+
+	foreach ($package->old_packages as $_package_name => $dest_package_filename)
+	{
+		$package->begin_status('Creating patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number'));
+
+		$dest_package_filename = $package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch';
+		$package->run_command('diff ' . $package->diff_options . ' ' . $_package_name . ' ' . $package->get('simple_name') . ' > ' . $dest_package_filename);
+
+		// Parse this diff to determine file changes from the checked versions and save them
+		$diff_file_changes[$_package_name] = $package->collect_diff_files($dest_package_filename, $_package_name);
+	}
+
+	// Now put those files determined within the correct directories
+	foreach ($diff_file_changes as $_package_name => $file_contents)
+	{
+		$package->begin_status('Creating files-only informations for ' . $package->old_packages[$_package_name] . $package->get('new_version_number'));
+
+		$dest_filename_dir = $package->get('files_directory') . '/' . $package->old_packages[$_package_name] . $package->get('new_version_number');
+
+		if (!file_exists($dest_filename_dir))
+		{
+			$package->run_command('mkdir ' . $dest_filename_dir);
+		}
+
+		// Now copy the file contents
+		foreach ($file_contents['all'] as $file)
+		{
+			$source_filename = $package->get('dest_dir') . '/' . $file;
+			$dest_filename = $dest_filename_dir . '/' . $file;
+
+			// Create Directories along the way?
+			$file = explode('/', $file);
+			// Remove filename portion
+			$file[sizeof($file)-1] = '';
+
+			chdir($dest_filename_dir);
+			foreach ($file as $entry)
+			{
+				$entry = trim($entry);
+				if ($entry)
+				{
+					if (!file_exists('./' . $entry))
+					{
+						$package->run_command('mkdir ' . $entry);
+					}
+					chdir('./' . $entry);
+				}
+			}
+
+			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
+		}
+	}
+
+	// Because there might be binary changes, we re-create the patch files... without parsing file differences.
+	$package->run_command('rm -Rv ' . $package->get('patch_directory'));
+
+	if (!file_exists($package->get('patch_directory')))
+	{
+		$package->run_command('mkdir ' . $package->get('patch_directory'));
+	}
+
+	chdir($package->locations['old_versions']);
+
+	foreach ($package->old_packages as $_package_name => $dest_package_filename)
+	{
+		$package->begin_status('Creating patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number'));
+
+		$dest_package_filename = $package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch';
+		$package->run_command('diff ' . $package->diff_options_long . ' ' . $_package_name . ' ' . $package->get('simple_name') . ' > ' . $dest_package_filename);
+	}
+
+	$packages = $diff_file_changes;
+
+	foreach ($packages as $_package_name => $file_contents)
+	{
+		$package->begin_status('Building specific update files for ' . $package->old_packages[$_package_name] . $package->get('new_version_number'));
+
+		$dest_filename_dir = $package->get('update_directory') . '/' . $package->old_packages[$_package_name] . $package->get('new_version_number');
+
+		if (!file_exists($dest_filename_dir))
+		{
+			$package->run_command('mkdir ' . $dest_filename_dir);
+		}
+
+		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $dest_filename_dir);
+		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $dest_filename_dir);
+
+		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update');
+		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update/old');
+		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update/new');
+
+		// Remove some files
+		$package->run_command('rm -v ' . $dest_filename_dir . '/install/install_install.php');
+		$package->run_command('rm -v ' . $dest_filename_dir . '/install/install_convert.php');
+		$package->run_command('rm -Rv ' . $dest_filename_dir . '/install/schemas');
+		$package->run_command('rm -Rv ' . $dest_filename_dir . '/install/convertors');
+
+		foreach ($file_contents['all'] as $index => $file)
+		{
+			if (strpos($file, 'recode_cjk') !== false)
+			{
+				unset($file_contents['all'][$index]);
+			}
+		}
+
+		// First of all, fill the 'old' directory
+		foreach ($file_contents['all'] as $file)
+		{
+			$source_filename = $package->locations['old_versions'] . $_package_name . '/' . $file;
+			$dest_filename = $dest_filename_dir . '/install/update/old/' . $file;
+
+			if (!file_exists($source_filename))
+			{
+				continue;
+			}
+
+			// Create Directories along the way?
+			$file = explode('/', $file);
+			// Remove filename portion
+			$file[sizeof($file)-1] = '';
+
+			chdir($dest_filename_dir . '/install/update/old');
+			foreach ($file as $entry)
+			{
+				$entry = trim($entry);
+				if ($entry)
+				{
+					if (!file_exists('./' . $entry))
+					{
+						$package->run_command('mkdir ' . $entry);
+					}
+					chdir('./' . $entry);
+				}
+			}
+
+			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
+		}
+
+		// Then fill the 'new' directory
+		foreach ($file_contents['all'] as $file)
+		{
+			$source_filename = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $file;
+			$dest_filename = $dest_filename_dir . '/install/update/new/' . $file;
+
+			if (!file_exists($source_filename))
+			{
+				continue;
+			}
+
+			// Create Directories along the way?
+			$file = explode('/', $file);
+			// Remove filename portion
+			$file[sizeof($file)-1] = '';
+
+			chdir($dest_filename_dir . '/install/update/new');
+			foreach ($file as $entry)
+			{
+				$entry = trim($entry);
+				if ($entry)
+				{
+					if (!file_exists('./' . $entry))
+					{
+						$package->run_command('mkdir ' . $entry);
+					}
+					chdir('./' . $entry);
+				}
+			}
+
+			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
+		}
+
+		// Build index.php file for holding the file structure
+		$index_contents = '<?php
+
+if (!defined(\'IN_PHPBB\'))
+{
+	exit;
+}
+
+// Set update info with file structure to update
+$update_info = array(
+	\'version\'	=> array(\'from\' => \'' . str_replace('_to_', '', $package->old_packages[$_package_name]) . '\', \'to\' => \'' . $package->get('new_version_number') . '\'),
+';
+
+		if (sizeof($file_contents['all']))
+		{
+			$index_contents .= '\'files\'		=> array(\'' . implode("',\n\t'", $file_contents['all']) . '\'),
+';
+		}
+		else
+		{
+			$index_contents .= '\'files\'		=> array(),
+';
+		}
+
+		if (sizeof($file_contents['binary']))
+		{
+			$index_contents .= '\'binary\'		=> array(\'' . implode("',\n\t'", $file_contents['binary']) . '\'),
+';
+		}
+		else
+		{
+			$index_contents .= '\'binary\'		=> array(),
+';
+		}
+
+		$index_contents .= ');
+
+?' . '>';
+
+		$fp = fopen($dest_filename_dir . '/install/update/index.php', 'wt');
+		fwrite($fp, $index_contents);
+		fclose($fp);
+	}
+	unset($diff_file_changes);
+
+	$package->begin_status('Clean up all install files');
+
+	// Copy the install files to their respective locations
+	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('patch_directory'));
+	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('patch_directory'));
+
+	// Remove some files
+	chdir($package->get('patch_directory') . '/install');
+
+	$package->run_command('rm -v install_install.php');
+	$package->run_command('rm -v install_update.php');
+	$package->run_command('rm -v install_convert.php');
+	$package->run_command('rm -Rv schemas');
+	$package->run_command('rm -Rv convertors');
+}
+
+// Build Main phpBB Release
+$compress_programs = array(
+//	'tar.gz'	=> 'tar -czf',
+	'tar.bz2'	=> 'tar -cjf',
+	'zip'		=> 'zip -r'
+);
+
+if (sizeof($package->old_packages))
+{
+	// Build Patch Files
+	chdir($package->get('patch_directory'));
+
+	foreach ($compress_programs as $extension => $compress_command)
+	{
+		$package->begin_status('Packaging phpBB Patch Files for ' . $extension);
+		$package->run_command('rm -v ../release_files/' . $package->get('release_filename') . '-patch.' . $extension);
+
+		// Build Package
+		$package->run_command($compress_command . ' ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' *');
+
+		// Build MD5 Sum
+		$package->run_command('md5sum ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' > ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . '.md5');
+	}
+
+	// Build Files Package
+	chdir($package->get('files_directory'));
+
+	foreach ($compress_programs as $extension => $compress_command)
+	{
+		$package->begin_status('Packaging phpBB Files for ' . $extension);
+
+		$package->run_command('rm -v ../release_files/' . $package->get('release_filename') . '-files.' . $extension);
+		$package->run_command('mkdir ' . $package->get('files_directory') . '/release');
+		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('files_directory') . '/release');
+		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('files_directory') . '/release');
+
+		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_install.php');
+		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_update.php');
+		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_convert.php');
+		$package->run_command('rm -Rv ' . $package->get('files_directory') . '/release/install/schemas');
+		$package->run_command('rm -Rv ' . $package->get('files_directory') . '/release/install/convertors');
+
+		// Pack files
+		foreach ($package->old_packages as $_package_name => $package_path)
+		{
+			chdir($package_path . $package->get('new_version_number'));
+			$command = ($extension == 'zip') ? 'zip -r' : 'tar cf';
+			$_ext = ($extension == 'zip') ? 'zip' : 'tar';
+			$package->run_command("$command ../release/phpBB-$package_path" . $package->get('new_version_number') . ".$_ext *");
+			chdir('..');
+		}
+
+		chdir('./release');
+		$package->run_command("$compress_command ../../release_files/" . $package->get('release_filename') . '-files.' . $extension . ' *');
+		// Build MD5 Sum
+		$package->run_command('md5sum ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . ' > ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . '.md5');
+		chdir('..');
+
+		$package->run_command('rm -Rv ' . $package->get('files_directory') . '/release');
+	}
+
+	// Build Update Package
+	foreach ($compress_programs as $extension => $compress_command)
+	{
+		chdir($package->get('update_directory'));
+
+		$package->begin_status('Packaging phpBB Update for ' . $extension);
+
+		$package->run_command('rm -v ../release_files/' . $package->get('release_filename') . '-update.' . $extension);
+		$package->run_command('mkdir ' . $package->get('update_directory') . '/release');
+
+		// Pack update files
+		$packages = $package->old_packages;
+
+		foreach ($packages as $_package_name => $package_path)
+		{
+			chdir($package_path . $package->get('new_version_number'));
+
+			$package->run_command('rm -v install/install_install.php');
+			$package->run_command('rm -v install/install_convert.php');
+			$package->run_command('rm -v includes/utf/data/recode_cjk.php');
+			$package->run_command('rm -Rv install/schemas');
+			$package->run_command('rm -Rv install/convertors');
+
+			$command = ($extension == 'zip') ? 'zip -r' : 'tar cf';
+			$_ext = ($extension == 'zip') ? 'zip' : 'tar';
+			$package->run_command("$command ../release/$package_path" . $package->get('new_version_number') . ".$_ext *");
+			chdir('..');
+
+			$last_version = $package_path . $package->get('new_version_number');
+
+//			chdir('./release');
+//			$package->run_command("$compress_command ../../release_files/" . $package->get('release_filename') . '-update.' . $extension . ' *');
+//			chdir('..');
+
+			chdir('./' . $last_version);
+			// Copy last package over...
+			$package->run_command('rm -v ../release_files/phpBB-' . $last_version . ".$extension");
+			$package->run_command("$compress_command ../../release_files/phpBB-$last_version.$extension *");
+
+			// Build MD5 Sum
+			$package->run_command("md5sum ../../release_files/phpBB-$last_version.$extension > ../../release_files/phpBB-$last_version.$extension.md5");
+			chdir('..');
+		}
+
+		$package->run_command('rm -Rv ' . $package->get('update_directory') . '/release');
+	}
+
+}
+
+// Delete updater and convertor from main archive
+chdir($package->get('dest_dir') . '/install');
+
+// $package->run_command('rm -v database_update.php');
+$package->run_command('rm -v install_update.php');
+
+chdir($package->locations['package_dir']);
+foreach ($compress_programs as $extension => $compress_command)
+{
+	$package->begin_status('Packaging phpBB for ' . $extension);
+	$package->run_command('rm -v ./release_files/' . $package->get('release_filename') . ".{$extension}");
+
+	// Build Package
+	$package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name'));
+
+	// Build MD5 Sum
+	$package->run_command('md5sum ./release_files/' . $package->get('release_filename') . '.' . $extension . ' > ./release_files/' . $package->get('release_filename') . '.' . $extension . '.md5');
+}
+
+// verify results
+chdir($package->locations['root']);
+$package->begin_status('********** Verifying packages **********');
+$package->run_command('./compare.sh ' . $package->package_infos['release_filename']);
+
+echo "Done.\n";

phpBB/.htaccess

@@ -1,3 +1,13 @@
+#
+# Uncomment the statement below if you want to make use of
+# HTTP authentication and it does not already work.
+# This could be required if you are for example using PHP via Apache CGI.
+#
+#<IfModule mod_rewrite.c>
+#RewriteEngine on
+#RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+#</IfModule>
+
 <Files "config.php">
 Order Allow,Deny
 Deny from All

phpBB/adm/admin_ban.php

@@ -1,308 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_ban'))
-	{
-		return;
-	}
-
-	$filename = basename(__FILE__);
-	$module['USER']['BAN_USERS'] = $filename . "$SID&amp;mode=user";
-	$module['USER']['BAN_EMAILS'] = $filename . "$SID&amp;mode=email";
-	$module['USER']['BAN_IPS'] = $filename . "$SID&amp;mode=ip";
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Load default header
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_user.'.$phpEx);
-
-// Do we have ban permissions?
-if (!$auth->acl_get('a_ban'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Mode setting
-$mode		= request_var('mode', '');
-$bansubmit	= (isset($_POST['bansubmit'])) ? true : false;
-$unbansubmit= (isset($_POST['unbansubmit'])) ? true : false;
-
-// Set some vars
-$current_time = time();
-
-// Start program
-if ($bansubmit)
-{
-	// Grab the list of entries
-	$ban			= request_var('ban', '');
-	$ban_len		= request_var('banlength', 0);
-	$ban_len_other	= request_var('banlengthother', '');
-	$ban_exclude	= request_var('banexclude', 0);
-	$ban_reason		= request_var('banreason', '');
-
-	user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason);
-
-	trigger_error($user->lang['BAN_UPDATE_SUCESSFUL']);
-}
-else if ($unbansubmit)
-{
-	$ban = request_var('unban', '');
-
-	user_unban($mode, $ban);
-
-	trigger_error($user->lang['BAN_UPDATE_SUCESSFUL']);
-}
-
-//
-// Output relevant entry page
-//
-
-
-//
-// Ban length options
-//
-$ban_end_text = array(0 => $user->lang['PERMANENT'], 30 => $user->lang['30_MINS'], 60 => $user->lang['1_HOUR'], 360 => $user->lang['6_HOURS'], 1440 => $user->lang['1_DAY'], 10080 => $user->lang['7_DAYS'], 20160 => $user->lang['2_WEEKS'], 40320 => $user->lang['1_MONTH'], -1 => $user->lang['OTHER'] . ' -&gt; ');
-
-$ban_end_options = '';
-foreach ($ban_end_text as $length => $text)
-{
-	$ban_end_options .= '<option value="' . $length . '">' . $text . '</option>';
-}
-
-// Title
-switch ($mode)
-{
-	case 'user':
-		$l_title = $user->lang['BAN_USERS'];
-		break;
-	case 'email':
-		$l_title = $user->lang['BAN_EMAILS'];
-		break;
-	case 'ip':
-		$l_title = $user->lang['BAN_IPS'];
-		break;
-}
-
-// Output page
-adm_page_header($l_title);
-
-?>
-
-<p><?php echo $user->lang['BAN_EXPLAIN']; ?></p>
-
-<?php
-
-switch ($mode)
-{
-	case 'user':
-
-		$field = 'username';
-		$l_ban_title = $user->lang['BAN_USERS'];
-		$l_ban_explain = $user->lang['BAN_USERNAME_EXPLAIN'];
-		$l_ban_exclude_explain = $user->lang['BAN_USER_EXCLUDE_EXPLAIN'];
-		$l_unban_title = $user->lang['UNBAN_USERNAME'];
-		$l_unban_explain = $user->lang['UNBAN_USERNAME_EXPLAIN'];
-		$l_ban_cell = $user->lang['USERNAME'] . ': <br /><span class="gensmall">[ <a href="' . "../memberlist.$phpEx$SID&amp;mode=searchuser&amp;form=banning&amp;field=ban\" onclick=\"window.open('../memberlist.$phpEx$SID&amp;mode=searchuser&amp;form=banning&amp;field=ban', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;\">" . $user->lang['FIND_USERNAME'] .'</a> ]</span>';
-		$l_no_ban_cell = $user->lang['NO_BANNED_USERS'];
-
-		$sql = 'SELECT b.*, u.user_id, u.username
-			FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u
-			WHERE (b.ban_end >= ' . time() . '
-					OR b.ban_end = 0)
-				AND u.user_id = b.ban_userid
-				AND b.ban_userid <> 0
-				AND u.user_id <> ' . ANONYMOUS . '
-			ORDER BY u.user_id ASC';
-		break;
-
-	case 'ip':
-
-		$field = 'ban_ip';
-		$l_ban_title = $user->lang['BAN_IPS'];
-		$l_ban_explain = $user->lang['BAN_IP_EXPLAIN'];
-		$l_ban_exclude_explain = $user->lang['BAN_IP_EXCLUDE_EXPLAIN'];
-		$l_unban_title = $user->lang['UNBAN_IP'];
-		$l_unban_explain = $user->lang['UNBAN_IP_EXPLAIN'];
-		$l_ban_cell = $user->lang['IP_HOSTNAME'] . ':';
-		$l_no_ban_cell = $user->lang['NO_BANNED_IP'];
-
-		$sql = 'SELECT *
-			FROM ' . BANLIST_TABLE . '
-			WHERE (ban_end >= ' . time() . "
-					OR ban_end = 0)
-				AND ban_ip <> ''";
-		break;
-
-	case 'email':
-
-		$field = 'ban_email';
-		$l_ban_title = $user->lang['BAN_EMAILS'];
-		$l_ban_explain = $user->lang['BAN_EMAIL_EXPLAIN'];
-		$l_ban_exclude_explain = $user->lang['BAN_EMAIL_EXCLUDE_EXPLAIN'];
-		$l_unban_title = $user->lang['UNBAN_EMAIL'];
-		$l_unban_explain = $user->lang['UNBAN_EMAIL_EXPLAIN'];
-		$l_ban_cell = $user->lang['EMAIL_ADDRESS'] . ':';
-		$l_no_ban_cell = $user->lang['NO_BANNED_EMAIL'];
-
-		$sql = 'SELECT *
-			FROM ' . BANLIST_TABLE . '
-			WHERE (ban_end >= ' . time() . "
-					OR ban_end = 0)
-				AND ban_email <> ''";
-		break;
-}
-$result = $db->sql_query($sql);
-
-$banned_options = '';
-$ban_length = $ban_reasons = array();
-if ($row = $db->sql_fetchrow($result))
-{
-	do
-	{
-
-		$banned_options .=  '<option' . (($row['ban_exclude']) ? ' class="sep"' : '') . ' value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
-
-		$time_length = (!empty($row['ban_end'])) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0;
-		$ban_length[$row['ban_id']] = (!empty($ban_end_text[$time_length])) ? $ban_end_text[$time_length] : $user->lang['OTHER'] . ' -> ' . gmdate('Y-m-d', $row['ban_end']);
-
-		$ban_reasons[$row['ban_id']] = addslashes($row['ban_reason']);
-	}
-	while ($row = $db->sql_fetchrow($result));
-}
-$db->sql_freeresult($result);
-
-?>
-
-<h1><?php echo $l_ban_title; ?></h1>
-
-<p><?php echo $l_ban_explain; ?></p>
-
-<script language="Javascript" type="text/javascript">
-<!--
-
-var ban_length = new Array();
-<?php
-
-	if (sizeof($ban_length))
-	{
-		foreach ($ban_length as $ban_id => $length)
-		{
-			echo "ban_length['$ban_id'] = \"$length\";\n";
-		}
-	}
-
-?>
-
-var ban_reason = new Array();
-<?php
-
-	if (sizeof($ban_reasons))
-	{
-		foreach ($ban_reasons as $ban_id => $reason)
-		{
-			echo "ban_reason['$ban_id'] = \"$reason\";\n";
-		}
-	}
-?>
-
-function display_details(option)
-{
-	document.forms[0].unbanreason.value = ban_reason[option];
-	document.forms[0].unbanlength.value = ban_length[option];
-}
-
-//-->
-</script>
-
-<form name="banning" method="post" action="<?php echo "admin_ban.$phpEx$SID&amp;mode=$mode"; ?>"><table class="bg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $l_ban_title; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" width="45%"><?php echo $l_ban_cell; ?></td>
-		<td class="row2"><textarea cols="40" rows="3" name="ban"></textarea></td>
-	</tr>
-	<tr>
-		<td class="row1" width="45%"><?php echo $user->lang['BAN_LENGTH']; ?>:</td>
-		<td class="row2"><select name="banlength"><?php echo $ban_end_options; ?></select>&nbsp; <input class="post" type="text" name="banlengthother" maxlength="10" size="10" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="45%"><?php echo $user->lang['BAN_EXCLUDE']; ?>: <br /><span class="gensmall"><?php echo $l_ban_exclude_explain;;?></span></td>
-		<td class="row2"><input type="radio" name="banexclude" value="1" /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="banexclude" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1" width="45%"><?php echo $user->lang['BAN_REASON']; ?>:</td>
-		<td class="row2"><input class="post" type="text" name="banreason" maxlength="255" size="40" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"> <input type="submit" name="bansubmit" value="<?php echo $user->lang['SUBMIT']; ?>" class="btnmain" />&nbsp; <input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="btnlite" />&nbsp;</td>
-	</tr>
-</table>
-
-<h1><?php echo $l_unban_title; ?></h1>
-
-<p><?php echo $l_unban_explain; ?></p>
-
-<table class="bg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $l_unban_title; ?></th>
-	</tr>
-<?php
-
-	if ($banned_options)
-	{
-
-?>
-	<tr>
-		<td class="row1" width="45%"><?php echo $l_ban_cell; ?>: <br /></td>
-		<td class="row2"> <select name="unban[]" multiple="multiple" size="5" onchange="display_details(this.options[this.selectedIndex].value)"><?php echo $banned_options; ?></select></td>
-	</tr>
-	<tr>
-		<td class="row1" width="45%"><?php echo $user->lang['BAN_REASON']; ?>:</td>
-		<td class="row2"><input class="row1" style="border:0px" type="text" name="unbanreason" size="40" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="45%"><?php echo $user->lang['BAN_LENGTH']; ?>:</td>
-		<td class="row2"><input class="row1" style="border:0px" type="text" name="unbanlength" size="40" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="<?php echo $user->lang['SUBMIT']; ?>" class="btnmain" />&nbsp; <input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="btnlite" /></td>
-	</tr>
-<?php
-
-	}
-	else
-	{
-
-?>
-	<tr>
-		<td class="row2" colspan="2" align="center"><?php echo $l_no_ban_cell;  ?></td>
-	</tr>
-<?php
-
-	}
-
-?>
-</table></form>
-
-<?php
-
-adm_page_footer();
-
-?>

phpBB/adm/admin_bbcodes.php

@@ -1,440 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_bbcode'))
-	{
-		return;
-	}
-
-	$module['POST']['BBCODES'] = basename(__FILE__) . $SID;
-	return;
-}
-
-define('IN_PHPBB', 1);
-
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Do we have general permissions?
-if (!$auth->acl_get('a_bbcode'))
-{
-	trigger_error('NO_ADMIN');
-}
-
-// Set up general vars
-$mode = request_var('mode', '');
-$bbcode_id = request_var('bbcode', 0);
-
-// Set up mode-specific vars
-switch ($mode)
-{
-	case 'add':
-		$bbcode_match = $bbcode_tpl = '';
-		break;
-
-	case 'edit':
-		$sql = 'SELECT bbcode_match, bbcode_tpl
-			FROM ' . BBCODES_TABLE . '
-			WHERE bbcode_id = ' . $bbcode_id;
-		$result = $db->sql_query($sql);
-		if (!$row = $db->sql_fetchrow($result))
-		{
-			trigger_error('BBCODE_NOT_EXIST');
-		}
-		$db->sql_freeresult($result);
-
-		$bbcode_match = $row['bbcode_match'];
-		$bbcode_tpl = htmlspecialchars($row['bbcode_tpl']);
-		break;
-
-	case 'modify':
-		$sql = 'SELECT bbcode_id
-			FROM ' . BBCODES_TABLE . '
-			WHERE bbcode_id = ' . $bbcode_id;
-		$result = $db->sql_query($sql);
-		if (!$row = $db->sql_fetchrow($result))
-		{
-			trigger_error('BBCODE_NOT_EXIST');
-		}
-		$db->sql_freeresult($result);
-
-		// No break here
-
-	case 'create':
-		$bbcode_match = htmlspecialchars(stripslashes($_POST['bbcode_match']));
-		$bbcode_tpl = stripslashes($_POST['bbcode_tpl']);
-		break;
-}
-
-// Do major work
-switch ($mode)
-{
-	case 'edit':
-	case 'add':
-		adm_page_header($user->lang['BBCODES']);
-
-?>
-
-<h1><?php echo $user->lang['BBCODES'] ?></h1>
-
-<p><?php echo $user->lang['BBCODES_EXPLAIN'] ?></p>
-
-<form method="post" action="admin_bbcodes.<?php echo $phpEx . $SID . '&amp;mode=' . (($mode == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&amp;bbcode=$bbcode_id" : '') ?>">
-<table cellspacing="1" cellpadding="0" border="0" align="center" width="90%">
-	<tr>
-		<td><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-			<tr>
-				<th colspan="2"><?php echo $user->lang['BBCODE_USAGE'] ?></th>
-			</tr>
-			<tr>
-				<td class="row3" colspan="2"><?php echo $user->lang['BBCODE_USAGE_EXPLAIN'] ?></td>
-			</tr>
-			<tr valign="top">
-				<td class="row1" width="40%"><b><?php echo $user->lang['EXAMPLES'] ?></b><br /><br /><?php echo $user->lang['BBCODE_USAGE_EXAMPLE'] ?></td>
-				<td class="row2"><textarea name="bbcode_match" cols="60" rows="5"><?php echo $bbcode_match ?></textarea></td>
-			</tr>
-		</table></td>
-	</tr>
-</table>
-
-<br clear="all" />
-
-<table cellspacing="1" cellpadding="0" border="0" align="center" width="90%">
-	<tr>
-		<td><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-			<tr>
-				<th colspan="2"><?php echo $user->lang['HTML_REPLACEMENT'] ?></th>
-			</tr>
-			<tr>
-				<td class="row3" colspan="2"><?php echo $user->lang['HTML_REPLACEMENT_EXPLAIN'] ?></td>
-			</tr>
-			<tr valign="top">
-				<td class="row1" width="40%"><b><?php echo $user->lang['EXAMPLES'] ?></b><br /><br /><?php echo $user->lang['HTML_REPLACEMENT_EXAMPLE'] ?></td>
-				<td class="row2"><textarea name="bbcode_tpl" cols="60" rows="8"><?php echo $bbcode_tpl ?></textarea></td>
-			</tr>
-			<tr>
-				<td class="cat" colspan="2" align="center"><input type="submit" value="<?php echo $user->lang['SUBMIT'] ?>" class="btnmain" /></td>
-			</tr>
-		</table></td>
-	</tr>
-</table>
-
-<br clear="all" />
-
-<table cellspacing="1" cellpadding="0" border="0" align="center" width="90%">
-	<tr>
-		<td><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-			<tr>
-				<th colspan="2"><?php echo $user->lang['TOKENS'] ?></th>
-			</tr>
-			<tr>
-				<td class="row3" colspan="2"><?php echo $user->lang['TOKENS_EXPLAIN'] ?></td>
-			</tr>
-			<tr>
-				<th><?php echo $user->lang['TOKEN'] ?></th>
-				<th><?php echo $user->lang['TOKEN_DEFINITION'] ?></th>
-			</tr>
-<?php
-
-		foreach ($user->lang['tokens'] as $token => $token_explain)
-		{
-			?><tr valign="top">
-				<td class="row1">{<?php echo $token ?>}</td>
-				<td class="row2"><?php echo $token_explain ?></td>
-			</tr><?php
-		}
-
-?>
-		</table></td>
-	</tr>
-</table>
-</form>
-
-<?php
-
-		adm_page_footer();
-		break;
-
-	case 'modify':
-	case 'create':
-		adm_page_header($user->lang['BBCODES']);
-
-		$data = build_regexp($bbcode_match, $bbcode_tpl);
-
-		$sql_ary = array(
-			'bbcode_tag'				=> $data['bbcode_tag'],
-			'bbcode_match'				=> $bbcode_match,
-			'bbcode_tpl'				=> $bbcode_tpl,
-			'first_pass_match'			=> $data['first_pass_match'],
-			'first_pass_replace'		=> $data['first_pass_replace'],
-			'second_pass_match'			=> $data['second_pass_match'],
-			'second_pass_replace'		=> $data['second_pass_replace']
-		);
-
-		if ($mode == 'create')
-		{
-			/* TODO: look for SQL incompatibilities
-			// NOTE: I'm sure there was another simpler (and obvious) way of finding a suitable bbcode_id
-			$sql = 'SELECT b1.bbcode_id
-				FROM ' . BBCODES_TABLE . ' b1, ' . BBCODES_TABLE . ' b2
-				WHERE b2.bbcode_id > b1.bbcode_id
-				GROUP BY b1.bbcode_id
-				HAVING MIN(b2.bbcode_id) > b1.bbcode_id + 1
-				ORDER BY b1.bbcode_id ASC';
-			$result = $db->sql_query_limit($sql, 1);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-*/
-			$sql = 'SELECT MAX(bbcode_id) as bbcode_id
-				FROM ' . BBCODES_TABLE;
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			if ($row)
-			{
-				$bbcode_id = $row['bbcode_id'] + 1;
-			}
-			else
-			{
-				$sql = 'SELECT MIN(bbcode_id) AS min_id, MAX(bbcode_id) AS max_id
-					FROM ' . BBCODES_TABLE;
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
-
-				if (empty($row['min_id']) || $row['min_id'] >= NUM_CORE_BBCODES)
-				{
-					$bbcode_id = NUM_CORE_BBCODES + 1;
-				}
-				else
-				{
-					$bbcode_id = $row['max_id'] + 1;
-				}
-			}
-
-			if ($bbcode_id > 31)
-			{
-				trigger_error('TOO_MANY_BBCODES');
-			}
-
-			$sql_ary['bbcode_id'] = (int) $bbcode_id;
-
-			$db->sql_query('INSERT INTO ' . BBCODES_TABLE . $db->sql_build_array('INSERT', $sql_ary));
-			$lang = 'BBCODE_ADDED';
-			$log_action = 'LOG_BBCODE_ADD';
-		}
-		else
-		{
-			$db->sql_query('UPDATE ' . BBCODES_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE bbcode_id = ' . $bbcode_id);
-			$lang = 'BBCODE_EDITED';
-			$log_action = 'LOG_BBCODE_EDIT';
-		}
-
-		add_log('admin', $log_action, $data['bbcode_tag']);
-
-		trigger_error($lang);
-		break;
-
-	case 'delete':
-		$sql = 'SELECT bbcode_tag
-			FROM ' . BBCODES_TABLE . "
-			WHERE bbcode_id = $bbcode_id";
-		$result = $db->sql_query($sql);
-		
-		if ($row = $db->sql_fetchrow($result))
-		{
-			$db->sql_query('DELETE FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id");
-			add_log('admin', 'LOG_BBCODE_DELETE', $row['bbcode_tag']);
-		}
-		$db->sql_freeresult($result);
-
-		// No break here
-
-	default:
-
-		adm_page_header($user->lang['BBCODES']);
-
-?>
-
-<h1><?php echo $user->lang['BBCODES'] ?></h1>
-
-<p><?php echo $user->lang['BBCODES_EXPLAIN'] ?></p>
-
-
-<form method="post" action="admin_bbcodes.<?php echo $phpEx . $SID ?>&amp;mode=add"><table cellspacing="1" cellpadding="0" border="0" align="center">
-	<tr>
-		<td><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-			<tr>
-				<th><?php echo $user->lang['BBCODE_TAG'] ?></th>
-				<th><?php echo $user->lang['ACTION'] ?></th>
-			</tr><?php
-
-		$sql = 'SELECT *
-			FROM ' . BBCODES_TABLE . '
-			ORDER BY bbcode_id';
-		$result = $db->sql_query($sql);
-
-		$row_class = '';
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-?>
-			<tr>
-				<td class="<?php echo $row_class ?>" align="center"><?php echo $row['bbcode_tag'] ?></td>
-				<td class="<?php echo $row_class ?>" align="center"><a href="admin_bbcodes.<?php echo $phpEx . $SID ?>&amp;mode=edit&amp;bbcode=<?php echo $row['bbcode_id'] ?>"><?php echo $user->lang['EDIT'] ?></a> | <a href="admin_bbcodes.<?php echo $phpEx . $SID ?>&amp;mode=delete&amp;bbcode=<?php echo $row['bbcode_id'] ?>"><?php echo $user->lang['DELETE'] ?></a></td>
-			</tr>
-<?php
-		}
-		$db->sql_freeresult($result);
-
-?>
-
-			<tr>
-				<td class="cat" colspan="2" align="center"><input type="submit" value="<?php echo $user->lang['ADD_BBCODE'] ?>" class="btnmain" /></td>
-			</tr>
-		</table></td>
-	</tr>
-</table></form>
-
-<?php
-
-	adm_page_footer();
-}
-
-// -----------------------------
-// Functions
-function build_regexp($msg_bbcode, $msg_html)
-{
-	$msg_bbcode = trim($msg_bbcode);
-	$msg_html = trim($msg_html);
-
-	$fp_match = preg_quote($msg_bbcode, '!');
-	$fp_replace = preg_replace('#^\[(.*?)\]#', '[$1:$uid]', $msg_bbcode);
-	$fp_replace = preg_replace('#\[/(.*?)\]$#', '[/$1:$uid]', $fp_replace);
-
-	$sp_match = preg_quote($msg_bbcode, '!');
-	$sp_match = preg_replace('#^\\\\\[(.*?)\\\\\]#', '\[$1:$uid\]', $sp_match);
-	$sp_match = preg_replace('#\\\\\[/(.*?)\\\\\]$#', '\[/$1:$uid\]', $sp_match);
-	$sp_replace = $msg_html;
-
-	$tokens = array(
-		'URL'	 => array(
-			'!([a-z0-9]+://)?([^?].*?[^ \t\n\r<"]*)!ie'	=>	"(('\$1') ? '\$1\$2' : 'http://\$2')"
-		),
-		'LOCAL_URL'	 => array(
-			'!([^:]+/[^ \t\n\r<"]*)!'	=>	'$1'
-		),
-		'EMAIL' => array(
-			'!([a-z0-9]+[a-z0-9\-\._]*@(?:(?:[0-9]{1,3}\.){3,5}[0-9]{1,3}|[a-z0-9]+[a-z0-9\-\._]*\.[a-z]+))!i'	=>	'$1'
-		),
-		'TEXT' => array(
-			'!(.*?)!es'	 =>	"str_replace('\\\"', '&quot;', str_replace('\\'', '&#39;', '\$1'))"
-		),
-		'COLOR' => array(
-			'!([a-z]+|#[0-9abcdef]+!i'	=>	'$1'
-		),
-		'NUMBER' => array(
-			'!([0-9]+)!'	=>	'$1'
-		)
-	);
-
-	if (preg_match_all('/\{(' . implode('|', array_keys($tokens)) . ')[0-9]*\}/i', $msg_bbcode, $m))
-	{
-		$pad = 0;
-		$modifiers = 'i';
-
-		foreach ($m[0] as $n => $token)
-		{
-			$token_type = $m[1][$n];
-
-			reset($tokens[$token_type]);
-			list($match, $replace) = each($tokens[$token_type]);
-
-			// Pad backreference numbers from tokens
-			if (preg_match_all('/(?<!\\\\)\$([0-9]+)/', $replace, $repad))
-			{
-				$repad = $pad + count(array_unique($repad[0]));
-				$replace = preg_replace('/(?<!\\\\)\$([0-9]+)/e', "'\$' . (\$1 + \$pad)", $replace);
-				$pad = $repad;
-			}
-
-			// Obtain pattern modifiers to use and alter the regex accordingly
-			$regex = preg_replace('/!(.*)!([a-z]*)/', '$1', $match);
-			$regex_modifiers = preg_replace('/!(.*)!([a-z]*)/', '$2', $match);
-
-			for ($i = 0; $i < strlen($regex_modifiers); ++$i)
-			{
-				if (strpos($modifiers, $regex_modifiers[$i]) === FALSE)
-				{
-					$modifiers .= $regex_modifiers[$i];
-
-					if ($regex_modifiers[$i] == 'e')
-					{
-						$fp_replace = "'" . str_replace("'", "\\'", $fp_replace) . "'";
-					}
-				}
-
-				if ($regex_modifiers[$i] == 'e')
-				{
-					$replace = "'.$replace.'";
-				}
-			}
-
-			$fp_match = str_replace(preg_quote($token, '!'), $regex, $fp_match);
-			$fp_replace = str_replace($token, $replace, $fp_replace);
-
-			$sp_match = str_replace(preg_quote($token, '!'), '(.*?)', $sp_match);
-			$sp_replace = str_replace($token, '$' . ($n + 1), $sp_replace);
-		}
-
-		$fp_match = '!' . $fp_match . '!' . $modifiers;
-		$sp_match = '!' . $sp_match . '!s';
-
-		if (strpos($fp_match, 'e') !== FALSE)
-		{
-			$fp_replace = str_replace("'.'", '', $fp_replace);
-			$fp_replace = str_replace(".''.", '.', $fp_replace);
-		}
-	}
-	else
-	{
-		// No replacement is present, no need for a second-pass pattern replacement
-		// A simple str_replace will suffice
-		$fp_match = '!' . $fp_match . '!' . $modifiers;
-		$sp_match = $fp_replace;
-		$sp_replace = '';
-	}
-
-	// Lowercase tags
-	$bbcode_tag = preg_replace('/.*?\[([a-z]+).*/i', '$1', $msg_bbcode);
-	$fp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $fp_match);
-	$fp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $fp_replace);
-	$sp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $sp_match);
-	$sp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $sp_replace);
-
-	return array(
-		'bbcode_tag'				=> $bbcode_tag,
-		'first_pass_match'			=> $fp_match,
-		'first_pass_replace'		=> $fp_replace,
-		'second_pass_match'			=> $sp_match,
-		'second_pass_replace'		=> $sp_replace
-	);
-}
-// End Functions
-// -----------------------------
-
-?>

phpBB/adm/admin_board.php

@@ -1,517 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	$filename = basename(__FILE__);
-	$module['GENERAL']['AUTH_SETTINGS']		= ($auth->acl_get('a_server')) ? "$filename$SID&amp;mode=auth" : '';
-	$module['GENERAL']['AVATAR_SETTINGS']	= ($auth->acl_get('a_board')) ? "$filename$SID&amp;mode=avatar" : '';
-	$module['GENERAL']['BOARD_DEFAULTS']	= ($auth->acl_get('a_defaults')) ? "$filename$SID&amp;mode=default" : '';
-	$module['GENERAL']['BOARD_SETTINGS']	= ($auth->acl_get('a_board')) ? "$filename$SID&amp;mode=setting" : '';
-	$module['GENERAL']['COOKIE_SETTINGS']	= ($auth->acl_get('a_cookies')) ? "$filename$SID&amp;mode=cookie" : '';
-	$module['GENERAL']['EMAIL_SETTINGS']	= ($auth->acl_get('a_server')) ? "$filename$SID&amp;mode=email" : '';
-	$module['GENERAL']['LOAD_SETTINGS']		= ($auth->acl_get('a_server')) ? "$filename$SID&amp;mode=load" : '';
-	$module['GENERAL']['SERVER_SETTINGS']	= ($auth->acl_get('a_server')) ? "$filename$SID&amp;mode=server" : '';
-	$module['GENERAL']['MESSAGE_SETTINGS']	= ($auth->acl_get('a_defaults')) ? "$filename$SID&amp;mode=message" : '';
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Load default header
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Get mode
-$mode	= request_var('mode', '');
-$action	= request_var('action', '');
-$submit = (isset($_POST['submit'])) ? true : false;
-
-// Set config vars
-$display_vars = array(
-	'cookie' => array(
-		'auth'	=> 'a_cookies',
-		'title'	=> 'COOKIE_SETTINGS',
-		'vars'	=> array(
-			'cookie_domain'	=> array('lang' => 'COOKIE_DOMAIN',	'type' => 'text::255', 'explain' => false),
-			'cookie_name'	=> array('lang' => 'COOKIE_NAME',	'type' => 'text::16', 'explain' => false),
-			'cookie_path'	=> array('lang'	=> 'COOKIE_PATH',	'type' => 'text::255', 'explain' => false),
-			'cookie_secure'	=> array('lang' => 'COOKIE_SECURE',	'type' => 'radio:disabled_enabled', 'explain' => true)
-		)
-	),
-	'avatar' => array(
-		'auth'	=> 'a_board',
-		'title'	=> 'AVATAR_SETTINGS',
-		'vars'	=> array(
-			'avatar_min_height' => false, 'avatar_min_width' => false, 'avatar_max_height' => false, 'avatar_max_width' => false,
-
-			'allow_avatar_local'	=> array('lang' => 'ALLOW_LOCAL',	'type' => 'radio:yes_no', 'explain' => false),
-			'allow_avatar_remote'	=> array('lang' => 'ALLOW_REMOTE',	'type' => 'radio:yes_no', 'explain' => true),
-			'allow_avatar_upload'	=> array('lang' => 'ALLOW_UPLOAD',	'type' => 'radio:yes_no', 'explain' => false),
-			'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',	'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
-			'avatar_min'			=> array('lang' => 'MIN_AVATAR_SIZE',	'type' => 'dimension:3:4', 'explain' => true),
-			'avatar_max'			=> array('lang' => 'MAX_AVATAR_SIZE',	'type' => 'dimension:3:4', 'explain' => true),
-			'avatar_path'			=> array('lang' => 'AVATAR_STORAGE_PATH',	'type' => 'text:20:255', 'explain' => true),
-			'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'type' => 'text:20:255', 'explain' => true)
-		)
-	),
-	'email'	=> array(
-		'auth'	=> 'a_server',
-		'title'	=> 'EMAIL_SETTINGS',
-		'vars'	=> array(
-			'email_enable'			=> array('lang' => 'ENABLE_EMAIL',			'type' => 'radio:enabled_disabled', 'explain' => true),
-			'board_email_form'		=> array('lang' => 'BOARD_EMAIL_FORM',		'type' => 'radio:enabled_disabled', 'explain' => true),
-			'board_hide_emails'		=> array('lang' => 'BOARD_HIDE_EMAILS',		'type' => 'radio:enabled_disabled', 'explain' => true),
-			'email_function_name'	=> array('lang' => 'EMAIL_FUNCTION_NAME',	'type' => 'text:20:50', 'explain' => true),
-			'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'type' => 'text:5:5', 'explain' => true),
-			'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'type' => 'text:25:100', 'explain' => true),
-			'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'type' => 'text:25:100', 'explain' => true),
-			'board_email_sig'		=> array('lang' => 'EMAIL_SIG',				'type' => 'textarea:5:30', 'explain' => true),
-			'smtp_delivery'			=> array('lang' => 'USE_SMTP',				'type' => 'radio:yes_no', 'explain' => true),
-			'smtp_host'				=> array('lang' => 'SMTP_SERVER',			'type' => 'text:25:50', 'explain' => false),
-			'smtp_port'				=> array('lang' => 'SMTP_PORT',				'type' => 'text:4:5', 'explain' => true),
-			'smtp_auth_method'		=> array('lang' => 'SMTP_AUTH_METHOD',		'type' => 'select', 'options' => 'mail_auth_select(\'{VALUE}\')', 'explain' => true),
-			'smtp_username'			=> array('lang' => 'SMTP_USERNAME',			'type' => 'text:25:255', 'explain' => true),
-			'smtp_password'			=> array('lang' => 'SMTP_PASSWORD',			'type' => 'password:25:255', 'explain' => true)
-		)
-	),
-	'load'	=> array(
-		'auth'	=> 'a_server',
-		'title'	=> 'SERVER_SETTINGS',
-		'vars'	=> array(
-			'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'type' => 'text:4:4', 'explain' => true),
-			'session_length'	=> array('lang' => 'SESSION_LENGTH',	'type' => 'text:5:5', 'explain' => true),
-			'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'type' => 'text:4:4', 'explain' => true),
-			'load_db_track'		=> array('lang' => 'YES_POST_MARKING',	'type' => 'radio:yes_no', 'explain' => true),
-			'load_db_lastread'	=> array('lang' => 'YES_READ_MARKING',	'type' => 'radio:yes_no', 'explain' => true),
-			'load_online'		=> array('lang' => 'YES_ONLINE',		'type' => 'radio:yes_no', 'explain' => true),
-			'load_online_guests'=> array('lang' => 'YES_ONLINE_GUESTS',	'type' => 'radio:yes_no', 'explain' => true),
-			'load_onlinetrack'	=> array('lang' => 'YES_ONLINE_TRACK',	'type' => 'radio:yes_no', 'explain' => true),
-			'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'type' => 'text:4:3', 'explain' => true),
-			'load_birthdays'	=> array('lang' => 'YES_BIRTHDAYS',		'type' => 'radio:yes_no', 'explain' => false),
-			'load_moderators'	=> array('lang' => 'YES_MODERATORS',	'type' => 'radio:yes_no', 'explain' => false),
-			'load_jumpbox'		=> array('lang' => 'YES_JUMPBOX',		'type' => 'radio:yes_no', 'explain' => false),
-			'load_search'		=> array('lang' => 'YES_SEARCH',		'type' => 'radio:yes_no', 'explain' => true),
-			'search_interval'	=> array('lang' => 'SEARCH_INTERVAL',	'type' => 'text:3:4', 'explain' => true),
-			'min_search_chars'	=> array('lang' => 'MIN_SEARCH_CHARS',	'type' => 'text:3:3', 'explain' => true),
-			'max_search_chars'	=> array('lang' => 'MAX_SEARCH_CHARS',	'type' => 'text:3:3', 'explain' => true),
-			'load_search_upd'	=> array('lang' => 'YES_SEARCH_UPDATE',	'type' => 'radio:yes_no', 'explain' => true),
-//			'load_search_phr'	=> array('lang' => 'YES_SEARCH_PHRASE',	'type' => 'radio:yes_no', 'explain' => true),
-			'load_tplcompile'	=> array('lang' => 'RECOMPILE_TEMPLATES', 'type' => 'radio:yes_no', 'explain' => true)
-		)
-	),
-	'default' => array(
-		'auth'	=> 'a_defaults',
-		'title'	=> 'BOARD_DEFAULTS',
-		'vars'	=> array(
-			'default_style'			=> array('lang' => 'DEFAULT_STYLE',			'type' => 'select', 'options' => 'style_select(\'{VALUE}\', true)', 'explain' => false),
-			'override_user_style'	=> array('lang' => 'OVERRIDE_STYLE',		'type' => 'radio:yes_no', 'explain' => true),
-			'default_lang'			=> array('lang' => 'DEFAULT_LANGUAGE',		'type' => 'select', 'options' => 'language_select(\'{VALUE}\')', 'explain' => false),
-			'default_dateformat'	=> array('lang' => 'DEFAULT_DATE_FORMAT',	'type' => 'text::255', 'explain' => true),
-			'board_timezone'		=> array('lang' => 'SYSTEM_TIMEZONE',		'type' => 'select', 'options' => 'tz_select(\'{VALUE}\')', 'explain' => false),
-			'board_dst'				=> array('lang' => 'SYSTEM_DST',			'type' => 'radio:yes_no', 'explain' => false),
-			'allow_privmsg'			=> array('lang' => 'BOARD_PM',				'type' => 'radio:yes_no', 'explain' => true),
-			'allow_topic_notify'	=> array('lang' => 'ALLOW_TOPIC_NOTIFY',	'type' => 'radio:yes_no', 'explain' => false),
-			'allow_forum_notify'	=> array('lang' => 'ALLOW_FORUM_NOTIFY',	'type' => 'radio:yes_no', 'explain' => false),
-			'allow_namechange'		=> array('lang' => 'ALLOW_NAME_CHANGE',		'type' => 'radio:yes_no', 'explain' => false),
-			'allow_attachments'		=> array('lang' => 'ALLOW_ATTACHMENTS',		'type' => 'radio:yes_no', 'explain' => false),
-			'allow_html'			=> array('lang' => 'ALLOW_HTML',			'type' => 'radio:yes_no', 'explain' => false),
-			'allow_html_tags'		=> array('lang' => 'ALLOWED_TAGS',			'type' => 'text:30:255', 'explain' => true),
-			'allow_bbcode'			=> array('lang' => 'ALLOW_BBCODE',			'type' => 'radio:yes_no', 'explain' => false),
-			'allow_smilies'			=> array('lang' => 'ALLOW_SMILIES',			'type' => 'radio:yes_no', 'explain' => false),
-			'allow_sig'				=> array('lang' => 'ALLOW_SIG',				'type' => 'radio:yes_no', 'explain' => false),
-			'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'type' => 'text:5:4', 'explain' => true),
-			'allow_nocensors'		=> array('lang' => 'ALLOW_NO_CENSORS',		'type' => 'radio:yes_no', 'explain' => true),
-			'allow_bookmarks'		=> array('lang' => 'ALLOW_BOOKMARKS',		'type' => 'radio:yes_no', 'explain' => true)
-		)
-	),
-	'message' => array(
-		'auth'	=> 'a_defaults',
-		'title'	=> 'MESSAGE_SETTINGS',
-		'lang'	=> 'ucp',
-		'vars'	=> array(
-			'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'type' => 'text:4:4', 'explain' => true),
-			'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'type' => 'text:4:4', 'explain' => true),
-			'full_folder_action'	=> array('lang' => 'FULL_FOLDER_ACTION',	'type' => 'select', 'options' => 'full_folder_select(\'{VALUE}\')', 'explain' => true),
-			'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'type' => 'text:3:3', 'explain' => true),
-			'allow_mass_pm'			=> array('lang' => 'ALLOW_MASS_PM',			'type' => 'radio:yes_no', 'explain' => false),
-			'auth_html_pm'			=> array('lang' => 'ALLOW_HTML_PM',			'type' => 'radio:yes_no', 'explain' => false),
-			'auth_bbcode_pm'		=> array('lang' => 'ALLOW_BBCODE_PM',		'type' => 'radio:yes_no', 'explain' => false),
-			'auth_smilies_pm'		=> array('lang' => 'ALLOW_SMILIES_PM',		'type' => 'radio:yes_no', 'explain' => false),
-			'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'type' => 'radio:yes_no', 'explain' => false),
-			'auth_download_pm'		=> array('lang' => 'ALLOW_DOWNLOAD_PM',		'type' => 'radio:yes_no', 'explain' => false),
-			'auth_report_pm'		=> array('lang' => 'ALLOW_REPORT_PM',		'type' => 'radio:yes_no', 'explain' => false),
-			'print_pm'				=> array('lang' => 'ALLOW_PRINT_PM',		'type' => 'radio:yes_no', 'explain' => false),
-			'email_pm'				=> array('lang' => 'ALLOW_EMAIL_PM',		'type' => 'radio:yes_no', 'explain' => false),
-			'forward_pm'			=> array('lang' => 'ALLOW_FORWARD_PM',		'type' => 'radio:yes_no', 'explain' => false),
-			'auth_img_pm'			=> array('lang' => 'ALLOW_IMG_PM',			'type' => 'radio:yes_no', 'explain' => false),
-			'auth_flash_pm'			=> array('lang' => 'ALLOW_FLASH_PM',		'type' => 'radio:yes_no', 'explain' => false),
-			'enable_pm_icons'		=> array('lang' => 'ENABLE_PM_ICONS',		'type' => 'radio:yes_no', 'explain' => false)
-		)
-	),
-	'server' => array(
-		'auth'	=> 'a_server',
-		'title'	=> 'SERVER_SETTINGS',
-		'vars'	=> array(
-			'server_name'		=> array('lang' => 'SERVER_NAME',	'type' => 'text:40:255', 'explain' => true),
-			'server_port'		=> array('lang' => 'SERVER_PORT',	'type' => 'text:5:5', 'explain' => true),
-			'script_path'		=> array('lang' => 'SCRIPT_PATH',	'type' => 'text::255', 'explain' => true),
-			'ip_check'			=> array('lang' => 'IP_VALID',		'type' => 'custom', 'options' => 'select_ip_check(\'{VALUE}\')', 'explain' => true),
-			'browser_check'		=> array('lang' => 'BROWSER_VALID',	'type' => 'radio:yes_no', 'explain' => true),
-			'gzip_compress'		=> array('lang' => 'ENABLE_GZIP',	'type' => 'radio:yes_no', 'explain' => false),
-			'smilies_path'		=> array('lang' => 'SMILIES_PATH',	'type' => 'text:20:255', 'explain' => true),
-			'icons_path'		=> array('lang' => 'ICONS_PATH',	'type' => 'text:20:255', 'explain' => true),
-			'upload_icons_path'	=> array('lang' => 'UPLOAD_ICONS_PATH', 'type' => 'text:20:255', 'explain' => true),
-			'ranks_path'		=> array('lang' => 'RANKS_PATH',	'type' => 'text:20:255', 'explain' => true)
-		)
-	),
-	'setting' => array(
-		'auth'	=> 'a_board',
-		'title'	=> 'BOARD_SETTINGS',
-		'vars'	=> array(
-			'board_disable_msg'	=> false, 'max_name_chars' => false, 'max_pass_chars' => false, 'bump_type' => false,
-			
-			'sitename'			=> array('lang' => 'SITE_NAME',			'type' => 'text:40:255', 'explain' => false),
-			'site_desc'			=> array('lang' => 'SITE_DESC',			'type' => 'text:40:255', 'explain' => false),
-			'board_disable'		=> array('lang' => 'DISABLE_BOARD',		'type' => 'custom', 'options' => 'board_disable(\'{VALUE}\')', 'explain' => true),
-			'require_activation'=> array('lang' => 'ACC_ACTIVATION',	'type' => 'custom', 'options' => 'select_acc_activation(\'{VALUE}\')', 'explain' => true),
-			'allow_autologin'	=> array('lang' => 'ALLOW_AUTOLOGIN',	'type' => 'radio:yes_no', 'explain' => true),
-			'max_autologin_time'=> array('lang' => 'AUTOLOGIN_LENGTH',	'type' => 'text:3:3', 'explain' => true),
-			'coppa_enable'		=> array('lang' => 'ENABLE_COPPA',		'type' => 'radio:yes_no', 'explain' => true),
-			'coppa_fax'			=> array('lang' => 'COPPA_FAX',			'type' => 'text:25:100', 'explain' => false),
-			'coppa_mail'		=> array('lang' => 'COPPA_MAIL',		'type' => 'textarea:5:40', 'explain' => true),
-			'enable_confirm'	=> array('lang' => 'VISUAL_CONFIRM',	'type' => 'radio:yes_no', 'explain' => true),
-			'max_reg_attempts'	=> array('lang' => 'REG_LIMIT',			'type' => 'text:4:4', 'explain' => true),
-			'min_name_chars'	=> array('lang' => 'USERNAME_LENGTH',	'type' => 'custom', 'options' => 'username_length(\'{VALUE}\')', 'explain' => true),
-			'allow_name_chars'	=> array('lang' => 'USERNAME_CHARS',	'type' => 'select', 'options' => 'select_username_chars(\'{VALUE}\')', 'explain' => true),
-			'min_pass_chars'	=> array('lang' => 'PASSWORD_LENGTH',	'type' => 'custom', 'options' => 'password_length(\'{VALUE}\')', 'explain' => true),
-			'pass_complex'		=> array('lang' => 'PASSWORD_TYPE',		'type' => 'select', 'options' => 'select_password_chars(\'{VALUE}\')', 'explain' => true),
-			'chg_passforce'		=> array('lang' => 'FORCE_PASS_CHANGE',	'type' => 'text:3:3', 'explain' => true),
-			'save_passwd'		=> array('lang' => 'SAVE_PASSWORDS',	'type' => 'text:2:2', 'explain' => true),
-			'max_login_attempts'=> array('lang' => 'LOGIN_LIMIT',		'type' => 'text:4:4', 'explain' => true),
-			'allow_emailreuse'	=> array('lang' => 'ALLOW_EMAIL_REUSE',	'type' => 'radio:yes_no', 'explain' => true),
-			'edit_time'			=> array('lang' => 'EDIT_TIME',			'type' => 'text:3:3', 'explain' => true),
-			'display_last_edited' => array('lang' => 'DISPLAY_LAST_EDITED', 'type' => 'radio:yes_no', 'explain' => true),
-			'flood_interval'	=> array('lang' => 'FLOOD_INTERVAL',	'type' => 'text:3:4', 'explain' => true),
-			'bump_interval'		=> array('lang' => 'BUMP_INTERVAL',		'type' => 'custom', 'options' => 'bump_interval(\'{VALUE}\')', 'explain' => true),
-			'topics_per_page'	=> array('lang' => 'TOPICS_PER_PAGE',	'type' => 'text:3:4', 'explain' => false),
-			'posts_per_page'	=> array('lang' => 'POSTS_PER_PAGE',	'type' => 'text:3:4', 'explain' => false),
-			'hot_threshold'		=> array('lang' => 'HOT_THRESHOLD',		'type' => 'text:3:4', 'explain' => false),
-			'max_poll_options'	=> array('lang' => 'MAX_POLL_OPTIONS',	'type' => 'text:4:4', 'explain' => false),
-			'max_post_chars'	=> array('lang' => 'CHAR_LIMIT',		'type' => 'text:4:6', 'explain' => true),
-			'max_post_smilies'	=> array('lang' => 'SMILIES_LIMIT',		'type' => 'text:4:4', 'explain' => true),
-			'max_quote_depth'	=> array('lang' => 'QUOTE_DEPTH_LIMIT',	'type' => 'text:4:4', 'explain' => true)
-		)
-	),
-	'auth' => array(
-		'auth'	=> 'a_server',
-		'title'	=> 'AUTH_SETTINGS',
-		'vars'	=> array(
-			'auth_method'	=> array('lang' => 'AUTH_METHOD',	'type' => 'select', 'options' => 'select_auth_method(\'{VALUE}\')', 'explain' => false)
-		)
-	)
-);
-
-if (!in_array($mode, array_keys($display_vars)))
-{
-	return;
-}
-
-// Perform the current mode
-$display_vars = $display_vars[$mode];
-
-// Check permissions
-if (!$auth->acl_get($display_vars['auth']))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-if (isset($display_vars['lang']))
-{
-	$user->add_lang($display_vars['lang']);
-}
-
-$new = $config;
-$cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => '')) : $new;
-
-// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
-foreach ($display_vars['vars'] as $config_name => $null)
-{
-	if (!isset($cfg_array[$config_name]))
-	{
-		continue;
-	}
-
-	$config_value = $cfg_array[$config_name];
-	$new[$config_name] = $config_value;
-
-	if ($config_name == 'email_function_name')
-	{
-		$new['email_function_name'] = (empty($new['email_function_name']) || !function_exists($new['email_function_name'])) ? 'mail' : str_replace(array('(', ')'), array('', ''), trim($new['email_function_name']));
-	}
-	
-	if ($submit)
-	{
-		set_config($config_name, $config_value);
-	}
-}
-
-if ($submit)
-{
-	add_log('admin', 'LOG_' . strtoupper($mode) . '_CONFIG');
-
-	trigger_error($user->lang['CONFIG_UPDATED']);
-}
-
-adm_page_header($user->lang[$display_vars['title']]);
-
-?>
-
-<h1><?php echo $user->lang[$display_vars['title']]; ?></h1>
-
-<p><?php echo $user->lang[$display_vars['title'] . '_EXPLAIN']; ?></p>
-
-<form action="<?php echo "admin_board.$phpEx$SID&amp;mode=$mode"; ?>" method="post"><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang[$display_vars['title']]; ?></th>
-	</tr>
-<?php
-
-// Output relevant page
-foreach ($display_vars['vars'] as $config_key => $vars)
-{
-	if (!is_array($vars))
-	{
-		continue;
-	}
-
-	$type = explode(':', $vars['type']);
-
-?>
-
-	<tr>
-		<td class="row1" width="50%"><b><?php echo $user->lang[$vars['lang']]; ?>: </b><?php echo ($vars['explain']) ? '<br /><span class="gensmall">' . $user->lang[$vars['lang'] . '_EXPLAIN'] . '</span>' : ''; ?></td>
-		<td class="row2"><?php echo build_cfg_template($type, $config_key, ((isset($vars['options'])) ? $vars['options'] : '')) . ((isset($vars['append'])) ? str_replace('{VALUE}', $new[$config_key], $vars['append']) : ''); ?></td>
-	</tr>
-
-<?php
-	
-	unset($display_vars['vars'][$config_key]);
-}
-
-if ($mode == 'auth')
-{
-	$auth_plugins = array();
-
-	$dp = opendir($phpbb_root_path . 'includes/auth');
-	while ($file = readdir($dp))
-	{
-		if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
-		{
-			$auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
-		}
-	}
-
-	sort($auth_plugins);
-
-	foreach ($auth_plugins as $method)
-	{
-		if ($method && file_exists($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx))
-		{
-			include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
-
-			$method = 'admin_' . $method;
-			if (function_exists($method))
-			{
-				if ($config_fields = $method($new))
-				{
-					// Check if we need to create config fields for this plugin
-					foreach ($config_fields as $field)
-					{
-						if (!isset($config[$field]))
-						{
-							set_config($field, '');
-						}
-					}
-				}
-				unset($config_fields);
-			}
-		}
-	}
-}
-
-?>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="btnlite" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-adm_page_footer();
-
-function select_auth_method($selected_method)
-{
-	global $new, $phpbb_root_path, $phpEx;
-
-	$auth_plugins = array();
-
-	$dp = opendir($phpbb_root_path . 'includes/auth');
-	while ($file = readdir($dp))
-	{
-		if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
-		{
-			$auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
-		}
-	}
-
-	sort($auth_plugins);
-
-	$auth_select = '';
-	foreach ($auth_plugins as $method)
-	{
-		$selected = ($selected_method == $method) ? ' selected="selected"' : '';
-		$auth_select .= '<option value="' . $method . '"' . $selected . '>' . ucfirst($method) . '</option>';
-	}
-
-	return $auth_select;
-}
-
-function mail_auth_select($selected_method)
-{
-	global $user;
-
-	$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP');
-	$s_smtp_auth_options = '';
-
-	foreach ($auth_methods as $method)
-	{
-		$s_smtp_auth_options .= '<option value="' . $method . '"' . (($selected_method == $method) ? ' selected="selected"' : '') . '>' . $user->lang['SMTP_' . str_replace('-', '_', $method)] . '</option>';
-	}
-
-	return $s_smtp_auth_options;
-}
-
-function full_folder_select($value)
-{
-	global $user;
-
-	return '<option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . $user->lang['DELETE_OLDEST_MESSAGES'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . $user->lang['HOLD_NEW_MESSAGES'] . '</option>';
-}
-
-function select_ip_check($value)
-{
-	global $user;
-
-	$ip_all = ($value == 4) ? ' checked="checked"' : '';
-	$ip_classc = ($value == 3) ? ' checked="checked"' : '';
-	$ip_classb = ($value == 2) ? ' checked="checked"' : '';
-	$ip_none = ($value == 0) ? ' checked="checked"' : '';
-
-	$options = <<<EOT
-	<input type="radio" name="config[ip_check]" value="4"$ip_all /> {$user->lang['ALL']}&nbsp;&nbsp;<input type="radio" name="config[ip_check]" value="3"$ip_classc /> {$user->lang['CLASS_C']}&nbsp;&nbsp;<input type="radio" name="config[ip_check]" value="2"$ip_classb /> {$user->lang['CLASS_B']}&nbsp;&nbsp;<input type="radio" name="config[ip_check]" value="0"$ip_none /> {$user->lang['NONE']}&nbsp;&nbsp;
-EOT;
-	
-	return $options;
-}
-
-function select_acc_activation($value)
-{
-	global $user, $config;
-
-	$activation_none	= ($value == USER_ACTIVATION_NONE) ? ' checked="checked"' : '';
-	$activation_user	= ($value == USER_ACTIVATION_SELF) ? ' checked="checked"' : '';
-	$activation_admin	= ($value == USER_ACTIVATION_ADMIN) ? ' checked="checked"' : '';
-	$activation_disable = ($value == USER_ACTIVATION_DISABLE) ? ' checked="checked"' : '';
-
-	$options = '<input type="radio" name="config[require_activation]" value="' . USER_ACTIVATION_NONE . '"' . $activation_none . ' /> ' . $user->lang['ACC_NONE'];
-
-	if ($config['email_enable'])
-	{
-		$options .= '&nbsp;&nbsp;<input type="radio" name="config[require_activation]" value="' . USER_ACTIVATION_SELF . '"' . $activation_user . ' /> ' . $user->lang['ACC_USER'];
-		$options .= '&nbsp;&nbsp;<input type="radio" name="config[require_activation]" value="' . USER_ACTIVATION_ADMIN . '"' . $activation_admin . ' /> ' . $user->lang['ACC_ADMIN'];
-	}
-	$options .= '&nbsp;&nbsp;<input type="radio" name="config[require_activation]" value="' . USER_ACTIVATION_DISABLE . '"' . $activation_disable . ' /> ' . $user->lang['ACC_DISABLE'];
-
-	return $options;
-}
-
-function username_length($value)
-{
-	global $new, $user;
-
-	return '<input class="post" type="text" size="3" maxlength="3" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input class="post" type="text" size="3" maxlength="3" name="config[max_name_chars]" value="' . $new['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
-}
-
-function select_username_chars($selected_value)
-{
-	global $user;
-
-	$user_char_ary = array('USERNAME_CHARS_ANY' => '.*', 'USERNAME_ALPHA_ONLY' => '[\w]+', 'USERNAME_ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+');
-	$user_char_options = '';
-	foreach ($user_char_ary as $lang => $value)
-	{
-		$selected = ($selected_value == $value) ? ' selected="selected"' : '';
-		$user_char_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
-	}
-
-	return $user_char_options;
-}
-
-function password_length($value)
-{
-	global $new, $user;
-
-	return '<input class="post" type="text" size="3" maxlength="3" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input class="post" type="text" size="3" maxlength="3" name="config[max_pass_chars]" value="' . $new['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
-}
-
-function select_password_chars($selected_value)
-{
-	global $user;
-
-	$pass_type_ary = array('PASS_TYPE_ANY' => '.*', 'PASS_TYPE_CASE' => '[a-zA-Z]', 'PASS_TYPE_ALPHA' => '[a-zA-Z0-9]', 'PASS_TYPE_SYMBOL' => '[a-zA-Z\W]'); 
-	$pass_char_options = '';
-	foreach ($pass_type_ary as $lang => $value)
-	{
-		$selected = ($selected_value == $value) ? ' selected="selected"' : '';
-		$pass_char_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
-	}
-
-	return $pass_char_options;
-}
-
-function bump_interval($value)
-{
-	global $new, $user;
-
-	$s_bump_type = '';
-	$types = array('m' => 'MINUTES', 'h' => 'HOURS', 'd' => 'DAYS');
-	foreach ($types as $type => $lang)
-	{
-		$selected = ($new['bump_type'] == $type) ? 'selected="selected" ' : '';
-		$s_bump_type .= '<option value="' . $type . '" ' . $selected . '>' . $user->lang[$lang] . '</option>';
-	}
-
-	return '<input class="post" type="text" size="3" maxlength="4" name="config[bump_interval]" value="' . $value . '" />&nbsp;<select name="config[bump_type]">' . $s_bump_type . '</select>';
-}
-
-function board_disable($value)
-{
-	global $new, $user;
-
-	$board_disable_yes = ($value) ? ' checked="checked"' : '';
-	$board_disable_no = (!$value) ? ' checked="checked"' : '';
-
-	return '<input type="radio" name="config[board_disable]" value="1"' . $board_disable_yes . ' /> ' . $user->lang['YES'] . '&nbsp;&nbsp;<input type="radio" name="config[board_disable]" value="0"' . $board_disable_no . ' /> ' . $user->lang['NO'] . '<br /><input class="post" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $new['board_disable_msg'] . '" />';
-}
-
-?>

phpBB/adm/admin_bots.php

@@ -1,394 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_server'))
-	{
-		return;
-	}
-
-	$module['USER']['BOTS'] = basename(__FILE__) . $SID;
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Do we have permission?
-if (!$auth->acl_get('a_server'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Set various vars
-$submit = (isset($_POST['submit'])) ? true : false;
-$action = request_var('action', '');
-$mark	= request_var('mark', 0);
-$id		= request_var('id', 0);
-
-if (isset($_POST['add']))
-{
-	$action = 'add';
-}
-
-$error = array();
-
-// User wants to do something, how inconsiderate of them!
-switch ($action)
-{
-	case 'activate':
-		if ($id || $mark)
-		{
-			$id = ($id) ? " = $id" : ' IN (' . implode(', ', $mark) . ')';
-			$sql = 'UPDATE ' . BOTS_TABLE . " 
-				SET bot_active = 1
-				WHERE bot_id $id";
-			$db->sql_query($sql);
-		}
-
-		$cache->destroy('bots');
-		break;
-
-	case 'deactivate':
-		if ($id || $mark)
-		{
-			$id = ($id) ? " = $id" : ' IN (' . implode(', ', $mark) . ')';
-			$sql = 'UPDATE ' . BOTS_TABLE . " 
-				SET bot_active = 0
-				WHERE bot_id $id";
-			$db->sql_query($sql);
-		}
-
-		$cache->destroy('bots');
-		break;
-
-	case 'delete':
-		if ($id || $mark)
-		{
-			// We need to delete the relevant user, usergroup and bot entries ...
-			$id = ($id) ? " = $id" : ' IN (' . implode(', ', $mark) . ')';
-			$sql = 'SELECT bot_name, user_id 
-				FROM ' . BOTS_TABLE . " 
-				WHERE bot_id $id";
-			$result = $db->sql_query($sql);
-
-			$user_id_ary = $bot_name_ary = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$user_id_ary[] = (int) $row['user_id'];
-				$bot_name_ary[] = $row['bot_name'];
-			}
-			$db->sql_freeresult($result);
-
-			$db->sql_transaction();
-
-			$sql = 'DELETE FROM ' . BOTS_TABLE . " 
-				WHERE bot_id $id";
-			$db->sql_query($sql);
-
-			foreach (array(USERS_TABLE, USER_GROUP_TABLE) as $table)
-			{
-				$sql = "DELETE FROM $table
-					WHERE user_id IN (" . implode(', ', $user_id_ary) . ')';
-				$db->sql_query($sql);
-			}
-
-			$db->sql_transaction('commit');
-
-			$cache->destroy('bots');
-
-			add_log('admin', 'LOG_BOT_DELETE', implode(', ', $bot_name_ary));
-			trigger_error($user->lang['BOT_DELETED']);
-		}
-		break;
-
-	case 'edit':
-	case 'add':
-		$bot_name	= request_var('bot_name', '');
-		$bot_agent	= request_var('bot_agent', '');
-		$bot_ip		= request_var('bot_ip', '');
-		$bot_active = request_var('bot_active', true);
-		$bot_lang	= request_var('bot_lang', $config['default_lang']);
-		$bot_style	= request_var('bot_style' , $config['default_style']);
-
-		if ($submit)
-		{
-			if (!$bot_agent && !$bot_ip)
-			{
-				$error[] = $user->lang['ERR_BOT_NO_MATCHES'];
-			}
-	
-			if ($bot_ip && !preg_match('#^[\d\.,:]+$#', $bot_ip))
-			{
-				if (!$ip_list = gethostbynamel($bot_ip))
-				{
-					$error[] = $user->lang['ERR_BOT_NO_IP'];
-				}
-				else
-				{
-					$bot_ip = implode(',', $ip_list);
-				}
-			}
-			$bot_ip = str_replace(' ', '', $bot_ip);
-
-			if (!sizeof($error))
-			{
-				$db->sql_transaction();
-
-				// New bot? Create a new user and group entry
-				if ($action == 'add')
-				{
-					$sql = 'SELECT group_id, group_colour 
-						FROM ' . GROUPS_TABLE . " 
-						WHERE group_name = 'BOTS' 
-							AND group_type = " . GROUP_SPECIAL;
-					$result = $db->sql_query($sql);
-
-					if (!extract($db->sql_fetchrow($result)))
-					{
-						trigger_error($user->lang['NO_GROUP']);
-					}
-					$db->sql_freeresult($result);
-
-					$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-						'group_id'		=> (int) $group_id, 
-						'username'		=> (string) $bot_name, 
-						'user_type'		=> (int) USER_IGNORE, 
-						'user_colour'	=> (string) $group_colour,
-						'user_lang'		=> (string) $bot_lang, 
-						'user_style'	=> (int) $bot_style,
-						'user_options'	=> 0)
-					);
-					$db->sql_query($sql);
-
-					$user_id = $db->sql_nextid();
-
-					// Add to Bots usergroup
-					$sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-						'user_id'	=> $user_id, 
-						'group_id'	=> $group_id)
-					);
-					$db->sql_query($sql);
-
-					$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-						'user_id'		=> (int) $user_id,
-						'bot_name'		=> (string) $bot_name, 
-						'bot_active'	=> (int) $bot_active, 
-						'bot_agent'		=> (string) $bot_agent,
-						'bot_ip'		=> (string) $bot_ip,)
-					);
-
-					$log = 'ADDED';
-				}
-				else
-				{
-					$sql = 'SELECT user_id 
-						FROM ' . BOTS_TABLE . " 
-						WHERE bot_id = $id";
-					$result = $db->sql_query($sql);
-
-					if (!extract($db->sql_fetchrow($result)))
-					{
-						trigger_error($user->lang['NO_BOT']);
-					}
-
-					$sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
-						'user_style'	=> (int) $bot_style,
-						'user_lang'		=> (string) $bot_lang,)
-					) . " WHERE user_id = $user_id";
-					$db->sql_query($sql);
-
-					$sql = 'UPDATE ' . BOTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
-						'bot_name'		=> (string) $bot_name, 
-						'bot_active'	=> (int) $bot_active, 
-						'bot_agent'		=> (string) $bot_agent,
-						'bot_ip'		=> (string) $bot_ip,)
-					) . " WHERE bot_id = $id";
-
-					$log = 'UPDATED';
-				}
-				$db->sql_query($sql);
-
-				$db->sql_transaction('commit');
-
-				$cache->destroy('bots');
-		
-				add_log('admin', 'LOG_BOT_' . $log, $bot_name);
-				trigger_error($user->lang['BOT_' . $log]);
-			}
-		}
-		else if ($id)
-		{
-			$sql = 'SELECT b.*, u.user_lang, u.user_style 
-				FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . " u
-				WHERE b.bot_id = $id
-					AND u.user_id = b.user_id";
-			$result = $db->sql_query($sql);
-
-			if (!extract($db->sql_fetchrow($result)))
-			{
-				trigger_error($user->lang['NO_BOT']);
-			}
-			$db->sql_freeresult($result);
-
-			$bot_lang = $user_lang;
-			$bot_style = $user_style;
-		}
-
-		$s_active_options = '';
-		foreach (array('0' => 'NO', '1' => 'YES') as $value => $lang)
-		{
-			$selected = ($bot_active == $value) ? ' selected="selected"' : '';
-			$s_active_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
-		}
-
-		$style_select = style_select($bot_style, true);
-		$lang_select = language_select($bot_lang);
-
-		$l_title = ($action == 'edit') ? 'EDIT' : 'ADD';
-
-		// Output relevant page
-		adm_page_header($user->lang['BOT_' . $l_title]);
-
-?>
-
-<h1><?php echo $user->lang['BOT_' . $l_title]; ?></h1>
-
-<p><?php echo $user->lang['BOT_EDIT_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_bots.$phpEx$SID&amp;action=$action&amp;id=$id"; ?>"><table class="bg" width="90%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['BOT_' . $l_title]; ?></th>
-	</tr>
-<?php
-
-	if (sizeof($error))
-	{
-
-?>
-	<tr>
-		<td class="row3" colspan="2" align="center"><span style="color:red"><?php echo implode('<br />', $error); ?></span></td>
-	</tr>
-<?php
-
-	}
-
-?>
-	<tr>
-		<td class="row1" width="40%"><b class="genmed"><?php echo $user->lang['BOT_NAME']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['BOT_NAME_EXPLAIN']; ?></span></td>
-		<td class="row2"><input class="post" type="text" name="bot_name" size="30" maxlength="255" value="<?php echo $bot_name; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b class="genmed"><?php echo $user->lang['BOT_STYLE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['BOT_STYLE_EXPLAIN']; ?></span></td>
-		<td class="row2"><select name="bot_style"><?php echo $style_select; ?></select></td>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b class="genmed"><?php echo $user->lang['BOT_LANG']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['BOT_LANG_EXPLAIN']; ?></span></td>
-		<td class="row2"><select name="bot_lang"><?php echo $lang_select; ?></select></td>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b class="genmed"><?php echo $user->lang['BOT_ACTIVE']; ?>: </b></td>
-		<td class="row2"><select name="bot_active"><?php echo $s_active_options; ?></select></td>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b class="genmed"><?php echo $user->lang['BOT_AGENT']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['BOT_AGENT_EXPLAIN']; ?></span></td>
-		<td class="row2"><input class="post" type="text" name="bot_agent" size="30" maxlength="255" value="<?php echo $bot_agent; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b class="genmed"><?php echo $user->lang['BOT_IP']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['BOT_IP_EXPLAIN']; ?></span></td>
-		<td class="row2"><input class="post" type="text" name="bot_ip" size="30" maxlength="255" value="<?php echo $bot_ip; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-		adm_page_footer();
-
-		break;
-}
-
-// Output relevant page
-adm_page_header($user->lang['BOTS']);
-
-?>
-
-<h1><?php echo $user->lang['BOTS']; ?></h1>
-
-<p><?php echo $user->lang['BOTS_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php "admin_bots.$phpEx$SID"; ?>"><table class="bg" width="90%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th nowrap="nowrap"><?php echo $user->lang['BOT_NAME']; ?></th>
-		<th nowrap="nowrap"><?php echo $user->lang['BOT_LAST_VISIT']; ?></th>
-		<th colspan="3" nowrap="nowrap"><?php echo $user->lang['OPTIONS']; ?></th>
-		<th nowrap="nowrap"><?php echo $user->lang['MARK']; ?></th>
-	</tr>
-<?php
-
-$s_options = '';
-foreach (array('activate' => 'BOT_ACTIVATE', 'deactivate' => 'BOT_DEACTIVATE', 'delete' => 'DELETE') as $value => $lang)
-{
-	$s_options .= '<option value="' . $value . '">' . $user->lang[$lang] . '</option>';
-}
-
-$sql = 'SELECT b.bot_id, b.bot_name, b.bot_active, u.user_lastvisit 
-	FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . ' u
-	WHERE u.user_id = b.user_id
-	ORDER BY u.user_lastvisit DESC';
-$result = $db->sql_query($sql);
-
-$row_class = '';
-while ($row = $db->sql_fetchrow($result))
-{
-	$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-
-	$active_lang = (!$row['bot_active']) ? 'BOT_ACTIVATE' : 'BOT_DEACTIVATE';
-	$active_value = (!$row['bot_active']) ? 'activate' : 'deactivate';
-	$id = $row['bot_id'];
-
-?>	
-	<tr>
-		<td class="<?php echo $row_class; ?>" width="50%"><?php echo $row['bot_name']; ?></td>
-		<td class="<?php echo $row_class; ?>" width="15%" align="center" nowrap="nowrap">&nbsp;<?php echo ($row['user_lastvisit']) ?  $user->format_date($row['user_lastvisit']) : $user->lang['BOT_NEVER']; ?>&nbsp;</td>
-		<td class="<?php echo $row_class; ?>" width="1%"align="center">&nbsp;<a href="<?php echo "admin_bots.$phpEx$SID&amp;id=$id&amp;action=$active_value"; ?>"><?php echo $user->lang[$active_lang]; ?></a>&nbsp;</td>
-		<td class="<?php echo $row_class; ?>" width="1%" align="center">&nbsp;<a href="<?php echo "admin_bots.$phpEx$SID&amp;id=$id&amp;action=edit"; ?>"><?php echo $user->lang['EDIT']; ?></a>&nbsp;</td>
-		<td class="<?php echo $row_class; ?>" width="1%" align="center">&nbsp;<a href="<?php echo "admin_bots.$phpEx$SID&amp;id=$id&amp;action=delete"; ?>"><?php echo $user->lang['DELETE']; ?></a>&nbsp;</td>
-		<td class="<?php echo $row_class; ?>" width="1%" align="center"><input type="checkbox" name="mark[]" value="<?php echo $id; ?>" /></td>
-	</tr>
-<?php
-
-}
-$db->sql_freeresult($result);
-
-?>
-	<tr>
-		<td class="cat" colspan="6"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td><input class="btnlite" type="submit" name="add" value="<?php echo $user->lang['BOT_ADD']; ?>" /></td>
-				<td align="right"><select name="action"><?php echo $s_options; ?></select> <input class="btnlite" type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" /></td>
-			</tr>
-		</table></td>
-	</tr>
-</table></form>
-<?php
-
-adm_page_footer();
-
-?>

phpBB/adm/admin_database.php

@@ -1,994 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	$filename = basename(__FILE__);
-	$module['DB']['DB_BACKUP'] = ($auth->acl_get('a_backup')) ? $filename . "$SID&amp;mode=backup" : '';
-
-	$file_uploads = @ini_get('file_uploads');
-	if (!empty($file_uploads) && $file_uploads !== 0 && strtolower($file_uploads) != 'off' && $auth->acl_get('a_restore'))
-	{
-		$module['DB']['DB_RESTORE'] = "$filename$SID&amp;mode=restore";
-	}
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Load default header
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_compress.'.$phpEx);
-
-@set_time_limit(1200);
-
-
-// Get some vars
-$mode = (isset($_GET['mode'])) ? htmlspecialchars($_GET['mode']) : '';
-$action = (isset($_REQUEST['action'])) ? htmlspecialchars($_REQUEST['action']) : '';
-
-
-// --------------------
-// Begin program proper
-// --------------------
-switch($mode)
-{
-	case 'backup':
-		if (!$auth->acl_get('a_backup'))
-		{
-			trigger_error($user->lang['NO_ADMIN']);
-		}
-
-		$db_type = '';
-		switch (SQL_LAYER)
-		{
-			case 'oracle':
-				$db_type = 'Oracle';
-				break;
-			case 'odbc':
-				$db_type = 'ODBC';
-				break;
-			case 'mssql':
-				$db_type = 'MSSQL';
-				break;
-		}
-
-		if ($db_type)
-		{
-			trigger_error($user->lang['Backups_not_supported']);
-		}
-
-		$additional_tables	= (isset($_REQUEST['tables'])) ? htmlspecialchars($_REQUEST['tables']) : '';
-		$backup_type		= (isset($_REQUEST['type'])) ? intval($_REQUEST['type']) : false;
-		$search				= (!empty($_REQUEST['search'])) ? true : false;
-		$store				= (!empty($_REQUEST['store'])) ? true : false;
-		$compress			= (isset($_REQUEST['compress'])) ? htmlspecialchars($_REQUEST['compress']) : '';
-
-		if (!isset($_POST['backupstart']) && !isset($_GET['backupstart']))
-		{
-			adm_page_header($user->lang['DB_BACKUP']);
-
-?>
-
-<h1><?php echo $user->lang['DB_BACKUP']; ?></h1>
-
-<p><?php echo $user->lang['Backup_explain']; ?></p>
-
-<form method="post" action="<?php echo "admin_database.$phpEx$SID&amp;mode=$mode"; ?>"><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['Backup_options']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b><?php echo $user->lang['Backup_type']; ?>: </b></td>
-		<td class="row2"><input type="radio" name="type" value="full"  checked="checked" /> <?php echo $user->lang['Full_backup']; ?>&nbsp;&nbsp;<input type="radio" name="type" value="structure" /> <?php echo $user->lang['Structure_only']; ?>&nbsp;&nbsp;<input type="radio" name="type" value="data" /> <?php echo $user->lang['Data_only']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['Additional_tables']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['Additional_tables_explain']; ?></span></td>
-		<td class="row2"><input class="post" type="text" name="tables" maxlength="255" size="40" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['INC_SEARCH_INDEX']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['INC_SEARCH_INDEX_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="radio" name="search" value="1" checked="checked" /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="search" value="0" /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['DOWNLOAD_STORE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['DOWNLOAD_STORE_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="radio" name="store" value="0" checked="checked" /> <?php echo $user->lang['EXPORT_DOWNLOAD']; ?>&nbsp;&nbsp;<input type="radio" name="store" value="1" /> <?php echo $user->lang['EXPORT_STORE']; ?></td>
-	</tr>
-<?php
-
-			if (@extension_loaded('zlib') || extension_loaded('bz2'))
-			{
-
-?>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['Compress_file']; ?>: </b></td>
-		<td class="row2"><input type="radio" name="compress" value="none" checked="checked" /> <?php echo $user->lang['NONE']; ?><?php
-
-				if (extension_loaded('zlib'))
-				{
-
-
-?>&nbsp;&nbsp;<input type="radio" name="compress" value="gzip" />.gz&nbsp;&nbsp;<input type="radio" name="compress" value="zip" />.zip<?php
-
-				}
-
-				if (extension_loaded('bz2'))
-				{
-
-?>&nbsp;&nbsp;<input type="radio" name="compress" value="bzip" />.bz2<?php
-
-				}
-
-?></td>
-	</tr>
-<?php
-
-			}
-
-?>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" name="backupstart" value="<?php echo $user->lang['Start_backup']; ?>" class="btnmain" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-			break;
-		}
-		else if (!isset($_POST['startdownload']) && !isset($_GET['startdownload']))
-		{
-			$meta = "<meta http-equiv=\"refresh\" content=\"0;url=admin_database.$phpEx?mode=backup&amp;type=$backup_type&amp;tables=" . quotemeta($additional_tables) . "&amp;search=$search&amp;store=" . quotemeta($store_path) . "&amp;compress=$compress&amp;backupstart=1&amp;startdownload=1\">";
-
-			$message = (empty($store_path)) ? $user->lang['Backup_download'] : $user->lang['Backup_writing'];
-
-			adm_page_header($user->lang['DB_Backup'], $meta);
-			page_message($user->lang['DB_Backup'], $message);
-			adm_page_footer();
-		}
-
-		$tables = (SQL_LAYER != 'postgresql') ? mysql_get_tables() : pg_get_tables();
-		@sort($tables);
-
-		if (!empty($additional_tables))
-		{
-			$additional_tables = explode(',', $additional_tables);
-
-			for($i = 0; $i < count($additional_tables); $i++)
-			{
-				$tables[] = trim($additional_tables[$i]);
-			}
-			unset($additional_tables);
-		}
-
-		// Enable output buffering
-		@ob_start();
-		@ob_implicit_flush(0);
-
-		// Build the sql script file...
-		echo "#\n";
-		echo "# phpBB Backup Script\n";
-		echo "# Dump of tables for $dbname\n";
-		echo "#\n# DATE : " .  gmdate("d-m-Y H:i:s", time()) . " GMT\n";
-		echo "#\n";
-
-		if (SQL_LAYER == 'postgresql')
-		{
-			 echo "\n" . pg_get_sequences("\n", $backup_type);
-		}
-
-		for($i = 0; $i < count($tables); $i++)
-		{
-			$table_name = $tables[$i];
-
-			if (SQL_LAYER != 'mysql4')
-			{
-				$table_def_function = "get_table_def_" . SQL_LAYER;
-				$table_content_function = "get_table_content_" . SQL_LAYER;
-			}
-			else
-			{
-				$table_def_function = "get_table_def_mysql";
-				$table_content_function = "get_table_content_mysql";
-			}
-
-			if ($backup_type != 'data')
-			{
-				echo "#\n# TABLE: " . $table_name . "\n#\n";
-				echo $table_def_function($table_name, "\n") . "\n";
-			}
-
-			if ($backup_type != 'structure')
-			{
-				//
-				// Skip search table data?
-				//
-				if ($search || (!$search && !preg_match('/search_word/', $table_name)))
-				{
-					$table_content_function($table_name, "output_table_content");
-				}
-			}
-		}
-
-		// Flush the buffer, send the file
-		switch ($compress)
-		{/*
-			case 'gzip':
-				$extension = 'sql.gz';
-				$contents = gzencode(ob_get_contents());
-				ob_end_clean();
-				break;
-
-			case 'zip':
-				$extension = 'zip';
-				$zip = new zipfile;
-				$zip->add_file(ob_get_contents(), "phpbb_db_backup.sql", time());
-				ob_end_clean();
-				$contents = $zip->file();
-				break;
-
-			case 'bzip':
-				$extension = 'bz2';
-				$contents = bzcompress(ob_get_contents());
-				ob_end_clean();
-				break;*/
-
-			default:
-				$extension = 'sql';
-				$contents = ob_get_contents();
-				ob_end_clean();
-		}
-
-		add_log('admin', 'log_db_backup');
-
-		if (empty($store_path))
-		{
-			header("Pragma: no-cache");
-			header("Content-Type: text/x-delimtext; name=\"phpbb_db_backup.$extension\"");
-			header("Content-disposition: attachment; filename=phpbb_db_backup.$extension");
-
-			echo $contents;
-			unset($contents);
-		}
-		else
-		{
-			if (!($fp = fopen('./../' . $store_path . "/phpbb_db_backup.$extension", 'wb')))
-			{
-				message_die(ERROR, 'Could not open backup file');
-			}
-
-			if (!fwrite($fp, $contents))
-			{
-				message_die(ERROR, 'Could not write backup file content');
-			}
-
-			fclose($fp);
-			unset($contents);
-
-			trigger_error($user->lang['Backup_success']);
-		}
-
-		exit;
-		break;
-
-	case 'restore':
-		if (!$auth->acl_get('a_restore'))
-		{
-			trigger_error($user->lang['NO_ADMIN']);
-		}
-
-		if (isset($_POST['restorestart']))
-		{
-			// Handle the file upload ....
-			// If no file was uploaded report an error...
-			if (!empty($_POST['local']))
-			{
-				$file_tmpname = './../' . str_replace('\\\\', '/', $_POST['local']);
-				$filename = substr($file_tmpname, strrpos($file_tmpname, '/'));
-			}
-			else
-			{
-				$filename = (!empty($_POST['backup_file']['name'])) ? $HTTP_POST_FILES['backup_file']['name'] : '';
-				$file_tmpname = ($HTTP_POST_FILES['backup_file']['tmp_name'] != 'none') ? $HTTP_POST_FILES['backup_file']['tmp_name'] : '';
-			}
-
-			if ($file_tmpname == '' || $filename == '' || !file_exists($file_tmpname))
-			{
-				trigger_error($user->lang['Restore_Error_no_file']);
-			}
-
-			$ext = substr($filename, strrpos($filename, '.') + 1);
-
-			if (!preg_match('/^(sql|gz|bz2)$/', $ext))
-			{
-				trigger_error($user->lang['Restore_Error_filename']);
-			}
-
-			if ((!extension_loaded('zlib') && $ext == 'gz') || (!extension_loaded('zip') && $ext == 'zip') || ($ext == 'bz2' && !extension_loaded('bz2')))
-			{
-				trigger_error($user->lang['Compress_unsupported']);
-			}
-
-			$sql_query = '';
-			switch ($ext)
-			{
-				case 'gz':
-					$fp = gzopen($file_tmpname, 'rb');
-					while (!gzeof($fp))
-					{
-						$sql_query .= gzgets($fp, 100000);
-					}
-					gzclose($fp);
-					break;
-
-				case 'bz2':
-					$sql_query = bzdecompress(fread(fopen($file_tmpname, 'rb'), filesize($file_tmpname)));
-					break;
-
-				case 'zip':
-
-
-				default;
-					$sql_query = fread(fopen($file_tmpname, 'r'), filesize($file_tmpname));
-			}
-
-			if ($sql_query != '')
-			{
-				// Strip out sql comments...
-				remove_remarks($sql_query);
-				$pieces = split_sql_file($sql_query, ';');
-
-				$sql_count = count($pieces);
-				for($i = 0; $i < $sql_count; $i++)
-				{
-					$sql = trim($pieces[$i]);
-
-					if (!empty($sql) && $sql[0] != '#')
-					{
-						$db->sql_query($sql);
-					}
-				}
-			}
-
-			add_log('admin', 'log_db_restore');
-
-			trigger_error($user->lang['Restore_success']);
-		}
-
-		//
-		// Restore page
-		//
-		adm_page_header($user->lang['DB_RESTORE']);
-
-?>
-
-<h1><?php echo $user->lang['DB_RESTORE']; ?></h1>
-
-<p><?php echo $user->lang['Restore_explain']; ?></p>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo "admin_database.$phpEx$SID&amp;mode=$mode"; ?>"><table class="bg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-		<th colspan="2"><?php echo $user->lang['Select_file']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['Upload_file']; ?>: <br /><span class="gensmall"><?php
-
-		echo $user->lang['Supported_extensions'];
-
-		$types = ': <u>sql</u>';
-		if (extension_loaded('zlib'))
-		{
-			$types .= ', <u>sql.gz</u>';
-		}
-		if (extension_loaded('bz2'))
-		{
-			$types .= ', <u>bz2</u>';
-		}
-
-		echo $types;
-
-?></span></td>
-		<td class="row2"><input type="file" name="backup_file" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['Local_backup_file']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Local_backup_file_explain']; ?></span></td>
-		<td class="row2"><input type="text" name="local" size="40" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" name="restorestart" value="<?php echo $user->lang['Start_Restore']; ?>" class="btnmain" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-		break;
-
-	default:
-		trigger_error($user->lang['No_admin']);
-		exit;
-
-}
-
-adm_page_footer();
-
-// -----------------------------------------------
-// Begin Functions
-//
-
-//
-// Table defns (not from phpMyAdmin)
-//
-function mysql_get_tables()
-{
-	global $db, $table_prefix;
-
-	$tables = array();
-
-	$result = mysql_list_tables($db->dbname, $db->db_connect_id);
-	if ($row = $db->sql_fetchrow($result))
-	{
-		do
-		{
-			if (preg_match('/^' . $table_prefix . '/', $row[0]))
-			{
-				$tables[] = $row[0];
-			}
-		}
-		while ($row = $db->sql_fetchrow($result));
-	}
-
-	return $tables;
-}
-
-//
-// The following functions are adapted from phpMyAdmin and upgrade_20.php
-//
-// This function is used for grabbing the sequences for postgres...
-//
-function pg_get_sequences($crlf, $backup_type)
-{
-	global $db;
-
-	$get_seq_sql = "SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*'
-		AND relkind = 'S' ORDER BY relname";
-
-	$seq = $db->sql_query($get_seq_sql);
-
-	if (!$num_seq = $db->sql_numrows($seq))
-	{
-
-		$return_val = "# No Sequences Found $crlf";
-
-	}
-	else
-	{
-		$return_val = "# Sequences $crlf";
-		$i_seq = 0;
-
-		while($i_seq < $num_seq)
-		{
-			$row = $db->sql_fetchrow($seq);
-			$sequence = $row['relname'];
-
-			$get_props_sql = "SELECT * FROM $sequence";
-			$seq_props = $db->sql_query($get_props_sql);
-
-			if ($db->sql_numrows($seq_props) > 0)
-			{
-				$row1 = $db->sql_fetchrow($seq_props);
-
-				if ($backup_type == 'structure')
-				{
-					$row['last_value'] = 1;
-				}
-
-				$return_val .= "CREATE SEQUENCE $sequence start " . $row['last_value'] . ' increment ' . $row['increment_by'] . ' maxvalue ' . $row['max_value'] . ' minvalue ' . $row['min_value'] . ' cache ' . $row['cache_value'] . "; $crlf";
-
-			}  // End if numrows > 0
-
-			if (($row['last_value'] > 1) && ($backup_type != 'structure'))
-			{
-				$return_val .= "SELECT NEXTVALE('$sequence'); $crlf";
-				unset($row['last_value']);
-			}
-
-			$i_seq++;
-
-		} // End while..
-
-	} // End else...
-
-	return $returnval;
-
-} // End function...
-
-//
-// The following functions will return the "CREATE TABLE syntax for the
-// varying DBMS's
-//
-// This function returns, will return the table def's for postgres...
-//
-function get_table_def_postgresql($table, $crlf)
-{
-	global $db;
-
-	$schema_create = "";
-	//
-	// Get a listing of the fields, with their associated types, etc.
-	//
-
-	$field_query = "SELECT a.attnum, a.attname AS field, t.typname as type, a.attlen AS length, a.atttypmod as lengthvar, a.attnotnull as notnull
-		FROM pg_class c, pg_attribute a, pg_type t
-		WHERE c.relname = '$table'
-			AND a.attnum > 0
-			AND a.attrelid = c.oid
-			AND a.atttypid = t.oid
-		ORDER BY a.attnum";
-	$result = $db->sql_query($field_query);
-
-	if (!$result)
-	{
-		message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $field_query);
-	} // end if..
-
-	$schema_create .= "DROP TABLE $table;$crlf";
-
-	//
-	// Ok now we actually start building the SQL statements to restore the tables
-	//
-
-	$schema_create .= "CREATE TABLE $table($crlf";
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		//
-		// Get the data from the table
-		//
-		$sql_get_default = "SELECT d.adsrc AS rowdefault
-			FROM pg_attrdef d, pg_class c
-			WHERE (c.relname = '$table')
-				AND (c.oid = d.adrelid)
-				AND d.adnum = " . $row['attnum'];
-		$def_res = $db->sql_query($sql_get_default);
-
-		if (!$def_res)
-		{
-			unset($row['rowdefault']);
-		}
-		else
-		{
-			$row['rowdefault'] = @pg_result($def_res, 0, 'rowdefault');
-		}
-
-		if ($row['type'] == 'bpchar')
-		{
-			// Internally stored as bpchar, but isn't accepted in a CREATE TABLE statement.
-			$row['type'] = 'char';
-		}
-
-		$schema_create .= '	' . $row['field'] . ' ' . $row['type'];
-
-		if (eregi('char', $row['type']))
-		{
-			if ($row['lengthvar'] > 0)
-			{
-				$schema_create .= '(' . ($row['lengthvar'] -4) . ')';
-			}
-		}
-
-		if (eregi('numeric', $row['type']))
-		{
-			$schema_create .= '(';
-			$schema_create .= sprintf("%s,%s", (($row['lengthvar'] >> 16) & 0xffff), (($row['lengthvar'] - 4) & 0xffff));
-			$schema_create .= ')';
-		}
-
-		if (!empty($row['rowdefault']))
-		{
-			$schema_create .= ' DEFAULT ' . $row['rowdefault'];
-		}
-
-		if ($row['notnull'] == 't')
-		{
-			$schema_create .= ' NOT NULL';
-		}
-
-		$schema_create .= ",$crlf";
-
-	}
-	//
-	// Get the listing of primary keys.
-	//
-
-	$sql_pri_keys = "SELECT ic.relname AS index_name, bc.relname AS tab_name, ta.attname AS column_name, i.indisunique AS unique_key, i.indisprimary AS primary_key
-		FROM pg_class bc, pg_class ic, pg_index i, pg_attribute ta, pg_attribute ia
-		WHERE (bc.oid = i.indrelid)
-			AND (ic.oid = i.indexrelid)
-			AND (ia.attrelid = i.indexrelid)
-			AND	(ta.attrelid = bc.oid)
-			AND (bc.relname = '$table')
-			AND (ta.attrelid = i.indrelid)
-			AND (ta.attnum = i.indkey[ia.attnum-1])
-		ORDER BY index_name, tab_name, column_name ";
-	$result = $db->sql_query($sql_pri_keys);
-
-	if (!$result)
-	{
-		message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_pri_keys);
-	}
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		if ($row['primary_key'] == 't')
-		{
-			if (!empty($primary_key))
-			{
-				$primary_key .= ', ';
-			}
-
-			$primary_key .= $row['column_name'];
-			$primary_key_name = $row['index_name'];
-
-		}
-		else
-		{
-			//
-			// We have to store this all this info because it is possible to have a multi-column key...
-			// we can loop through it again and build the statement
-			//
-			$index_rows[$row['index_name']]['table'] = $table;
-			$index_rows[$row['index_name']]['unique'] = ($row['unique_key'] == 't') ? ' UNIQUE ' : '';
-			$index_rows[$row['index_name']]['column_names'] .= $row['column_name'] . ', ';
-		}
-	}
-
-	if (!empty($index_rows))
-	{
-		while(list($idx_name, $props) = each($index_rows))
-		{
-			$props['column_names'] = ereg_replace(", $", "" , $props['column_names']);
-			$index_create .= 'CREATE ' . $props['unique'] . " INDEX $idx_name ON $table (" . $props['column_names'] . ");$crlf";
-		}
-	}
-
-	if (!empty($primary_key))
-	{
-		$schema_create .= "	CONSTRAINT $primary_key_name PRIMARY KEY ($primary_key),$crlf";
-	}
-
-	//
-	// Generate constraint clauses for CHECK constraints
-	//
-	$sql_checks = "SELECT rcname as index_name, rcsrc
-		FROM pg_relcheck, pg_class bc
-		WHERE rcrelid = bc.oid
-			AND bc.relname = '$table'
-			AND NOT EXISTS (
-				SELECT *
-					FROM pg_relcheck as c, pg_inherits as i
-					WHERE i.inhrelid = pg_relcheck.rcrelid
-						AND c.rcname = pg_relcheck.rcname
-						AND c.rcsrc = pg_relcheck.rcsrc
-						AND c.rcrelid = i.inhparent
-			)";
-	$result = $db->sql_query($sql_checks);
-
-	if (!$result)
-	{
-		message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_checks);
-	}
-
-	//
-	// Add the constraints to the sql file.
-	//
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$schema_create .= '	CONSTRAINT ' . $row['index_name'] . ' CHECK ' . $row['rcsrc'] . ",$crlf";
-	}
-
-	$schema_create = ereg_replace(',' . $crlf . '$', '', $schema_create);
-	$index_create = ereg_replace(',' . $crlf . '$', '', $index_create);
-
-	$schema_create .= "$crlf);$crlf";
-
-	if (!empty($index_create))
-	{
-		$schema_create .= $index_create;
-	}
-
-	//
-	// Ok now we've built all the sql return it to the calling function.
-	//
-	return (stripslashes($schema_create));
-
-}
-
-//
-// This function returns the "CREATE TABLE" syntax for mysql dbms...
-//
-function get_table_def_mysql($table, $crlf)
-{
-	global $db;
-
-	$schema_create = "";
-	$field_query = "SHOW FIELDS FROM $table";
-	$key_query = "SHOW KEYS FROM $table";
-
-	// If the user has selected to drop existing tables when doing a restore.
-	// Then we add the statement to drop the tables....
-	$schema_create .= "DROP TABLE IF EXISTS $table;$crlf";
-	$schema_create .= "CREATE TABLE $table($crlf";
-
-	// Ok lets grab the fields...
-	$result = $db->sql_query($field_query);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$schema_create .= '	' . $row['Field'] . ' ' . $row['Type'];
-
-		if (!empty($row['Default']))
-		{
-			$schema_create .= ' DEFAULT \'' . $row['Default'] . '\'';
-		}
-
-		if ($row['Null'] != "YES")
-		{
-			$schema_create .= ' NOT NULL';
-		}
-
-		if ($row['Extra'] != "")
-		{
-			$schema_create .= ' ' . $row['Extra'];
-		}
-
-		$schema_create .= ",$crlf";
-	}
-	//
-	// Drop the last ',$crlf' off ;)
-	//
-	$schema_create = ereg_replace(',' . $crlf . '$', "", $schema_create);
-
-	//
-	// Get any Indexed fields from the database...
-	//
-	$result = $db->sql_query($key_query);
-
-	while($row = $db->sql_fetchrow($result))
-	{
-		$kname = $row['Key_name'];
-
-		if (($kname != 'PRIMARY') && ($row['Non_unique'] == 0))
-		{
-			$kname = "UNIQUE|$kname";
-		}
-
-		if (!is_array($index[$kname]))
-		{
-			$index[$kname] = array();
-		}
-
-		$index[$kname][] = $row['Column_name'];
-	}
-
-	foreach ($index as $x => $columns)
-	{
-		$schema_create .= ", $crlf";
-
-		if ($x == 'PRIMARY')
-		{
-			$schema_create .= '	PRIMARY KEY (' . implode($columns, ', ') . ')';
-		}
-		elseif (substr($x,0,6) == 'UNIQUE')
-		{
-			$schema_create .= '	UNIQUE ' . substr($x,7) . ' (' . implode($columns, ', ') . ')';
-		}
-		else
-		{
-			$schema_create .= "	KEY $x (" . implode($columns, ', ') . ')';
-		}
-	}
-
-	$schema_create .= "$crlf);";
-
-	if (get_magic_quotes_runtime())
-	{
-		return stripslashes($schema_create);
-	}
-	else
-	{
-		return $schema_create;
-	}
-
-} // End get_table_def_mysql
-
-
-//
-// This fuction will return a tables create definition to be used as an sql
-// statement.
-//
-//
-// The following functions Get the data from the tables and format it as a
-// series of INSERT statements, for each different DBMS...
-// After every row a custom callback function $handler gets called.
-// $handler must accept one parameter ($sql_insert);
-//
-//
-// Here is the function for postgres...
-//
-function get_table_content_postgresql($table, $handler)
-{
-	global $db;
-
-	// Grab all of the data from current table.
-	$result = $db->sql_query("SELECT * FROM $table");
-
-	$i_num_fields = $db->sql_numfields($result);
-
-	for ($i = 0; $i < $i_num_fields; $i++)
-	{
-		$aryType[] = $db->sql_fieldtype($i, $result);
-		$aryName[] = $db->sql_fieldname($i, $result);
-	}
-
-	$iRec = 0;
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		unset($schema_vals);
-		unset($schema_fields);
-		unset($schema_insert);
-
-		// Build the SQL statement to recreate the data.
-		for($i = 0; $i < $i_num_fields; $i++)
-		{
-			$strVal = $row[$aryName[$i]];
-			if (preg_match('#char|text|bool#i', $aryType[$i]))
-			{
-				$strQuote = "'";
-				$strEmpty = "";
-				$strVal = addslashes($strVal);
-			}
-			elseif (preg_match('#date|timestamp#i', $aryType[$i]))
-			{
-				if ($empty($strVal))
-				{
-					$strQuote = "";
-				}
-				else
-				{
-					$strQuote = "'";
-				}
-			}
-			else
-			{
-				$strQuote = "";
-				$strEmpty = "NULL";
-			}
-
-			if (empty($strVal) && $strVal != "0")
-			{
-				$strVal = $strEmpty;
-			}
-
-			$schema_vals .= " $strQuote$strVal$strQuote,";
-			$schema_fields .= " $aryName[$i],";
-		}
-
-		$schema_vals = preg_replace('#,$#', '', $schema_vals);
-		$schema_vals = preg_replace('#^ #', '', $schema_vals);
-		$schema_fields = preg_replace('#,$#', '', $schema_fields);
-		$schema_fields = preg_replace('#^ #', '', $schema_fields);
-
-		// Take the ordered fields and their associated data and build it
-		// into a valid sql statement to recreate that field in the data.
-		$schema_insert = "INSERT INTO $table ($schema_fields) VALUES($schema_vals);";
-
-		$handler(trim($schema_insert));
-	}
-
-	return(true);
-
-}// end function get_table_content_postgres...
-
-//
-// This function is for getting the data from a mysql table.
-//
-
-function get_table_content_mysql($table, $handler)
-{
-	global $db;
-
-	// Grab the data from the table.
-	$result = $db->sql_query("SELECT * FROM $table");
-
-	// Loop through the resulting rows and build the sql statement.
-	$schema_insert = "";
-	if ($row = $db->sql_fetchrow($result))
-	{
-		$schema_insert = "\n#\n# Table Data for $table\n#\n";
-
-		$handler($schema_insert);
-
-		do
-		{
-			$table_list = '(';
-			$num_fields = $db->sql_numfields($result);
-			//
-			// Grab the list of field names.
-			//
-			for ($j = 0; $j < $num_fields; $j++)
-			{
-				$table_list .= $db->sql_fieldname($j, $result) . ', ';
-			}
-			//
-			// Get rid of the last comma
-			//
-			$table_list = preg_replace('#, $#', '', $table_list);
-			$table_list .= ')';
-			//
-			// Start building the SQL statement.
-			//
-			$schema_insert = "INSERT INTO $table $table_list VALUES(";
-			//
-			// Loop through the rows and fill in data for each column
-			//
-			for ($j = 0; $j < $num_fields; $j++)
-			{
-				if (!isset($row[$j]))
-				{
-					//
-					// If there is no data for the column set it to null.
-					// There was a problem here with an extra space causing the
-					// sql file not to reimport if the last column was null in
-					// any table.  Should be fixed now :) JLH
-					//
-					$schema_insert .= ' NULL,';
-				}
-				elseif ($row[$j] != '')
-				{
-					$schema_insert .= ' \'' . addslashes($row[$j]) . '\',';
-				}
-				else
-				{
-					$schema_insert .= '\'\',';
-				}
-			}
-			//
-			// Get rid of the the last comma.
-			//
-			$schema_insert = preg_replace('#,$#', '', $schema_insert);
-			$schema_insert .= ');';
-			//
-			// Go ahead and send the insert statement to the handler function.
-			//
-			$handler(trim($schema_insert));
-		}
-		while ($row = $db->sql_fetchrow($result));
-	}
-
-	return true;
-}
-
-function output_table_content($content)
-{
-	global $tempfile;
-
-	//fwrite($tempfile, $content . "\n");
-	//$backup_sql .= $content . "\n";
-	echo $content ."\n";
-	return;
-}
-//
-// End Functions
-// -----------------------------------------------
-
-?>

phpBB/adm/admin_disallow.php

@@ -1,157 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_names'))
-	{
-		return;
-	}
-
-	$module['USER']['DISALLOW'] = basename(__FILE__) . $SID;
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_user.'.$phpEx);
-
-// Check permissions
-if (!$auth->acl_get('a_names'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-if (isset($_POST['disallow']))
-{
-	$disallowed_user = (isset($_REQUEST['disallowed_user'])) ? htmlspecialchars($_REQUEST['disallowed_user']) : '';
-	$disallowed_user = str_replace('*', '%', $disallowed_user);
-
-	if (validate_username($disallowed_user))
-	{
-		$message = $user->lang['Disallowed_already'];
-	}
-	else
-	{
-		$sql = 'INSERT INTO ' . DISALLOW_TABLE . " (disallow_username)
-			VALUES('" . $db->sql_escape(stripslashes($disallowed_user)) . "')";
-		$result = $db->sql_query($sql);
-
-		$message = $user->lang['Disallow_successful'];
-	}
-
-	add_log('admin', 'log_disallow_add', str_replace('%', '*', $disallowed_user));
-
-	trigger_error($message);
-}
-else if (isset($_POST['allow']))
-{
-	$disallowed_id = (isset($_REQUEST['disallowed_id'])) ? intval($_REQUEST['disallowed_id']) : '';
-
-	if (empty($disallowed_id))
-	{
-		trigger_error($user->lang['No_user_selected']);
-	}
-
-	$sql = 'DELETE FROM ' . DISALLOW_TABLE . "
-		WHERE disallow_id = $disallowed_id";
-	$db->sql_query($sql);
-
-	add_log('admin', 'log_disallow_delete');
-
-	trigger_error($user->lang['Disallowed_deleted']);
-}
-
-// Grab the current list of disallowed usernames...
-$sql = 'SELECT *
-	FROM ' . DISALLOW_TABLE;
-$result = $db->sql_query($sql);
-
-$disallow_select = '';
-if ($row = $db->sql_fetchrow($result))
-{
-	do
-	{
-		$disallow_select .= '<option value="' . $row['disallow_id'] . '">' . str_replace('%', '*', $row['disallow_username']) . '</option>';
-	}
-	while ($row = $db->sql_fetchrow($result));
-}
-
-// Output page
-adm_page_header($user->lang['DISALLOW']);
-
-?>
-
-<h1><?php echo $user->lang['DISALLOW']; ?></h1>
-
-<p><?php echo $user->lang['Disallow_explain']; ?></p>
-
-<form method="post" action="<?php echo "admin_disallow.$phpEx$SID"; ?>"><table class="bg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['Add_disallow_title']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['USERNAME']; ?><br /><span class="gensmall"><?php echo $user->lang['Add_disallow_explain']; ?></span></td>
-		<td class="row2"><input class="post" type="text" name="disallowed_user" size="30" />&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="disallow" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" />
-	</tr>
-</table>
-
-<h1><?php echo $user->lang['Delete_disallow_title']; ?></h1>
-
-<p><?php echo $user->lang['Delete_disallow_explain']; ?></p>
-
-<table class="bg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['Delete_disallow_title']; ?></th>
-	</tr>
-<?php
-
-	if ($disallow_select != '')
-	{
-
-?>
-	<tr>
-		<td class="row1"><?php echo $user->lang['USERNAME']; ?></td>
-		<td class="row2"><select class="post" name="disallowed_id"><?php echo $disallow_select; ?></select></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="allow" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" />
-	</tr>
-<?php
-
-	}
-	else
-	{
-
-?>
-	<tr>
-		<td class="row1" colspan="2" align="center"><?php echo $user->lang['No_disallowed']; ?></td>
-	</tr>
-<?php
-
-	}
-
-?>
-</table></form>
-
-<?php
-
-adm_page_footer();
-
-?>

phpBB/adm/admin_email.php

@@ -1,274 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	$file = basename(__FILE__);
-	$module['GENERAL']['MASS_EMAIL'] = ($auth->acl_get('a_email')) ? "$file$SID" : '';
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = './../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Check permissions
-if (!$auth->acl_get('a_email'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Set some vars
-$message = $subject = $group_id = '';
-
-// Do the job ...
-if (isset($_POST['submit']))
-{
-	// Error checking needs to go here ... if no subject and/or no message then skip 
-	// over the send and return to the form
-	$group_id	= request_var('g', 0);
-	$usernames	= request_var('usernames', '');
-	$subject	= preg_replace('#&(\#[0-9]+;)#', '&\1', strtr(request_var('subject', ''), array_flip(get_html_translation_table(HTML_ENTITIES))));
-	$message	= preg_replace('#&(\#[0-9]+;)#', '&\1', strtr(request_var('message', ''), array_flip(get_html_translation_table(HTML_ENTITIES))));
-	$use_queue	= (isset($_POST['send_immediatly'])) ? false : true;
-	$priority	= request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY);
-
-	// NOTE: Only temporary, i do not think this is a good idea for the final code, but i have to test this more than once. ;)
-	$log_session= (isset($_POST['log_session'])) ? true : false;
-
-	$error = array();
-	if (!$subject)
-	{
-		$error[] = $user->lang['NO_EMAIL_SUBJECT'];
-	}
-
-	if (!$message)
-	{
-		$error[] = $user->lang['NO_EMAIL_MESSAGE'];
-	}
-
-	if (!sizeof($error))	
-	{
-		if ($usernames)
-		{
-			$usernames = implode(', ', preg_replace('#^[\s]*?(.*?)[\s]*?$#e', "\"'\" . \$db->sql_escape('\\1') . \"'\"", explode("\n", $usernames)));
-
-			$sql = 'SELECT username, user_email, user_jabber, user_notify_type, user_lang 
-				FROM ' . USERS_TABLE . " 
-				WHERE username IN ($usernames)
-					AND user_allow_massemail = 1
-				ORDER BY user_lang, user_notify_type, SUBSTRING(user_email FROM INSTR(user_email,'@'))";
-		}
-		else
-		{
-			$sql = ($group_id) ? 'SELECT u.user_email, u.username, u.user_lang, u.user_jabber, u.user_notify_type FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> 1 AND u.user_id = ug.user_id AND u.user_allow_massemail = 1" : 'SELECT u.username, u.user_email, u.user_jabber, u.user_notify_type, u.user_lang FROM ' . USERS_TABLE . ' u WHERE u.user_allow_massemail = 1';
-
-			// TODO: different for other db servers?
-			$sql .= " ORDER BY u.user_lang, u.user_notify_type, SUBSTRING(u.user_email FROM INSTR(u.user_email,'@'))";
-		}
-		$result = $db->sql_query($sql);
-
-		if (!($row = $db->sql_fetchrow($result)))
-		{
-			trigger_error($user->lang['NO_USER']);
-		}
-		$db->sql_freeresult($result);
-	
-		$i = $j = 0;
-		// Send with BCC, no more than 50 recipients for one mail (to not exceed the limit)
-		$max_chunk_size = 50;
-		$email_list = array();
-		$old_lang = $row['user_lang'];
-		$old_notify_type = $row['user_notify_type'];
-
-		do
-		{
-			if (($row['user_notify'] == NOTIFY_EMAIL && $row['user_email']) ||
-				($row['user_notify'] == NOTIFY_IM && $row['user_jabber']) ||
-				($row['user_notify'] == NOTIFY_BOTH && $row['user_email'] && $row['user_jabber']))
-			{
-				if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type)
-				{
-					$i = 0;
-					$j++;
-					$old_lang = $row['user_lang'];
-					$old_notify_type = $row['user_notify_type'];
-				}
-
-				$email_list[$j][$i]['lang']		= $row['user_lang'];
-				$email_list[$j][$i]['method']	= $row['user_notify_type'];
-				$email_list[$j][$i]['email']	= $row['user_email'];
-				$email_list[$j][$i]['name']		= $row['username'];
-				$email_list[$j][$i]['jabber']	= $row['user_jabber'];
-				$i++;
-			}
-		} 
-		while ($row = $db->sql_fetchrow($result));
-		$db->sql_freeresult($result);
-
-		// Send the messages
-		include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
-		$messenger = new messenger($use_queue);
-
-		$errored = false;
-
-		for ($i = 0; $i < sizeof($email_list); $i++)
-		{
-			$used_lang = $email_list[$i][0]['lang'];
-			$used_method = $email_list[$i][0]['method'];
-
-			for ($j = 0; $j < sizeof($email_list[$i]); $j++)
-			{
-				$email_row = $email_list[$i][$j];
-
-				$messenger->{((sizeof($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);
-				$messenger->im($email_row['jabber'], $email_row['name']);
-			}
-
-			$messenger->template('admin_send_email', $used_lang);
-
-			$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
-			
-			$messenger->subject($subject);
-			$messenger->replyto($config['board_email']);
-			$messenger->set_mail_priority($priority);
-
-			$messenger->assign_vars(array(
-				'SITENAME'		=> $config['sitename'],
-				'CONTACT_EMAIL' => $config['board_contact'],
-				'MESSAGE'		=> $message)
-			);
-	
-			if (!($messenger->send($used_method, $log_session)))
-			{
-				$errored = true;
-			}
-		}
-		unset($email_list);
-
-		$messenger->save_queue();
-
-		if ($group_id)
-		{
-			$sql = 'SELECT group_name 
-				FROM ' . GROUPS_TABLE . " 
-				WHERE group_id = $group_id";
-			$result = $db->sql_query($sql);
-
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-			extract($row);
-		}
-		else
-		{
-			// Not great but the logging routine doesn't cope well with localising
-			// on the fly
-			$group_name = $user->lang['ALL_USERS'];
-		}
-
-		add_log('admin', 'LOG_MASS_EMAIL', $group_name);
-		$message = (!$errored) ? $user->lang['EMAIL_SENT'] : sprintf($user->lang['EMAIL_SEND_ERROR'], '<a href="admin_viewlogs.' . $phpEx . $SID . '&amp;mode=critical" class="gen">', '</a>');
-		trigger_error($message);
-	}
-}
-
-// Initial selection
-$sql = 'SELECT group_id, group_type, group_name
-	FROM ' . GROUPS_TABLE . ' 
-	ORDER BY group_type DESC, group_name ASC';
-$result = $db->sql_query($sql);
-
-$select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_USERS'] . '</option>';
-if ($row = $db->sql_fetchrow($result))
-{
-	do
-	{
-		$selected = ($group_id == $row['group_id']) ? ' selected="selected"' : '';
-		$select_list .= '<option value = "' . $row['group_id'] . '"' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="blue"' : '') . $selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-	}
-	while ($row = $db->sql_fetchrow($result));
-}
-$db->sql_freeresult($result);
-
-$s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . $user->lang['MAIL_LOW_PRIORITY'] . '</option>';
-$s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>';
-$s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . $user->lang['MAIL_HIGH_PRIORITY'] . '</option>';
-
-adm_page_header($user->lang['MASS_EMAIL']);
-
-?>
-
-<h1><?php echo $user->lang['MASS_EMAIL']; ?></h1>
-
-<p><?php echo $user->lang['MASS_EMAIL_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_email.$phpEx$SID"; ?>" name="email"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['COMPOSE']; ?></th>
-	</tr>
-<?php
-
-	if (sizeof($error))
-	{
-
-?>
-	<tr>
-		<td class="row3" colspan="2" align="center"><span class="error"><?php echo implode('<br />', $error); ?></span></td>
-	</tr>
-<?php
-
-	}
-
-?>
-	<tr>
-		<td class="row1" width="40%"><b><?php echo $user->lang['SEND_TO_GROUP']; ?>: </b></td>
-		<td class="row2"><select name="g"><?php echo $select_list; ?></select></td>
-	</tr>
-	<tr>
-		<td class="row1" valign="top"><b><?php echo $user->lang['SEND_TO_USERS']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['SEND_TO_USERS_EXPLAIN']; ?><br />[ <a href="" onclick="window.open('<?php echo "../memberlist.$phpEx$SID"; ?>&amp;mode=searchuser&amp;form=email&amp;field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;"><?php echo $user->lang['FIND_USERNAME']; ?></a> ]</span></td>
-		<td class="row2" align="left"><textarea name="usernames" rows="5" cols="40"><?php echo $usernames; ?></textarea></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['SUBJECT']; ?>: </b></td>
-		<td class="row2"><input class="post" type="text" name="subject" size="45" maxlength="100" tabindex="2" value="<?php echo $subject; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1" valign="top"><span class="gen"><b><?php echo $user->lang['MASS_MESSAGE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['MASS_MESSAGE_EXPLAIN']; ?></span></td>
-		<td class="row2"><textarea class="post" name="message" rows="10" cols="60" tabindex="3"><?php echo $message; ?></textarea></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['MAIL_PRIORITY']; ?>: </b></td>
-		<td class="row2"><select name="mail_priority_flag"><?php echo $s_priority_options; ?></select></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['SEND_IMMEDIATLY']; ?>: </b></td>
-		<td class="row2"><input type="checkbox" name="send_immediatly" class="text" checked="checked" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['LOG_SESSION']; ?>: </b></td>
-		<td class="row2"><input type="checkbox" name="log_session" class="text" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" value="<?php echo $user->lang['EMAIL']; ?>" name="submit" class="btnmain" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-adm_page_footer();
-
-?>

phpBB/adm/admin_groups.php

@@ -1,956 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-* @todo Avatar gallery ...
-* @todo Mass user pref setting via group membership
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_group'))
-	{
-		return;
-	}
-
-	$module['USER']['GROUP_MANAGE'] = basename(__FILE__) . "$SID&amp;mode=manage";
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_user.'.$phpEx);
-
-// Do we have general permissions?
-if (!$auth->acl_get('a_group'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Check and set some common vars
-$mode		= request_var('mode', '');
-$action		= (isset($_POST['add'])) ? 'add' : ((isset($_POST['addusers'])) ? 'addusers' : request_var('action', ''));
-$group_id	= request_var('g', 0);
-$mark_ary	= request_var('mark', array(0));
-$name_ary	= request_var('usernames', '');
-$leader		= request_var('leader', 0);
-$default	= request_var('default', 0);
-$start		= request_var('start', 0);
-$update		= (isset($_POST['update'])) ? true : false;
-$confirm	= (isset($_POST['confirm'])) ? true : false;
-$cancel		= (isset($_POST['cancel'])) ? true : false;
-
-// Clear some vars
-$can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false;
-$group_row = array();
-
-// Grab basic data for group, if group_id is set and exists
-if ($group_id)
-{
-	$sql = 'SELECT * 
-		FROM ' . GROUPS_TABLE . " 
-		WHERE group_id = $group_id";
-	$result = $db->sql_query($sql);
-	$group_row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	if (!$group_row)
-	{
-		trigger_error($user->lang['NO_GROUP']);
-	}
-}
-
-switch ($mode)
-{
-	case 'manage':
-		// Page header
-		adm_page_header($user->lang['MANAGE']);
-
-		// Common javascript
-?>
-
-<script language="javascript" type="text/javascript">
-<!--
-function marklist(match, status)
-{
-	len = eval('document.' + match + '.length');
-	for (i = 0; i < len; i++)
-	{
-		eval('document.' + match + '.elements[i].checked = ' + status);
-	}
-}
-
-//-->
-</script>
-
-<?php
-
-		// Which page?
-		switch ($action)
-		{
-			case 'approve':
-			case 'demote':
-			case 'promote':
-				if (!$group_id)
-				{
-					trigger_error($user->lang['NO_GROUP']);
-				}
-				
-				group_user_attributes($action, $group_id, $mark_ary, false, ($group_id) ? $group_row['group_name'] : false);
-
-				switch ($action)
-				{
-					case 'demote':
-						$message = 'GROUP_MODS_DEMOTED';
-					break;
-				
-					case 'promote':
-						$message = 'GROUP_MODS_PROMOTED';
-					break;
-					
-					case 'approve':
-						$message = 'USERS_APPROVED';
-					break;
-				}
-
-				trigger_error($user->lang[$message]);
-			break;
-
-			case 'default':
-				if (!$group_id)
-				{
-					trigger_error($user->lang['NO_GROUP']);
-				}
-
-				if (!$mark_ary)
-				{
-					$start = 0;
-					do
-					{
-						$sql = 'SELECT user_id 
-							FROM ' . USER_GROUP_TABLE . "
-							WHERE group_id = $group_id 
-							ORDER BY user_id";
-						$result = $db->sql_query_limit($sql, 200, $start);
-
-						$mark_ary = array();
-						if ($row = $db->sql_fetchrow($result))
-						{
-							do
-							{
-								$mark_ary[] = $row['user_id'];
-							}
-							while ($row = $db->sql_fetchrow($result));
-
-							group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
-
-							$start = (sizeof($user_id_ary) < 200) ? 0 : $start + 200;
-						}
-						else
-						{
-							$start = 0;
-						}
-						$db->sql_freeresult($result);
-					}
-					while ($start);
-				}
-				else
-				{
-					group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
-				}
-
-				trigger_error($user->lang['GROUP_DEFS_UPDATED']);
-			break;
-
-			case 'deleteusers':
-			case 'delete':
-				if (!$cancel && !$confirm)
-				{
-					adm_page_confirm($user->lang['CONFIRM'], $user->lang['CONFIRM_OPERATION']);
-				}
-				else
-				{
-					if (!$group_id)
-					{
-						trigger_error($user->lang['NO_GROUP']);
-					}
-
-					switch ($action)
-					{
-						case 'delete':
-							$error = group_delete($group_id, $group_row['group_name']);
-						break;
-
-						case 'deleteusers':
-							$error = group_user_del($group_id, $mark_ary, false, $group_row['group_name']);
-						break;
-					}
-
-					if ($error)
-					{
-						trigger_error($user->lang[$error]);
-					}
-
-					$message = ($action == 'delete') ? 'GROUP_DELETED' : 'GROUP_USERS_REMOVE';
-					trigger_error($user->lang[$message]);
-				}
-			break;
-
-			case 'addusers':
-				if (!$group_id)
-				{
-					trigger_error($user->lang['NO_GROUP']);
-				}
-
-				if (!$name_ary)
-				{
-					trigger_error($user->lang['NO_USERS']);
-				}
-
-				$name_ary = array_unique(explode("\n", $name_ary));
-
-				// Add user/s to group
-				if ($error = group_user_add($group_id, false, $name_ary, $group_row['group_name'], $default, $leader, $group_row))
-				{
-					trigger_error($user->lang[$error]);
-				}
-
-				$message = ($action == 'addleaders') ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED';
-				trigger_error($user->lang[$message]);
-			break;
-
-			case 'edit':
-			case 'add':
-
-				$data = $submit_ary = array();
-
-				if ($action == 'edit' && !$group_id)
-				{
-					trigger_error($user->lang['NO_GROUP']);
-				}
-
-				$error = array();
-				$user->add_lang('ucp');
-				
-				// Did we submit?
-				if ($update)
-				{
-					$group_name	= request_var('group_name', '');
-					$group_desc	= request_var('group_description', '');
-					$group_type	= request_var('group_type', GROUP_FREE);
-
-					$data['uploadurl']	= request_var('uploadurl', '');
-					$data['remotelink'] = request_var('remotelink', '');
-					$delete				= request_var('delete', '');
-
-					$submit_ary = array(
-						'colour'		=> request_var('group_colour', ''),
-						'rank'			=> request_var('group_rank', 0),
-						'receive_pm'	=> isset($_REQUEST['group_receive_pm']) ? 1 : 0,
-						'message_limit'	=> request_var('group_message_limit', 0)
-					);
-
-					$avatar = '';
-
-					if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink'])
-					{
-						$data['width']		= request_var('width', '');
-						$data['height']		= request_var('height', '');
-
-						// Avatar stuff
-						$var_ary = array(
-							'uploadurl'		=> array('string', true, 5, 255), 
-							'remotelink'	=> array('string', true, 5, 255), 
-							'width'			=> array('string', true, 1, 3), 
-							'height'		=> array('string', true, 1, 3), 
-						);
-
-						if (!($error = validate_data($data, $var_ary)))
-						{
-							$data['user_id'] = "g$group_id";
-
-							if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload)
-							{
-								list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error);
-							}
-							else if ($data['remotelink'])
-							{
-								list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_remote($data, $error);
-							}
-						}
-					}
-					else if ($delete)
-					{
-						$submit_ary['avatar'] = '';
-						$submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0;
-					}
-
-					if (($submit_ary['avatar'] && (!isset($group_row['group_avatar']) || $group_row['group_avatar'] != $submit_ary['avatar'])) || $delete)
-					{
-						if (isset($group_row['group_avatar']) && $group_row['group_avatar'])
-						{
-							avatar_delete($group_row['group_avatar']);
-						}
-					}
-
-					// Only set the rank, colour, etc. if it's changed or if we're adding a new
-					// group. This prevents existing group members being updated if no changes 
-					// were made.
-					
-					$group_attributes = array();
-					foreach (array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'message_limit') as $test)
-					{
-						if ($action == 'add' || (isset($group_row['group_' . $test]) && $group_row['group_' . $test] != $submit_ary[$test]))
-						{
-							$group_attributes[$test] = $group_row['group_' . $test] = $submit_ary[$test];
-						}
-					}
-
-					if (!($error = group_create($group_id, $group_type, $group_name, $group_description, $group_attributes)))
-					{
-						$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
-						trigger_error($message);
-					}
-				}
-				else if (!$group_id)
-				{
-					$group_name = request_var('group_name', '');
-					$group_description = '';
-					$group_type = GROUP_OPEN;
-				}
-				else
-				{
-					$group_name = $group_row['group_name'];
-					$group_description = $group_row['group_description'];
-					$group_type = $group_row['group_type'];
-				}
-
-?>
-
-<h1><?php echo $user->lang['MANAGE']; ?></h1>
-
-<p><?php echo $user->lang['GROUP_EDIT_EXPLAIN']; ?></p>
-
-<?php 
-				$sql = 'SELECT * 
-					FROM ' . RANKS_TABLE . '
-					WHERE rank_special = 1
-					ORDER BY rank_title';
-				$result = $db->sql_query($sql);
-
-				$rank_options = '<option value="-1"' . ((empty($group_rank)) ? 'selected="selected" ' : '') . '>' . $user->lang['USER_DEFAULT'] . '</option>';
-				if ($row = $db->sql_fetchrow($result))
-				{
-					do
-					{
-						$selected = (!empty($group_rank) && $row['rank_id'] == $group_rank) ? ' selected="selected"' : '';
-						$rank_options .= '<option value="' . $row['rank_id'] . '"' . $selected . '>' . $row['rank_title'] . '</option>';
-					}
-					while ($row = $db->sql_fetchrow($result));
-				}
-				$db->sql_freeresult($result);
-
-				$type_free		= ($group_type == GROUP_FREE) ? ' checked="checked"' : '';
-				$type_open		= ($group_type == GROUP_OPEN) ? ' checked="checked"' : '';
-				$type_closed	= ($group_type == GROUP_CLOSED) ? ' checked="checked"' : '';
-				$type_hidden	= ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : '';
-
-				if (isset($group_row['group_avatar']) && $group_row['group_avatar'])
-				{
-					switch ($group_row['group_avatar_type'])
-					{
-						case AVATAR_UPLOAD:
-							$avatar_img = $phpbb_root_path . $config['avatar_path'] . '/';
-							break;
-						case AVATAR_GALLERY:
-							$avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/';
-							break;
-					}
-					$avatar_img .= $group_row['group_avatar'];
-
-					$avatar_img = '<img src="' . $avatar_img . '" width="' . $group_row['group_avatar_width'] . '" height="' . $group_row['group_avatar_height'] . '" alt="" />';
-				}
-				else
-				{
-					$avatar_img = '<img src="images/no_avatar.gif" alt="" />';
-				}
-
-				$display_gallery = (isset($_POST['displaygallery'])) ? true : false;
-
-?>
-
-<script language="javascript" type="text/javascript">
-<!--
-
-function swatch()
-{
-	window.open('./swatch.<?php echo $phpEx; ?>?form=settings&name=group_colour', '_swatch', 'HEIGHT=115,resizable=yes,scrollbars=no,WIDTH=636');
-	return false;
-}
-
-//-->
-</script>
-
-<form name="settings" method="post" action="<?php echo "admin_groups.$phpEx$SID&amp;mode=$mode&amp;action=$action&amp;g=$group_id"; ?>"<?php echo ($can_upload) ? ' enctype="multipart/form-data"' : ''; ?>>
-
-	<table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['GROUP_DETAILS']; ?></th>
-	</tr>
-<?php
-
-				if (sizeof($error))
-				{
-
-?>
-	<tr>
-		<td class="row1" colspan="2" align="center"><span style="color:red"><?php echo implode('<br />', $error); ?></span></td>
-	</tr>
-<?php
-
-				}
-
-?>
-	<tr>
-		<td class="row2" width="40%"><b><?php echo $user->lang['GROUP_NAME']; ?>:</b></td>
-		<td class="row1"><?php 
-	
-				if ($group_type != GROUP_SPECIAL)
-				{
-		
-?><input class="post" type="text" name="group_name" value="<?php echo ($group_name) ? $group_name : ''; ?>" size="40" maxlength="40" /><?php
-			
-				}
-				else
-				{
-				
-?><b><?php echo ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name; ?></b><?php
-	
-				}
-	
-?></td>
-	</tr>
-	<tr>
-		<td class="row2"><b><?php echo $user->lang['GROUP_DESC']; ?>:</b></td>
-		<td class="row1"><input class="post" type="text" name="group_description" value="<?php echo ($group_description) ? $group_description : ''; ?>" size="40" maxlength="255" /></td>
-	</tr>
-<?php
-
-				if ($group_type != GROUP_SPECIAL)
-				{
-
-?>
-	<tr>
-		<td class="row2"><b><?php echo $user->lang['GROUP_TYPE']; ?>:</b><br /><span class="gensmall"><?php echo $user->lang['GROUP_TYPE_EXPLAIN']; ?></span></td>
-		<td class="row1" nowrap="nowrap"><input type="radio" name="group_type" value="<?php echo GROUP_FREE . '"' . $type_free; ?> /> <?php echo $user->lang['GROUP_OPEN']; ?> &nbsp; <input type="radio" name="group_type" value="<?php echo GROUP_OPEN . '"' . $type_open; ?> /> <?php echo $user->lang['GROUP_REQUEST']; ?> &nbsp; <input type="radio" name="group_type" value="<?php echo GROUP_CLOSED . '"' . $type_closed; ?> /> <?php echo $user->lang['GROUP_CLOSED']; ?> &nbsp; <input type="radio" name="group_type" value="<?php echo GROUP_HIDDEN . '"' . $type_hidden; ?>" /> <?php echo $user->lang['GROUP_HIDDEN']; ?></td>
-	</tr>
-<?php
-
-				}
-
-?>
-	<tr>
-		<th colspan="2"><?php echo $user->lang['GROUP_SETTINGS_SAVE']; ?></th>
-	</tr>
-	<tr>
-		<td class="row2"><b><?php echo $user->lang['GROUP_RECEIVE_PM']; ?>:</b></td>
-		<td class="row1" nowrap="nowrap"><input type="checkbox" name="group_receive_pm"<?php echo (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : ''; ?> /></td>
-	</tr>
-	<tr>
-		<td class="row2"><b><?php echo $user->lang['GROUP_MESSAGE_LIMIT']; ?>:</b><br /><span class="gensmall"><?php echo $user->lang['GROUP_MESSAGE_LIMIT_EXPLAIN']; ?></span></td>
-		<td class="row1" nowrap="nowrap"><input class="post" type="text" maxlength="4" size="4" name="group_message_limit" value="<?php echo (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row2"><b><?php echo $user->lang['GROUP_COLOR']; ?>:</b><br /><span class="gensmall"><?php echo $user->lang['GROUP_COLOR_EXPLAIN']; ?></span></td>
-		<td class="row1" nowrap="nowrap"><input class="post" type="text" name="group_colour" value="<?php echo (isset($group_row['group_colour'])) ? $group_row['group_colour'] : ''; ?>" size="6" maxlength="6" /> &nbsp; [ <a href="<?php echo "swatch.$phpEx"; ?>" onclick="swatch();return false" target="_swatch"><?php echo $user->lang['COLOUR_SWATCH']; ?></a> ]</td>
-	</tr>
-	<tr>
-		<td class="row2"><b><?php echo $user->lang['GROUP_RANK']; ?>:</b></td>
-		<td class="row1"><select name="group_rank"><?php echo $rank_options; ?></select></td>
-	</tr>
-	<tr>
-		<th colspan="2"><?php echo $user->lang['GROUP_AVATAR']; ?></th>
-	</tr>
-	<tr> 
-		<td class="row2" width="35%"><b><?php echo $user->lang['CURRENT_IMAGE']; ?>: </b><br /><span class="gensmall"><?php echo sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)); ?></span></td>
-		<td class="row1" align="center"><br /><?php echo $avatar_img; ?><br /><br /><input type="checkbox" name="delete" />&nbsp;<span class="gensmall"><?php echo $user->lang['DELETE_AVATAR']; ?></span></td>
-	</tr>
-<?php
-
-			// Can we upload?
-			if ($can_upload)
-			{
-
-?>
-	<tr> 
-		<td class="row2" width="35%"><b><?php echo $user->lang['UPLOAD_AVATAR_FILE']; ?>: </b></td>
-		<td class="row1"><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $config['avatar_max_filesize']; ?>" /><input class="post" type="file" name="uploadfile" /></td>
-	</tr>
-	<tr> 
-		<td class="row2" width="35%"><b><?php echo $user->lang['UPLOAD_AVATAR_URL']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['UPLOAD_AVATAR_URL_EXPLAIN']; ?></span></td>
-		<td class="row1"><input class="post" type="text" name="uploadurl" size="40" value="" /></td>
-	</tr>
-<?php
-
-			}
-
-?>
-	<tr> 
-		<td class="row2" width="35%"><b><?php echo $user->lang['LINK_REMOTE_AVATAR']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['LINK_REMOTE_AVATAR_EXPLAIN']; ?></span></td>
-		<td class="row1"><input class="post" type="text" name="remotelink" size="40" value="" /></td>
-	</tr>
-	<tr> 
-		<td class="row2" width="35%"><b><?php echo $user->lang['LINK_REMOTE_SIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['LINK_REMOTE_SIZE_EXPLAIN']; ?></span></td>
-		<td class="row1"><input class="post" type="text" name="width" size="3" value="<?php echo (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : ''; ?>" /> <span class="gen">px X </span> <input class="post" type="text" name="height" size="3" value="<?php echo (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : ''; ?>" /> <span class="gen">px</span></td>
-	</tr>
-<?php
-
-			// Do we have a gallery?
-			if ($config['allow_avatar_local'] && !$display_gallery)
-			{
-
-?>
-	<tr> 
-		<td class="row2" width="35%"><b><?php echo $user->lang['AVATAR_GALLERY']; ?>: </b></td>
-		<td class="row1"><input class="btnlite" type="submit" name="displaygallery" value="<?php echo $user->lang['DISPLAY_GALLERY']; ?>" /></td>
-	</tr>
-<?php
-			}
-
-			// Do we want to display it?
-			if ($config['allow_avatar_local'] && $display_gallery)
-			{
-
-?>
-	<tr> 
-		<th colspan="2"><?php echo $user->lang['AVATAR_GALLERY']; ?></th>
-	</tr>
-	<tr> 
-		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed"><?php echo $user->lang['AVATAR_CATEGORY']; ?>: </span><select name="avatarcat">{S_CAT_OPTIONS}</select>&nbsp; <span class="genmed"><?php echo $user->lang['AVATAR_PAGE']; ?>: </span><select name="avatarpage">{S_PAGE_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" value="<?php echo $user->lang['GO']; ?>" name="avatargallery" /></td>
-	</tr>
-	<tr> 
-		<td class="row1" colspan="2" align="center">
-
-			<table cellspacing="1" cellpadding="4" border="0">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-				<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-				<td class="row2" align="center"><input type="radio" name="avatarselect" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		
-		</td>
-	</tr>
-<?php
-
-			}
-
-?>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="update" value="<?php echo $user->lang['SUBMIT']; ?>" /> &nbsp; <input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td>
-	</tr>
-	</table>
-</form>
-
-<?php
-
-				adm_page_footer();
-			break;
-		}
-
-		if ($mode == 'list' || $group_id)
-		{
-			if (!$group_id)
-			{
-				trigger_error($user->lang['NO_GROUP']);
-			}
-
-?>
-
-<h1><?php echo $user->lang['GROUP_MEMBERS']; ?></h1>
-
-<p><?php echo $user->lang['GROUP_MEMBERS_EXPLAIN']; ?></p>
-
-<form name="list" method="post" action="<?php echo "admin_groups.$phpEx$SID&amp;mode=$mode&amp;g=$group_id"; ?>">
-
-	<table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th width="55%"><?php echo $user->lang['USERNAME']; ?></th>
-		<th width="3%" nowrap="nowrap"><?php echo $user->lang['GROUP_DEFAULT']; ?></th>
-		<th width="20%"><?php echo $user->lang['JOINED']; ?></th>
-		<th width="20%"><?php echo $user->lang['POSTS']; ?></th>
-		<th width="2%"><?php echo $user->lang['MARK']; ?></th>
-	</tr>
-<?php
-
-				// Total number of group leaders
-				$sql = 'SELECT COUNT(user_id) AS total_leaders 
-					FROM ' . USER_GROUP_TABLE . " 
-					WHERE group_id = $group_id 
-						AND group_leader = 1";
-				$result = $db->sql_query($sql);
-
-				$total_leaders = ($row = $db->sql_fetchrow($result)) ? $row['total_leaders'] : 0;
-				$db->sql_freeresult($result);
-
-				// Total number of group members (non-leaders)
-				$sql = 'SELECT COUNT(user_id) AS total_members 
-					FROM ' . USER_GROUP_TABLE . " 
-					WHERE group_id = $group_id 
-						AND group_leader <> 1";
-				$result = $db->sql_query($sql);
-
-				$total_members = ($row = $db->sql_fetchrow($result)) ? $row['total_members'] : 0;
-				$db->sql_freeresult($result);
-
-				// Grab the members
-				$sql = 'SELECT u.user_id, u.username, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending 
-					FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug 
-					WHERE ug.group_id = $group_id 
-						AND u.user_id = ug.user_id 
-					ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username ";
-				$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
-
-				$leader = $member = 0;
-				$group_data = array();
-				if ($row = $db->sql_fetchrow($result))
-				{
-					do
-					{
-						$type = ($row['group_leader']) ? 'leader' : 'member';
-
-						$group_data[$type][$$type]['user_id'] = $row['user_id'];
-						$group_data[$type][$$type]['group_id'] = $row['group_id'];
-						$group_data[$type][$$type]['username'] = $row['username'];
-						$group_data[$type][$$type]['user_regdate'] = $row['user_regdate'];
-						$group_data[$type][$$type]['user_posts'] = $row['user_posts'];
-						$group_data[$type][$$type]['user_pending'] = ($row['user_pending']) ? 1 : 0;
-
-						$$type++;
-					}
-					while ($row = $db->sql_fetchrow($result));
-				}
-				$db->sql_freeresult($result);
-
-				if ($group_row['group_type'] != GROUP_SPECIAL)
-				{
-
-?>
-	<tr>
-		<td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_LEAD']; ?></b></td>
-	</tr>
-<?php
-
-					if (sizeof($group_data['leader']))
-					{
-						$row_class = '';
-						foreach ($group_data['leader'] as $row)
-						{
-							$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-
-?>
-	<tr>
-		<td class="<?php echo $row_class; ?>"><a href="<?php echo "admin_users.$phpEx$SID&amp;mode=edit&amp;u=" . $row['user_id']; ?>"><?php echo $row['username']; ?></a></td>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo ($row['group_id'] == $group_id) ? $user->lang['YES'] : $user->lang['NO']; ?></td>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']); ?></td>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo $row['user_posts']; ?></td>
-		<td class="<?php echo $row_class; ?>" align="center"><input class="checkbox" type="checkbox" name="mark[]" value="<?php echo $row['user_id']; ?>" /></td>
-	</tr>
-<?php	
-
-						}
-					}
-					else
-					{
-
-?>
-	<tr>
-		<td class="row1" colspan="5" align="center"><?php echo $user->lang['GROUPS_NO_MODS']; ?></td>
-	</tr>
-<?php
-
-					}
-				}
-
-?>
-	<tr>
-		<td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_APPROVED']; ?></b></td>
-	</tr>
-<?php
-
-				if (sizeof($group_data['member']))
-				{
-					$row_class = '';
-					$pending = false;
-
-					foreach ($group_data['member'] as $row)
-					{
-						$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-
-						if ($row['user_pending'] && !$pending)
-						{
-?>
-	<tr>
-		<td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_PENDING']; ?></b></td>
-	</tr>
-<?php
-							$pending = true;
-						}
-
-?>
-	<tr class="<?php echo $row_class; ?>">
-		<td><a href="<?php echo "admin_users.$phpEx$SID&amp;mode=edit&amp;u=" . $row['user_id']; ?>"><?php echo $row['username']; ?></a></td>
-		<td align="center"><?php echo ($row['group_id'] == $group_id) ? $user->lang['YES'] : $user->lang['NO']; ?></td>
-		<td align="center"><?php echo ($row['user_regdate']) ? $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']) : '-'; ?></td>
-		<td align="center"><?php echo $row['user_posts']; ?></td>
-		<td align="center"><input class="checkbox" type="checkbox" name="mark[]" value="<?php echo $row['user_id']; ?>" /></td>
-	</tr>
-<?php
-
-					}
-				}
-				else
-				{
-
-?>
-	<tr>
-		<td class="row1" colspan="5" align="center"><?php echo $user->lang['GROUPS_NO_MEMBERS']; ?></td>
-	</tr>
-<?php
-
-				}
-
-?>
-	<tr>
-		<td class="cat" colspan="5" align="right">
-			<select name="action"><option class="sep" value=""><?php echo $user->lang['SELECT_OPTION']; ?></option><?php
-
-				foreach (array('default' => 'DEFAULT', 'approve' => 'APPROVE', 'demote' => 'DEMOTE', 'promote' => 'PROMOTE', 'deleteusers' => 'DELETE') as $option => $lang)
-				{
-					echo '<option value="' . $option . '">' . $user->lang['GROUP_' . $lang] . '</option>';
-				}
-
-?>
-			</select> <input class="btnmain" type="submit" name="update" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;
-		</td>
-	</tr>
-	</table>
-
-	<table width="95%" cellspacing="1" cellpadding="1" border="0" align="center">
-	<tr>
-		<td valign="top"><?php echo on_page($total_members, $config['topics_per_page'], $start); ?></td>
-		<td align="right">
-			<b class="gensmall"><a href="javascript:marklist('list', true);"><?php echo $user->lang['MARK_ALL']; ?></a> :: <a href="javascript:marklist('list', false);"><?php echo $user->lang['UNMARK_ALL']; ?></a></b>&nbsp;<br />
-			<span class="nav"><?php echo generate_pagination("admin_groups.$phpEx$SID&amp;action=$action&amp;mode=$mode&amp;g=$group_id", $total_members, $config['topics_per_page'], $start, true); ?></span>
-		</td>
-	</tr>
-	</table>
-
-
-<h1><?php echo $user->lang['ADD_USERS']; ?></h1>
-
-<p><?php echo $user->lang['ADD_USERS_EXPLAIN']; ?></p>
-
-	<table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['ADD_USERS']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b><?php echo $user->lang['USER_GROUP_LEADER']; ?>:</b></span></td>
-		<td class="row2"><input type="radio" name="leader" value="1" /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="leader" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['USER_GROUP_DEFAULT']; ?>:</b> <br /><span class="gensmall"><?php echo $user->lang['USER_GROUP_DEFAULT_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="radio" name="default" value="1" /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="default" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['USERNAME']; ?>:</b><br /><span class="gensmall"><?php echo $user->lang['USERNAMES_EXPLAIN']; ?><br />[ <a href="<?php echo "../memberlist.$phpEx$SID&amp;mode=searchuser&amp;form=list&amp;field=usernames"; ?>" target="usersearch"><?php echo $user->lang['FIND_USERNAME']; ?></a> ]</span></td>
-		<td class="row2"><textarea name="usernames" cols="40" rows="5"></textarea></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="addusers" value="<?php echo $user->lang['SUBMIT']; ?>" /></td>
-	</tr>
-	</table>
-
-</form>
-
-<?php
-
-			adm_page_footer();
-		}
-
-
-?>
-
-<h1><?php echo $user->lang['GROUP_MANAGE']; ?></h1>
-
-<p><?php echo $user->lang['GROUP_MANAGE_EXPLAIN']; ?></p>
-
-<h1><?php echo $user->lang['USER_DEF_GROUPS']; ?></h1>
-
-<p><?php echo $user->lang['USER_DEF_GROUPS_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_groups.$phpEx$SID&amp;mode=$mode"; ?>">
-
-	<table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th width="95%"><?php echo $user->lang['MANAGE']; ?></th>
-		<th nowrap="nowrap"><?php echo $user->lang['TOTAL_MEMBERS']; ?></th>
-		<th colspan="3"><?php echo $user->lang['OPTIONS']; ?></th>
-	</tr>
-<?php
-
-				$sql = 'SELECT g.group_id, g.group_name, g.group_type, COUNT(ug.user_id) AS total_members 
-					FROM (' . GROUPS_TABLE . ' g
-					LEFT JOIN ' . USER_GROUP_TABLE . ' ug USING (group_id)) 
-					GROUP BY g.group_id 
-					ORDER BY g.group_type ASC, g.group_name';
-				$result = $db->sql_query($sql);
-
-				$special = $normal = 0;
-				$group_ary = array();
-				while ($row = $db->sql_fetchrow($result) )
-				{
-					$type = ($row['group_type'] == GROUP_SPECIAL) ? 'special' : 'normal';
-
-					$group_ary[$type][$$type]['group_id'] = $row['group_id'];
-					$group_ary[$type][$$type]['group_name'] = $row['group_name'];
-					$group_ary[$type][$$type]['group_type'] = $row['group_type'];
-					$group_ary[$type][$$type]['total_members'] = $row['total_members'];
-
-					$$type++;
-				}
-				$db->sql_freeresult($result);
-
-				$special_toggle = false;
-				foreach ($group_ary as $type => $row_ary)
-				{
-					if ($type == 'special')
-					{
-
-?>
-	<tr>
-		<td class="cat" colspan="5" align="right"><?php echo $user->lang['CREATE_GROUP']; ?>: <input class="post" type="text" name="group_name" maxlength="30" /> <input class="btnmain" type="submit" name="add" value="<?php echo $user->lang['SUBMIT']; ?>" /></td>
-	</tr>
-	</table>
-
-<h1><?php echo $user->lang['SPECIAL_GROUPS']; ?></h1>
-
-<p><?php echo $user->lang['SPECIAL_GROUPS_EXPLAIN']; ?></p>
-
-	<table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th width="95%"><?php echo $user->lang['MANAGE']; ?></th>
-		<th><?php echo $user->lang['TOTAL_MEMBERS']; ?></th>
-		<th colspan="3"><?php echo $user->lang['OPTIONS']; ?></th>
-	</tr>
-<?php
-
-					}
-
-					$row_class = '';
-					foreach ($row_ary as $row)
-					{
-						$row_class = ($row_class != 'row1') ? 'row1' : 'row2';
-
-						$group_id = $row['group_id'];
-						$group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name'];
-
-?>
-	<tr class="<?php echo $row_class; ?>">
-		<td width="95%"><a href="admin_groups.<?php echo "$phpEx$SID&amp;mode=$mode&amp;action=list&amp;g=$group_id"; ?>"><?php echo $group_name; ?></a></td>
-		<td align="center" nowrap="nowrap">&nbsp;<?php echo $row['total_members']; ?>&nbsp;</td>
-		<td align="center" nowrap="nowrap">&nbsp;<a href="<?php echo "admin_groups.$phpEx$SID&amp;mode=$mode&amp;action=default&amp;g=$group_id"; ?>"><?php echo $user->lang['GROUP_DEFAULT']; ?></a>&nbsp;</td>
-		<td align="center" nowrap="nowrap">&nbsp;<a href="<?php echo "admin_groups.$phpEx$SID&amp;mode=$mode&amp;action=edit&amp;g=$group_id"; ?>"><?php echo $user->lang['EDIT']; ?></a>&nbsp;</td>
-		<td align="center" nowrap="nowrap">&nbsp;<?php 
-	
-						echo ($row['group_type'] != GROUP_SPECIAL) ? "<a href=\"admin_groups.$phpEx$SID&amp;mode=$mode&amp;action=delete&amp;g=$group_id\">" . $user->lang['DELETE'] . '</a>' : $user->lang['DELETE'];
-
-?>&nbsp;</td>
-	</tr>
-<?php
-
-					}
-				}
-
-?>
-	<tr>
-		<td class="cat" colspan="5">&nbsp;</td>
-	</tr>
-	</table>
-</form>
-
-<?php
-
-		adm_page_footer();
-	break;
-
-	// Setting groupwide preferences
-	case 'prefs':
-		adm_page_header($user->lang['GROUP_PREFS']);
-
-		if ($update)
-		{
-			$user_lang	= request_var('lang', '');
-			$user_tz	= request_var('tz', 0.0);
-			$user_dst	= request_var('dst', 0);
-		}
-		else
-		{
-		}
-
-?>
-<h1><?php echo $user->lang['GROUP_SETTINGS']; ?></h1>
-
-<p><?php echo $user->lang['GROUP_SETTINGS_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_groups.$phpEx$SID&amp;action=edit&amp;g=$group_id"; ?>"><table class="bg" width="90%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['GROUP_SETTINGS']; ?></th>
-	</tr>
-	<tr>
-		<td class="row2"><?php echo $user->lang['GROUP_LANG']; ?>:</td>
-		<td class="row1"><select name="user_lang"><?php echo '<option value="-1" selected="selected">' . $user->lang['USER_DEFAULT'] . '</option>' . language_select(); ?></select></td>
-	</tr>
-	<tr>
-		<td class="row2"><?php echo $user->lang['GROUP_TIMEZONE']; ?>:</td>
-		<td class="row1"><select name="user_tz"><?php echo '<option value="-14" selected="selected">' . $user->lang['USER_DEFAULT'] . '</option>' . tz_select(); ?></select></td>
-	</tr>
-	<tr>
-		<td class="row2"><?php echo $user->lang['GROUP_DST']; ?>:</td>
-		<td class="row1" nowrap="nowrap"><input type="radio" name="user_dst" value="0" /> <?php echo $user->lang['DISABLED']; ?> &nbsp; <input type="radio" name="user_dst" value="1" /> <?php echo $user->lang['ENABLED']; ?> &nbsp; <input type="radio" name="user_dst" value="-1" checked="checked" /> <?php echo $user->lang['USER_DEFAULT']; ?></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="submitprefs" value="<?php echo $user->lang['SUBMIT']; ?>" /> &nbsp; <input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-		adm_page_footer();
-	break;
-
-	default:
-		trigger_error($user->lang['NO_MODE']);
-}
-
-exit;
-
-?>

phpBB/adm/admin_icons.php

@@ -1,776 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_icons'))
-	{
-		return;
-	}
-
-	$filename = basename(__FILE__);
-	$module['POST']['SMILIES'] = "$filename$SID&amp;mode=smilies";
-	$module['POST']['ICONS'] = "$filename$SID&amp;mode=icons";
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = './../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Do we have general permissions?
-if (!$auth->acl_get('a_icons'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Grab some basic parameters
-$mode = request_var('mode', '');
-$action = request_var('action', '');
-$action = (isset($_POST['add'])) ? 'add' : $action;
-$action = (isset($_POST['edit'])) ? 'edit' : $action;
-$id = request_var('id', 0);
-
-// What are we working on?
-switch ($mode)
-{
-	case 'smilies':
-		$table = SMILIES_TABLE;
-		$lang = 'SMILIES';
-		$fields = 'smiley';
-		$img_path = $config['smilies_path'];
-		break;
-
-	case 'icons':
-		$table = ICONS_TABLE;
-		$lang = 'ICONS';
-		$fields = 'icons';
-		$img_path = $config['icons_path'];
-		break;
-}
-
-// Clear some arrays
-$_images = $_paks = array();
-$notice = '';
-
-
-// Grab file list of paks and images
-if ($action == 'edit' || $action == 'add' || $action == 'import')
-{
-	$imglist = filelist($phpbb_root_path . $img_path, '');
-	
-	foreach ($imglist as $path => $img_ary)
-	{
-		foreach ($img_ary as $img)
-		{
-			$img_size = @getimagesize($phpbb_root_path . $img_path . '/' . $path . $img);
-
-			$_images[$path.$img]['file'] = $path.$img;
-			$_images[$path.$img]['width'] = $img_size[0];
-			$_images[$path.$img]['height'] = $img_size[1];
-		}
-	}
-	unset($imglist);
-
-	$dir = @opendir($phpbb_root_path . $img_path);
-	while ($file = @readdir($dir))
-	{
-		if (is_file($phpbb_root_path . $img_path . '/' . $file) && preg_match('#\.pak$#i', $file))
-		{
-			$_paks[] = $file;
-		}
-	}
-	@closedir($dir);
-}
-
-
-// What shall we do today? Oops, I believe that's trademarked ...
-switch ($action)
-{
-	case 'edit':
-		unset($_images);
-		$_images = array();
-
-	case 'add':
-
-		$order_list = '';
-
-		$sql = "SELECT * 
-			FROM $table 
-			ORDER BY {$fields}_order " . (($id || $action == 'add') ? 'DESC' : 'ASC');
-		$result = $db->sql_query($sql);
-
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				if ($action == 'add')
-				{
-					unset($_images[$row[$fields . '_url']]);
-				}
-
-				if ($row[$fields . '_id'] == $id)
-				{
-					$after = TRUE;
-					$data[$row[$fields . '_url']] = $row;
-				}
-				else
-				{
-					if ($action == 'edit' && !$id)
-					{
-						$data[$row[$fields . '_url']] = $row;
-					}
-					
-					$selected = '';
-					if (!empty($after))
-					{
-						$selected = ' selected="selected"';
-						$after = FALSE;
-					}
-
-					$after_txt = ($mode == 'smilies') ? $row['code'] : $row['icons_url'];
-					$order_list = '<option value="' . ($row[$fields . '_order']) . '"' . $selected . '>' . sprintf($user->lang['AFTER_' . $lang], ' -&gt; ' . htmlspecialchars($after_txt)) . '</option>' . $order_list;
-				}
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		$db->sql_freeresult($result);
-
-		$order_list = '<option value="1"' . ((!isset($after)) ? ' selected="selected"' : '') . '>' . $user->lang['FIRST'] . '</option>' . $order_list;
-
-		if ($action == 'add')
-		{
-			$data = $_images;
-		}
-
-		$colspan = (($mode == 'smilies') ? '7' : '5');
-		$colspan += ($id) ? 1 : 0;
-		$colspan += ($action == 'add') ? 2 : 0;
-
-		adm_page_header($user->lang[$lang]);
-
-?>
-
-<h1><?php echo $user->lang[$lang]; ?></h1>
-
-<p><?php echo $user->lang[$lang .'_EXPLAIN']; ?></p>
-
-<form method="post" action="admin_icons.<?php echo $phpEx . $SID . "&amp;mode=$mode&amp;action=" . (($action == 'add') ? 'create' : 'modify'); ?>">
-<table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-<tr>
-	<th colspan="<?php echo $colspan; ?>"><?php echo $user->lang[$lang . '_CONFIG'] ?></th>
-</tr>
-<tr>
-	<td class="cat"><?php echo $user->lang[$lang . '_URL'] ?></td>
-	<td class="cat"><?php echo $user->lang[$lang . '_LOCATION'] ?></td>
-<?php
-	if ($mode == 'smilies')
-	{
-?>
-	<td class="cat"><?php echo $user->lang[$lang . '_CODE'] ?></td>
-	<td class="cat"><?php echo $user->lang[$lang . '_EMOTION'] ?></td>
-<?php
-	}
-?>
-	<td class="cat"><?php echo $user->lang[$lang . '_WIDTH'] ?></td>
-	<td class="cat"><?php echo $user->lang[$lang . '_HEIGHT'] ?></td>
-	<td class="cat"><?php echo $user->lang['DISPLAY_ON_POSTING'] ?></td>
-<?php
-	if ($id || $action == 'add')
-	{
-?>
-	<td class="cat"><?php echo $user->lang[$lang . '_ORDER'] ?></td>
-<?php
-	}
-?>
-<?php
-	if ($action == 'add')
-	{
-?>
-	<td class="cat"><?php echo $user->lang['ADD'] ?></td>
-<?php
-	}
-?>
-</tr>
-<?php
-	$row = 0;
-	foreach ($data as $img => $img_row)
-	{
-		$row_class = (($row % 2) == 0) ? 'row1' : 'row2';
-?>
-<tr>
-	<td align="center" class="<?php echo $row_class; ?>"><img src="<?php echo $phpbb_root_path . $img_path . '/' . $img ?>" border="0" alt="" title="" /><input type="hidden" name="image[<?php echo $img; ?>]" value="1" /></td>
-	<td valign="top" class="<?php echo $row_class; ?>">[<?php echo $img; ?>]</td>
-<?php
-
-	if ($mode == 'smilies')
-	{
-
-?>
-		<td class="<?php echo $row_class; ?>"><input class="post" type="text" name="code[<?php echo $img; ?>]" value="<?php echo (!empty($img_row['code'])) ? $img_row['code'] : '' ?>" size="10" /></td>
-		<td class="<?php echo $row_class; ?>"><input class="post" type="text" name="emotion[<?php echo $img; ?>]" value="<?php echo (!empty($img_row['emotion'])) ? $img_row['emotion'] : '' ?>" size="10" /></td>
-<?php
-
-	}
-
-?>
-	<td class="<?php echo $row_class; ?>"><input class="post" type="text" size="3" name="width[<?php echo $img; ?>]" value="<?php echo (!empty($img_row[$fields .'_width'])) ? $img_row[$fields .'_width'] : $img_row['width'] ?>" /></td>
-	<td class="<?php echo $row_class; ?>"><input class="post" type="text" size="3" name="height[<?php echo $img; ?>]" value="<?php echo (!empty($img_row[$fields .'_height'])) ? $img_row[$fields .'_height'] : $img_row['height'] ?>" /></td>
-	<td class="<?php echo $row_class; ?>"><input type="checkbox" name="display_on_posting[<?php echo $img; ?>]"<?php echo (!empty($img_row['display_on_posting']) || $action == 'add') ? ' checked="checked"' : '' ?> /></td>
-<?php
-		if ($id || $action == 'add')
-		{
-?>
-			<td class="<?php echo $row_class; ?>"><select name="order[<?php echo $img; ?>]"><?php echo $order_list ?></select></td>
-<?php
-		}
-	
-		if ($action == 'add')
-		{
-?>
-			<td class="<?php echo $row_class; ?>"><input type="checkbox" name="add_img[<?php echo $img; ?>]" value="1" /><?php
-	
-	}
-?>
-</tr>
-<?php
-	if (isset($img_row[$fields . '_id']))
-	{
-
-?><input type="hidden" name="id[<?php echo $img; ?>]" value="<?php echo $img_row[$fields . '_id'] ?>" /><?php
-	
-	}
-	$row++;
-}
-?>
-<tr>
-	<td class="cat" colspan="<?php echo $colspan; ?>" align="center"><?php 
-			
-	
-?><input class="btnmain" type="submit" value="<?php echo $user->lang['SUBMIT'] ?>" /></td>
-	</tr>
-</table></form>
-<?php
-
-		adm_page_footer();
-		break;
-
-	case 'create':
-	case 'modify':
-
-		// Get items to create/modify
-		$images = (isset($_POST['image'])) ? array_keys($_POST['image']) : array();
-		
-		// Now really get the items
-		$image_id		= (isset($_POST['id'])) ? array_map('intval', $_POST['id']) : array();
-		$image_order	= (isset($_POST['order'])) ? array_map('intval', $_POST['order']) : array();
-		$image_width	= (isset($_POST['width'])) ? array_map('intval', $_POST['width']) : array();
-		$image_height	= (isset($_POST['height'])) ? array_map('intval', $_POST['height']) : array();
-		$image_add		= (isset($_POST['add_img'])) ? array_map('intval', $_POST['add_img']) : array();
-		$image_emotion	= request_var('emotion', '');
-		$image_code		= request_var('code', '');
-		$image_display_on_posting = (isset($_POST['display_on_posting'])) ? array_map('intval', $_POST['display_on_posting']) : array();
-
-		foreach ($images as $image)
-		{
-			if (($mode == 'smilies' && ($image_emotion[$image] == '' || $image_code[$image] == '')) ||
-				($action == 'create' && !isset($image_add[$image])))
-			{
-			}
-			else
-			{
-				if ($image_width[$image] == 0 || $image_height[$image] == 0)
-				{
-					$img_size = @getimagesize($phpbb_root_path . $img_path . '/' . $image);
-					$image_width[$image] = $img_size[0];
-					$image_height[$image] = $img_size[1];
-				}
-
-				$img_sql = array(
-					$fields . '_url'	=>	$image,
-					$fields . '_width'	=>	$image_width[$image],
-					$fields . '_height'	=>	$image_height[$image],
-					'display_on_posting'=>	(isset($image_display_on_posting[$image])) ? 1 : 0,
-				);
-
-				if ($mode == 'smilies')
-				{
-					$img_sql = array_merge($img_sql, array(
-						'emotion'	=>	$image_emotion[$image],
-						'code'		=>	$image_code[$image])
-					);
-				}
-				
-				if (!empty($image_order[$image]))
-				{
-					$img_sql = array_merge($img_sql, array(
-						$fields . '_order'	=>	$image_order[$image] . '.5')
-					);
-				}
-
-				if ($action == 'modify')
-				{
-					$sql = "UPDATE $table
-						SET " . $db->sql_build_array('UPDATE', $img_sql) . " 
-						WHERE {$fields}_id = " . $image_id[$image];
-					$db->sql_query($sql);
-				}
-				else
-				{
-					$sql = "INSERT INTO $table " . $db->sql_build_array('INSERT', $img_sql);
-					$db->sql_query($sql);
-				}
-
-				$update = FALSE;
-
-				if ($action == 'modify' && !empty($image_order[$image]))
-				{
-					$update = TRUE;
-
-					$result = $db->sql_query("SELECT {$fields}_order 
-						FROM $table
-						WHERE {$fields}_id = " . $image_id[$image]);
-					$order_old = $db->sql_fetchfield($fields . '_order', 0, $result);
-
-					if ($order_old == $image_order[$image])
-					{
-						$update = FALSE;
-					}
-
-					if ($order_old > $image_order[$image])
-					{
-						$sign = '+';
-						$where = $fields . '_order >= ' . $image_order[$image] . " AND {$fields}_order < $order_old";
-					}
-					else if ($order_old < $image_order[$image])
-					{
-						$sign = '-';
-						$where = "{$fields}_order > $order_old AND {$fields}_order < " . $image_order[$image];
-						$sql[$fields . '_order'] = $image_order[$image] - 1;
-					}
-				}
-
-				if ($update)
-				{
-					$sql = "UPDATE $table
-						SET {$fields}_order = {$fields}_order $sign 1
-						WHERE $where";
-					$db->sql_query($sql);
-				}
-			
-			}
-		}
-		
-		$cache->destroy('icons');
-
-		if ($action == 'modify')
-		{
-			trigger_error($user->lang[$lang . '_EDITED']);
-		}
-		else
-		{
-			trigger_error($user->lang[$lang . '_ADDED']);
-		}
-
-		break;
-
-	case 'import':
-
-		$pak = request_var('pak', '');
-		$current = request_var('current', '');
-
-		if ($pak != '')
-		{
-			$order = 0;
-
-			// The user has already selected a smilies_pak file
-			if ($current == 'delete')
-			{
-				$db->sql_query("TRUNCATE $table");
-
-				switch ($mode)
-				{
-					case 'smilies':
-						break;
-
-					case 'icons':
-						// Reset all icon_ids
-						$db->sql_query('UPDATE ' . TOPICS_TABLE . ' 
-							SET icon_id = 0');
-						$db->sql_query('UPDATE ' . POSTS_TABLE . ' 
-							SET icon_id = 0');
-						break;
-				}
-			}
-			else 
-			{
-				$cur_img = array();
-
-				$field_sql = ($mode == 'smilies') ? 'code' : 'icons_url';
-				$result = $db->sql_query("SELECT $field_sql FROM $table");
-
-				while ($row = $db->sql_fetchrow($result))
-				{
-					++$order;
-					$cur_img[$row[$field_sql]] = 1;
-				}
-				$db->sql_freeresult($result);
-			}
-
-			if (!($pak_ary = @file($phpbb_root_path . $img_path . '/' . $pak)))
-			{
-				trigger_error('Could not read pak file', E_USER_ERROR);
-			}
-
-			foreach ($pak_ary as $pak_entry)
-			{
-				$data = array();
-				if (preg_match_all("#'(.*?)', #", $pak_entry, $data))
-				{
-					if ((sizeof($data[1]) != 3 && $mode == 'icons') || 
-						(sizeof($data[1]) != 5 && $mode == 'smilies'))
-					{
-						trigger_error($user->lang['WRONG_PAK_TYPE']);
-					}
-
-					$img = stripslashes($data[1][0]);
-					$width = stripslashes($data[1][1]);
-					$height = stripslashes($data[1][2]);
-					if (isset($data[1][3]) && isset($data[1][4]))
-					{
-						$emotion = stripslashes($data[1][3]);
-						$code = htmlentities(stripslashes($data[1][4]));
-					}
-
-					if ($current == 'replace' && 
-						(($mode == 'smilies' && !empty($cur_img[$code])) || 
-						($mode == 'icons' && !empty($cur_img[$img]))))
-					{
-						$replace_sql = ($mode == 'smilies') ? $code : $img;
-						$sql = array(
-							$fields . '_url'	=>	$img,
-							$fields . '_height'	=>	(int) $height,
-							$fields . '_width'	=>	(int) $width,
-						);
-						if ($mode == 'smilies')
-						{
-							$sql = array_merge($sql, array(
-								'emotion'	=>	$emotion
-							));
-						}
-
-						$db->sql_query("UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " 
-							WHERE $field_sql = '" . $db->sql_escape($replace_sql) . "'");
-					}
-					else
-					{
-						++$order;
-
-						$sql = array(
-							$fields . '_url'	=>	$img,
-							$fields . '_height'	=>	(int) $height,
-							$fields . '_width'	=>	(int) $width,
-							$fields . '_order'	=>	(int) $order,
-						);
-
-						if ($mode == 'smilies')
-						{
-							$sql = array_merge($sql, array(
-								'code'		=>	$code,
-								'emotion'	=>	$emotion
-							));
-						}
-						$db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql));
-					}
-
-				}
-			}
-
-			$cache->destroy('icons');
-			trigger_error($user->lang[$lang . '_IMPORT_SUCCESS']);
-		}
-		else
-		{
-			$pak_options = '';
-
-			foreach ($_paks as $pak)
-			{
-				$pak_options .= '<option value="' . $pak . '">' . htmlspecialchars($pak) . '</option>';
-			}
-
-			adm_page_header($user->lang[$lang]);
-
-?>
-<h1><?php echo $user->lang[$lang] ?></h1>
-
-<p><?php echo $user->lang[$lang .'_EXPLAIN'] ?></p>
-
-<form method="post" action="admin_icons.<?php echo $phpEx . $SID . '&amp;mode=' . $mode . '&amp;action=import'; ?>">
-<table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-<tr>
-	<th colspan="2"><?php echo $user->lang[$lang . '_IMPORT'] ?></th>
-</tr>
-<?php
-
-			if ($pak_options == '')
-			{
-
-?>
-<tr>
-	<td class="row1" colspan="2"><?php echo $user->lang['NO_' . $lang . '_PAK']; ?></td>
-</tr>
-<?php
-
-			}
-			else
-			{
-
-?>
-<tr>
-	<td class="row2"><?php echo $user->lang['SELECT_PACKAGE'] ?></td>
-	<td class="row1"><select name="pak"><?php echo $pak_options ?></select></td>
-</tr>
-<tr>
-	<td class="row2"><?php echo $user->lang['CURRENT_' . $lang] ?><br /><span class="gensmall"><?php echo $user->lang['CURRENT_' . $lang . '_EXPLAIN'] ?></span></td>
-	<td class="row1"><input type="radio" name="current" value="keep" checked="checked" /> <?php echo $user->lang['KEEP_ALL'] ?>&nbsp; &nbsp;<input type="radio" name="current" value="replace" /> <?php echo $user->lang['REPLACE_MATCHES'] ?>&nbsp; &nbsp;<input type="radio" name="current" value="delete" /> <?php echo $user->lang['DELETE_ALL'] ?>&nbsp;</td>
-	</tr>
-<tr>
-	<td class="cat" colspan="2" align="center"><input class="btnmain" name="import" type="submit" value="<?php echo $user->lang['IMPORT_' . $lang] ?>" /></td>
-</tr>
-<?php
-
-			}
-
-?>
-</table></form>
-<?php
-			adm_page_footer();
-
-		}
-		break;
-
-	case 'export':
-
-		adm_page_header($user->lang['EXPORT_' . $lang]);
-		trigger_error(sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '<a href="admin_icons.' . $phpEx . $SID . '&amp;mode=' . $mode . '&amp;action=send">', '</a>'));
-		break;
-
-	case 'send':
-
-		$sql = "SELECT * 
-			FROM $table
-			ORDER BY {$fields}_order";
-		$result = $db->sql_query($sql);
-
-		$pak = '';
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$pak .= "'" . addslashes($row[$fields . '_url']) . "', ";
-			$pak .= "'" . addslashes($row[$fields . '_height']) . "', ";
-			$pak .= "'" . addslashes($row[$fields . '_width']) . "', ";
-			if ($mode == 'smilies')
-			{
-				$pak .= "'" . addslashes($row['emotion']) . "', ";
-				$pak .= "'" . addslashes($row['code']) . "', ";
-			}
-			$pak .= "\n";
-		}
-		$db->sql_freeresult($result);
-
-		if ($pak != '')
-		{
-			$db->sql_close();
-
-			header('Content-Type: text/x-delimtext; name="' . $fields . '.pak"');
-			header('Content-disposition: attachment; filename=' . $fields . '.pak"');
-			echo $pak;
-			exit;
-		}
-		else
-		{
-			trigger_error($user->lang['NO_' . $fields . '_EXPORT']);
-		}
-		break;
-
-	case 'delete':
-
-		$db->sql_query("DELETE FROM $table 
-			WHERE {$fields}_id = $id");
-
-		switch ($mode)
-		{
-			case 'smilies':
-				break;
-
-			case 'icons':
-				// Reset appropriate icon_ids
-				$db->sql_query('UPDATE ' . TOPICS_TABLE . " 
-					SET icon_id = 0 
-					WHERE icon_id = $id");
-				$db->sql_query('UPDATE ' . POSTS_TABLE . " 
-					SET icon_id = 0 
-					WHERE icon_id = $id");
-				break;
-		}
-
-		$notice = $user->lang[$lang . '_DELETED'];
-
-	case 'move_up':
-	case 'move_down':
-
-		if ($action != 'delete')
-		{
-			$image_order = intval($_GET['order']);
-			$order_total = $image_order * 2 + (($action == 'move_up') ? -1 : 1);
-
-			$sql = 'UPDATE ' . $table . '
-				SET ' . $fields . "_order = $order_total - " . $fields . '_order
-				WHERE ' . $fields . "_order IN ($image_order, " . (($action == 'move_up') ? $image_order - 1 : $image_order + 1) . ')';
-			$db->sql_query($sql);
-
-			$cache->destroy('icons');
-
-		}
-		// No break; here, display the smilies admin back
-
-	default:
-
-		// By default, check that image_order is valid and fix it if necessary
-		$sql = "SELECT {$fields}_id AS order_id, {$fields}_order AS fields_order
-			FROM $table
-			ORDER BY {$fields}_order";
-		$result = $db->sql_query($sql);
-
-		if ($row = $db->sql_fetchrow($result))
-		{
-			$order = 0;
-			do
-			{
-				++$order;
-				if ($row['fields_order'] != $order)
-				{
-					$db->sql_query("UPDATE $table
-						SET {$fields}_order = $order
-						WHERE {$fields}_id = " . $row['order_id']);
-				}
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		$db->sql_freeresult($result);
-
-		// Output the page
-		adm_page_header($user->lang[$lang]);
-
-?>
-
-<h1><?php echo $user->lang[$lang]; ?></h1>
-
-<p><?php echo $user->lang[$lang .'_EXPLAIN']; ?></p>
-
-<?php
-
-	if ($notice != '')
-	{
-
-?>
-		<b style="color:green"><?php echo $notice; ?></b>
-<?php
-	
-	}
-
-?>
-
-<form method="post" action="admin_icons.<?php echo $phpEx . $SID . '&amp;mode=' . $mode ?>">
-<table cellspacing="1" cellpadding="0" border="0" align="center">
-<tr>
-	<td align="right"> &nbsp;&nbsp; <a href="admin_icons.<?php echo $phpEx . $SID . '&amp;mode=' . $mode . '&amp;action=import'; ?>"><?php echo $user->lang['IMPORT_' . $lang]; ?></a> | <a href="admin_icons.<?php echo $phpEx . $SID . '&amp;mode=' . $mode . '&amp;action=export'; ?>"><?php echo $user->lang['EXPORT_' . $lang]; ?></a></td>
-</tr>
-<tr>
-	<td>
-		<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-		<tr>
-			<th><?php echo $user->lang[$lang]; ?></th>
-<?php
-			if ($mode == 'smilies')
-			{
-?>
-				<th><?php echo $user->lang['CODE']; ?></th>
-				<th><?php echo $user->lang['EMOTION']; ?></th>
-<?php
-			}
-?>
-			<th><?php echo $user->lang['ACTION']; ?></th>
-			<th><?php echo $user->lang['REORDER']; ?></th>
-		</tr>
-<?php
-		$spacer = FALSE;
-
-		$sql = "SELECT * 
-			FROM $table
-			ORDER BY display_on_posting DESC, {$fields}_order ASC";
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (!$spacer && !$row['display_on_posting'])
-			{
-				$spacer = TRUE;
-?>
-		<tr>
-			<td class="row3" colspan="<?php echo ($mode == 'smilies') ? 5 : 3; ?>" align="center"><?php echo $user->lang[$lang . '_NOT_DISPLAYED'] ?></td>
-		</tr>
-<?php
-			}
-
-			$row_class = ($row_class != 'row1') ? 'row1' : 'row2';
-			$alt_text = ($mode == 'smilies') ? htmlspecialchars($row['code']) : '';
-?>
-		<tr>
-			<td class="<?php echo $row_class; ?>" align="center"><img src="<?php echo $phpbb_root_path . $img_path . '/' . $row[$fields . '_url']; ?>" width="<?php echo $row[$fields . '_width']; ?>" height="<?php echo $row[$fields . '_height']; ?>" alt="<?php echo $alt_text; ?>" title="<?php echo $alt_text; ?>" /></td>
-<?php
-
-			if ($mode == 'smilies')
-			{
-?>
-				<td class="<?php echo $row_class; ?>" align="center"><?php echo htmlspecialchars($row['code']); ?></td>
-				<td class="<?php echo $row_class; ?>" align="center"><?php echo $row['emotion']; ?></td>
-<?php
-			}
-?>
-			<td class="<?php echo $row_class; ?>" align="center"><a href="<?php echo "admin_icons.$phpEx$SID&amp;mode=$mode&amp;action=edit&amp;id=" . $row[$fields . '_id']; ?>"><?php echo $user->lang['EDIT']; ?></a> | <a href="<?php echo "admin_icons.$phpEx$SID&amp;mode=$mode&amp;action=delete&amp;id=" . $row[$fields . '_id']; ?>"><?php echo $user->lang['DELETE']; ?></a></td>
-			<td class="<?php echo $row_class; ?>" align="center"><a href="<?php echo "admin_icons.$phpEx$SID&amp;mode=$mode&amp;action=move_up&amp;order=" . $row[$fields . '_order']; ?>"><?php echo $user->lang['MOVE_UP']; ?></a> <br /> <a href="<?php echo "admin_icons.$phpEx$SID&amp;mode=$mode&amp;action=move_down&amp;order=" . $row[$fields . '_order']; ?>"><?php echo $user->lang['MOVE_DOWN']; ?></a></td>
-		</tr>
-<?php
-
-		}
-		$db->sql_freeresult($result);
-
-?>
-		<tr>
-			<td class="cat" colspan="<?php echo ($mode == 'smilies') ? 5 : 3; ?>" align="center"><input type="submit" name="add" value="<?php echo $user->lang['ADD_' . $lang]; ?>" class="btnmain" />&nbsp;<input type="submit" name="edit" value="<?php echo $user->lang['EDIT_' . $lang]; ?>" class="btnmain" /></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-</form>
-
-<?php
-		adm_page_footer();
-
-		break;
-}
-
-?>

phpBB/adm/admin_jabber.php

@@ -1,212 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-* @todo Check/enter/update transport info
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_server'))
-	{
-		return;
-	}
-
-	$module['GENERAL']['IM'] = basename(__FILE__) . $SID;
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_jabber.'.$phpEx);
-
-// Do we have general permissions?
-if (!$auth->acl_get('a_server'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Grab some basic parameters
-$submit = (isset($_POST['submit'])) ? true : false;
-
-$jab_enable		= request_var('jab_enable', $config['jab_enable']);
-$jab_host		= request_var('jab_host', $config['jab_host']);
-$jab_port		= request_var('jab_port', $config['jab_port']);
-$jab_username	= request_var('jab_username', $config['jab_username']);
-$jab_password	= request_var('jab_password', $config['jab_password']);
-$jab_resource	= request_var('jab_resource', $config['jab_resource']);
-
-$jabber = new jabber();
-$error = array();
-
-// Setup the basis vars for jabber connection
-$jabber->server		= $jab_host;
-$jabber->port		= ($jab_port) ? $jab_port : 5222;
-$jabber->username	= $jab_username;
-$jabber->password	= $jab_password;
-$jabber->resource	= $jab_resource;
-
-// Are changing (or initialising) a new host or username? If so run some checks and 
-// try to create account if it doesn't exist
-if ($jab_enable)
-{
-	if ($jab_host != $config['jab_host'] || $jab_username != $config['jab_username'])
-	{
-		if (!$jabber->Connect())
-		{
-			trigger_error('Could not connect to Jabber server', E_USER_ERROR);
-		}
-
-		// First we'll try to authorise using this account, if that fails we'll
-		// try to create it.
-		if (!($result = $jabber->SendAuth()))
-		{
-			if (($result = $jabber->AccountRegistration($config['board_email'], $config['sitename'])) <> 2)
-			{
-
-				$error[] = ($result == 1) ? $user->lang['ERR_JAB_USERNAME'] : sprintf($user->lang['ERR_JAB_REGISTER'], $result);
-			}
-			else
-			{
-				$message = $user->lang['JAB_REGISTERED'];
-				$log = 'JAB_REGISTER';
-			}
-		}
-		else
-		{
-			$message = $user->lang['JAB_CHANGED'];
-			$log = 'JAB_CHANGED';
-		}
-
-		sleep(1);
-		$jabber->Disconnect();
-	}
-	else if ($jab_password != $config['jab_password'])
-	{
-		if (!$jabber->Connect())
-		{
-			trigger_error('Could not connect to Jabber server', E_USER_ERROR);
-		}
-
-		if (!$jabber->SendAuth())
-		{
-			trigger_error('Could not authorise on Jabber server', E_USER_ERROR);
-		}
-		$jabber->SendPresence(NULL, NULL, 'online');
-
-		if (($result = $jabber->ChangePassword($jab_password))  <> 2)
-		{
-			$error[] = ($result == 1) ? $user->lang['ERR_JAB_PASSCHG'] : sprintf($user->lang['ERR_JAB_PASSFAIL'], $result);
-		}
-		else
-		{
-			$message = $user->lang['JAB_PASS_CHANGED'];
-			$log = 'JAB_PASSCHG';
-		}
-
-		sleep(1);
-		$jabber->Disconnect();
-	}
-}
-
-// Pull relevant config data
-$sql = 'SELECT *
-	FROM ' . CONFIG_TABLE . "
-	WHERE config_name LIKE 'jab_%'";
-$result = $db->sql_query($sql);
-
-while ($row = $db->sql_fetchrow($result))
-{
-	$config_name = $row['config_name'];
-	$config_value = $row['config_value'];
-
-	$default_config[$config_name] = $config_value;
-	$new[$config_name] = (isset($_POST[$config_name])) ? request_var($config_name, '') : $default_config[$config_name];
-
-	if ($submit && !sizeof($error))
-	{
-		set_config($config_name, $new[$config_name]);
-	}
-}
-
-if ($submit && !sizeof($error))
-{
-	add_log('admin', 'LOG_' . $log);
-	trigger_error($message);
-}
-
-
-
-// Output the page
-adm_page_header($user->lang['IM']);
-
-$jab_enable_yes		= ($new['jab_enable']) ? 'checked="checked"' : '';
-$jab_enable_no		= (!$new['jab_enable']) ? 'checked="checked"' : '';
-
-?>
-<h1><?php echo $user->lang['IM']; ?></h1>
-
-<p><?php echo $user->lang['IM_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_jabber.$phpEx$SID"; ?>"><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['IM']; ?></th>
-	</tr>
-<?php
-
-	if (sizeof($error))
-	{
-
-?>
-	<tr>
-		<td class="row3" colspan="2" align="center"><span style="color:red"><?php echo implode('<br />', $error); ?></td>
-	</tr>
-<?php
-
-	}
-
-?>
-	<tr>
-		<td class="row1" width="40%"><b><?php echo $user->lang['JAB_ENABLE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['JAB_ENABLE_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="radio" name="jab_enable" value="1"<?php echo $jab_enable_yes; ?> /><?php echo $user->lang['ENABLED']; ?>&nbsp; &nbsp;<input type="radio" name="jab_enable" value="0"<?php echo $jab_enable_no; ?> /><?php echo $user->lang['DISABLED']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b><?php echo $user->lang['JAB_SERVER']; ?>: </b><br /><span class="gensmall"><?php echo sprintf($user->lang['JAB_SERVER_EXPLAIN'], '<a href="http://www.jabber.org/user/publicservers.php" target="_blank">', '</a>'); ?></span></td>
-		<td class="row2"><input class="post" type="text" name="jab_host" value="<?php echo $new['jab_host']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b><?php echo $user->lang['JAB_PORT']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['JAB_PORT_EXPLAIN']; ?></span></td>
-		<td class="row2"><input class="post" type="text" name="jab_port" value="<?php echo $new['jab_port']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['JAB_USERNAME']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['JAB_USERNAME_EXPLAIN']; ?></span></td>
-		<td class="row2"><input class="post" type="text" name="jab_username" value="<?php echo $new['jab_username']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['JAB_PASSWORD']; ?>: </b></td>
-		<td class="row2"><input class="post" type="text" name="jab_password" value="<?php echo $new['jab_password']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['JAB_RESOURCE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['JAB_RESOURCE_EXPLAIN']; ?></span></td>
-		<td class="row2"><input class="post" type="text" name="jab_resource" value="<?php echo $new['jab_resource']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-	adm_page_footer();
-
-?>

phpBB/adm/admin_phpinfo.php

@@ -1,85 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	$module['GENERAL']['PHP_INFO'] = ($auth->acl_get('a_server')) ? basename(__FILE__) . $SID : '';
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Load default header
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-
-// Check permissions
-if (!$auth->acl_get('a_server'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-ob_start(); 
-phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES); 
-$phpinfo = ob_get_contents(); 
-ob_end_clean(); 
-
-// Get used layout
-$layout = (preg_match('#bgcolor#i', $phpinfo)) ? 'old' : 'new';
-
-// Here we play around a little with the PHP Info HTML to try and stylise
-// it along phpBB's lines ... hopefully without breaking anything. The idea
-// for this was nabbed from the PHP annotated manual
-preg_match_all('#<body[^>]*>(.*)</body>#siU', $phpinfo, $output); 
-
-switch ($layout)
-{
-	case 'old':
-		$output = preg_replace('#<table#', '<table class="bg"', $output[1][0]);
-		$output = preg_replace('# bgcolor="\#(\w){6}"#', '', $output);
-		$output = preg_replace('#(\w),(\w)#', '\1, \2', $output);
-		$output = preg_replace('#border="0" cellpadding="3" cellspacing="1" width="600"#', 'border="0" cellspacing="1" cellpadding="4" width="95%"', $output);
-		$output = preg_replace('#<tr valign="top"><td align="left">(.*?<a .*?</a>)(.*?)</td></tr>#s', '<tr class="row1"><td style="{background-color: #9999cc;}"><table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td style="{background-color: #9999cc;}">\2</td><td style="{background-color: #9999cc;}">\1</td></tr></table></td></tr>', $output);
-		$output = preg_replace('#<tr valign="baseline"><td[ ]{0,1}><b>(.*?)</b>#', '<tr><td class="row1" nowrap="nowrap">\1', $output);
-		$output = preg_replace('#<td align="(center|left)">#', '<td class="row2">', $output);
-		$output = preg_replace('#<td>#', '<td class="row2">', $output);
-		$output = preg_replace('#valign="middle"#', '', $output);
-		$output = preg_replace('#<tr >#', '<tr>', $output);
-		$output = preg_replace('#<hr(.*?)>#', '', $output);
-		$output = preg_replace('#<h1 align="center">#i', '<h1>', $output);
-		$output = preg_replace('#<h2 align="center">#i', '<h2>', $output);
-		break;
-	case 'new':
-		$output = preg_replace('#<table#', '<table class="bg" align="center"', $output[1][0]);
-		$output = preg_replace('#(\w),(\w)#', '\1, \2', $output);
-		$output = preg_replace('#border="0" cellpadding="3" width="600"#', 'border="0" cellspacing="1" cellpadding="4" width="95%"', $output);
-		$output = preg_replace('#<tr class="v"><td>(.*?<a .*?</a>)(.*?)</td></tr>#s', '<tr class="row1"><td><table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td>\2</td><td>\1</td></tr></table></td></tr>', $output);
-		$output = preg_replace('#<td>#', '<td style="{background-color: #9999cc;}">', $output);
-		$output = preg_replace('#class="e"#', 'class="row1" nowrap="nowrap"', $output);
-		$output = preg_replace('#class="v"#', 'class="row2"', $output);
-		$output = preg_replace('# class="h"#', '', $output);
-		$output = preg_replace('#<hr />#', '', $output);
-		preg_match_all('#<div class="center">(.*)</div>#siU', $output, $output); 
-		$output = $output[1][0];
-		break;
-}
-
-adm_page_header($user->lang['PHP_INFO']);
-
-echo '<h1>' . $user->lang['PHP_INFO'] . '</h1>';
-echo '<p>' . $user->lang['PHP_INFO_EXPLAIN'] . '</p>';
-echo $output; 
-
-adm_page_footer();
-
-?>

phpBB/adm/admin_prune.php

@@ -1,254 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_prune'))
-	{
-		return;
-	}
-
-	$module['FORUM']['PRUNE']   = basename(__FILE__) . $SID . '&amp;mode=forums';
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Do we have permission?
-if (!$auth->acl_get('a_prune'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Get the forum ID for pruning
-$forum_id = (isset($_REQUEST['f'])) ? array_map('intval', $_REQUEST['f']) : array();
-
-// Check for submit to be equal to Prune. If so then proceed with the pruning.
-if (isset($_POST['submit']))
-{
-	$prune_posted = (isset($_POST['prune_days'])) ? intval($_POST['prune_days']) : 0;
-	$prune_viewed = (isset($_POST['prune_vieweddays'])) ? intval($_POST['prune_vieweddays']) : 0;
-	$prune_all = !$prune_posted && !$prune_viewed;
-	
-	$prune_flags = 0;
-	$prune_flags += (!empty($_POST['prune_old_polls'])) ? 2 : 0;
-	$prune_flags += (!empty($_POST['prune_announce'])) ? 4 : 0;
-	$prune_flags += (!empty($_POST['prune_sticky'])) ? 8 : 0;
-
-	// Convert days to seconds for timestamp functions...
-	$prunedate_posted = time() - ($prune_posted * 86400);
-	$prunedate_viewed = time() - ($prune_viewed * 86400);
-
-	adm_page_header($user->lang['PRUNE']);
-
-?>
-
-<h1><?php echo $user->lang['PRUNE']; ?></h1>
-
-<p><?php echo $user->lang['PRUNE_SUCCESS']; ?></p>
-
-<table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th><?php echo $user->lang['FORUM']; ?></th>
-		<th><?php echo $user->lang['TOPICS_PRUNED']; ?></th>
-		<th><?php echo $user->lang['POSTS_PRUNED']; ?></th>
-	</tr>
-<?php
-
-	$sql_forum = (sizeof($forum_id)) ? ' AND forum_id IN (' . implode(', ', $forum_id) . ')' : '';
-
-	// Get a list of forum's or the data for the forum that we are pruning.
-	$sql = 'SELECT forum_id, forum_name 
-		FROM ' . FORUMS_TABLE . '
-		WHERE forum_type = ' . FORUM_POST . "
-			$sql_forum 
-		ORDER BY left_id ASC";
-	$result = $db->sql_query($sql);
-
-	if ($row = $db->sql_fetchrow($result))
-	{
-		$prune_ids = array();
-		$p_result['topics'] = 0;
-		$p_result['posts'] = 0;
-		$log_data = '';
-		do
-		{
-			if ($auth->acl_get('f_list', $row['forum_id']))
-			{
-				if ($prune_all)
-				{
-					$p_result = prune($row['forum_id'], 'posted', time(), $prune_flags, false);
-				}
-				else
-				{
-					if ($prune_posted)
-					{
-						$return = prune($row['forum_id'], 'posted', $prunedate_posted, $prune_flags, false);
-						$p_result['topics'] += $return['topics'];
-						$p_result['posts'] += $return['posts'];
-					}
-					if ($prune_viewed)
-					{
-						$return = prune($row['forum_id'], 'viewed', $prunedate_viewed, $prune_flags, false);
-						$p_result['topics'] += $return['topics'];
-						$p_result['posts'] += $return['posts'];
-					}
-				}
-
-				
-				$prune_ids[] = $row['forum_id'];
-
-				$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-
-?>
-	<tr>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo $row['forum_name']; ?></td>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo $p_result['topics']; ?></td>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo $p_result['posts']; ?></td>
-	</tr>
-<?php
-	
-				$log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name'];
-			}
-		}
-		while ($row = $db->sql_fetchrow($result));
-
-		// Sync all pruned forums at once
-		sync('forum', 'forum_id', $prune_ids, TRUE);
-
-		add_log('admin', 'LOG_PRUNE', $log_data);
-	}
-	else
-	{
-
-?>
-	<tr>
-		<td class="row1" align="center"><?php echo $user->lang['NO_PRUNE']; ?></td>
-	</tr>
-<?php
-
-	}
-	$db->sql_freeresult($result);
-
-?>
-</table>
-
-<br clear="all" />
-
-<?php
-
-	adm_page_footer();
-
-}
-
-adm_page_header($user->lang['PRUNE']);
-
-?>
-
-<h1><?php echo $user->lang['PRUNE']; ?></h1>
-
-<p><?php echo $user->lang['FORUM_PRUNE_EXPLAIN']; ?></p>
-
-<?php
-
-// If they haven't selected a forum for pruning yet then
-// display a select box to use for pruning.
-if (!$forum_id)
-{
-
-?>
-
-<form method="post" action="<?php echo "admin_prune.$phpEx$SID"; ?>"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th align="center"><?php echo $user->lang['SELECT_FORUM']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><select name="f[]" multiple="true" size="5"><?php echo make_forum_select(false, false, false); ?></select></td>
-	</tr>
-	<tr>
-		<td class="cat" align="center"><input class="btnmain" type="submit" value="<?php echo $user->lang['LOOK_UP_FORUM']; ?>" />&nbsp; <input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="btnlite" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-}
-else
-{
-	$sql = 'SELECT forum_id, forum_name 
-		FROM ' . FORUMS_TABLE . ' 
-		WHERE forum_id IN (' . implode(', ', $forum_id) . ')';
-	$result = $db->sql_query($sql);
-
-	if (!($row = $db->sql_fetchrow($result)))
-	{
-		trigger_error($user->lang['NO_FORUM']);
-	}
-
-	$forum_list = $s_hidden_fields = '';
-	do
-	{
-		$forum_list .= (($forum_list != '') ? ', ' : '') . '<b>' . $row['forum_name'] . '</b>';
-		$s_hidden_fields .= '<input type="hidden" name="f[]" value="' . $row['forum_id'] . '" />';
-	}
-	while ($row = $db->sql_fetchrow($result));
-	$db->sql_freeresult($result);
-
-	$l_selected_forums = (sizeof($forum_id) == 1) ? 'SELECTED_FORUM' : 'SELECTED_FORUMS';
-
-?>
-
-<h2><?php echo $user->lang['FORUM']; ?></h2>
-
-<p><?php echo $user->lang[$l_selected_forums] . ': ' . $forum_list; ?></p>
-
-<form method="post"	action="<?php echo "admin_prune.$phpEx$SID"; ?>"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['FORUM_PRUNE']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['PRUNE_NOT_POSTED']; ?></td>
-		<td class="row2"><input type="text" name="prune_days" size="4" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['PRUNE_NOT_VIEWED']; ?></td>
-		<td class="row2"><input type="text" name="prune_vieweddays" size="4" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['PRUNE_OLD_POLLS'] ?>: <br /><span class="gensmall"><?php echo $user->lang['PRUNE_OLD_POLLS_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="radio" name="prune_old_polls" value="1" /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="prune_old_polls" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['PRUNE_ANNOUNCEMENTS'] ?>: </td>
-		<td class="row2"><input type="radio" name="prune_announce" value="1" /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="prune_announce" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['PRUNE_STICKY'] ?>: </td>
-		<td class="row2"><input type="radio" name="prune_sticky" value="1" /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="prune_sticky" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><?php echo $s_hidden_fields; ?><input type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" class="btnmain"></td>
-	</tr>
-</table></form>
-
-<?php
-
-}
-
-adm_page_footer();
-
-?>

phpBB/adm/admin_prune_users.php

@@ -1,254 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_userdel'))
-	{
-		return;
-	}
-
-	$module['USER']['PRUNE_USERS'] = basename(__FILE__) . $SID;
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Do we have forum admin permissions?
-if (!$auth->acl_get('a_userdel'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Set mode
-$mode = (isset($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : '';
-
-// Do prune
-if (isset($_POST['prune']))
-{
-	if (empty($_POST['confirm']))
-	{
-		$values = array('prune', 'deactivate', 'delete', 'users', 'username', 'email', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'deleteposts');
-
-		$l_message = '<form method="post" action="admin_prune_users.' . $phpEx . $SID . '">' . $user->lang['Confirm_prune_users'] . '<br /><br /><input class="btnlite" type="submit" name="confirm" value="' . $user->lang['Yes'] . '" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="cancel" value="' . $user->lang['No'] . '" />';
-
-		foreach ($values as $field)
-		{
-			$l_message .= (!empty($_POST[$field])) ? '<input type="hidden" name="' . $field . '" value="' . urlencode($_POST[$field]) . '" />' : '';
-		}
-
-		$l_message .= '</form>';
-
-		adm_page_header($user->lang['Prune_users']);
-
-?>
-
-<h1><?php echo $user->lang['PRUNE_USERS']; ?></h1>
-
-<p><?php echo $user->lang['PRUNE_USERS_EXPLAIN']; ?></p>
-
-<?php
-
-		page_message($user->lang['CONFIRM'], $l_message, false);
-		adm_page_footer();
-
-	}
-	else if (isset($_POST['confirm']))
-	{
-		if (!empty($_POST['users']))
-		{
-			$users = explode("\n", urldecode($_POST['users']));
-
-			$where_sql = '';
-			foreach ($users as $username)
-			{
-				$where_sql .= (($where_sql != '') ? ', ' : '') . '\'' . trim($username) . '\'';
-			}
-			$where_sql = " AND username IN ($where_sql)";
-		}
-		else
-		{
-			$username = (!empty($_POST['username'])) ? urldecode($_POST['username']) : '';
-			$email = (!empty($_POST['email'])) ? urldecode($_POST['email']) : '';
-
-			$joined_select = (!empty($_POST['joined_select'])) ? $_POST['joined_select'] : 'lt';
-			$active_select = (!empty($_POST['active_select'])) ? $_POST['active_select'] :'lt';
-			$count_select = (!empty($_POST['count_select'])) ? $_POST['count_select'] : 'eq';
-			$joined = (!empty($_POST['joined'])) ? explode('-', $_POST['joined']) : array();
-			$active = (!empty($_POST['active'])) ? explode('-', $_POST['active']) :array();
-			$count = (!empty($_POST['count'])) ? intval($_POST['count']) : '';
-
-			$key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
-			$sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_lastvisit');
-
-			$where_sql = '';
-			$where_sql .= ($username) ? " AND username LIKE '" . str_replace('*', '%', $username) ."'" : '';
-			$where_sql .= ($email) ? " AND user_email LIKE '" . str_replace('*', '%', $email) ."' " : '';
-			$where_sql .= ($joined) ? " AND user_regdate " . $key_match[$joined_select] . " " . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : '';
-			$where_sql .= ($count) ? " AND user_posts " . $key_match[$count_select] . " $count " : '';
-			$where_sql .= ($active) ? " AND user_lastvisit " . $key_match[$active_select] . " " . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : '';
-		}
-
-		$sql = 'SELECT username, user_id FROM ' . USERS_TABLE . '
-			WHERE user_id <> ' . ANONYMOUS . "
-			$where_sql";
-		$result = $db->sql_query($sql);
-
-		$where_sql = '';
-		$user_ids = array();
-		$usernames = array();
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				$where_sql .= (($where_sql != '') ? ', ' : '') . $row['user_id'];
-				$user_ids[] = $row['user_id'];
-				$usernames[] = $row['username'];
-			}
-			while ($row = $db->sql_fetchrow($result));
-
-			$where_sql = " AND user_id IN ($where_sql)";
-		}
-		$db->sql_freeresult($result);
-
-		if ($where_sql != '')
-		{
-			$sql = '';
-			if (!empty($_POST['delete']))
-			{
-				if (!empty($_POST['deleteposts']))
-				{
-					// Call unified post deletion routine?
-
-					$l_log = 'LOG_PRUNE_USER_DEL_DEL';
-				}
-				else
-				{
-					for($i = 0; $i < sizeof($user_ids); $i++)
-					{
-						$sql = 'UPDATE ' . POSTS_TABLE . '
-							SET poster_id = ' . ANONYMOUS . ", post_username = '" . $usernames[$i] . "'
-							WHERE user_id = " . $userids[$i];
-//						$db->sql_query($sql);
-					}
-
-					$l_log = 'LOG_PRUNE_USER_DEL_ANON';
-				}
-
-				$sql = 'DELETE FROM ' . USERS_TABLE;
-			}
-			else if (!empty($_POST['deactivate']))
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . " 
-					SET user_active = 0";
-
-				$l_log = 'LOG_PRUNE_USER_DEAC';
-			}
-
-			$sql .= ' WHERE user_id <> ' . ANONYMOUS . "
-				$where_sql";
-//			$db->sql_query($sql);
-
-			add_log('admin', $l_log, implode(', ', $usernames));
-
-			unset($user_ids);
-			unset($usernames);
-		}
-
-		trigger_error($user->lang['SUCCESS_USER_PRUNE']);
-	}
-}
-
-
-// Front end
-$find_count = array('lt' => $user->lang['LESS_THAN'], 'eq' => $user->lang['EQUAL_TO'], 'gt' => $user->lang['MORE_THAN']);
-$s_find_count = '';
-foreach ($find_count as $key => $value)
-{
-	$selected = ($key == 'eq') ? ' selected="selected"' : '';
-	$s_find_count .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-}
-
-$find_time = array('lt' => $user->lang['BEFORE'], 'gt' => $user->lang['AFTER']);
-$s_find_join_time = '';
-foreach ($find_time as $key => $value)
-{
-	$s_find_join_time .= '<option value="' . $key . '">' . $value . '</option>';
-}
-$s_find_active_time = '';
-foreach ($find_time as $key => $value)
-{
-	$s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>';
-}
-
-//
-//
-//
-adm_page_header($user->lang['PRUNE_USERS']);
-
-?>
-
-<h1><?php echo $user->lang['PRUNE_USERS']; ?></h1>
-
-<p><?php echo $user->lang['PRUNE_USERS_EXPLAIN']; ?></p>
-
-<form method="post" name="post" action="<?php echo "admin_prune_users.$phpEx$SID"; ?>"><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['PRUNE_USERS']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><b><?php echo $user->lang['USERNAME']; ?>: </b></td>
-		<td class="row2"><input class="post" type="text" name="username" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['EMAIL']; ?>: </b></td>
-		<td class="row2"><input class="post" type="text" name="email" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['JOINED']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['Joined_explain']; ?></span></td>
-		<td class="row2"><select name="joined_select"><?php echo $s_find_join_time; ?></select> <input class="post" type="text" name="joined" maxlength="10" size="10" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['LAST_ACTIVE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['Last_active_explain']; ?></span></td>
-		<td class="row2"><select name="active_select"><?php echo $s_find_active_time; ?></select> <input class="post" type="text" name="active" maxlength="10" size="10" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['POSTS']; ?>: </b></td>
-		<td class="row2"><select name="count_select"><?php echo $s_find_count; ?></select> <input class="post" type="text" name="count" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['PRUNE_USERS']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['SELECT_USERS_EXPLAIN']; ?></span></td>
-		<td class="row2"><textarea name="users" cols="40" rows="5"></textarea></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['DELETE_USER_POSTS']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['DELETE_USER_POSTS_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="radio" name="deleteposts" value="1" /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="deleteposts" value="0" checked="checked" /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['DEACTIVATE_DELETE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['DEACTIVATE_DELETE_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="radio" name="action" value="delete" /> <?php echo $user->lang['DELETE_USERS']; ?>&nbsp;&nbsp;<input type="radio" name="action" value="deactivate" checked="checked" /> <?php echo $user->lang['DEACTIVATE']; ?></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input class="btnlite" type="submit" name="update" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input type="submit" name="usersubmit" value="<?php echo $user->lang['FIND_USERNAME']; ?>" class="btnlite" onClick="window.open('<?php echo "../search.$phpEx$SID&amp;mode=searchuser&amp;field=users"; ?>', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=650');return false;" /><input type="hidden" name="prune" value="1" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-adm_page_footer();
-
-?>

phpBB/adm/admin_ranks.php

@@ -1,324 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_ranks'))
-	{
-		return;
-	}
-
-	$module['USER']['RANKS'] = basename(__FILE__) . $SID;
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Let's set the root dir for phpBB
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Do we have permission?
-if (!$auth->acl_get('a_ranks'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Check mode
-if (isset($_REQUEST['mode']))
-{
-	$mode = $_REQUEST['mode'];
-}
-else
-{
-	// These could be entered via a form button
-	if (isset($_POST['add']))
-	{
-		$mode = 'add';
-	}
-	else if (isset($_POST['save']))
-	{
-		$mode = 'save';
-	}
-	else
-	{
-		$mode = '';
-	}
-}
-
-$rank_id = (isset($_GET['id'])) ? intval($_GET['id']) : 0;
-
-
-//
-switch ($mode)
-{
-	case 'edit':
-	case 'add':
-
-		$data = $ranks = $existing_imgs = array();
-		$result = $db->sql_query('SELECT * 
-			FROM ' . RANKS_TABLE . ' 
-			ORDER BY rank_special DESC, rank_min DESC');
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				$existing_imgs[] = $row['rank_image'];
-				if ($mode == 'edit' && $rank_id == $row['rank_id'])
-				{
-					$ranks = $row;
-				}
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		$db->sql_freeresult($result);
-
-		$imglist = filelist($phpbb_root_path . $config['ranks_path'], '');
-
-		$edit_img = $filename_list = '';
-		foreach ($imglist as $path => $img_ary)
-		{
-			foreach ($img_ary as $img)
-			{
-				$img = substr($path, 1) . (($path != '') ? '/' : '') . $img; 
-
-				if (!in_array($img, $existing_imgs) || $mode == 'edit')
-				{
-					if ($ranks && $img == $ranks['rank_image'])
-					{
-						$selected = ' selected="selected"';
-						$edit_img = $img;
-					}
-					else
-					{
-						$selected = '';
-					}
-
-					$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>';
-				}
-			}
-		}
-		$filename_list = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>----------</option>' . $filename_list;
-		unset($existing_imgs);
-		unset($imglist);
-
-		// They want to add a new rank, show the form.
-		$s_hidden_fields = '<input type="hidden" name="mode" value="save" />';
-
-		adm_page_header($user->lang['RANKS']);
-
-?>
-
-<script language="javascript" type="text/javascript" defer="defer">
-<!--
-
-function update_image(newimage)
-{
-	document.image.src = (newimage) ? "<?php echo $phpbb_root_path . $config['ranks_path']; ?>/" + newimage : "../images/spacer.gif";
-}
-
-function update_image_dimensions()
-{
-	if (document.image.height && document.forms[0].height)
-	{
-		document.forms[0].height.value = document.image.height;
-		document.forms[0].width.value = document.image.width;
-	}
-}
-
-//-->
-</script>
-
-<h1><?php echo $user->lang['RANKS']; ?></h1>
-
-<p><?php echo $user->lang['RANKS_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_ranks.$phpEx$SID&amp;id=$rank_id"; ?>"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['RANKS']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><?php echo $user->lang['RANK_TITLE']; ?>: </td>
-		<td class="row2"><input class="post" type="text" name="title" size="25" maxlength="40" value="<?php echo $ranks['rank_title']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1" width="40%"><?php echo $user->lang['RANK_IMAGE']; ?>:</td>
-		<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td valign="middle"><select name="rank_image" onchange="update_image(this.options[selectedIndex].value);"><?php echo $filename_list ?></select></td>
-				<td>&nbsp;&nbsp;</td>
-				<td valign="middle"><img src="<?php echo ($edit_img) ? $phpbb_root_path . $config['ranks_path'] . '/' . $edit_img : '../images/spacer.gif' ?>" name="image" border="0" alt="" title="" onload="update_image_dimensions()" /></td>
-			</tr>
-		</table></td>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['RANK_SPECIAL']; ?>: </td>
-		<td class="row2"><input type="radio" name="special_rank" value="1"<?php echo ($ranks['rank_special']) ? ' checked="checked"' : ''; ?> /><?php echo $user->lang['YES']; ?> &nbsp;&nbsp;<input type="radio" name="special_rank" value="0"<?php echo (!$ranks['rank_special']) ? ' checked="checked"' : ''; ?> /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['RANK_MINIMUM']; ?>: </td>
-		<td class="row2"><input class="post" type="text" name="min_posts" size="5" maxlength="10" value="<?php echo ($ranks['rank_special']) ? '' : $ranks['rank_min']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><?php echo $s_hidden_fields; ?><input type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="btnlite" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-		adm_page_footer();
-
-		break;
-
-	case 'save':
-
-		//
-		// Ok, they sent us our info, let's update it.
-		//
-
-		$rank_id = (isset($_REQUEST['id'])) ? intval($_REQUEST['id']) : 0;
-		$rank_title = (isset($_POST['title'])) ? trim($_POST['title']) : '';
-		$special_rank = (!empty($_POST['special_rank'])) ? 1 : 0;
-		$min_posts = (isset($_POST['min_posts'])) ? intval($_POST['min_posts']) : -1;
-		$rank_image = (isset($_POST['rank_image'])) ? trim(htmlspecialchars($_POST['rank_image'])) : '';
-
-		if ($special_rank == 1)
-		{
-			$min_posts = -1;
-		}
-
-		// The rank image has to be a jpg, gif or png
-		if ($rank_image != '' && !preg_match('#(\.gif|\.png|\.jpg|\.jpeg)$#i', $rank_image))
-		{
-			$rank_image = '';
-		}
-
-		if ($rank_id)
-		{
-			$sql = "UPDATE " . RANKS_TABLE . "
-				SET rank_title = '" . $db->sql_escape($rank_title) . "', rank_special = $special_rank, rank_min = $min_posts, rank_image = '" . $db->sql_escape($rank_image) . "'
-				WHERE rank_id = $rank_id";
-
-			$message = $user->lang['RANK_UPDATED'];
-		}
-		else
-		{
-			$sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_min, rank_image)
-				VALUES ('" . $db->sql_escape($rank_title) . "', $special_rank, $min_posts, '" . $db->sql_escape($rank_image) . "')";
-
-			$message = $user->lang['RANK_ADDED'];
-		}
-		$db->sql_query($sql);
-
-		$cache->destroy('ranks');
-
-		trigger_error($message);
-
-		break;
-
-	case 'delete':
-
-		// Ok, they want to delete their rank
-		$rank_id = (isset($_REQUEST['id'])) ? intval($_REQUEST['id']) : 0;
-
-		if ($rank_id)
-		{
-			$sql = "DELETE FROM " . RANKS_TABLE . "
-				WHERE rank_id = $rank_id";
-			$db->sql_query($sql);
-
-			$sql = "UPDATE " . USERS_TABLE . "
-				SET user_rank = 0
-				WHERE user_rank = $rank_id";
-			$db->sql_query($sql);
-
-			$cache->destroy('ranks');
-
-			trigger_error($user->lang['RANK_REMOVED']);
-		}
-		else
-		{
-			trigger_error($user->lang['MUST_SELECT_RANK']);
-		}
-
-		break;
-
-	default:
-
-		adm_page_header($user->lang['RANKS']);
-
-?>
-
-<h1><?php echo $user->lang['RANKS']; ?></h1>
-
-<p><?php echo $user->lang['RANKS_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_ranks.$phpEx$SID"; ?>"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th><?php echo $user->lang['RANK_IMAGE']; ?></th>
-		<th><?php echo $user->lang['RANK_TITLE']; ?></th>
-        <th><?php echo $user->lang['RANK_MINIMUM']; ?></th>
-		<th><?php echo $user->lang['ACTION']; ?></th>
-	</tr>
-<?php
-
-		// Show the default page
-		$sql = "SELECT * FROM " . RANKS_TABLE . "
-			ORDER BY rank_min ASC, rank_special ASC";
-		$result = $db->sql_query($sql);
-
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				$row_class = ($row_class != 'row1') ? 'row1' : 'row2';
-
-?>
-	<tr>
-		<td class="<?php echo $row_class; ?>" align="center"><?php
-	
-				if ($row['rank_image'])
-				{
-		
-?><img src="<?php echo $phpbb_root_path . $config['ranks_path'] . '/' . $row['rank_image']; ?>"" border="0" alt="<?php echo $row['rank_title']; ?>" title="<?php echo $row['rank_title']; ?>" /><?php
-
-				}
-				else
-				{
-					echo '-';
-				}
-
-?></td>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo $row['rank_title']; ?></td>
-        <td class="<?php echo $row_class; ?>" align="center"><?php echo ($row['rank_special']) ? '-' : $row['rank_min']; ?></td>
-		<td class="<?php echo $row_class; ?>" align="center">&nbsp;<a href="<?php echo "admin_ranks.$phpEx$SID&amp;mode=edit&amp;id=" . $row['rank_id']; ?>"><?php echo $user->lang['EDIT']; ?></a> | <a href="<?php echo "admin_ranks.$phpEx$SID&amp;mode=delete&amp;id=" . $row['rank_id']; ?>"><?php echo $user->lang['DELETE']; ?></a>&nbsp;</td>
-	</tr>
-<?php
-
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-
-?>
-	<tr>
-		<td class="cat" colspan="5" align="center"><input type="submit" class="btnmain" name="add" value="<?php echo $user->lang['ADD_RANK']; ?>" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-		adm_page_footer();
-
-		break;
-}
-
-?>

phpBB/adm/admin_search.php

@@ -1,175 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_search'))
-	{
-		return;
-	}
-
-	$module['DB']['SEARCH_INDEX'] = basename(__FILE__) . $SID;
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
-
-// Check permissions
-if (!$auth->acl_get('a_search'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Start indexing
-if (isset($_POST['start']) || isset($_GET['batchstart']))
-{
-	$batchsize = 5000; // Process this many posts per batch
-	$batchcount = request_var('batchcount', 1);
-	$batchstart = request_var('batchstart', 0);
-	$loopcount = 0;
-
-	$fulltext = new fulltext_search();
-
-	// Search re-indexing is tough on the server ... so we'll check the load
-	// each loop and if we're on a 1min load of 3 or more we'll re-load the page
-	// and try again. No idea how well this will work in practice so we'll see ...
-	if (file_exists('/proc/loadavg'))
-	{
-		if ($load = @file('/proc/loadavg'))
-		{
-			list($load) = explode(' ', $load[0]);
-
-			if ($load > 3)
-			{
-				redirect("adm/admin_search.$phpEx$SID&batchstart=$batchstart&batchcount=$batchcount", 3);
-			}
-		}
-	}
-
-	if (!$batchstart)
-	{
-		// Take board offline
-		set_config('board_disable', 1);
-
-		// Empty existing tables
-		$db->sql_query("TRUNCATE " . SEARCH_TABLE);
-		$db->sql_query("TRUNCATE " . SEARCH_WORD_TABLE);
-		$db->sql_query("TRUNCATE " . SEARCH_MATCH_TABLE);
-	}
-
-	// Fetch a batch of posts_text entries
-	$sql = "SELECT COUNT(*) AS total, MAX(post_id) AS max_post_id, MIN(post_id) AS min_post_id
-		FROM " . POSTS_TABLE;
-	$result = $db->sql_query($sql);
-
-	$row = $db->sql_fetchrow($result);
-	$totalposts = $row['total'];
-	$max_post_id = $row['max_post_id'];
-
-	$batchstart = (!$batchstart) ? $row['min_post_id'] : $batchstart;
-	$batchend = $batchstart + $batchsize;
-
-	$db->sql_freeresult($result);
-
-	$sql = "SELECT *
-		FROM " . POSTS_TABLE . "
-		WHERE post_id
-			BETWEEN $batchstart
-				AND $batchend";
-	$result = $db->sql_query($sql);
-
-	if ($row = $db->sql_fetchrow($result))
-	{
-		do
-		{
-			$fulltext->add('admin', $row['post_id'], $row['post_text'], $row['post_subject']);
-		}
-		while ($row = $db->sql_fetchrow($result));
-	}
-
-	$db->sql_freeresult($result);
-
-	$batchcount++;
-
-	if (($batchstart + $batchsize) < $max_post_id)
-	{
-		redirect("adm/admin_search.$phpEx$SID&batchstart=" . ($batchstart + $batchsize) . "&batchcount=$batchcount", 3);
-	}
-	else
-	{
-		set_config('board_disable', 0);
-
-		// search tidy
-		$fulltext->search_tidy();
-
-		adm_page_header($user->lang['SEARCH_INDEX']);
-
-?>
-
-<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
-
-<p><?php echo $user->lang['SEARCH_INDEX_COMPLETE']; ?></p>
-
-<?php
-
-		adm_page_footer();
-
-	}
-
-	exit;
-
-}
-else if (isset($_POST['cancel']))
-{
-	set_config('board_disable', 0);
-	adm_page_header($user->lang['SEARCH_INDEX']);
-
-?>
-
-<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
-
-<p><?php echo $user->lang['SEARCH_INDEX_CANCEL']; ?></p>
-
-<?php
-
-	adm_page_footer();
-
-}
-else
-{
-	adm_page_header($user->lang['SEARCH_INDEX']);
-
-?>
-
-<h1><?php echo $user->lang['SEARCH_INDEX']; ?></h1>
-
-<p><?php echo $user->lang['SEARCH_INDEX_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_search.$phpEx$SID"; ?>"><table cellspacing="1" cellpadding="4" border="0" align="center" bgcolor="#98AAB1">
-	<tr>
-		<td class="cat" height="28" align="center">&nbsp;<input type="submit" name="start" value="<?php echo $user->lang['START']; ?>" class="btnmain" /> &nbsp; <input type="submit" name="cancel" value="<?php echo $user->lang['CANCEL']; ?>" class="btnmain" />&nbsp;</td>
-	</tr>
-</table></form>
-
-<?php
-
-	adm_page_footer();
-
-}
-
-?>

phpBB/adm/admin_viewlogs.php

@@ -1,253 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_'))
-	{
-		return;
-	}
-
-	$filename = basename(__FILE__);
-	$module['LOG']['ADMIN_LOGS'] = $filename . "$SID&amp;mode=admin";
-	$module['LOG']['MOD_LOGS'] = $filename . "$SID&amp;mode=mod";
-	$module['LOG']['CRITICAL_LOGS'] = $filename . "$SID&amp;mode=critical";
-
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = '../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Do we have styles admin permissions?
-if (!$auth->acl_get('a_'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Set some variables
-$mode		= request_var('mode', 'admin');
-$forum_id	= request_var('f', 0);
-$start		= request_var('start', 0);
-$deletemark = (isset($_POST['delmarked'])) ? true : false;
-$deleteall	= (isset($_POST['delall'])) ? true : false;
-$marked		= request_var('mark', array(0));
-
-// Sort keys
-$sort_days	= request_var('st', 0);
-$sort_key	= request_var('sk', 't');
-$sort_dir	= request_var('sd', 'd');
-
-// Define some vars depending on which logs we're looking at
-$log_type = ($mode == 'admin') ? LOG_ADMIN : (($mode == 'mod') ? LOG_MOD : LOG_CRITICAL);
-
-$user->add_lang('mcp');
-
-// Delete entries if requested and able
-if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs'))
-{
-	$where_sql = '';
-	if ($deletemark && $marked)
-	{
-		$sql_in = array();
-		foreach ($marked as $mark)
-		{
-			$sql_in[] =  $mark;
-		}
-		$where_sql = ' AND log_id IN (' . implode(', ', $sql_in) . ')';
-		unset($sql_in);
-	}
-
-	$sql = 'DELETE FROM ' . LOG_TABLE . "
-		WHERE log_type = $log_type 
-			$where_sql";
-	$db->sql_query($sql);
-
-	add_log('admin', 'LOG_' . strtoupper($mode) . '_CLEAR');
-}
-
-// Sorting
-$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 364 => $user->lang['1_YEAR']);
-$sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']);
-$sort_by_sql = array('u' => 'l.user_id', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation');
-
-$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-// Define where and sort sql for use in displaying logs
-$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
-$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-
-$l_title = $user->lang[strtoupper($mode) . '_LOGS'];
-$l_title_explain = $user->lang[strtoupper($mode) . '_LOGS_EXPLAIN'];
-
-// Output page
-adm_page_header($l_title);
-
-?>
-
-<h1><?php echo $l_title; ?></h1>
-
-<p><?php echo $l_title_explain; ?></p>
-
-<form name="list" method="post" action="<?php echo "admin_viewlogs.$phpEx$SID&amp;mode=$mode"; ?>">
-<?php
-
-// Define forum list if we're looking @ mod logs
-if ($mode == 'mod')
-{
-
-	$forum_box = '<option value="0">' . $user->lang['ALL_FORUMS'] . '</option>' . make_forum_select($forum_id);
-
-?>
-<table width="100%" cellpadding="1" cellspacing="1" border="0">
-	<tr>
-		<td align="right"><?php echo $user->lang['SELECT_FORUM']; ?>: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit() }"><?php echo $forum_box; ?></select> <input class="btnlite" type="submit" value="<?php echo $user->lang['GO']; ?>" /></td>
-	</tr>
-</table>
-<?php
-
-}
-
-//
-// Grab log data
-//
-$log_data = array();
-$log_count = 0;
-view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort);
-
-?>
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td align="left" valign="top">&nbsp;<span class="nav"><?php echo on_page($log_count, $config['topics_per_page'], $start); ?></span></td>
-	<td align="right" valign="top" nowrap="nowrap">
-		<span class="nav"><?php	echo generate_pagination("admin_viewlogs.$phpEx$SID&amp;mode=$mode&amp;$u_sort_param", $log_count, $config['topics_per_page'], $start, true); ?></span>
-	</td>
-</tr>
-</table>
-
-<table class="bg" width="100%" cellpadding="4" cellspacing="1" border="0">
-	<tr>
-		<td class="cat" colspan="5" height="28" align="center"><?php echo $user->lang['DISPLAY_LOG']; ?>: &nbsp;<?php echo $s_limit_days; ?>&nbsp;<?php echo $user->lang['SORT_BY']; ?>: <?php echo $s_sort_key; ?> <?php echo $s_sort_dir; ?>&nbsp;<input class="btnlite" type="submit" value="<?php echo $user->lang['GO']; ?>" name="sort" /></td>
-	</tr>
-	<tr>
-		<th width="15%" height="25" nowrap="nowrap"><?php echo $user->lang['USERNAME']; ?></th>
-		<th width="15%" nowrap="nowrap"><?php echo $user->lang['IP']; ?></th>
-		<th width="20%" nowrap="nowrap"><?php echo $user->lang['TIME']; ?></th>
-		<th width="45%" nowrap="nowrap"><?php echo $user->lang['ACTION']; ?></th>
-		<th nowrap="nowrap"><?php echo $user->lang['MARK']; ?></th>
-	</tr>
-<?php
-
-$row_class = '';
-
-if ($log_count)
-{
-	for ($i = 0; $i < sizeof($log_data); $i++)
-	{
-		$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-		
-?>
-	<tr>
-		<td class="<?php echo $row_class; ?>" nowrap="nowrap"><?php echo $log_data[$i]['username']; ?></td>
-		<td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><?php echo $log_data[$i]['ip']; ?></td>
-		<td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><?php echo $user->format_date($log_data[$i]['time']); ?></td>
-		<td class="<?php echo $row_class; ?>"><?php 
-			echo $log_data[$i]['action']; 
-
-			$data = array();
-				
-			foreach (array('viewtopic', 'viewlogs', 'viewforum') as $check)
-			{
-				if (isset($log_data[$i][$check]) && $log_data[$i][$check])
-				{
-					$data[] = '<a href="' . $log_data[$i][$check] . '">' . $user->lang['LOGVIEW_' . strtoupper($check)] . '</a>';
-				}
-			}
-
-			if (sizeof($data))
-			{
-				echo '<br />&#187; <span class="gensmall">[ ' . implode(' | ', $data) . ' ]</span>';
-			}
-?>
-		</td>
-		<td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><input type="checkbox" name="mark[]" value="<?php echo $log_data[$i]['id']; ?>" /></td>
-	</tr>
-<?php
-
-	}
-
-	if ($auth->acl_get('a_clearlogs'))
-	{
-
-?>
-	<tr>
-		<td class="cat" colspan="5" height="28" align="right"><input class="btnlite" type="submit" name="delmarked" value="<?php echo $user->lang['DELETE_MARKED']; ?>" />&nbsp; <input class="btnlite" type="submit" name="delall" value="<?php echo $user->lang['DELETE_ALL']; ?>" />&nbsp;</td>
-	</tr>
-<?php
-
-	}
-}
-else
-{
-?>
-	<tr>
-		<td class="row1" colspan="5" align="center" nowrap="nowrap"><?php echo $user->lang['NO_ENTRIES']; ?></td>
-	</tr>
-<?php
-
-}
-
-?>
-</table>
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr>
-		<td align="left" valign="top">&nbsp;<span class="nav"><?php echo on_page($log_count, $config['topics_per_page'], $start); ?></span></td>
-		<td align="right" valign="top" nowrap="nowrap"><span class="nav"><?php
-
-	if ($auth->acl_get('a_clearlogs'))
-	{
-
-
-?><b><a href="javascript:marklist('list', true);"><?php echo $user->lang['MARK_ALL']; ?></a> :: <a href="javascript:marklist('list', false);"><?php echo $user->lang['UNMARK_ALL']; ?></a></b>&nbsp;<br /><br /><?php
-
-	}
-	
-	echo generate_pagination("admin_viewlogs.$phpEx$SID&amp;mode=$mode&amp;$u_sort_param", $log_count, $config['topics_per_page'], $start, true);
-	
-?></span></td>
-	</tr>
-</table></form>
-
-<script language="Javascript" type="text/javascript">
-<!--
-function marklist(match, status)
-{
-	len = eval('document.' + match + '.length');
-	for (i = 0; i < len; i++)
-	{
-		eval('document.' + match + '.elements[i].checked = ' + status);
-	}
-}
-//-->
-</script>
-
-<?php
-
-adm_page_footer();
-
-?>

phpBB/adm/admin_words.php

@@ -1,200 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-/**
-*/
-if (!empty($setmodules))
-{
-	if (!$auth->acl_get('a_words'))
-	{
-		return;
-	}
-
-	$module['POST']['WORD_CENSOR'] = basename(__FILE__) . $SID;
-	return;
-}
-
-define('IN_PHPBB', 1);
-// Include files
-$phpbb_root_path = './../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-require('pagestart.' . $phpEx);
-
-// Do we have forum admin permissions?
-if (!$auth->acl_get('a_words'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-$mode = request_var('mode', '');
-$mode = (isset($_POST['add'])) ? 'add' : ((isset($_POST['save'])) ? 'save' : $mode);
-
-$s_hidden_fields = '';
-$word_info = array();
-
-switch ($mode)
-{
-	case 'edit':
-		$word_id = request_var('id', 0);
-		
-		if (!$word_id)
-		{
-			trigger_error($user->lang['NO_WORD']);
-		}
-
-		$sql = 'SELECT *
-			FROM ' . WORDS_TABLE . "
-			WHERE word_id = $word_id";
-		$result = $db->sql_query_limit($sql, 1);
-
-		$word_info = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		$s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_id . '" />';
-
-	case 'add':
-
-		adm_page_header($user->lang['WORDS_TITLE']);
-?>
-
-<h1><?php echo $user->lang['WORDS_TITLE']; ?></h1>
-
-<p><?php echo $user->lang['WORDS_EXPLAIN']; ?></p>
-
-<form method="post" action="<?php echo "admin_words.$phpEx$SID"; ?>"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2"><?php echo $user->lang['EDIT_WORD']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['WORD']; ?>: </b></td>
-		<td class="row2"><input class="post" type="text" name="word" value="<?php echo $word_info['word']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="row1"><b><?php echo $user->lang['REPLACEMENT']; ?>: </b></td>
-		<td class="row2"><input class="post" type="text" name="replacement" value="<?php echo $word_info['replacement']; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><?php echo $s_hidden_fields; ?><input class="btnmain" type="submit" name="save" value="<?php echo $user->lang['SUBMIT']; ?>" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-			adm_page_footer();
-			break;
-
-		case 'save':
-			$word_id = request_var('id', 0);
-			$word = request_var('word', '');
-			$replacement = request_var('replacement', '');
-
-			if (!$word || !$replacement)
-			{
-				trigger_error($user->lang['ENTER_WORD']);
-			}
-
-			$sql = ($word_id) ? "UPDATE " . WORDS_TABLE . " SET word = '" . $db->sql_escape($word) . "', replacement = '" . $db->sql_escape($replacement) . "' WHERE word_id = $word_id" : "INSERT INTO " . WORDS_TABLE . " (word, replacement) VALUES ('" . $db->sql_escape($word) . "', '" . $db->sql_escape($replacement) . "')";
-			$db->sql_query($sql);
-
-			$cache->destroy('word_censors');
-
-			$log_action = ($word_id) ? 'LOG_EDIT_WORD' : 'LOG_ADD_WORD';
-			add_log('admin', $log_action, $word);
-
-			$message = ($word_id) ? $user->lang['WORD_UPDATED'] : $user->lang['WORD_ADDED'];
-			trigger_error($message);
-			break;
-
-		case 'delete':
-
-			$word_id = request_var('id', 0);
-
-			if (!$word_id)
-			{
-				trigger_error($user->lang['NO_WORD']);
-			}
-
-			$sql = 'SELECT word
-				FROM ' . WORDS_TABLE . "
-				WHERE word_id = $word_id";
-			$result = $db->sql_query($sql);
-			$deleted_word = $db->sql_fetchfield('word', 0, $result);
-			$db->sql_freeresult($result);
-
-			$sql = 'DELETE FROM ' . WORDS_TABLE . "
-				WHERE word_id = $word_id";
-			$db->sql_query($sql);
-
-			$cache->destroy('word_censors');
-
-			add_log('admin', 'LOG_DELETE_WORD', $deleted_word);
-
-			$message = $user->lang['WORD_REMOVE'];
-			trigger_error($message);
-		
-			break;
-
-		default:
-
-			adm_page_header($user->lang['WORDS_TITLE']);
-?>
-
-<h1><?php echo $user->lang['WORDS_TITLE']; ?></h1>
-
-<p><?php echo $user->lang['WORDS_EXPLAIN']; ?></p>
-
-<form method="post" action="admin_words.<?php echo $phpEx . $SID; ?>"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th><?php echo $user->lang['WORD']; ?></th>
-		<th><?php echo $user->lang['REPLACEMENT']; ?></th>
-		<th colspan="2"><?php echo $user->lang['ACTION']; ?></th>
-	</tr>
-
-<?php
-
-		$sql = 'SELECT *
-			FROM ' . WORDS_TABLE . '
-			ORDER BY word';
-		$result = $db->sql_query($sql);
-
-		$row_class = '';
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-
-?>
-	<tr>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo $row['word']; ?></td>
-		<td class="<?php echo $row_class; ?>" align="center"><?php echo $row['replacement']; ?></td>
-		<td class="<?php echo $row_class; ?>">&nbsp;<a href="<?php echo "admin_words.$phpEx$SID&amp;mode=edit&amp;id=" . $row['word_id']; ?>"><?php echo $user->lang['EDIT']; ?></a>&nbsp;</td>
-		<td class="<?php echo $row_class; ?>">&nbsp;<a href="<?php echo "admin_words.$phpEx$SID&amp;mode=delete&amp;id=" . $row['word_id']; ?>"><?php echo $user->lang['DELETE']; ?></a>&nbsp;</td>
-	</tr>
-<?php
-
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		$db->sql_freeresult($result);
-
-?>
-	<tr>
-		<td class="cat" colspan="5" height="28" align="center"><?php echo $s_hidden_fields; ?><input class="btnmain" type="submit" name="add" value="<?php echo $user->lang['ADD_WORD']; ?>" /></td>
-	</tr>
-</table></form>
-
-<?php
-
-		adm_page_footer();
-		break;
-}
-
-?>

phpBB/adm/editor.js

@@ -1,306 +0,0 @@
-// bbCode control by subBlue design [ www.subBlue.com ]
-// Includes unixsafe colour palette selector by SHS`
-
-// Startup variables
-var imageTag = false;
-var theSelection = false;
-
-// Check for Browser & Platform for PC & IE specific bits
-// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
-var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion); // Get browser version
-
-var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1));
-var is_nav = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1)
-                && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1)
-                && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
-
-var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1));
-var is_mac = (clientPC.indexOf("mac")!=-1);
-
-// Shows the help messages in the helpline window
-function helpline(help) {
-	document.forms[form_name].helpbox.value = eval(help + "_help");
-}
-
-// Replacement for arrayname.length property
-function getarraysize(thearray) {
-	for (i = 0; i < thearray.length; i++) {
-		if ((thearray[i] == "undefined") || (thearray[i] == "") || (thearray[i] == null))
-			return i;
-		}
-	return thearray.length;
-}
-
-// Replacement for arrayname.push(value) not implemented in IE until version 5.5
-// Appends element to the array
-function arraypush(thearray,value) {
-	thearray[ getarraysize(thearray) ] = value;
-}
-
-// Replacement for arrayname.pop() not implemented in IE until version 5.5
-// Removes and returns the last element of an array
-function arraypop(thearray) {
-	thearraysize = getarraysize(thearray);
-	retval = thearray[thearraysize - 1];
-	delete thearray[thearraysize - 1];
-	return retval;
-}
-
-function smiley(text) {
-	text = ' ' + text + ' ';
-	if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) {
-		var caretPos = document.forms[form_name].elements[text_name].caretPos;
-
-		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
-		document.forms[form_name].elements[text_name].focus();
-	} else {
-		var selStart = document.forms[form_name].elements[text_name].selectionStart;
-		var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
-
-		mozWrap(document.forms[form_name].elements[text_name], text, '')
-		document.forms[form_name].elements[text_name].focus();
-		document.forms[form_name].elements[text_name].selectionStart = selStart + text.length;
-		document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length;
-	}
-}
-
-function bbfontstyle(bbopen, bbclose) {
-	if ((clientVer >= 4) && is_ie && is_win) {
-		theSelection = document.selection.createRange().text;
-		if (!theSelection) {
-			insert_text(bbopen + bbclose);
-			document.forms[form_name].elements[text_name].focus();
-			return;
-		}
-		document.selection.createRange().text = bbopen + theSelection + bbclose;
-		document.forms[form_name].elements[text_name].focus();
-		return;
-	} else {
-		insert_text(bbopen + bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		return;
-	}
-	storeCaret(document.forms[form_name].elements[text_name]);
-}
-
-function insert_text(text) {
-	if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) {
-		var caretPos = document.forms[form_name].elements[text_name].caretPos;
-		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
-	} else {
-		var selStart = document.forms[form_name].elements[text_name].selectionStart;
-		var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
-
-		mozWrap(document.forms[form_name].elements[text_name], text, '')
-		document.forms[form_name].elements[text_name].selectionStart = selStart + text.length;
-		document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length;
-	}
-}
-
-function attach_inline() {
-	insert_text('[attachment=' + document.forms[form_name].elements['attachments'].value + ']' + document.forms[form_name].elements['attachments'].options[document.forms[form_name].elements['attachments'].selectedIndex].text + '[/attachment]');
-}
-
-function bbstyle(bbnumber) {
-
-	donotinsert = false;
-	theSelection = false;
-	bblast = 0;
-	document.forms[form_name].elements[text_name].focus();
-
-	if (bbnumber == -1) { // Close all open tags & default button names
-		while (bbcode[0]) {
-			butnumber = arraypop(bbcode) - 1;
-			document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1];
-			buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
-			if (buttext != "[*]")
-			{
-				eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
-			}
-		}
-		document.forms[form_name].addbbcode10.value = "List";
-		bbtags[10] = "[list]";
-		document.forms[form_name].addbbcode12.value = "List=";
-		bbtags[12] = "[list=]";
-		imageTag = false; // All tags are closed including image tags :D
-		document.forms[form_name].elements[text_name].focus();
-		return;
-	}
-
-	if ((clientVer >= 4) && is_ie && is_win)
-	{
-		theSelection = document.selection.createRange().text; // Get text selection
-		if (theSelection) {
-			// Add tags around selection
-			document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1];
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
-			return;
-		}
-	}
-	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
-	{
-		mozWrap(document.forms[form_name].elements[text_name], bbtags[bbnumber], bbtags[bbnumber+1]);
-		document.forms[form_name].elements[text_name].focus();
-		theSelection = '';
-		return;
-	}
-
-	// Find last occurance of an open tag the same as the one just clicked
-	for (i = 0; i < bbcode.length; i++) {
-		if (bbcode[i] == bbnumber+1) {
-			bblast = i;
-			donotinsert = true;
-		}
-	}
-
-	if ((bbnumber == 10) && (bbtags[10] != "[*]"))
-	{
-		if (donotinsert)
-		{
-			document.forms[form_name].addbbcode12.value = "List=";
-			tmp_help = o_help;
-			o_help = e_help;
-			e_help = tmp_help;
-			bbtags[12] = "[list=]";
-		}
-		else
-		{
-			document.forms[form_name].addbbcode12.value = "[*]";
-			tmp_help = o_help;
-			o_help = e_help;
-			e_help = tmp_help;
-			bbtags[12] = "[*]";
-		}
-	}
-
-	if ((bbnumber == 12) && (bbtags[12] != "[*]"))
-	{
-		if (donotinsert)
-		{
-			document.forms[form_name].addbbcode10.value = "List";
-			tmp_help = l_help;
-			l_help = e_help;
-			e_help = tmp_help;
-			bbtags[10] = "[list]";
-		}
-		else
-		{
-			document.forms[form_name].addbbcode10.value = "[*]";
-			tmp_help = l_help;
-			l_help = e_help;
-			e_help = tmp_help;
-			bbtags[10] = "[*]";
-		}
-	}
-
-	if (donotinsert) {		// Close all open tags up to the one just clicked & default button names
-		while (bbcode[bblast]) {
-				butnumber = arraypop(bbcode) - 1;
-				if (bbtags[butnumber] != "[*]")
-				{
-					insert_text(bbtags[butnumber + 1]);
-				}
-				else
-				{
-					insert_text(bbtags[butnumber]);
-				}
-				buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
-				if (bbtags[butnumber] != "[*]")
-				{
-					eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
-				}
-				imageTag = false;
-			}
-			document.forms[form_name].elements[text_name].focus();
-			return;
-	} else { // Open tags
-
-		if (imageTag && (bbnumber != 14)) {		// Close image tag before adding another
-			insert_text(bbtags[15]);
-
-			lastValue = arraypop(bbcode) - 1;	// Remove the close image tag from the list
-			document.forms[form_name].addbbcode14.value = "Img";	// Return button back to normal state
-			imageTag = false;
-		}
-
-		// Open tag
-		insert_text(bbtags[bbnumber]);
-
-		if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag
-		if (bbtags[bbnumber] != "[*]")
-		{
-			arraypush(bbcode,bbnumber+1);
-			eval('document.forms[form_name].addbbcode'+bbnumber+'.value += "*"');
-		}
-		document.forms[form_name].elements[text_name].focus();
-		return;
-	}
-
-	storeCaret(document.forms[form_name].elements[text_name]);
-}
-
-// From http://www.massless.org/mozedit/
-function mozWrap(txtarea, open, close)
-{
-	var selLength = txtarea.textLength;
-	var selStart = txtarea.selectionStart;
-	var selEnd = txtarea.selectionEnd;
-	if (selEnd == 1 || selEnd == 2) 
-		selEnd = selLength;
-
-	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd)
-	var s3 = (txtarea.value).substring(selEnd, selLength);
-	txtarea.value = s1 + open + s2 + close + s3;
-	return;
-}
-
-// Insert at Claret position. Code from
-// http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-function storeCaret(textEl) {
-	if (textEl.createTextRange) { textEl.caretPos = document.selection.createRange().duplicate(); }
-}
-
-function colorPalette(dir, width, height)
-{
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	numberList[0] = "00";
-	numberList[1] = "40";
-	numberList[2] = "80";
-	numberList[3] = "BF";
-	numberList[4] = "FF";
-	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
-	for(r = 0; r < 5; r++)
-	{
-		if (dir == 'h')
-		{
-			document.writeln('<tr>');
-		}
-		for(g = 0; g < 5; g++)
-		{
-			if (dir == 'v')
-			{
-				document.writeln('<tr>');
-			}
-			for(b = 0; b < 5; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '">');
-				document.write('<a href="javascript:bbfontstyle(\'[color=#' + color + ']\', \'[/color]\');" onmouseover="helpline(\'s\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" border="0" alt="#' + color + '" title="#' + color + '" /></a>');
-				document.writeln('</td>');
-			}
-			if (dir == 'v')
-			{
-				document.writeln('</tr>');
-			}
-		}
-		if (dir == 'h')
-		{
-			document.writeln('</tr>');
-		}
-	}
-	document.writeln('</table>');
-}

phpBB/adm/pagestart.php

@@ -1,469 +0,0 @@
-<?php
-/** 
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-*/
-define('NEED_SID', true);
-define('IN_ADMIN', true);
-require($phpbb_root_path . 'common.'.$phpEx);
-require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
-
-// Start session management
-$user->session_begin();
-$auth->acl($user->data);
-$user->setup('admin');
-// End session management
-
-// Did user forget to login? Give 'em a chance to here ...
-if (!$user->data['is_registered'])
-{
-	if ($user->data['is_bot'])
-	{
-		redirect("../index.$phpEx$SID");
-	}
-
-	login_box('', $user->lang['LOGIN_ADMIN'], $user->lang['LOGIN_ADMIN_SUCCESS'], true);
-}
-
-// Have they authenticated (again) as an admin for this session?
-if (!$user->data['session_admin'])
-{
-	login_box('', $user->lang['LOGIN_ADMIN_CONFIRM'], $user->lang['LOGIN_ADMIN_SUCCESS'], true, false);
-}
-
-// Is user any type of admin? No, then stop here, each script needs to
-// check specific permissions but this is a catchall
-if (!$auth->acl_get('a_'))
-{
-	trigger_error($user->lang['NO_ADMIN']);
-}
-
-// Some oft used variables
-$safe_mode	= (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') ? true : false;
-$file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
-
-
-// -----------------------------
-// Functions
-function adm_page_header($sub_title, $meta = '', $table_html = true)
-{
-	global $config, $db, $user, $phpEx;
-
-	define('HEADER_INC', true);
-
-	// gzip_compression
-	if ($config['gzip_compress'])
-	{
-		if (extension_loaded('zlib') && !headers_sent())
-		{
-			ob_start('ob_gzhandler');
-		}
-	}
-
-	header("Content-type: text/html; charset=" . $user->lang['ENCODING']);
-
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $user->lang['ENCODING']; ?>">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="stylesheet" href="subSilver.css" type="text/css">
-<?php
-
-	echo $meta;
-
-?>
-<style type="text/css">
-<!--
-th		{ background-image: url('images/cellpic3.gif') }
-td.cat	{ background-image: url('images/cellpic1.gif') }
-//-->
-</style>
-<title><?php echo $config['sitename'] . ' - ' . $page_title; ?></title>
-</head>
-<body>
-
-<?php
-
-	if ($table_html)
-	{
-
-?>
-<a name="top"></a>
-
-<table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr>
-		<td colspan="2" height="25" align="right" nowrap="nowrap"><span class="subtitle">&#0187; <i><?php echo $sub_title; ?></i></span> &nbsp;&nbsp;</td>
-	</tr>
-</table>
-
-<table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
-	<tr>
-		<td><br clear="all" />
-
-<?php
-
-	}
-
-}
-
-function adm_page_footer($copyright_html = true)
-{
-	global $cache, $config, $db, $phpEx;
-
-	if (!empty($cache))
-	{
-		$cache->unload();
-	}
-
-	// Close our DB connection.
-	$db->sql_close();
-
-?>
-
-		</td>
-	</tr>
-</table>
-<?php
-
-	if ($copyright_html)
-	{
-
-?>
-
-<div class="copyright" align="center">Powered by phpBB <?php echo $config['version']; ?> &copy; 2002 <a href="http://www.phpbb.com/" target="_phpbb">phpBB Group</a></div>
-
-<br clear="all" />
-
-</body>
-</html>
-<?php
-
-	}
-
-	exit;
-}
-
-function adm_page_message($title, $message, $show_header = false)
-{
-	global $phpEx, $SID, $user;
-
-	if ($show_header)
-	{
-
-?>
-
-<table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr>
-		<td><a href="<?php echo "../index.$phpEx$SID"; ?>"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td>
-		<td width="100%" background="images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $user->lang['ADMIN_TITLE']; ?></span> &nbsp; &nbsp; &nbsp;</td>
-	</tr>
-</table>
-
-<?php
-
-	}
-
-?>
-
-<br /><br />
-
-<table class="bg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th><?php echo $title; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><?php echo $message; ?></td>
-	</tr>
-</table>
-
-<br />
-
-<?php
-
-}
-
-function adm_page_confirm($title, $message)
-{
-	global $phpEx, $SID, $user;
-
-	// Grab data from GET and POST arrays ... note this is _not_
-	// validated! Everything is typed as string to ensure no
-	// funny business on displayed hidden field data. Validation
-	// will be carried out by whatever processes this form.
-	$var_ary = array_merge($_GET, $_POST);
-
-	$s_hidden_fields = '';
-	foreach ($var_ary as $key => $var)
-	{
-		if (empty($var))
-		{
-			continue;
-		}
-
-		if (is_array($var))
-		{
-			foreach ($var as $k => $v)
-			{
-				if (is_array($v))
-				{
-					foreach ($v as $_k => $_v)
-					{
-						set_var($var[$k][$_k], $_v, 'string');
-						$s_hidden_fields .= "<input type=\"hidden\" name=\"${key}[$k][$_k]\" value=\"" . addslashes($_v) . '" />';
-					}
-				}
-				else
-				{
-					set_var($var[$k], $v, 'string');
-					$s_hidden_fields .= "<input type=\"hidden\" name=\"${key}[$k]\" value=\"" . addslashes($v) . '" />';
-				}
-			}
-		}
-		else
-		{
-			set_var($var, $var, 'string');
-			$s_hidden_fields .= '<input type="hidden" name="' . $key . '" value="' . addslashes($var) . '" />';
-		}
-		unset($var_ary[$key]);
-	}
-
-?>
-
-<br /><br />
-
-<form name="confirm" method="post" action="<?php echo $_SERVER['SCRIPT_NAME'] . $SID; ?>">
-<table class="bg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th><?php echo $title; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><?php echo $message; ?><br /><br /><input class="btnlite" type="submit" name="confirm" value="<?php echo $user->lang['YES']; ?>" />&nbsp;&nbsp;<input class="btnmain" type="submit" name="cancel" value="<?php echo $user->lang['NO']; ?>" /></td>
-	</tr>
-</table>
-
-<?php echo $s_hidden_fields; ?>
-</form>
-
-<br />
-
-<?php
-
-	adm_page_footer();
-
-}
-
-
-function build_cfg_template($tpl_type, $config_key, $options = '')
-{
-	global $new, $user;
-
-	$tpl = '';
-	$name = 'config[' . $config_key . ']';
-
-	switch ($tpl_type[0])
-	{
-		case 'text':
-		case 'password':
-			$size = (int) $tpl_type[1];
-			$maxlength = (int) $tpl_type[2];
-
-			$tpl = '<input class="post" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '" />';
-			break;
-
-		case 'dimension':
-			$size = (int) $tpl_type[1];
-			$maxlength = (int) $tpl_type[2];
-
-			$tpl = '<input class="post" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" /> x <input class="post" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" />';
-			break;
-
-		case 'textarea':
-			$rows = (int) $tpl_type[1];
-			$cols = (int) $tpl_type[2];
-
-			$tpl = '<textarea name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $new[$config_key] . '</textarea>';
-			break;
-
-		case 'radio':
-			$key_yes	= ($new[$config_key]) ? ' checked="checked"' : '';
-			$key_no		= (!$new[$config_key]) ? ' checked="checked"' : '';
-
-			$tpl_type_cond = explode('_', $tpl_type[1]);
-			$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true;
-
-			$tpl_no = '<input type="radio" name="' . $name . '" value="0"' . $key_no . ' />' . (($type_no) ? $user->lang['NO'] : $user->lang['DISABLED']);
-			$tpl_yes = '<input type="radio" name="' . $name . '" value="1"' . $key_yes . ' />' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']);
-
-			$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . '&nbsp;&nbsp;' . $tpl_no : $tpl_no . '&nbsp;&nbsp;' . $tpl_yes;
-			break;
-
-		case 'select':
-			eval('$s_options = ' . str_replace('{VALUE}', $new[$config_key], $options) . ';');
-			$tpl = '<select name="' . $name . '">' . $s_options . '</select>';
-			break;
-
-		case 'custom':
-			eval('$tpl = ' . str_replace('{VALUE}', $new[$config_key], $options) . ';');
-			break;
-
-		default:
-			break;
-	}
-
-	return $tpl;
-}
-
-
-/**
-* @package acp
-* General ACP module class
-*/
-class module
-{
-	var $id = 0;
-	var $type;
-	var $name;
-	var $mode;
-
-	// Private methods, should not be overwritten
-	function create($module_type, $module_url, $selected_mod = false, $selected_submod = false)
-	{
-		global $template, $auth, $db, $user, $config;
-
-		$sql = 'SELECT module_id, module_title, module_filename, module_subs, module_acl
-			FROM ' . MODULES_TABLE . "
-			WHERE module_type = 'acp'
-				AND module_enabled = 1
-			ORDER BY module_order ASC";
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			// Authorisation is required for the basic module
-			if ($row['module_acl'])
-			{
-				$is_auth = false;
-
-				eval('$is_auth = (' . preg_replace(array('#acl_([a-z_]+)#e', '#cfg_([a-z_]+)#e'), array('$auth->acl_get("\\1")', '$config["\\1"]'), $row['module_acl']) . ');');
-
-				// The user is not authorised to use this module, skip it
-				if (!$is_auth)
-				{
-					continue;
-				}
-			}
-
-			$selected = ($row['module_filename'] == $selected_mod || $row['module_id'] == $selected_mod || (!$selected_mod && !$i)) ?  true : false;
-/*
-			// Get the localised lang string if available, or make up our own otherwise
-			$template->assign_block_vars($module_type . '_section', array(
-				'L_TITLE'		=> (isset($user->lang[strtoupper($module_type) . '_' . $row['module_title']])) ? $user->lang[strtoupper($module_type) . '_' . $row['module_title']] : ucfirst(str_replace('_', ' ', strtolower($row['module_title']))),
-				'S_SELECTED'	=> $selected,
-				'U_TITLE'		=> $module_url . '&amp;i=' . $row['module_id'])
-			);
-*/
-			if ($selected)
-			{
-				$module_id = $row['module_id'];
-				$module_name = $row['module_filename'];
-
-				if ($row['module_subs'])
-				{
-					$j = 0;
-					$submodules_ary = explode("\n", $row['module_subs']);
-					foreach ($submodules_ary as $submodule)
-					{
-						$submodule = explode(',', trim($submodule));
-						$submodule_title = array_shift($submodule);
-
-						$is_auth = true;
-						foreach ($submodule as $auth_option)
-						{
-							if (!$auth->acl_get($auth_option))
-							{
-								$is_auth = false;
-							}
-						}
-
-						if (!$is_auth)
-						{
-							continue;
-						}
-
-						$selected = ($submodule_title == $selected_submod || (!$selected_submod && !$j)) ? true : false;
-/*
-						// Get the localised lang string if available, or make up our own otherwise
-						$template->assign_block_vars("{$module_type}_section.{$module_type}_subsection", array(
-							'L_TITLE'		=> (isset($user->lang[strtoupper($module_type) . '_' . strtoupper($submodule_title)])) ? $user->lang[strtoupper($module_type) . '_' . strtoupper($submodule_title)] : ucfirst(str_replace('_', ' ', strtolower($submodule_title))),
-							'S_SELECTED'	=> $selected,
-							'U_TITLE'		=> $module_url . '&amp;i=' . $module_id . '&amp;mode=' . $submodule_title
-						));
-*/
-						if ($selected)
-						{
-							$this->mode = $submodule_title;
-						}
-
-						$j++;
-					}
-				}
-			}
-
-			$i++;
-		}
-		$db->sql_freeresult($result);
-
-		if (!$module_id)
-		{
-			trigger_error('MODULE_NOT_EXIST');
-		}
-
-		$this->type = $module_type;
-		$this->id = $module_id;
-		$this->name = $module_name;
-	}
-
-	// Public methods to be overwritten by modules
-	function module()
-	{
-		// Module name
-		// Module filename
-		// Module description
-		// Module version
-		// Module compatibility
-		return false;
-	}
-
-	function init()
-	{
-		return false;
-	}
-
-	function install()
-	{
-		return false;
-	}
-
-	function uninstall()
-	{
-		return false;
-	}
-}
-// End Functions
-// -----------------------------
-
-?>

phpBB/adm/style/acp_attachments.html

@@ -0,0 +1,376 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF U_BACK -->
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+<!-- ENDIF -->
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_TITLE_EXPLAIN}</p>
+
+<!-- IF S_WARNING -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<!-- IF S_NOTIFY -->
+	<div class="successbox">
+		<h3>{L_NOTIFY}</h3>
+		<p>{NOTIFY_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<!-- IF S_UPLOADING_FILES -->
+	<h2>{L_UPLOADING_FILES}</h2>
+
+	<!-- BEGIN upload -->
+		:: {upload.FILE_INFO}<br />
+		<!-- IF upload.S_DENIED --><span class="error">{upload.DENIED}</span><!-- ELSEIF upload.ERROR_MSG --><span class="error">{upload.ERROR_MSG}</span><!-- ELSE --><span class="success">{L_SUCCESSFULLY_UPLOADED}</span><!-- ENDIF -->
+		<br /><br />
+	<!-- END upload -->
+
+<!-- ENDIF -->
+
+<!-- IF S_ATTACHMENT_SETTINGS -->
+
+	<!-- IF not S_THUMBNAIL_SUPPORT -->
+		<div class="errorbox">
+			<p>{L_NO_THUMBNAIL_SUPPORT}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="attachsettings" method="post" action="{U_ACTION}">
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+				</fieldset>
+			<!-- ENDIF -->
+			<fieldset>
+				<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
+
+			<dl>
+				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{options.CONTENT}</dd>
+			</dl>
+
+		<!-- ENDIF -->
+	<!-- END options -->
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</fieldset>
+
+	<!-- IF not S_SECURE_DOWNLOADS -->
+		<div class="errorbox">
+			<p>{L_SECURE_DOWNLOAD_NOTICE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_SECURE_TITLE}</legend>
+		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>
+	<dl>
+		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt>
+		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
+	</dl>
+	<dl>
+		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
+		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
+			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
+	</dl>
+
+	<p class="quick">
+		<input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}" />
+	</p>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_REMOVE_IPS}</legend>
+	<!-- IF S_DEFINED_IPS -->
+			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>
+		<dl>
+			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt>
+			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>
+		</dl>
+
+		<p class="quick">
+			<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" />
+		</p>
+		</fieldset>
+
+	<!-- ELSE -->
+		<p>{L_NO_IPS_DEFINED}</p>
+	<!-- ENDIF -->
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_EXTENSION_GROUPS -->
+
+	<!-- IF S_EDIT_GROUP -->
+		<script type="text/javascript" defer="defer">
+		// <![CDATA[
+			function update_image(newimage)
+			{
+				if (newimage == 'no_image')
+				{
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
+				}
+				else
+				{
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
+				}
+			}
+
+			function show_extensions(elem)
+			{
+				var str = '';
+
+				for (i = 0; i < elem.length; i++)
+				{
+					var element = elem.options[i];
+					if (element.selected)
+					{
+						if (str)
+						{
+							str = str + ', ';
+						}
+
+						str = str + element.innerHTML;
+					}
+				}
+
+				if (document.all)
+				{
+					document.all.ext.innerText = str;
+				}
+				else if (document.getElementById('ext').textContent)
+				{
+					document.getElementById('ext').textContent = str;
+				}
+				else if (document.getElementById('ext').firstChild.nodeValue)
+				{
+					document.getElementById('ext').firstChild.nodeValue = str;
+				}
+			}
+
+		// ]]>
+		</script>
+
+		<form id="extgroups" method="post" action="{U_ACTION}">
+		<fieldset>
+			<input type="hidden" name="action" value="{ACTION}" />
+			<input type="hidden" name="g" value="{GROUP_ID}" />
+
+			<legend>{L_LEGEND}</legend>
+		<dl>
+			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
+			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
+			<dd>{S_CATEGORY_SELECT}</dd>
+		</dl>
+		<dl>
+			<dt><label for="allowed">{L_ALLOWED}:</label></dt>
+			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
+			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt>
+			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
+					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
+			</select></dd>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
+		</dl>
+		<dl>
+			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
+			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt>
+			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>
+			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
+				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
+			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
+		</dl>
+
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		</p>
+		{S_FORM_TOKEN}
+		</fieldset>
+
+		</form>
+	<!-- ELSE -->
+
+		<form id="extgroups" method="post" action="{U_ACTION}">
+		<fieldset class="tabulated">
+		<legend>{L_TITLE}</legend>
+
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" />
+		<thead>
+		<tr>
+			<th>{L_EXTENSION_GROUP}</th>
+			<th>{L_SPECIAL_CATEGORY}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN groups -->
+			<!-- IF groups.S_ADD_SPACER and not groups.S_FIRST_ROW -->
+			<tr>
+				<td class="spacer" colspan="3">&nbsp;</td>
+			</tr>
+			<!-- ENDIF -->
+			<tr>
+				<td><strong>{groups.GROUP_NAME}</strong>
+					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span>
+					<!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span>
+					<!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM_POST}</span>
+					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
+				</td>
+				<td>{groups.CATEGORY}</td>
+				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
+			</tr>
+		<!-- END groups -->
+		</tbody>
+		</table>
+		<p class="quick">
+				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" />
+				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
+		</p>
+		{S_FORM_TOKEN}
+		</fieldset>
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_EXTENSIONS -->
+
+	<form id="add_ext" method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{L_ADD_EXTENSION}</legend>
+	<dl>
+		<dt><label for="add_extension">{L_EXTENSION}</label></dt>
+		<dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt>
+		<dd>{GROUP_SELECT_OPTIONS}</dd>
+	</dl>
+
+	<p class="quick">
+		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<br />
+
+	<form id="change_ext" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
+	<table cellspacing="1">
+		<col class="row1" /><col class="row1" /><col class="row2" />
+	<thead>
+	<tr>
+		<th>{L_EXTENSION}</th>
+		<th>{L_EXTENSION_GROUP}</th>
+		<th>{L_DELETE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN extensions -->
+		<!-- IF extensions.S_SPACER -->
+		<tr>
+			<td class="spacer" colspan="3">&nbsp;</td>
+		</tr>
+		<!-- ENDIF -->
+		<tr>
+			<td><strong>{extensions.EXTENSION}</strong></td>
+			<td>{extensions.GROUP_OPTIONS}</td>
+			<td><input type="checkbox" class="radio" name="extension_id_list[]" value="{extensions.EXTENSION_ID}" /><input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}" /></td>
+		</tr>
+	<!-- END extensions -->
+	</tbody>
+	</table>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_ORPHAN -->
+
+	<form id="orphan" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_FILENAME}</th>
+		<th>{L_FILEDATE}</th>
+		<th>{L_FILESIZE}</th>
+		<th>{L_ATTACH_POST_ID}</th>
+		<th>{L_ATTACH_TO_POST}</th>
+		<th>{L_DELETE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN orphan -->
+		<!-- IF orphan.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
+			<td>{orphan.FILETIME}</td>
+			<td>{orphan.FILESIZE}</td>
+			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
+			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
+			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
+		</tr>
+	<!-- END orphan -->
+	<tr class="row4">
+		<td colspan="4">&nbsp;</td>
+		<td class="small"><a href="#" onclick="marklist('orphan', 'add', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'add', false); return false;">{L_UNMARK_ALL}</a></td>
+		<td class="small"><a href="#" onclick="marklist('orphan', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
+	</tr>
+	</tbody>
+	</table>
+
+	<br />
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ban.html

@@ -0,0 +1,124 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<p>{L_ACP_BAN_EXPLAIN}</p>
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_EXPLAIN}</p>
+
+<script type="text/javascript">
+// <![CDATA[
+
+	var ban_length = new Array();
+		ban_length[-1] = '';
+	<!-- BEGIN ban_length -->
+		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
+	<!-- END ban_length -->
+
+	var ban_reason = new Array();
+		ban_reason[-1] = '';
+	<!-- BEGIN ban_reason -->
+		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
+	<!-- END ban_reason -->
+
+	var ban_give_reason = new Array();
+		ban_give_reason[-1] = '';
+	<!-- BEGIN ban_give_reason -->
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
+	<!-- END ban_give_reason -->
+
+	function display_details(option)
+	{
+		document.getElementById('acp_unban').unbangivereason.value = ban_give_reason[option];
+		document.getElementById('acp_unban').unbanreason.value = ban_reason[option];
+		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
+	}
+
+// ]]>
+</script>
+
+<form id="acp_ban" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_TITLE}</legend>
+<dl>
+	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
+	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
+	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
+</dl>
+<dl>
+	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
+	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
+	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
+</dl>
+<dl>
+	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
+		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
+	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
+</dl>
+<dl>
+	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
+	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
+</dl>
+
+<p class="submit-buttons">
+	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
+</p>
+{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<br /><br />
+
+<h1>{L_UNBAN_TITLE}</h1>
+
+<p>{L_UNBAN_EXPLAIN}</p>
+
+<form id="acp_unban" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_UNBAN_TITLE}</legend>
+
+<!-- IF S_BANNED_OPTIONS -->
+	<dl>
+		<dt><label for="unban">{L_BAN_CELL}:</label></dt>
+		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
+		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
+		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
+	</dl>
+	<dl>
+		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
+		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
+	</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+
+<!-- ELSE -->
+
+	<p>{L_NO_BAN_CELL}</p>
+	{S_FORM_TOKEN}
+</fieldset>
+
+<!-- ENDIF -->
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_bbcodes.html

@@ -0,0 +1,124 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_BBCODE -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_ACP_BBCODES}</h1>
+
+	<p>{L_ACP_BBCODES_EXPLAIN}</p>
+
+	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_BBCODE_USAGE}</legend>
+		<p>{L_BBCODE_USAGE_EXPLAIN}</p>
+	<dl>
+		<dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
+		<dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_HTML_REPLACEMENT}</legend>
+		<p>{L_HTML_REPLACEMENT_EXPLAIN}</p>
+	<dl>
+		<dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt>
+		<dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_BBCODE_HELPLINE}</legend>
+		<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
+	<dl>
+		<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
+		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_SETTINGS}</legend>
+	<dl>
+		<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
+		<dd><input type="checkbox" class="radio" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	
+	<br />
+
+	<table cellspacing="1" id="down">
+	<thead>
+	<tr>
+		<th colspan="2">{L_TOKENS}</th>
+	</tr>
+	<tr>
+		<td class="row3" colspan="2">{L_TOKENS_EXPLAIN}</td>
+	</tr>
+	<tr>
+		<th>{L_TOKEN}</th>
+		<th>{L_TOKEN_DEFINITION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN token -->
+		<tr valign="top">
+			<td class="row1">{token.TOKEN}</td>
+			<td class="row2">{token.EXPLAIN}</td>
+		</tr>
+	<!-- END token -->
+	</tbody>
+	</table>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_BBCODES}</h1>
+
+	<p>{L_ACP_BBCODES_EXPLAIN}</p>
+	
+	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_ACP_BBCODES}</legend>
+
+	<table cellspacing="1" id="down">
+	<thead>
+	<tr>
+		<th>{L_BBCODE_TAG}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN bbcodes -->
+		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
+			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr class="row3">
+			<td colspan="2">{L_ACP_NO_ITEMS}</td>
+		</tr>
+	<!-- END bbcodes -->
+	</tbody>
+	</table>
+
+	<p class="quick">
+		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_board.html

@@ -0,0 +1,49 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_TITLE_EXPLAIN}</p>
+
+<!-- IF S_ERROR -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<form id="acp_board" method="post" action="{U_ACTION}">
+
+<!-- BEGIN options -->
+	<!-- IF options.S_LEGEND -->
+		<!-- IF not options.S_FIRST_ROW -->
+			</fieldset>
+		<!-- ENDIF -->
+		<fieldset>
+			<legend>{options.LEGEND}</legend>
+	<!-- ELSE -->
+
+		<dl>
+			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>{options.CONTENT}</dd>
+		</dl>
+
+	<!-- ENDIF -->
+<!-- END options -->
+
+<!-- IF S_AUTH -->
+	<!-- BEGIN auth_tpl -->
+		{auth_tpl.TPL}
+	<!-- END auth_tpl -->
+<!-- ENDIF -->
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_bots.html

@@ -0,0 +1,102 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_BOT -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_BOT_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_bots" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+	<dl>
+		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
+		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
+		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
+		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt>
+		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
+		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
+		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
+	</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_BOTS}</h1>
+
+	<p>{L_BOTS_EXPLAIN}</p>
+
+	<form id="acp_bots" method="post" action="{U_ACTION}">
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_BOT_NAME}</th>
+		<th>{L_BOT_LAST_VISIT}</th>
+		<th colspan="3">{L_OPTIONS}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN bots -->
+		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td style="width: 50%;">{bots.BOT_NAME}</td>
+			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
+		</tr>
+	<!-- END bots -->
+	</tbody>
+	</table>
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
+	</fieldset>
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<select name="action">{S_BOT_OPTIONS}</select>
+		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
+		<p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p>
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_captcha.html

@@ -0,0 +1,71 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_VC_SETTINGS}</h1>
+
+<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+
+
+<form id="acp_captcha" method="post" action="{U_ACTION}">
+
+<fieldset>
+<legend>{L_GENERAL_OPTIONS}</legend>
+
+<dl>
+	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+<dl>
+	<dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
+	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+</dl>
+<dl>
+	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}:</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
+	<dd><input id="max_login_attempts" type="text" size="4" maxlength="4" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
+</dl>
+<dl>
+	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+<dl>
+	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+</fieldset>
+
+<fieldset>
+<legend>{L_AVAILABLE_CAPTCHAS}</legend>
+<dl>
+	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
+	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
+</dl>
+ <!-- IF S_CAPTCHA_HAS_CONFIG -->
+<dl>
+	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
+	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
+</dl>
+<!-- ENDIF -->
+</fieldset>
+
+<!-- IF CAPTCHA_PREVIEW_TPL -->
+<fieldset>
+	<legend>{L_PREVIEW}</legend>
+<!-- INCLUDE {CAPTCHA_PREVIEW_TPL} -->
+</fieldset>
+<!-- ENDIF -->
+
+<fieldset>
+	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
+	</p>
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_database.html

@@ -0,0 +1,98 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF MODE eq 'restore' -->
+	<h1>{L_ACP_RESTORE}</h1>
+
+	<p>{L_ACP_RESTORE_EXPLAIN}</p>
+
+	<!-- IF .files -->
+	<form id="acp_backup" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_RESTORE_OPTIONS}</legend>
+	<dl>
+		<dt><label for="file">{L_SELECT_FILE}:</label></dt>
+		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
+	</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
+		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
+		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_ACP_NO_ITEMS}</p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- ELSE -->
+	<h1>{L_ACP_BACKUP}</h1>
+
+	<p>{L_ACP_BACKUP_EXPLAIN}</p>
+
+	<script type="text/javascript">
+	// <![CDATA[
+
+		function selector(bool)
+		{
+			var table = document.getElementById('table');
+
+			for (var i = 0; i < table.options.length; i++)
+			{
+				table.options[i].selected = bool;
+			}
+		}
+
+	// ]]>
+	</script>
+
+	<form id="acp_backup" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_BACKUP_OPTIONS}</legend>
+	<dl>
+		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
+			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
+			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
+		<dd><!-- BEGIN methods -->
+		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
+		<!-- END methods --></dd>
+	</dl>
+	<dl>
+		<dt><label for="where">{L_ACTION}:</label></dt>
+		<dd>
+			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
+			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>
+		</dd>
+	</dl>
+	<dl>
+		<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
+		<dd><select id="table" name="table[]" size="10" multiple="multiple">
+		<!-- BEGIN tables -->
+			<option value="{tables.TABLE}">{tables.TABLE}</option>
+		<!-- END tables -->
+		</select></dd>
+		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
+	</dl>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_disallow.html

@@ -0,0 +1,45 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_DISALLOW_USERNAMES}</h1>
+
+<p>{L_ACP_DISALLOW_EXPLAIN}</p>
+
+<form id="acp_disallow" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_ADD_DISALLOW_TITLE}</legend>
+<dl>
+	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
+	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
+</dl>
+
+<p class="quick">
+	<input class="button1" type="submit" name="disallow" value="{L_SUBMIT}" />
+</p>
+</fieldset>
+
+<h1>{L_DELETE_DISALLOW_TITLE}</h1>
+
+<p>{L_DELETE_DISALLOW_EXPLAIN}</p>
+
+<fieldset>
+	<legend>{L_DELETE_DISALLOW_TITLE}</legend>
+<!-- IF S_DISALLOWED_NAMES -->
+	<dl>
+		<dt><label for="disallowed">{L_USERNAME}:</label></dt>
+		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>
+	</dl>
+
+	<p class="quick">
+		<input class="button1" type="submit" name="allow" value="{L_SUBMIT}" />
+	</p>
+<!-- ELSE -->
+	<p>{L_NO_DISALLOWED}</p>
+<!-- ENDIF -->
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_email.html

@@ -0,0 +1,54 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_MASS_EMAIL}</h1>
+
+<p>{L_ACP_MASS_EMAIL_EXPLAIN}</p>
+
+<!-- IF S_WARNING -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<form id="acp_email" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_COMPOSE}</legend>
+<dl>
+	<dt><label for="group">{L_SEND_TO_GROUP}:</label></dt>
+	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
+</dl>
+<dl>
+	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
+	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+</dl>
+<dl>
+	<dt><label for="subject">{L_SUBJECT}:</label></dt>
+	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>
+</dl>
+<dl>
+	<dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
+	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>
+</dl>
+<dl>
+	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt>
+	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
+</dl>
+<dl>
+	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
+	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
+</dl>
+
+<p class="submit-buttons">
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+</p>
+{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_forums.html

@@ -0,0 +1,505 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_FORUM -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Handle displaying/hiding several options based on the forum type
+		*/
+		function display_options(value)
+		{
+			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
+				if (value == {FORUM_POST})
+				{
+					dE('type_actions', -1);
+				}
+				else
+				{
+					dE('type_actions', 1);
+				}
+			<!-- ENDIF -->
+
+			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
+				if (value == {FORUM_LINK})
+				{
+					dE('cat_to_link_actions', 1);
+				}
+				else
+				{
+					dE('cat_to_link_actions', -1);
+				}
+			<!-- ENDIF -->
+
+			if (value == {FORUM_POST})
+			{
+				dE('forum_post_options', 1);
+				dE('forum_link_options', -1);
+				dE('forum_rules_options', 1);
+				dE('forum_cat_options', -1);
+			}
+			else if (value == {FORUM_LINK})
+			{
+				dE('forum_post_options', -1);
+				dE('forum_link_options', 1);
+				dE('forum_rules_options', -1);
+				dE('forum_cat_options', -1);
+			}
+			else if (value == {FORUM_CAT})
+			{
+				dE('forum_post_options', -1);
+				dE('forum_link_options', -1);
+				dE('forum_rules_options', 1);
+				dE('forum_cat_options', 1);
+			}
+		}
+
+		/**
+		* Init the wanted display functionality if javascript is enabled.
+		* If javascript is not available, the user is still able to properly administrate.
+		*/
+		onload = function()
+		{
+			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
+				<!-- IF S_FORUM_POST -->
+					dE('type_actions', -1);
+				<!-- ENDIF -->
+			<!-- ENDIF -->
+
+			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
+				<!-- IF S_FORUM_CAT -->
+					dE('cat_to_link_actions', -1);
+				<!-- ENDIF -->
+			<!-- ENDIF -->
+
+			<!-- IF not S_FORUM_POST -->
+				dE('forum_post_options', -1);
+			<!-- ENDIF -->
+
+			<!-- IF not S_FORUM_CAT -->
+				dE('forum_cat_options', -1);
+			<!-- ENDIF -->
+
+			<!-- IF not S_FORUM_LINK -->
+				dE('forum_link_options', -1);
+			<!-- ENDIF -->
+
+			<!-- IF S_FORUM_LINK -->
+			dE('forum_rules_options', -1);
+			<!-- ENDIF -->
+		}
+
+	// ]]>
+	</script>
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE} <!-- IF FORUM_NAME -->:: {FORUM_NAME}<!-- ENDIF --></h1>
+
+	<p>{L_FORUM_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="forumedit" method="post" action="{U_EDIT_ACTION}">
+
+	<fieldset>
+		<legend>{L_FORUM_SETTINGS}</legend>
+	<dl>
+		<dt><label for="forum_type">{L_FORUM_TYPE}:</label></dt>
+		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
+	</dl>
+	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
+	<div id="type_actions">
+		<dl>
+			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
+			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
+		</dl>
+	</div>
+	<!-- ENDIF -->
+	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
+	<div id="cat_to_link_actions">
+		<dl>
+			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt>
+			<!-- IF S_FORUMS_LIST -->
+				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+			<!-- ELSE -->
+				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
+			<!-- ENDIF -->
+		</dl>
+	</div>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt>
+		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
+		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
+		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
+		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
+		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
+		<!-- IF FORUM_IMAGE_SRC -->
+			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
+		<!-- ENDIF -->
+	</dl>
+	<dl>
+		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
+		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
+	</dl>
+	<!-- IF S_FORUM_PASSWORD_SET -->
+	<dl>
+		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
+		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>
+	</dl>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt>
+		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
+	</dl>
+	<!-- IF S_CAN_COPY_PERMISSIONS -->
+		<dl>
+			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
+		</dl>
+	<!-- ENDIF -->
+	</fieldset>
+
+	<div id="forum_cat_options">
+		<fieldset>
+			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		<dl>
+			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		</fieldset>
+	</div>
+
+	<div id="forum_post_options">
+		<fieldset>
+			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		<dl>
+			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
+			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}:</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
+			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
+		</dl>
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
+		<dl>
+			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		</fieldset>
+	</div>
+
+	<div id="forum_link_options">
+		<fieldset>
+			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		<dl>
+			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
+			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		</fieldset>
+	</div>
+
+	<div id="forum_rules_options">
+		<fieldset>
+			<legend>{L_FORUM_RULES}</legend>
+		<dl>
+			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
+			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
+		</dl>
+	<!-- IF FORUM_RULES_PREVIEW -->
+		<dl>
+			<dt><label>{L_FORUM_RULES_PREVIEW}:</label></dt>
+			<dd>{FORUM_RULES_PREVIEW}</dd>
+		</dl>
+	<!-- ENDIF -->
+		<dl>
+			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
+			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
+			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+		</dl>
+		</fieldset>
+	</div>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_DELETE_FORUM -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_FORUM_DELETE}</h1>
+
+	<p>{L_FORUM_DELETE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_forum" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_FORUM_DELETE}</legend>
+	<dl>
+		<dt><label>{L_FORUM_NAME}:</label></dt>
+		<dd><strong>{FORUM_NAME}</strong></dd>
+	</dl>
+	<!-- IF S_FORUM_POST -->
+		<dl>
+			<dt><label for="delete_action">{L_ACTION}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
+			<!-- IF S_MOVE_FORUM_OPTIONS -->
+				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
+			<!-- ENDIF -->
+		</dl>
+	<!-- ENDIF -->
+	<!-- IF S_HAS_SUBFORUMS -->
+		<dl>
+			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
+			<!-- IF S_FORUMS_LIST -->
+				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+			<!-- ENDIF -->
+		</dl>
+	<!-- ENDIF -->
+
+	<p class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_CONTINUE_SYNC -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		var close_waitscreen = 0;
+		// no scrollbars...
+		popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
+	// ]]>
+	</script>
+
+	<h1>{L_FORUM_ADMIN}</h1>
+
+	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
+
+	<p>{L_PROGRESS_EXPLAIN}</p>
+
+<!-- ELSE -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Popup search progress bar
+		*/
+		function popup_progress_bar()
+		{
+			var close_waitscreen = 0;
+			// no scrollbars...
+			popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
+		}
+	// ]]>
+	</script>
+
+	<h1>{L_FORUM_ADMIN}</h1>
+
+	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
+
+	<!-- IF ERROR_MSG -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_RESYNCED -->
+		<script type="text/javascript">
+		// <![CDATA[
+			var close_waitscreen = 1;
+		// ]]>
+		</script>
+
+		<div class="successbox">
+			<h3>{L_NOTIFY}</h3>
+			<p>{L_FORUM_RESYNCED}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>
+
+	<!-- IF .forums -->
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" />
+		<tbody>
+		<!-- BEGIN forums -->
+			<tr>
+				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
+				<td>
+					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
+					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
+					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
+					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
+				</td>
+				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ELSE -->
+						{ICON_MOVE_UP_DISABLED}
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
+					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
+					<!-- IF not forums.S_FORUM_LINK -->
+						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
+					<!-- ELSE -->
+						{ICON_SYNC_DISABLED}
+					<!-- ENDIF -->
+					<a href="{forums.U_DELETE}">{ICON_DELETE}</a>
+				</td>
+			</tr>
+		<!-- END forums -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<form id="fselect" method="post" action="{U_SEL_ACTION}">
+
+	<fieldset class="quick">
+		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
+
+		<input class="button2" type="submit" value="{L_GO}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<form id="forums" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
+		<input type="hidden" name="action" value="add" />
+
+		<input type="text" name="forum_name" value="" maxlength="255" />
+		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_forums_copy_perm.html

@@ -0,0 +1,22 @@
+<!-- INCLUDE overall_header.html -->
+
+<h1>{L_COPY_PERMISSIONS}</h1>
+
+<p>{L_COPY_PERMISSIONS_EXPLAIN}</p>
+<p>{L_ACL_LINK}</p>
+
+<form id="confirm" method="post" action="{S_COPY_ACTION}">
+
+<fieldset>
+	<dl>
+		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+		<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
+	</dl>
+	<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
+		<input type="submit" name="update" value="{L_CONTINUE}" class="button2" />&nbsp;
+	</div>
+</fieldset>
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_groups.html

@@ -0,0 +1,358 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_ACP_GROUPS_MANAGE}</h1>
+
+	<p>{L_GROUP_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+
+	<fieldset>
+		<legend>{L_GROUP_DETAILS}</legend>
+	<dl>
+		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
+		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
+		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
+		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+	</dl>
+	<!-- IF not S_SPECIAL_GROUP -->
+		<dl>
+			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
+			<dd>
+				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
+			</dd>
+		</dl>
+	<!-- ELSE -->
+		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
+	<!-- ENDIF -->
+
+	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
+		<dl>
+			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
+		</dl>
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_GROUP_OPTIONS_SAVE}</legend>
+	<!-- IF S_USER_FOUNDER -->
+	<dl>
+		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
+		<dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
+	</dl>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}:</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
+		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
+		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
+		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
+	<dl>
+		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
+		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
+		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
+		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
+		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_GROUP_AVATAR}</legend>
+	<dl>
+		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dd>{AVATAR_IMAGE}</dd>
+		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
+	</dl>
+	<!-- IF not S_IN_AVATAR_GALLERY -->
+		<!-- IF S_CAN_UPLOAD -->
+			<dl>
+				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
+			</dl>
+		<!-- ENDIF -->
+		<dl>
+			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
+		</dl>
+		<!-- IF S_DISPLAY_GALLERY -->
+			<dl>
+				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
+				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- ELSE -->
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_AVATAR_GALLERY}</legend>
+		<dl>
+			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
+		</dl>
+		<dl>
+			<table cellspacing="1">
+			<!-- BEGIN avatar_row -->
+			<tr>
+				<!-- BEGIN avatar_column -->
+					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
+				<!-- END avatar_column -->
+			</tr>
+			<tr>
+				<!-- BEGIN avatar_option_column -->
+					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+				<!-- END avatar_option_column -->
+			</tr>
+			<!-- END avatar_row -->
+			</table>
+		</dl>
+		</fieldset>
+
+		<fieldset class="quick" style="margin-top: -15px;">
+			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		</fieldset>
+
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_LIST -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
+
+	<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
+
+	<form id="list" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
+		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
+	</fieldset>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_USERNAME}</th>
+		<th>{L_GROUP_DEFAULT}</th>
+		<th>{L_JOINED}</th>
+		<th>{L_POSTS}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>
+	</tr>
+	<!-- BEGIN leader -->
+		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><!-- IF leader.USERNAME_COLOUR --><a href="{leader.U_USER_EDIT}" style="color: #{leader.USERNAME_COLOUR};" class="username-coloured">{leader.USERNAME}</a><!-- ELSE --><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a><!-- ENDIF --></td>
+			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
+			<td style="text-align: center;">{leader.JOINED}</td>
+			<td style="text-align: center;">{leader.USER_POSTS}</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{leader.USER_ID}" /></td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr>
+			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
+		</tr>
+	<!-- END leader -->
+	<tr>
+		<td class="row3" colspan="5"><strong>{L_GROUP_APPROVED}</strong></td>
+	</tr>
+	<!-- BEGIN member -->
+		<!-- IF member.S_PENDING -->
+		<tr>
+			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>
+		</tr>
+		<!-- ELSE -->
+			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><!-- IF member.USERNAME_COLOUR --><a href="{member.U_USER_EDIT}" style="color: #{member.USERNAME_COLOUR};" class="username-coloured">{member.USERNAME}</a><!-- ELSE --><a href="{member.U_USER_EDIT}">{member.USERNAME}</a><!-- ENDIF --></td>
+			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
+			<td style="text-align: center;">{member.JOINED}</td>
+			<td style="text-align: center;">{member.USER_POSTS}</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td>
+		</tr>
+		<!-- ENDIF -->
+	<!-- BEGINELSE -->
+		<tr>
+			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
+		</tr>
+	<!-- END member -->
+	</tbody>
+	</table>
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<fieldset class="quick">
+		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
+		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
+		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+	</fieldset>
+
+	<h1>{L_ADD_USERS}</h1>
+
+	<p>{L_ADD_USERS_EXPLAIN}</p>
+
+	<fieldset>
+		<legend>{L_ADD_USERS}</legend>
+	<dl>
+		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
+		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
+			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
+		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
+			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
+		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	</dl>
+
+	<p class="quick">
+		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_GROUPS_MANAGE}</h1>
+
+	<p>{L_ACP_GROUPS_MANAGE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<h1>{L_USER_DEF_GROUPS}</h1>
+
+	<p>{L_USER_DEF_GROUPS_EXPLAIN}</p>
+
+	<form id="acp_groups" method="post" action="{U_ACTION}">
+
+	<table cellspacing="1">
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th style="width: 50%">{L_GROUP}</th>
+		<th>{L_TOTAL_MEMBERS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN groups -->
+		<!-- IF groups.S_SPECIAL -->
+		<!-- IF groups.S_FIRST_ROW -->
+			<tr>
+				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
+			</tr>
+		<!-- ENDIF -->
+	</tbody>
+	</table>
+
+	<fieldset class="quick">
+		<!-- IF S_GROUP_ADD -->
+			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			<input type="hidden" name="add" value="1" />
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<h1>{L_SPECIAL_GROUPS}</h1>
+
+	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
+
+	<table cellspacing="1">
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+	<thead>
+	<tr>
+		<th style="width: 50%">{L_GROUP}</th>
+		<th>{L_TOTAL_MEMBERS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+		<!-- ELSE -->
+		<tr>
+			<td><strong>{groups.GROUP_NAME}</strong></td>
+			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
+			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
+			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
+			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+		</tr>
+		<!-- ENDIF -->
+	<!-- END groups -->
+	</tbody>
+	</table>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_icons.html

@@ -0,0 +1,268 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT -->
+
+	<script type="text/javascript" defer="defer">
+	// <![CDATA[
+	<!-- IF S_ADD_CODE -->
+	
+			var smiley = Array();
+			<!-- BEGIN smile -->
+				smiley['{smile.SMILEY_URL}'] = Array();
+				smiley['{smile.SMILEY_URL}']['code'] = '{smile.CODE}';
+				smiley['{smile.SMILEY_URL}']['emotion'] = '{smile.EMOTION}';
+				smiley['{smile.SMILEY_URL}']['width'] = {smile.WIDTH};
+				smiley['{smile.SMILEY_URL}']['height'] = {smile.HEIGHT};
+				smiley['{smile.SMILEY_URL}']['order'] = {smile.ORDER};
+			<!-- END smile -->
+
+			function update_image(newimage)
+			{
+				var use_element = smiley[newimage];
+
+				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
+				document.getElementById('add_code').value = use_element['code'];
+				document.getElementById('add_emotion').value = use_element['emotion'];
+				document.getElementById('add_width').value = use_element['width'];
+				document.getElementById('add_height').value = use_element['height'];
+
+				element = document.getElementById('add_order');
+				for (var i = 0; i < element.length; i++)
+				{
+					if (element.options[i].value == use_element['order'])
+					{
+						document.getElementById('add_order').options.selectedIndex = i;
+					}
+				}
+			}
+		
+	<!-- ENDIF -->
+
+	
+	function toggle_select(icon, display, select)
+	{
+		var disp = document.getElementById('order_disp_' + select);
+		var nodisp = document.getElementById('order_no_disp_' + select);
+		disp.disabled = !display;
+		nodisp.disabled = display;
+		if (display)
+		{
+			document.getElementById('order_' + select).selectedIndex = 0;
+			nodisp.className = 'disabled-options';
+			disp.className = '';
+		}
+		else
+		{
+			document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
+			disp.className = 'disabled-options';
+			nodisp.className = '';
+		}
+	}
+	// ]]>
+	</script>
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<form id="acp_icons" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th colspan="{COLSPAN}">{L_CONFIG}</th>
+	</tr>
+	<!-- IF .items or S_ADD_CODE -->
+	<tr class="row3">
+		<td>{L_URL}</td>
+		<td>{L_LOCATION}</td>
+	<!-- IF S_SMILIES -->
+		<td>{L_SMILIES_CODE}</td>
+		<td>{L_SMILIES_EMOTION}</td>
+	<!-- ENDIF -->
+		<td>{L_WIDTH}</td>
+		<td>{L_HEIGHT}</td>
+		<td>{L_DISPLAY_ON_POSTING}</td>
+	<!-- IF ID or S_ADD -->
+		<td>{L_ORDER}</td>
+	<!-- ENDIF -->
+	<!-- IF S_ADD -->
+		<td>{L_ADD}</td>
+	<!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN items -->
+		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	
+		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
+		<td style="vertical-align: top;">[{items.IMG}]</td>
+		<!-- IF S_SMILIES -->
+			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
+			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
+		<!-- ENDIF -->
+		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
+		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td>
+			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
+			<!-- IF items.S_ID -->
+				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
+			<!-- ENDIF -->
+		</td>
+		<!-- IF ID or S_ADD -->
+			<td><select id="order_{items.S_ROW_COUNT}" name="order[{items.IMG}]">
+				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
+				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
+			</select></td>
+		<!-- ENDIF -->	
+		<!-- IF S_ADD -->
+			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
+		<!-- ENDIF -->
+		</tr>
+	<!-- END items -->
+	<!-- IF S_ADD_CODE -->
+	<tr>
+		<th colspan="{COLSPAN}">{L_ADD_SMILEY_CODE}</th>
+	</tr>
+	<tr class="row1">
+		<td style="text-align: center;"><select name="add_image" id="add_image" onchange="update_image(this.options[selectedIndex].value);">{S_IMG_OPTIONS}</select></td>
+		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
+		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
+		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
+		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
+		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
+		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
+ 		<td><select id="order_add_order" name="add_order">
+				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
+				<optgroup id="order_no_disp_add_order" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup>
+		</select></td>
+		<td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td>
+	</tr>
+	<!-- ENDIF -->
+	<!-- ELSE -->
+	<tr class="row3">
+		<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
+	</tr>
+	<!-- ENDIF -->
+	</tbody>
+	</table>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_CHOOSE_PAK -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<form id="acp_icons" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_IMPORT}</legend>
+	
+	<!-- IF not S_PAK_OPTIONS -->
+		<p>{L_NO_PAK_OPTIONS}</p>
+
+	<!-- ELSE -->
+		<dl>
+			<dt><label for="pak">{L_SELECT_PACKAGE}</label></dt>
+			<dd><select id="pak" name="pak">{S_PAK_OPTIONS}</select></dd>
+		</dl>
+			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}</label>
+				<label><input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}</label>
+				<label><input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}</label></dd>
+		</dl>
+
+	<p class="quick">
+		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
+	</p>
+	<!-- ENDIF -->
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF NOTICE -->
+		<div class="successbox">
+			<h3>{L_NOTIFY}</h3>
+			<p>{NOTICE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_icons" method="post" action="{U_ACTION}">
+
+	<div style="text-align: right;"><a href="{U_IMPORT}">{L_IMPORT}</a> | <a href="{U_EXPORT}">{L_EXPORT}</a></div>
+
+	<fieldset class="tabulated">
+
+	<legend>{L_TITLE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_TITLE}</th>
+		<!-- IF S_SMILIES -->
+		<th>{L_CODE}</th>
+		<th>{L_EMOTION}</th>
+		<!-- ENDIF -->
+		<th>{L_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN items -->
+		<!-- IF items.S_SPACER -->
+			<tr>
+				<td class="row3" colspan="{COLSPAN}" style="text-align: center;">{L_NOT_DISPLAYED}</td>
+			</tr>
+		<!-- ENDIF -->
+		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
+			<!-- IF S_SMILIES -->
+				<td style="text-align: center;">{items.CODE}</td>
+				<td style="text-align: center;">{items.EMOTION}</td>
+			<!-- ENDIF -->
+			<td style="text-align: right; white-space: nowrap;">
+				<!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+				<!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
+			</td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr class="row3">
+			<td colspan="{COLSPAN}">{L_ACP_NO_ITEMS}</td>
+		</tr>
+	<!-- END items -->
+	</tbody>
+	</table>
+	<div>{PAGINATION}</div>
+	<p class="quick">
+		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_inactive.html

@@ -0,0 +1,77 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h2>{L_INACTIVE_USERS}</h2>
+
+<p>{L_INACTIVE_USERS_EXPLAIN}</p>
+
+<form id="inactive" method="post" action="{U_ACTION}">
+
+<div class="clearfix"></div>
+
+<!-- IF PAGINATION -->
+<div class="pagination">
+	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+</div>
+<!-- ENDIF -->
+
+<table cellspacing="1">
+<thead>
+<tr>
+	<th>{L_USERNAME}</th>
+	<th>{L_JOINED}</th>
+	<th>{L_INACTIVE_DATE}</th>
+	<th>{L_LAST_VISIT}</th>
+	<th>{L_INACTIVE_REASON}</th>
+	<th>{L_MARK}</th>
+</tr>
+</thead>
+<tbody>
+<!-- BEGIN inactive -->
+	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+		<td style="vertical-align: top;">
+			{inactive.USERNAME_FULL}
+			<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+		</td>
+		<td style="vertical-align: top;">{inactive.JOINED}</td>
+		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
+		<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
+		<td style="vertical-align: top;">
+			{inactive.REASON}
+			<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
+		</td>
+		<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
+	</tr>
+<!-- BEGINELSE -->
+	<tr>
+		<td colspan="6" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+	</tr>
+<!-- END inactive -->
+</tbody>
+</table>
+
+<fieldset class="display-options">
+	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	<input class="button2" type="submit" value="{L_GO}" name="sort" />
+</fieldset>
+
+<hr />
+
+<!-- IF PAGINATION -->
+	<div class="pagination">
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+<!-- ENDIF -->
+
+<fieldset class="quick">
+	<select name="action">{S_INACTIVE_OPTIONS}</select>
+	<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+	<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+	{S_FORM_TOKEN}
+</fieldset>
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_jabber.html

@@ -0,0 +1,65 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_JABBER_SETTINGS}</h1>
+
+<p>{L_ACP_JABBER_SETTINGS_EXPLAIN}</p>
+
+<!-- IF S_WARNING -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<form id="acp_jabber" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_ACP_JABBER_SETTINGS}</legend>
+<!-- IF S_GTALK_NOTE -->
+	<p>{L_JAB_GTALK_NOTE}</p>
+<!-- ENDIF -->
+<dl>
+	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+</dl>
+<dl>
+	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
+</dl>
+<!-- IF S_CAN_USE_SSL -->
+<dl>
+	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<!-- ENDIF -->
+<dl>
+	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
+</dl>
+
+</fieldset>
+
+<fieldset class="submit-buttons">
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_language.html

@@ -0,0 +1,255 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_SELECT_METHOD -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
+
+	<form id="selectmethod" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_DOWNLOAD_AS}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+
+	<p class="quick">
+		<input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" />
+	</p>
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_DETAILS -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_LANGUAGE_PACK_DETAILS}</h1>
+
+	<form id="details" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{LANG_LOCAL_NAME}</legend>
+	<dl>
+		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt>
+		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt>
+		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
+		<dd><strong>{LANG_ISO}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
+		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
+	</dl>
+
+	<p class="quick" style="margin-top: -15px;">
+		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+	<br /><br />
+
+	<!-- IF S_MISSING_FILES -->
+		<div class="errorbox">
+			<h3>{L_MISSING_FILES}</h3>
+			<p>{MISSING_FILES}</p>
+		</div>
+		<br /><br />
+	<!-- ENDIF -->
+
+	<!-- IF S_MISSING_VARS -->
+		<h1>{L_MISSING_LANG_VARIABLES}</h1>
+
+		<p>{L_MISSING_VARS_EXPLAIN}</p>
+
+		<form id="missing" method="post" action="{U_MISSING_ACTION}">
+
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_LANGUAGE_KEY}</th>
+			<th>{L_LANGUAGE_VARIABLE}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN missing -->
+			<tr class="row4">
+				<td><strong>{missing.FILE}</strong></td>
+				<td style="text-align: right;"><input type="submit" name="missing_file[{missing.KEY}]" value="{L_SELECT}" class="button2" /></td>
+			</tr>
+			{missing.TPL}
+		<!-- END missing -->
+		</tbody>
+		</table>
+		<div>{S_FORM_TOKEN}</div>
+		</form>
+
+		<br /><br />
+	<!-- ENDIF -->
+
+	<a name="entries"></a>
+
+	<h1>{L_LANGUAGE_ENTRIES}</h1>
+
+	<p>{L_LANGUAGE_ENTRIES_EXPLAIN}</p>
+
+	<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
+
+	<!-- IF S_FROM_STORE -->
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+			<input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" /> 
+		</fieldset>
+	<!-- ENDIF -->
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" />
+	</fieldset>
+
+	<p>&nbsp;<br />&nbsp;</p>
+
+
+	<!--[if lt IE 8]>
+	<style type="text/css">
+	/* <![CDATA[ */
+		input.langvalue, textarea.langvalue {
+		width: 450px;
+		}
+	/* ]]> */
+	</style>
+	<![endif]-->
+
+	<table cellspacing="1">
+	<thead>
+	<!-- IF S_EMAIL_FILE -->
+		<tr>
+			<th colspan="2">{L_FILE_CONTENTS}</th>
+		</tr>
+	<!-- ELSE -->
+		<tr>
+			<th>{L_LANGUAGE_KEY}</th>
+			<th>{L_LANGUAGE_VARIABLE}</th>
+		</tr>
+	<!-- ENDIF -->
+	<tr>
+		<td rowspan="2" class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td>
+		<td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
+	</tr>
+	<tr>
+		<td class="row3" style="text-align: right;">	
+		<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF S_EMAIL_FILE -->
+		<tr>
+			<td class="row2" colspan="2" style="text-align: center;"><textarea name="entry" id="entry" cols="80" rows="20">{LANG}</textarea></td>
+		</tr>
+	<!-- ELSE -->
+		{TPL}
+	<!-- ENDIF -->
+	<tr>
+		<td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
+	</tr>
+	</tbody>
+	</table>
+	</form>
+
+<!-- ELSEIF S_UPLOAD -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_UPLOAD_SETTINGS}</h1>
+
+	<form id="upload" method="post" action="{U_ACTION}">
+
+	<!-- IF S_CONNECTION_SUCCESS -->
+		<div class="successbox">
+			<p>{L_CONNECTION_SUCCESS}</p>
+		</div>
+	<!-- ELSEIF S_CONNECTION_FAILED -->
+		<div class="errorbox">
+			<p>{L_CONNECTION_FAILED}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_UPLOAD_SETTINGS}</legend>
+	<dl>
+		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dd><strong>{NAME}</strong></dd>
+	</dl>
+	<!-- BEGIN data -->
+	<dl>
+		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
+		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
+	</dl>
+	<!-- END data -->
+	</fieldset>
+	
+	<fieldset class="quick">
+		{HIDDEN}
+		{S_FORM_TOKEN}
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_LANGUAGE_PACKS}</h1>
+
+	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_LANGUAGE_PACK_NAME}</th>
+		<th>{L_LANGUAGE_PACK_LOCALNAME}</th>
+		<th>{L_LANGUAGE_PACK_ISO}</th>
+		<th>{L_LANGUAGE_PACK_USED_BY}</th>
+		<th>{L_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>
+	</tr>
+	<!-- BEGIN lang -->
+		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>
+		<td>{lang.LOCAL_NAME}</td>
+		<td style="text-align: center;"><strong>{lang.ISO}</strong></td>
+		<td style="text-align: center;">{lang.USED_BY}</td>
+		<td style="text-align: center;">&nbsp;<a href="{lang.U_DOWNLOAD}">{L_DOWNLOAD}</a>&nbsp;|&nbsp;<a href="{lang.U_DELETE}">{L_DELETE}</a></td>
+	</tr>
+	<!-- END lang -->
+	<!-- IF .notinst -->
+	<tr>
+		<td class="row3" colspan="5"><strong>{L_UNINSTALLED_LANGUAGE_PACKS}</strong></td>
+	</tr>
+	<!-- ENDIF -->
+	<!-- BEGIN notinst -->
+		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td>{notinst.NAME}</td>
+		<td>{notinst.LOCAL_NAME}</td>
+		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td>
+		<td colspan="2" style="text-align: center;"><a href="{notinst.U_INSTALL}">{L_INSTALL}</a></td>
+	</tr>
+	<!-- END notinst -->
+	</tbody>
+	</table>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_logs.html

@@ -0,0 +1,93 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_EXPLAIN}</p>
+
+<form id="list" method="post" action="{U_ACTION}">
+
+<fieldset class="display-options" style="float: left">
+	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+</fieldset>
+
+<!-- IF PAGINATION -->
+<div class="pagination" style="float: right; margin: 15px 0 2px 0">
+	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+</div>
+<!-- ENDIF -->
+
+<div class="clearfix">&nbsp;</div>
+<div><br style="clear: both;" /></div>
+
+<!-- IF .log -->
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_USERNAME}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
+		<th>{L_ACTION}</th>
+		<!-- IF S_CLEARLOGS -->
+			<th>{L_MARK}</th>
+		<!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN log -->
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td>
+				{log.USERNAME}
+				<!-- IF log.REPORTEE_USERNAME -->
+				<br />&raquo; {log.REPORTEE_USERNAME}
+				<!-- ENDIF -->
+			</td>
+			<td style="text-align: center;">{log.IP}</td>
+			<td style="text-align: center;">{log.DATE}</td>
+			<td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td>
+			<!-- IF S_CLEARLOGS -->
+				<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
+			<!-- ENDIF -->
+		</tr>
+	<!-- END log -->
+	</tbody>
+	</table>
+
+<!-- IF PAGINATION -->
+	<div class="pagination">
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+<!-- ENDIF -->
+
+<!-- ELSE -->
+	<div class="errorbox">
+		<p>{L_NO_ENTRIES}</p>
+	</div>
+<!-- ENDIF -->
+
+<fieldset class="display-options">
+	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+	<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	{S_FORM_TOKEN}
+</fieldset>
+<hr />
+
+<!-- IF S_SHOW_FORUMS -->
+	<fieldset class="quick">
+		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
+		<input class="button2" type="submit" value="{L_GO}" />
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF .log and S_CLEARLOGS -->
+	<fieldset class="quick">
+		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br />
+		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+	</fieldset>
+<!-- ENDIF -->
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_main.html

@@ -0,0 +1,255 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_RESTORE_PERMISSIONS -->
+
+	<h1>{L_PERMISSIONS_TRANSFERRED}</h1>
+
+	<p>{L_PERMISSIONS_TRANSFERRED_EXPLAIN}</p>
+
+<!-- ELSE -->
+
+	<h1>{L_WELCOME_PHPBB}</h1>
+
+	<p>{L_ADMIN_INTRO}</p>
+
+	<!-- IF S_VERSIONCHECK_FAIL -->
+		<div class="errorbox notice">
+			<p>{L_VERSIONCHECK_FAIL}</p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+		</div>
+	<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+		</div>
+	<!-- ENDIF -->
+
+
+	<!-- IF S_REMOVE_INSTALL -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_REMOVE_INSTALL}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_WRITABLE_CONFIG -->
+		<div class="errorbox notice">
+			<p>{L_WRITABLE_CONFIG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_PHP_VERSION_OLD -->
+		<div class="errorbox notice">
+			<p>{L_PHP_VERSION_OLD}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<table cellspacing="1">
+		<caption>{L_FORUM_STATS}</caption>
+		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+	<thead>
+	<tr>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td>{L_NUMBER_POSTS}: </td>
+		<td><strong>{TOTAL_POSTS}</strong></td>
+		<td>{L_POSTS_PER_DAY}: </td>
+		<td><strong>{POSTS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_TOPICS}: </td>
+		<td><strong>{TOTAL_TOPICS}</strong></td>
+		<td>{L_TOPICS_PER_DAY}: </td>
+		<td><strong>{TOPICS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_USERS}: </td>
+		<td><strong>{TOTAL_USERS}</strong></td>
+		<td>{L_USERS_PER_DAY}: </td>
+		<td><strong>{USERS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_FILES}: </td>
+		<td><strong>{TOTAL_FILES}</strong></td>
+		<td>{L_FILES_PER_DAY}: </td>
+		<td><strong>{FILES_PER_DAY}</strong></td>
+	</tr>
+
+
+	<tr>
+		<td>{L_BOARD_STARTED}: </td>
+		<td><strong>{START_DATE}</strong></td>
+		<td>{L_AVATAR_DIR_SIZE}: </td>
+		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SIZE}: </td>
+		<td><strong>{DBSIZE}</strong></td>
+		<td>{L_UPLOAD_DIR_SIZE}: </td>
+		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SERVER_INFO}: </td>
+		<td><strong>{DATABASE_INFO}</strong></td>
+		<td>{L_GZIP_COMPRESSION}: </td>
+		<td><strong>{GZIP_COMPRESSION}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_BOARD_VERSION}: </td>
+		<td>
+			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+		</td>
+	<!-- IF S_TOTAL_ORPHAN -->
+		<td>{L_NUMBER_ORPHAN}: </td>
+		<td><strong>{TOTAL_ORPHAN}</strong></td>
+	<!-- ELSE -->
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	<!-- ENDIF -->
+	</tr>
+	</tbody>
+	</table>
+
+	<!-- IF S_ACTION_OPTIONS -->
+		<fieldset>
+			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
+
+			<form id="action_online_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span>&nbsp;</span></dt>
+					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_date_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span>&nbsp;</span></dt>
+					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_stats_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_user_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_db_track_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<!-- IF S_FOUNDER -->
+			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+			<form id="action_purge_cache_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+			<!-- ENDIF -->
+  		</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF .log -->
+		<h2>{L_ADMIN_LOG}</h2>
+
+		<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
+
+		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
+
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_USERNAME}</th>
+			<th>{L_IP}</th>
+			<th>{L_TIME}</th>
+			<th>{L_ACTION}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN log -->
+			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+				<td>{log.USERNAME}</td>
+				<td style="text-align: center;">{log.IP}</td>
+				<td style="text-align: center;">{log.DATE}</td>
+				<td>{log.ACTION}</td>
+			</tr>
+		<!-- END log -->
+		</tbody>
+		</table>
+
+		<br />
+
+	<!-- ENDIF -->
+
+	<!-- IF S_INACTIVE_USERS -->
+		<h2>{L_INACTIVE_USERS}</h2>
+
+		<p>{L_INACTIVE_USERS_EXPLAIN_INDEX}</p>
+
+		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
+
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_USERNAME}</th>
+			<th>{L_JOINED}</th>
+			<th>{L_INACTIVE_DATE}</th>
+			<th>{L_LAST_VISIT}</th>
+			<th>{L_INACTIVE_REASON}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN inactive -->
+			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+				<td style="vertical-align: top;">
+					{inactive.USERNAME_FULL}
+					<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+				</td>
+				<td style="vertical-align: top;">{inactive.JOINED}</td>
+				<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
+				<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
+				<td style="vertical-align: top;">
+					{inactive.REASON}
+					<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
+				</td>
+			</tr>
+		<!-- BEGINELSE -->
+			<tr>
+				<td colspan="5" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+			</tr>
+		<!-- END inactive -->
+		</tbody>
+		</table>
+
+	<!-- ENDIF -->
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_modules.html

@@ -0,0 +1,212 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<!-- IF S_EDIT_MODULE -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+		function display_options(value)
+		{
+			if (value == 'category')
+			{
+				dE('modoptions', -1);
+			}
+			else
+			{
+				dE('modoptions', 1);
+			}
+		}
+
+		function display_modes(value)
+		{
+			// Find the old select tag
+			var item = document.getElementById('module_mode');
+
+			// Create the new select tag
+			var new_node = document.createElement('select');
+			new_node.setAttribute('id', 'module_mode');
+			new_node.setAttribute('name', 'module_mode');
+
+			// Substitute it for the old one
+			item.parentNode.replaceChild(new_node, item);
+
+			// Reset the variable
+			item = document.getElementById('module_mode');
+
+			var j = 0;
+<!-- BEGIN m_names -->
+		
+			if (value == '{m_names.A_NAME}')
+			{
+	<!-- BEGIN modes -->
+				item.options[j] = new Option('{m_names.modes.A_VALUE}');
+				item.options[j].value = '{m_names.modes.A_OPTION}';
+				j++;
+	<!-- END modes -->
+			}
+<!-- END m_names -->
+
+			// select first item
+			item.options[0].selected = true;
+		}
+
+	// ]]>
+	</script>
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE} :: {MODULENAME}</h1>
+
+	<p>{L_EDIT_MODULE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="moduleedit" method="post" action="{U_EDIT_ACTION}">
+
+	<fieldset>
+		<legend>{L_GENERAL_OPTIONS}</legend>
+	<dl>
+		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br />
+		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
+		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
+		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>
+	</dl>
+	<dl>
+		<dt><label for="parent_id">{L_PARENT}:</label></dt>
+		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
+	</dl>
+	<hr />
+	<dl>
+		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
+		<dl>
+			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br />
+			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>
+			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br />
+			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>
+			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
+		</dl>
+	</div>
+
+	<p class="submit-buttons">
+		<input type="hidden" name="action" value="{ACTION}" />
+		<input type="hidden" name="m" value="{MODULE_ID}" />
+		
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+	<h1>{L_ACP_MODULE_MANAGEMENT}</h1>
+
+	<p>{L_ACP_MODULE_MANAGEMENT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<table cellspacing="1">
+	<tbody>
+	<tr>
+		<td class="row3">{NAVIGATION}<!-- IF S_NO_MODULES --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <!-- IF MODULE_ENABLED --><a href="{U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->]<!-- ENDIF --></td>
+	</tr>
+	</tbody>
+	</table>
+
+	<!-- IF .modules -->
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
+		<tbody>
+		<!-- BEGIN modules -->
+			<tr>
+				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
+				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
+				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
+				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
+					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW-->
+						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
+						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ELSE -->
+						{ICON_MOVE_UP_DISABLED}
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
+					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
+					<a href="{modules.U_DELETE}">{ICON_DELETE}</a>
+				</td>
+			</tr>
+		<!-- END modules -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<div class="clearfix">&nbsp;</div>
+
+	<form id="quick" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<input type="hidden" name="action" value="quickadd" />
+
+		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
+		<input class="button2" name="quickadd" type="submit" value="{L_ADD_MODULE}" />
+	</fieldset>
+	
+	</form>
+
+	<form id="module" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+		<input type="hidden" name="action" value="add" />
+		<input type="hidden" name="module_parent_id" value="{PARENT_ID}" />
+
+		<input type="text" name="module_langname" maxlength="255" /> 
+		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
+	</fieldset>
+
+	</form>
+
+	<div class="clearfix">&nbsp;</div><br style="clear: both;" />
+	
+	<form id="mselect" method="post" action="{U_SEL_ACTION}">
+	<fieldset class="quick">
+		{L_SELECT_MODULE}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
+
+		<input class="button2" type="submit" value="{L_GO}" />
+	</fieldset>
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->