Vergleich install/upgrade.php - 1.8.0 - 1.8.22

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

require_once MYBB_ROOT.'inc/class_error.php';
$error_handler = new errorHandler();

 

require_once MYBB_ROOT.'inc/class_error.php';
$error_handler = new errorHandler();

 

require_once MYBB_ROOT."inc/functions.php";


require_once MYBB_ROOT."inc/class_core.php";
$mybb = new MyBB;

 

require_once MYBB_ROOT."inc/class_core.php";
$mybb = new MyBB;





require_once MYBB_ROOT."inc/config.php";

 
require_once MYBB_ROOT."inc/config.php";





$orig_config = $config;

 
$orig_config = $config;





if(!is_array($config['database']))
{
	$config['database'] = array(

if(!is_array($config['database']))
{
	$config['database'] = array(

Zeile 45Zeile 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/functions.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_xml.php";
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.
if($config['database']['type'] == 'sqlite3' || $config['database']['type'] == 'sqlite2')
{
	$config['database']['type'] = 'sqlite';

 
$lang->load('language');

// If we're upgrading from an SQLite installation, make sure we still work.
if($config['database']['type'] == 'sqlite3' || $config['database']['type'] == 'sqlite2')
{
	$config['database']['type'] = 'sqlite';

}




}

// Load DB interface
require_once MYBB_ROOT."inc/db_base.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 73Zeile 77
		break;
	default:
		$db = new DB_MySQL;

 
		break;
	default:
		$db = new DB_MySQL;

}


}


// Connect to Database
define('TABLE_PREFIX', $config['database']['table_prefix']);
$db->connect($config['database']);

// Connect to Database
define('TABLE_PREFIX', $config['database']['table_prefix']);
$db->connect($config['database']);

Zeile 83Zeile 87

// Load Settings
if(file_exists(MYBB_ROOT."inc/settings.php"))

 

// Load Settings
if(file_exists(MYBB_ROOT."inc/settings.php"))

{

{

	require_once MYBB_ROOT."inc/settings.php";
}

if(!file_exists(MYBB_ROOT."inc/settings.php") || !$settings)
{
	if(function_exists('rebuild_settings'))

 
	require_once MYBB_ROOT."inc/settings.php";
}

if(!file_exists(MYBB_ROOT."inc/settings.php") || !$settings)
{
	if(function_exists('rebuild_settings'))

	{

	{

		rebuild_settings();

 
		rebuild_settings();

	}
	else
	{
		$options = array(

	}
	else
	{
		$options = array(

			"order_by" => "title",
			"order_dir" => "ASC"
		);

 
			"order_by" => "title",
			"order_dir" => "ASC"
		);





		$query = $db->simple_select("settings", "value, name", "", $options);

		$settings = array();
		while($setting = $db->fetch_array($query))

 
		$query = $db->simple_select("settings", "value, name", "", $options);

		$settings = array();
		while($setting = $db->fetch_array($query))

		{

		{

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

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

Zeile 119Zeile 123
if(substr($settings['bburl'], -1) == "/")
{
	$settings['bburl'] = my_substr($settings['bburl'], 0, -1);

 
if(substr($settings['bburl'], -1) == "/")
{
	$settings['bburl'] = my_substr($settings['bburl'], 0, -1);

}


}


$mybb->settings = &$settings;
$mybb->parse_cookies();


$mybb->settings = &$settings;
$mybb->parse_cookies();


Zeile 139Zeile 143

// 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");

 
$displaygroupfields = array("title", "description", "namestyle", "usertitle", "stars", "starimage", "image");

$fpermfields = array("canview", "candlattachments", "canpostthreads", "canpostreplys", "canpostattachments", "canratethreads", "caneditposts", "candeleteposts", "candeletethreads", "caneditattachments", "canpostpolls", "canvotepolls", "cansearch");

$fpermfields = array('canview', 'canviewthreads', 'candlattachments', 'canpostthreads', 'canpostreplys', 'canpostattachments', 'canratethreads', 'caneditposts', 'candeleteposts', 'candeletethreads', 'caneditattachments', 'canpostpolls', 'canvotepolls', 'cansearch', 'modposts', 'modthreads', 'modattachments', 'mod_edit_posts');


// Include the installation resources
require_once INSTALL_ROOT."resources/output.php";


// Include the installation resources
require_once INSTALL_ROOT."resources/output.php";

Zeile 159Zeile 163
	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.");
		}

		my_unsetcookie("mybbuser");

 
		{
			$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.");
		}

		my_unsetcookie("mybbuser");

		my_unsetcookie("sid");



		if($mybb->user['uid'])
		{
			$time = TIME_NOW;

		if($mybb->user['uid'])
		{
			$time = TIME_NOW;

Zeile 174Zeile 178
				"lastvisit" => $time,
			);
			$db->update_query("users", $lastvisit, "uid='".$mybb->user['uid']."'");

 
				"lastvisit" => $time,
			);
			$db->update_query("users", $lastvisit, "uid='".$mybb->user['uid']."'");

			$db->delete_query("sessions", "sid='".$session->sid."'");

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

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

Zeile 204Zeile 207
			}
		}


 
			}
		}


		$db->delete_query("sessions", "ip='".$db->escape_string($session->ipaddress)."' AND sid != '".$session->sid."'");

		$newsession = array(
			"uid" => $user['uid']
		);

		$db->update_query("sessions", $newsession, "sid='".$session->sid."'");

		// Temporarily set the cookie remember option for the login cookies
		$mybb->user['remember'] = $user['remember'];

		my_setcookie("mybbuser", $user['uid']."_".$user['loginkey'], null, true);
		my_setcookie("sid", $session->sid, -1, true);

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














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


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

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

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

		add_upgrade_store("allow_anonymous_info", $mybb->get_input('allow_anonymous_info', 1));
		require_once INSTALL_ROOT."resources/upgrade".$mybb->get_input('from', 1).".php";

		add_upgrade_store("allow_anonymous_info", $mybb->get_input('allow_anonymous_info', MyBB::INPUT_INT));
		require_once INSTALL_ROOT."resources/upgrade".$mybb->get_input('from', MyBB::INPUT_INT).".php";

		if($db->table_exists("datacache") && $upgrade_detail['requires_deactivated_plugins'] == 1 && $mybb->get_input('donewarning') != "true")
		{
			$plugins = $cache->read('plugins', true);
			if(!empty($plugins['active']))
			{
				$output->print_header();

 
		if($db->table_exists("datacache") && $upgrade_detail['requires_deactivated_plugins'] == 1 && $mybb->get_input('donewarning') != "true")
		{
			$plugins = $cache->read('plugins', true);
			if(!empty($plugins['active']))
			{
				$output->print_header();

				$lang->plugin_warning = "<input type=\"hidden\" name=\"from\" value=\"".$mybb->get_input('from', 1)."\" />\n<input type=\"hidden\" name=\"donewarning\" value=\"true\" />\n<div class=\"error\"><strong><span style=\"color: red\">Warning:</span></strong> <p>There are still ".count($plugins['active'])." plugin(s) active. Active plugins can sometimes cause problems during an upgrade procedure or may break your forum afterward. It is <strong>strongly</strong> reccommended that you deactivate your plugins before continuing.</p></div> <br />";

				$lang->plugin_warning = "<input type=\"hidden\" name=\"from\" value=\"".$mybb->get_input('from', MyBB::INPUT_INT)."\" />\n<input type=\"hidden\" name=\"donewarning\" value=\"true\" />\n<div class=\"error\"><strong><span style=\"color: red\">Warning:</span></strong> <p>There are still ".count($plugins['active'])." plugin(s) active. Active plugins can sometimes cause problems during an upgrade procedure or may break your forum afterward. It is <strong>strongly</strong> reccommended that you deactivate your plugins before continuing.</p></div> <br />";

				$output->print_contents($lang->sprintf($lang->plugin_warning, $mybb->version));
				$output->print_footer("doupgrade");
			}
			else
			{

 
				$output->print_contents($lang->sprintf($lang->plugin_warning, $mybb->version));
				$output->print_footer("doupgrade");
			}
			else
			{

				add_upgrade_store("startscript", $mybb->get_input('from', 1));
				$runfunction = next_function($mybb->get_input('from', 1));

				add_upgrade_store("startscript", $mybb->get_input('from', MyBB::INPUT_INT));
				$runfunction = next_function($mybb->get_input('from', MyBB::INPUT_INT));

			}
		}
		else
		{

 
			}
		}
		else
		{

			add_upgrade_store("startscript", $mybb->get_input('from', 1));
			$runfunction = next_function($mybb->get_input('from', 1));

			add_upgrade_store("startscript", $mybb->get_input('from', MyBB::INPUT_INT));
			$runfunction = next_function($mybb->get_input('from', MyBB::INPUT_INT));

		}
	}
	$currentscript = get_upgrade_store("currentscript");

		}
	}
	$currentscript = get_upgrade_store("currentscript");

Zeile 392Zeile 383
	}
}


 
	}
}


 
/**
 * 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 475Zeile 469
		// Re-import master
		$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme.xml');
		if(file_exists(MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php"))

 
		// Re-import master
		$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.php";
			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php";
		}

			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions.php";
			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php";
		}

Zeile 486Zeile 480
		}
		else
		{

 
		}
		else
		{

			$output->print_error();

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

		}

		// Import master theme

		}

		// Import master theme

Zeile 542Zeile 536
	$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 560Zeile 557
	$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 567Zeile 567
	$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 596Zeile 595
	$cache->update_groupleaders();
	$cache->update_threadprefixes();
	$cache->update_forumsdisplay();

 
	$cache->update_groupleaders();
	$cache->update_threadprefixes();
	$cache->update_forumsdisplay();

 
	$cache->update_reportreasons(true);


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

	$output->print_contents("$contents<p>".$lang->upgrade_continue."</p>");
	$output->print_footer("finished");
}

 

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

	$output->print_contents("$contents<p>".$lang->upgrade_continue."</p>");
	$output->print_footer("finished");
}







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

function upgradedone()
{

 
function upgradedone()
{

	global $db, $output, $mybb, $lang, $config;

	global $db, $output, $mybb, $lang, $config, $plugins;


	ob_start();

 

	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 625Zeile 628

	// Attempt to run an update check
	require_once MYBB_ROOT.'inc/functions_task.php';

 

	// Attempt to run an update check
	require_once MYBB_ROOT.'inc/functions_task.php';

	run_task(12);










	$query = $db->simple_select('tasks', 'tid', "file='versioncheck'");
	$update_check = $db->fetch_array($query);
	if($update_check)
	{
		// Load plugin system for update check
		require_once MYBB_ROOT."inc/class_plugins.php";
		$plugins = new pluginSystem;

		run_task($update_check['tid']);
	}


	if(is_writable("./"))
	{


	if(is_writable("./"))
	{

Zeile 666Zeile 678
	$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 697
	}
}


 
	}
}


 
/**
 * 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 735
	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 757
	}
}


 
	}
}


 
/**
 * 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 773
	return my_unserialize($data['contents']);
}


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


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

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

	$replace_array = array(
		"title" => $db->escape_string($title),

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

	$replace_array = array(
		"title" => $db->escape_string($title),

		"contents" => $db->escape_string(serialize($contents))

		"contents" => $db->escape_string(my_serialize($contents))

	);
	$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 941Zeile 983
	$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 994
	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 1073Zeile 1121
	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))

Zeile 1090Zeile 1142
		fclose($file);
	}
}

 
		fclose($file);
	}
}

?>