Vergleich install/upgrade.php - 1.8.5 - 1.8.27

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 47Zeile 47

// Include the files necessary for installation
require_once MYBB_ROOT."inc/class_timers.php";

 

// Include the files necessary for installation
require_once MYBB_ROOT."inc/class_timers.php";

require_once MYBB_ROOT."inc/class_xml.php";

 
require_once MYBB_ROOT.'inc/class_language.php';

$lang = new MyLanguage();

 
require_once MYBB_ROOT.'inc/class_language.php';

$lang = new MyLanguage();

$lang->set_path(MYBB_ROOT.'install/resources/');

$lang->set_path(INSTALL_ROOT.'resources/');

$lang->load('language');

// If we're upgrading from an SQLite installation, make sure we still work.

$lang->load('language');

// If we're upgrading from an SQLite installation, make sure we still work.

Zeile 62Zeile 61

// 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';


require_once MYBB_ROOT."inc/db_{$config['database']['type']}.php";
switch($config['database']['type'])


require_once MYBB_ROOT."inc/db_{$config['database']['type']}.php";
switch($config['database']['type'])

Zeile 71Zeile 71
		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;

Zeile 143Zeile 149

// Include the necessary contants for installation
$grouppermignore = array("gid", "type", "title", "description", "namestyle", "usertitle", "stars", "starimage", "image");

 

// Include the necessary contants for installation
$grouppermignore = array("gid", "type", "title", "description", "namestyle", "usertitle", "stars", "starimage", "image");

$groupzerogreater = array("pmquota", "maxpmrecipients", "maxreputationsday", "attachquota", "maxemails", "maxwarningsday", "maxposts", "edittimelimit", "canusesigxposts", "maxreputationsperthread");

$groupzerogreater = array("pmquota", "maxpmrecipients", "maxreputationsday", "attachquota", "maxemails", "maxwarningsday", "maxposts", "edittimelimit", "canusesigxposts", "maxreputationsperuser", "maxreputationsperthread", "emailfloodtime");

$displaygroupfields = array("title", "description", "namestyle", "usertitle", "stars", "starimage", "image");
$fpermfields = array('canview', 'canviewthreads', 'candlattachments', 'canpostthreads', 'canpostreplys', 'canpostattachments', 'canratethreads', 'caneditposts', 'candeleteposts', 'candeletethreads', 'caneditattachments', 'canpostpolls', 'canvotepolls', 'cansearch', 'modposts', 'modthreads', 'modattachments', 'mod_edit_posts');


$displaygroupfields = array("title", "description", "namestyle", "usertitle", "stars", "starimage", "image");
$fpermfields = array('canview', 'canviewthreads', 'candlattachments', 'canpostthreads', 'canpostreplys', 'canpostattachments', 'canratethreads', 'caneditposts', 'candeleteposts', 'candeletethreads', 'caneditattachments', 'canpostpolls', 'canvotepolls', 'cansearch', 'modposts', 'modthreads', 'modattachments', 'mod_edit_posts');


Zeile 163Zeile 169
	if($mybb->input['action'] == "logout" && $mybb->user['uid'])
	{
		// Check session ID if we have one

 
	if($mybb->input['action'] == "logout" && $mybb->user['uid'])
	{
		// Check session ID if we have one

		if($mybb->get_input('logoutkey') != $mybb->user['logoutkey'])

		if($mybb->get_input('logoutkey') !== $mybb->user['logoutkey'])

		{
			$output->print_error("Your user ID could not be verified to log you out.  This may have been because a malicious Javascript was attempting to log you out automatically.  If you intended to log out, please click the Log Out button at the top menu.");
		}

		{
			$output->print_error("Your user ID could not be verified to log you out.  This may have been because a malicious Javascript was attempting to log you out automatically.  If you intended to log out, please click the Log Out button at the top menu.");
		}

Zeile 193Zeile 199
			'fields' => array('username', 'password', 'salt', 'loginkey')
		);
		$user = get_user_by_username($mybb->get_input('username'), $options);

 
			'fields' => array('username', 'password', 'salt', 'loginkey')
		);
		$user = get_user_by_username($mybb->get_input('username'), $options);





		if(!$user['uid'])
		{
			$output->print_error("The username you have entered appears to be invalid.");

		if(!$user['uid'])
		{
			$output->print_error("The username you have entered appears to be invalid.");

Zeile 207Zeile 213
			}
		}


 
			}
		}


		my_setcookie("mybbuser", $user['uid']."_".$user['loginkey'], null, true);

		my_setcookie("mybbuser", $user['uid']."_".$user['loginkey'], null, true, "lax");


		header("Location: ./upgrade.php");
	}


		header("Location: ./upgrade.php");
	}

Zeile 217Zeile 223
	if($mybb->user['uid'] == 0)
	{
		$output->print_header($lang->please_login, "errormsg", 0, 1);

 
	if($mybb->user['uid'] == 0)
	{
		$output->print_header($lang->please_login, "errormsg", 0, 1);





		$output->print_contents('<p>'.$lang->login_desc.'</p>
<form action="upgrade.php" method="post">
	<div class="border_wrapper">

		$output->print_contents('<p>'.$lang->login_desc.'</p>
<form action="upgrade.php" method="post">
	<div class="border_wrapper">

Zeile 247Zeile 253
		$output->print_footer("");

		exit;

 
		$output->print_footer("");

		exit;

	}

	}

	else if($mybb->usergroup['cancp'] != 1 && $mybb->usergroup['cancp'] != 'yes')
	{
		$output->print_error($lang->sprintf($lang->no_permision, $mybb->user['logoutkey']));
	}

	if(!$mybb->input['action'] || $mybb->input['action'] == "intro")

 
	else if($mybb->usergroup['cancp'] != 1 && $mybb->usergroup['cancp'] != 'yes')
	{
		$output->print_error($lang->sprintf($lang->no_permision, $mybb->user['logoutkey']));
	}

	if(!$mybb->input['action'] || $mybb->input['action'] == "intro")

	{

	{

		$output->print_header();

 
		$output->print_header();





		if($db->table_exists("upgrade_data"))

 
		if($db->table_exists("upgrade_data"))

		{

		{

			$db->drop_table("upgrade_data");
		}

 
			$db->drop_table("upgrade_data");
		}

 

		$collation = $db->build_create_table_collation();
		
		$engine = '';
		if($db->type == "mysql" || $db->type == "mysqli")
		{
			$engine = 'ENGINE=MyISAM';
		}
		

		$db->write_query("CREATE TABLE ".TABLE_PREFIX."upgrade_data (
			title varchar(30) NOT NULL,
			contents text NOT NULL,
			UNIQUE (title)

 
		$db->write_query("CREATE TABLE ".TABLE_PREFIX."upgrade_data (
			title varchar(30) NOT NULL,
			contents text NOT NULL,
			UNIQUE (title)

		);");

		) {$engine}{$collation};");


		$dh = opendir(INSTALL_ROOT."resources");



		$dh = opendir(INSTALL_ROOT."resources");


Zeile 317Zeile 332
		unset($upgradescripts);
		unset($upgradescript);


 
		unset($upgradescripts);
		unset($upgradescript);


		$output->print_contents($lang->sprintf($lang->upgrade_welcome, $mybb->version)."<p><select name=\"from\">$vers</select>".$lang->upgrade_send_stats);
		$output->print_footer("doupgrade");









		if(end($version_history) == reset($key_order) && empty($mybb->input['force']))
		{
			$output->print_contents($lang->upgrade_not_needed);
			$output->print_footer("finished");
		}
		else
		{
			$output->print_contents($lang->sprintf($lang->upgrade_welcome, $mybb->version)."<p><select name=\"from\">$vers</select>".$lang->upgrade_send_stats);
			$output->print_footer("doupgrade");
		}

	}
	elseif($mybb->input['action'] == "doupgrade")
	{

	}
	elseif($mybb->input['action'] == "doupgrade")
	{

Zeile 383Zeile 406
	}
}


 
	}
}


 
/**
 * Do the upgrade changes
 */

function upgradethemes()
{
	global $output, $db, $system_upgrade_detail, $lang, $mybb;

function upgradethemes()
{
	global $output, $db, $system_upgrade_detail, $lang, $mybb;

Zeile 430Zeile 456
			cachefile varchar(100) NOT NULL default '',
			lastmodified bigint(30) NOT NULL default '0',
			PRIMARY KEY(sid)

 
			cachefile varchar(100) NOT NULL default '',
			lastmodified bigint(30) NOT NULL default '0',
			PRIMARY KEY(sid)

		) ENGINE=MyISAM{$charset};");

		$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme.xml');
		if(file_exists(MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php"))
		{
			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php";
		}

		) ENGINE=MyISAM{$charset};");

		$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme.xml');
		if(file_exists(MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php"))
		{
			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php";
		}

		else if(file_exists(MYBB_ROOT."admin/inc/functions_themes.php"))
		{
			require_once MYBB_ROOT."admin/inc/functions_themes.php";

		else if(file_exists(MYBB_ROOT."admin/inc/functions_themes.php"))
		{
			require_once MYBB_ROOT."admin/inc/functions_themes.php";

Zeile 477Zeile 503
		}
		else
		{

 
		}
		else
		{

			$output->print_error();

			$output->print_error($lang->no_theme_functions_file);

		}

		// Import master theme

		}

		// Import master theme

Zeile 488Zeile 514

	// Now deal with the master templates
	$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme.xml');

 

	// Now deal with the master templates
	$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme.xml');

	$parser = new XMLParser($contents);

	$parser = create_xml_parser($contents);

	$tree = $parser->get_tree();

	$theme = $tree['theme'];

	$tree = $parser->get_tree();

	$theme = $tree['theme'];

Zeile 533Zeile 559
	$output->print_footer("rebuildsettings");
}


 
	$output->print_footer("rebuildsettings");
}


 
/**
 * Update the settings
 */

function buildsettings()
{
	global $db, $output, $system_upgrade_detail, $lang;

function buildsettings()
{
	global $db, $output, $system_upgrade_detail, $lang;

Zeile 551Zeile 580
	$output->print_footer("buildcaches");
}


 
	$output->print_footer("buildcaches");
}


 
/**
 * Rebuild caches
 */

function buildcaches()
{
	global $db, $output, $cache, $lang, $mybb;

function buildcaches()
{
	global $db, $output, $cache, $lang, $mybb;

Zeile 558Zeile 590
	$output->print_header($lang->upgrade_datacache_building);

	$contents .= $lang->upgrade_building_datacache;

 
	$output->print_header($lang->upgrade_datacache_building);

	$contents .= $lang->upgrade_building_datacache;

	require_once MYBB_ROOT."inc/class_datacache.php";
	$cache = new datacache;




	$cache->update_version();
	$cache->update_attachtypes();
	$cache->update_smilies();

	$cache->update_version();
	$cache->update_attachtypes();
	$cache->update_smilies();

Zeile 580Zeile 611
	$cache->update_tasks();
	$cache->update_spiders();
	$cache->update_bannedips();

 
	$cache->update_tasks();
	$cache->update_spiders();
	$cache->update_bannedips();

	$cache->update_banned();

 
	$cache->update_birthdays();
	$cache->update_most_replied_threads();
	$cache->update_most_viewed_threads();
	$cache->update_groupleaders();
	$cache->update_threadprefixes();
	$cache->update_forumsdisplay();

 
	$cache->update_birthdays();
	$cache->update_most_replied_threads();
	$cache->update_most_viewed_threads();
	$cache->update_groupleaders();
	$cache->update_threadprefixes();
	$cache->update_forumsdisplay();

 
	$cache->update_reportreasons(true);


	$contents .= $lang->done."</p>";



	$contents .= $lang->done."</p>";


Zeile 594Zeile 625
	$output->print_footer("finished");
}


 
	$output->print_footer("finished");
}


 
/**
 * Called as latest function. Send statistics, create lock file etc
 */

function upgradedone()
{
	global $db, $output, $mybb, $lang, $config, $plugins;

	ob_start();

 
function upgradedone()
{
	global $db, $output, $mybb, $lang, $config, $plugins;

	ob_start();

	$output->print_header("Upgrade Complete");

	$output->print_header($lang->upgrade_complete);


	$allow_anonymous_info = get_upgrade_store("allow_anonymous_info");
	if($allow_anonymous_info == 1)


	$allow_anonymous_info = get_upgrade_store("allow_anonymous_info");
	if($allow_anonymous_info == 1)

Zeile 666Zeile 700
	$output->print_footer();
}


 
	$output->print_footer();
}


 
/**
 * Show the finish page
 */

function whatsnext()
{
	global $output, $db, $system_upgrade_detail, $lang;

function whatsnext()
{
	global $output, $db, $system_upgrade_detail, $lang;

Zeile 682Zeile 719
	}
}


 
	}
}


 
/**
 * Determine the next function we need to call
 *
 * @param int $from
 * @param string $func
 *
 * @return string
 */

function next_function($from, $func="dbchanges")
{
	global $oldvers, $system_upgrade_detail, $currentscript, $cache;

function next_function($from, $func="dbchanges")
{
	global $oldvers, $system_upgrade_detail, $currentscript, $cache;

Zeile 712Zeile 757
	return $function;
}


 
	return $function;
}


 
/**
 * @param string $module
 */

function load_module($module)
{
	global $system_upgrade_detail, $currentscript, $upgrade_detail;

function load_module($module)
{
	global $system_upgrade_detail, $currentscript, $upgrade_detail;

Zeile 731Zeile 779
	}
}


 
	}
}


 
/**
 * Get a value from our upgrade data cache
 *
 * @param string $title
 *
 * @return mixed
 */

function get_upgrade_store($title)
{
	global $db;

function get_upgrade_store($title)
{
	global $db;

Zeile 740Zeile 795
	return my_unserialize($data['contents']);
}


 
	return my_unserialize($data['contents']);
}


 
/**
 * @param string $title
 * @param mixed $contents
 */

function add_upgrade_store($title, $contents)
{
	global $db;

function add_upgrade_store($title, $contents)
{
	global $db;

Zeile 751Zeile 810
	$db->replace_query("upgrade_data", $replace_array, "title");
}


 
	$db->replace_query("upgrade_data", $replace_array, "title");
}


 
/**
 * @param int $redo 2 means that all setting tables will be dropped and recreated
 *
 * @return array
 */

function sync_settings($redo=0)
{
	global $db;

function sync_settings($redo=0)
{
	global $db;

Zeile 869Zeile 933
		}
	}
	$settings_xml = file_get_contents(INSTALL_ROOT."resources/settings.xml");

 
		}
	}
	$settings_xml = file_get_contents(INSTALL_ROOT."resources/settings.xml");

	$parser = new XMLParser($settings_xml);

	$parser = create_xml_parser($settings_xml);

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

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

Zeile 941Zeile 1005
	$query = $db->simple_select("settings", "*", "", array('order_by' => 'title'));
	while($setting = $db->fetch_array($query))
	{

 
	$query = $db->simple_select("settings", "*", "", array('order_by' => 'title'));
	while($setting = $db->fetch_array($query))
	{

		$setting['value'] = str_replace("\"", "\\\"", $setting['value']);


		$setting['name'] = addcslashes($setting['name'], "\\'");
		$setting['value'] = addcslashes($setting['value'], '\\"$');

		$settings .= "\$settings['{$setting['name']}'] = \"".$setting['value']."\";\n";
	}
	$settings = "<?php\n/*********************************\ \n  DO NOT EDIT THIS FILE, PLEASE USE\n  THE SETTINGS EDITOR\n\*********************************/\n\n$settings\n";

		$settings .= "\$settings['{$setting['name']}'] = \"".$setting['value']."\";\n";
	}
	$settings = "<?php\n/*********************************\ \n  DO NOT EDIT THIS FILE, PLEASE USE\n  THE SETTINGS EDITOR\n\*********************************/\n\n$settings\n";

Zeile 951Zeile 1016
	return array($groupcount, $settingcount);
}


 
	return array($groupcount, $settingcount);
}


 
/**
 * @param int $redo 2 means that the tasks table will be dropped and recreated
 *
 * @return int
 */

function sync_tasks($redo=0)
{
	global $db;

function sync_tasks($redo=0)
{
	global $db;

Zeile 1031Zeile 1101

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

 

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

	$parser = new XMLParser($task_file);

	$parser = create_xml_parser($task_file);

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


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


Zeile 1073Zeile 1143
	return $taskcount;
}


 
	return $taskcount;
}


 
/**
 * Write our settings to the settings file
 */

function write_settings()
{
	global $db;
	$query = $db->simple_select("settings", "*", "", array('order_by' => 'title'));
	while($setting = $db->fetch_array($query))
	{

 
function write_settings()
{
	global $db;
	$query = $db->simple_select("settings", "*", "", array('order_by' => 'title'));
	while($setting = $db->fetch_array($query))
	{

		$setting['value'] = $db->escape_string($setting['value']);


		$setting['name'] = addcslashes($setting['name'], "\\'");
		$setting['value'] = addcslashes($setting['value'], '\\"$');

		$settings .= "\$settings['{$setting['name']}'] = \"{$setting['value']}\";\n";
	}
	if(!empty($settings))

		$settings .= "\$settings['{$setting['name']}'] = \"{$setting['value']}\";\n";
	}
	if(!empty($settings))