Vergleich install/index.php - 1.8.24 - 1.8.39

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 52Zeile 52
	}
}


 
	}
}


require_once MYBB_ROOT.'inc/class_xml.php';

 
require_once MYBB_ROOT.'inc/functions_user.php';
require_once MYBB_ROOT.'inc/class_language.php';
$lang = new MyLanguage();

require_once MYBB_ROOT.'inc/functions_user.php';
require_once MYBB_ROOT.'inc/class_language.php';
$lang = new MyLanguage();

Zeile 61Zeile 60

// Load DB interface
require_once MYBB_ROOT."inc/db_base.php";

 

// Load DB interface
require_once MYBB_ROOT."inc/db_base.php";

 
require_once MYBB_ROOT."inc/AbstractPdoDbDriver.php";


// Prevent any shut down functions from running
$done_shutdown = 1;


// Prevent any shut down functions from running
$done_shutdown = 1;

Zeile 121Zeile 121
			'short_title' => 'SQLite',
			'structure_file' => 'sqlite_db_tables.php',
			'population_file' => 'pgsql_db_inserts.php'

 
			'short_title' => 'SQLite',
			'structure_file' => 'sqlite_db_tables.php',
			'population_file' => 'pgsql_db_inserts.php'

 
		);
	}

	if (in_array('pgsql', $supported_dbs)) {
		$dboptions['pgsql_pdo'] = array(
			'class' => 'PostgresPdoDbDriver',
			'title' => 'PostgreSQL (PDO)',
			'short_title' => 'PostgreSQL (PDO)',
			'structure_file' => 'pgsql_db_tables.php',
			'population_file' => 'pgsql_db_inserts.php'
		);
	}

	if (in_array('mysql', $supported_dbs)) {
		$dboptions['mysql_pdo'] = array(
			'class' => 'MysqlPdoDbDriver',
			'title' => 'MySQL (PDO)',
			'short_title' => 'MySQL (PDO)',
			'structure_file' => 'mysql_db_tables.php',
			'population_file' => 'mysql_db_inserts.php'

		);
	}
}

		);
	}
}

Zeile 1118Zeile 1138
	else
	{
		$configstatus = $lang->sprintf($lang->req_step_span_pass, $lang->writable);

 
	else
	{
		$configstatus = $lang->sprintf($lang->req_step_span_pass, $lang->writable);

 
		@fclose($configwritable);

	}

 
	}

	@fclose($configwritable);

 

	// Check settings file is writable
	$settingswritable = @fopen(MYBB_ROOT.'inc/settings.php', 'w');


	// Check settings file is writable
	$settingswritable = @fopen(MYBB_ROOT.'inc/settings.php', 'w');

Zeile 1132Zeile 1152
	else
	{
		$settingsstatus = $lang->sprintf($lang->req_step_span_pass, $lang->writable);

 
	else
	{
		$settingsstatus = $lang->sprintf($lang->req_step_span_pass, $lang->writable);

 
		@fclose($settingswritable);

	}

 
	}

	@fclose($settingswritable);

 

	// Check cache directory is writable
	$cachewritable = @fopen(MYBB_ROOT.'cache/test.write', 'w');


	// Check cache directory is writable
	$cachewritable = @fopen(MYBB_ROOT.'cache/test.write', 'w');

Zeile 1142Zeile 1162
		$errors[] = $lang->sprintf($lang->req_step_error_box, $lang->req_step_error_cachedir);
		$cachestatus = $lang->sprintf($lang->req_step_span_fail, $lang->not_writable);
		$showerror = 1;

 
		$errors[] = $lang->sprintf($lang->req_step_error_box, $lang->req_step_error_cachedir);
		$cachestatus = $lang->sprintf($lang->req_step_span_fail, $lang->not_writable);
		$showerror = 1;

		@fclose($cachewritable);
	}
	else

	}
	else


	{
		$cachestatus = $lang->sprintf($lang->req_step_span_pass, $lang->writable);
		@fclose($cachewritable);

	{
		$cachestatus = $lang->sprintf($lang->req_step_span_pass, $lang->writable);
		@fclose($cachewritable);

Zeile 1159Zeile 1178
	{
		$errors[] = $lang->sprintf($lang->req_step_error_box, $lang->req_step_error_uploaddir);
		$uploadsstatus = $lang->sprintf($lang->req_step_span_fail, $lang->not_writable);

 
	{
		$errors[] = $lang->sprintf($lang->req_step_error_box, $lang->req_step_error_uploaddir);
		$uploadsstatus = $lang->sprintf($lang->req_step_span_fail, $lang->not_writable);

		$showerror = 1;
		@fclose($uploadswritable);
	}
	else

		$showerror = 1;
	}
	else


	{
		$uploadsstatus = $lang->sprintf($lang->req_step_span_pass, $lang->writable);
		@fclose($uploadswritable);

	{
		$uploadsstatus = $lang->sprintf($lang->req_step_span_pass, $lang->writable);
		@fclose($uploadswritable);

Zeile 1178Zeile 1196
		$errors[] =  $lang->sprintf($lang->req_step_error_box, $lang->req_step_error_avatardir);
		$avatarsstatus = $lang->sprintf($lang->req_step_span_fail, $lang->not_writable);
		$showerror = 1;

 
		$errors[] =  $lang->sprintf($lang->req_step_error_box, $lang->req_step_error_avatardir);
		$avatarsstatus = $lang->sprintf($lang->req_step_span_fail, $lang->not_writable);
		$showerror = 1;

		@fclose($avatarswritable);

 
	}
	else
	{

	}
	else
	{

Zeile 1199Zeile 1216
		echo "\n			<input type=\"hidden\" name=\"action\" value=\"{$mybb->input['action']}\" />";
		echo "\n				<div id=\"next_button\"><input type=\"submit\" class=\"submit_button\" value=\"{$lang->recheck} &raquo;\" /></div><br style=\"clear: both;\" />\n";
		$output->print_footer();

 
		echo "\n			<input type=\"hidden\" name=\"action\" value=\"{$mybb->input['action']}\" />";
		echo "\n				<div id=\"next_button\"><input type=\"submit\" class=\"submit_button\" value=\"{$lang->recheck} &raquo;\" /></div><br style=\"clear: both;\" />\n";
		$output->print_footer();

	}
	else

	}
	else

	{
		echo $lang->req_step_reqcomplete;
		$output->print_footer('database_info');

	{
		echo $lang->req_step_reqcomplete;
		$output->print_footer('database_info');

Zeile 1219Zeile 1236

	echo "<script type=\"text/javascript\">
		function updateDBSettings()

 

	echo "<script type=\"text/javascript\">
		function updateDBSettings()

		{

		{

			var dbengine = \$(\"#dbengine\").val();
			$('.db_settings').each(function()
			{

			var dbengine = \$(\"#dbengine\").val();
			$('.db_settings').each(function()
			{

Zeile 1255Zeile 1272
	$dbengines = '';

	// Loop through database engines

 
	$dbengines = '';

	// Loop through database engines

	foreach($dboptions as $dbfile => $dbtype)
	{

	foreach($dboptions as $dbfile => $dbtype)
	{

		if($mybb->get_input('dbengine') == $dbfile)
		{
			$dbengines .= "<option value=\"{$dbfile}\" selected=\"selected\">{$dbtype['title']}</option>";

		if($mybb->get_input('dbengine') == $dbfile)
		{
			$dbengines .= "<option value=\"{$dbfile}\" selected=\"selected\">{$dbtype['title']}</option>";

Zeile 1294Zeile 1311
		if(empty($mybb->input['config'][$dbfile]['dbpass']))
		{
			$mybb->input['config'][$dbfile]['dbpass'] = '';

 
		if(empty($mybb->input['config'][$dbfile]['dbpass']))
		{
			$mybb->input['config'][$dbfile]['dbpass'] = '';

		}

		}

		if(empty($mybb->input['config'][$dbfile]['encoding']))
		{
			$mybb->input['config'][$dbfile]['encoding'] = "utf8";

		if(empty($mybb->input['config'][$dbfile]['encoding']))
		{
			$mybb->input['config'][$dbfile]['encoding'] = "utf8";

Zeile 1403Zeile 1420
	}

	$mybb->input['config'] = $mybb->get_input('config', MyBB::INPUT_ARRAY);

 
	}

	$mybb->input['config'] = $mybb->get_input('config', MyBB::INPUT_ARRAY);

	$config = $mybb->input['config'][$mybb->input['dbengine']];


	$config = $mybb->input['config'][$mybb->input['dbengine']];


	if(strstr($mybb->input['dbengine'], "sqlite") !== false)
	{
		if(strstr($config['dbname'], "./") !== false || strstr($config['dbname'], "../") !== false || empty($config['dbname']))

	if(strstr($mybb->input['dbengine'], "sqlite") !== false)
	{
		if(strstr($config['dbname'], "./") !== false || strstr($config['dbname'], "../") !== false || empty($config['dbname']))

Zeile 1417Zeile 1434
	// Attempt to connect to the db
	require_once MYBB_ROOT."inc/db_{$mybb->input['dbengine']}.php";
	switch($mybb->input['dbengine'])

 
	// Attempt to connect to the db
	require_once MYBB_ROOT."inc/db_{$mybb->input['dbengine']}.php";
	switch($mybb->input['dbengine'])

	{

	{

		case "sqlite":
			$db = new DB_SQLite;
			break;
		case "pgsql":
			$db = new DB_PgSQL;

 
		case "sqlite":
			$db = new DB_SQLite;
			break;
		case "pgsql":
			$db = new DB_PgSQL;

 
			break;
		case "pgsql_pdo":
			$db = new PostgresPdoDbDriver();

			break;
		case "mysqli":
			$db = new DB_MySQLi;

 
			break;
		case "mysqli":
			$db = new DB_MySQLi;

 
			break;
		case "mysql_pdo":
			$db = new MysqlPdoDbDriver();

			break;
		default:
			$db = new DB_MySQL;
	}
 	$db->error_reporting = 0;

 
			break;
		default:
			$db = new DB_MySQL;
	}
 	$db->error_reporting = 0;

 

	if(!isset($config['encoding']))
	{
		$config['encoding'] = null;
	}


	$connect_array = array(
		"hostname" => $config['dbhost'],


	$connect_array = array(
		"hostname" => $config['dbhost'],

Zeile 1464Zeile 1492
		$errors[] = $lang->db_step_error_tableprefix_too_long;
	}


 
		$errors[] = $lang->db_step_error_tableprefix_too_long;
	}


	if(($db->engine == 'mysql' || $db->engine == 'mysqli') && $config['encoding'] == 'utf8mb4' && version_compare($db->get_version(), '5.5.3', '<'))

	if($connection !== false && ($db->engine == 'mysql' || $db->engine == 'mysqli') && $config['encoding'] == 'utf8mb4' && version_compare($db->get_version(), '5.5.3', '<'))

	{
		$errors[] = $lang->db_step_error_utf8mb4_error;
	}

	{
		$errors[] = $lang->db_step_error_utf8mb4_error;
	}

Zeile 1478Zeile 1506
	if($db->fetch_db_charsets() != false)
	{
		$db_encoding = "\$config['database']['encoding'] = '".addcslashes($config['encoding'], "'")."';";

 
	if($db->fetch_db_charsets() != false)
	{
		$db_encoding = "\$config['database']['encoding'] = '".addcslashes($config['encoding'], "'")."';";

	}

	}

	else
	{
		$db_encoding = "// \$config['database']['encoding'] = '".addcslashes($config['encoding'], "'")."';";

	else
	{
		$db_encoding = "// \$config['database']['encoding'] = '".addcslashes($config['encoding'], "'")."';";

Zeile 1586Zeile 1614
 *  To enable this functionality for the logs below, set the
 *  the number of days before each log should be pruned.
 *  If you set the value to 0, the logs will not be pruned.

 
 *  To enable this functionality for the logs below, set the
 *  the number of days before each log should be pruned.
 *  If you set the value to 0, the logs will not be pruned.

 */


 */


\$config['log_pruning'] = array(
	'admin_logs' => 365, // Administrator logs
	'mod_logs' => 365, // Moderator logs

\$config['log_pruning'] = array(
	'admin_logs' => 365, // Administrator logs
	'mod_logs' => 365, // Moderator logs

Zeile 1622Zeile 1650
 */

\$config['disallowed_remote_addresses'] = array(

 
 */

\$config['disallowed_remote_addresses'] = array(

	'127.0.0.1',


	'0.0.0.0',
	'127.0.0.0/8',

	'10.0.0.0/8',
	'172.16.0.0/12',
	'192.168.0.0/16',

	'10.0.0.0/8',
	'172.16.0.0/12',
	'192.168.0.0/16',

Zeile 1660Zeile 1689
		$val = preg_replace('#mybb_(\S+?)([\s\.,\(]|$)#', $config['tableprefix'].'\\1\\2', $val);
		$val = preg_replace('#;$#', $db->build_create_table_collation().";", $val);
		preg_match('#CREATE TABLE (\S+)(\s?|\(?)\(#i', $val, $match);

 
		$val = preg_replace('#mybb_(\S+?)([\s\.,\(]|$)#', $config['tableprefix'].'\\1\\2', $val);
		$val = preg_replace('#;$#', $db->build_create_table_collation().";", $val);
		preg_match('#CREATE TABLE (\S+)(\s?|\(?)\(#i', $val, $match);

		if($match[1])

		if(!empty($match[1]))

		{
			$db->drop_table($match[1], false, false);
			echo $lang->sprintf($lang->tablecreate_step_created, $match[1]);
		}
		$db->query($val);

 
		{
			$db->drop_table($match[1], false, false);
			echo $lang->sprintf($lang->tablecreate_step_created, $match[1]);
		}
		$db->query($val);

		if($match[1])

		if(!empty($match[1]))

		{
			echo $lang->done . "<br />\n";
		}

		{
			echo $lang->done . "<br />\n";
		}

Zeile 1780Zeile 1809
	// 1.8: Stylesheet Colors
	$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme_colors.xml');


 
	// 1.8: Stylesheet Colors
	$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme_colors.xml');


	require_once MYBB_ROOT."inc/class_xml.php";
	$parser = new XMLParser($contents);

	$parser = create_xml_parser($contents);


	$tree = $parser->get_tree();

	if(is_array($tree) && is_array($tree['colors']))

	$tree = $parser->get_tree();

	if(is_array($tree) && is_array($tree['colors']))

Zeile 1958Zeile 1986
		if(isset($_SERVER['SERVER_ADMIN']) && filter_var($_SERVER['SERVER_ADMIN'], FILTER_VALIDATE_EMAIL))
		{
			$contactemail = $_SERVER['SERVER_ADMIN'];

 
		if(isset($_SERVER['SERVER_ADMIN']) && filter_var($_SERVER['SERVER_ADMIN'], FILTER_VALIDATE_EMAIL))
		{
			$contactemail = $_SERVER['SERVER_ADMIN'];

 
		}
		else
		{
			$contactemail = null;

		}
	}


		}
	}


Zeile 2027Zeile 2059
		$adminuser = $adminemail = '';

		$settings = file_get_contents(INSTALL_ROOT.'resources/settings.xml');

 
		$adminuser = $adminemail = '';

		$settings = file_get_contents(INSTALL_ROOT.'resources/settings.xml');

		$parser = new XMLParser($settings);

		$parser = create_xml_parser($settings);

		$parser->collapse_dups = 0;
		$tree = $parser->get_tree();
		$groupcount = $settingcount = 0;

		$parser->collapse_dups = 0;
		$tree = $parser->get_tree();
		$groupcount = $settingcount = 0;

Zeile 2098Zeile 2130

		include_once MYBB_ROOT."inc/functions_task.php";
		$tasks = file_get_contents(INSTALL_ROOT.'resources/tasks.xml');

 

		include_once MYBB_ROOT."inc/functions_task.php";
		$tasks = file_get_contents(INSTALL_ROOT.'resources/tasks.xml');

		$parser = new XMLParser($tasks);

		$parser = create_xml_parser($tasks);

		$parser->collapse_dups = 0;
		$tree = $parser->get_tree();
		$taskcount = 0;

		$parser->collapse_dups = 0;
		$tree = $parser->get_tree();
		$taskcount = 0;

Zeile 2136Zeile 2168
		echo $lang->sprintf($lang->admin_step_insertedtasks, $taskcount);

		$views = file_get_contents(INSTALL_ROOT.'resources/adminviews.xml');

 
		echo $lang->sprintf($lang->admin_step_insertedtasks, $taskcount);

		$views = file_get_contents(INSTALL_ROOT.'resources/adminviews.xml');

		$parser = new XMLParser($views);

		$parser = create_xml_parser($views);

		$parser->collapse_dups = 0;
		$tree = $parser->get_tree();
		$view_count = 0;

		$parser->collapse_dups = 0;
		$tree = $parser->get_tree();
		$view_count = 0;

Zeile 2240Zeile 2272

	// Insert all of our user groups from the XML file
	$usergroup_settings = file_get_contents(INSTALL_ROOT.'resources/usergroups.xml');

 

	// Insert all of our user groups from the XML file
	$usergroup_settings = file_get_contents(INSTALL_ROOT.'resources/usergroups.xml');

	$parser = new XMLParser($usergroup_settings);

	$parser = create_xml_parser($usergroup_settings);

	$parser->collapse_dups = 0;
	$tree = $parser->get_tree();


	$parser->collapse_dups = 0;
	$tree = $parser->get_tree();


Zeile 2294Zeile 2326
		'lastactive' => $now,
		'lastvisit' => $now,
		'website' => '',

 
		'lastactive' => $now,
		'lastvisit' => $now,
		'website' => '',

		'icq' => '',

 
		'skype' =>'',
		'google' =>'',
		'birthday' => '',

		'skype' =>'',
		'google' =>'',
		'birthday' => '',

Zeile 2336Zeile 2367

	echo $lang->done_step_adminoptions;
	$adminoptions = file_get_contents(INSTALL_ROOT.'resources/adminoptions.xml');

 

	echo $lang->done_step_adminoptions;
	$adminoptions = file_get_contents(INSTALL_ROOT.'resources/adminoptions.xml');

	$parser = new XMLParser($adminoptions);

	$parser = create_xml_parser($adminoptions);

	$parser->collapse_dups = 0;
	$tree = $parser->get_tree();
	$insertmodule = array();

	$parser->collapse_dups = 0;
	$tree = $parser->get_tree();
	$insertmodule = array();

Zeile 2419Zeile 2450
	$cache->update_threadprefixes();
	$cache->update_forumsdisplay();
	$cache->update("plugins", array());

 
	$cache->update_threadprefixes();
	$cache->update_forumsdisplay();
	$cache->update("plugins", array());

 
	$cache->update("mostonline", array(
		'numusers' => 0,
		'time' => 0,
    ));

	$cache->update("internal_settings", array('encryption_key' => random_str(32)));
	$cache->update_default_theme();
	$cache->update_reportreasons(true);

	$cache->update("internal_settings", array('encryption_key' => random_str(32)));
	$cache->update_default_theme();
	$cache->update_reportreasons(true);

Zeile 2427Zeile 2462
	$dh = opendir(INSTALL_ROOT."resources");
	while(($file = readdir($dh)) !== false)
	{

 
	$dh = opendir(INSTALL_ROOT."resources");
	while(($file = readdir($dh)) !== false)
	{

		if(preg_match("#upgrade([0-9]+).php$#i", $file, $match))

		if(preg_match("#upgrade(\d+(p\d+)*).php$#i", $file, $match))

		{
			$version_history[$match[1]] = $match[1];
		}
	}

 
		{
			$version_history[$match[1]] = $match[1];
		}
	}

	sort($version_history, SORT_NUMERIC);

	natsort($version_history);

	$cache->update("version_history", $version_history);

	// Schedule an update check so it occurs an hour ago.  Gotta stay up to date!

	$cache->update("version_history", $version_history);

	// Schedule an update check so it occurs an hour ago.  Gotta stay up to date!

Zeile 2450Zeile 2485
	if(is_writable('./'))
	{
		$lock = @fopen('./lock', 'w');

 
	if(is_writable('./'))
	{
		$lock = @fopen('./lock', 'w');

		$written = @fwrite($lock, '1');
		@fclose($lock);
		if($written)


		if($lock !== false)


		{

 
		{

			echo $lang->done_step_locked;







			$written = @fwrite($lock, '1');
			@fclose($lock);

			if($written)
			{
				echo $lang->done_step_locked;
			}

		}
	}
	if(!$written)

		}
	}
	if(!$written)

Zeile 2468Zeile 2508
/**
 * @param array $config
 *

 
/**
 * @param array $config
 *

 * @return DB_MySQL|DB_MySQLi|DB_PgSQL|DB_SQLite

 * @return DB_MySQL|DB_MySQLi|DB_PgSQL|DB_SQLite|PostgresPdoDbDriver|MysqlPdoDbDriver

 */
function db_connection($config)
{

 */
function db_connection($config)
{

Zeile 2480Zeile 2520
			break;
		case "pgsql":
			$db = new DB_PgSQL;

 
			break;
		case "pgsql":
			$db = new DB_PgSQL;

 
			break;
		case "pgsql_pdo":
			$db = new PostgresPdoDbDriver();

			break;
		case "mysqli":
			$db = new DB_MySQLi;

 
			break;
		case "mysqli":
			$db = new DB_MySQLi;

 
			break;
		case "mysql_pdo":
			$db = new MysqlPdoDbDriver();

			break;
		default:
			$db = new DB_MySQL;

			break;
		default:
			$db = new DB_MySQL;