Vergleich install/resources/upgrade12.php - 1.8.5 - 1.8.30

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 177Zeile 177
			echo "<input type=\"hidden\" name=\"{$key}\" value=\"{$val}\" />";
}
global $footer_extra;

			echo "<input type=\"hidden\" name=\"{$key}\" value=\"{$val}\" />";
}
global $footer_extra;

		$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

		$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

		$output->print_footer($next_act);
}
else

		$output->print_footer($next_act);
}
else

Zeile 189Zeile 189
		echo "<p><strong>The integrer conversion process is now complete.</strong></p>";
echo "<p>Click next to continue with the upgrade process.</p>";
global $footer_extra;

		echo "<p><strong>The integrer conversion process is now complete.</strong></p>";
echo "<p>Click next to continue with the upgrade process.</p>";
global $footer_extra;

		$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

		$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer($next_act);
}


$output->print_footer($next_act);
}

Zeile 213Zeile 213
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_dbchanges_post1");
}


$output->print_footer("12_dbchanges_post1");
}

Zeile 238Zeile 238
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_dbchanges_post2");
}


$output->print_footer("12_dbchanges_post2");
}

Zeile 274Zeile 274
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_dbchanges_user");
}


$output->print_footer("12_dbchanges_user");
}

Zeile 300Zeile 300
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_dbchanges2");
}


$output->print_footer("12_dbchanges2");
}

Zeile 557Zeile 557

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();


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


Zeile 769Zeile 769
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_dbchanges3");
}


$output->print_footer("12_dbchanges3");
}

Zeile 845Zeile 845
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_dbchanges4");
}


$output->print_footer("12_dbchanges4");
}

Zeile 914Zeile 914
	}

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

	}

$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();


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


Zeile 1076Zeile 1076
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_dbchanges5");
}


$output->print_footer("12_dbchanges5");
}

Zeile 1239Zeile 1239
	) ENGINE=MyISAM{$collation};");

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

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

$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();


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


Zeile 1279Zeile 1279
		$db->insert_query("adminviews", $new_view);
$view_count++;
}

		$db->insert_query("adminviews", $new_view);
$view_count++;
}


$avatardimensions = str_replace('x', '|', my_strtolower($mybb->settings['postmaxavatarsize']));

 

$db->simple_select("users", "uid", "avatar != '' AND avatardimensions = ''");
while($user = $db->fetch_array($query))


$db->simple_select("users", "uid", "avatar != '' AND avatardimensions = ''");
while($user = $db->fetch_array($query))

Zeile 1293Zeile 1291
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_redoconfig");
}


$output->print_footer("12_redoconfig");
}

Zeile 1347Zeile 1345
 *
* Please see the MyBB Docs for advanced
* database configuration for larger installations

 *
* Please see the MyBB Docs for advanced
* database configuration for larger installations

 * http://docs.mybb.com/

 * https://docs.mybb.com/

 */

\$config['database']['type'] = '{$config['dbtype']}';

 */

\$config['database']['type'] = '{$config['dbtype']}';

Zeile 1448Zeile 1446
	echo "<p>Click next to continue with the upgrade process.</p>";

global $footer_extra;

	echo "<p>Click next to continue with the upgrade process.</p>";

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_dbchanges6");
}


$output->print_footer("12_dbchanges6");
}

Zeile 1465Zeile 1463
	}
else
{

	}
else
{

		$ipp = $_POST['ipspage'];

		$ipp = (int)$_POST['ipspage'];

	}

if($_POST['ipstart'])
{

	}

if($_POST['ipstart'])
{

		$startat = $_POST['ipstart'];

		$startat = (int)$_POST['ipstart'];

		$upper = $startat+$ipp;
$lower = $startat;
}

		$upper = $startat+$ipp;
$lower = $startat;
}

Zeile 1520Zeile 1518
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer($nextact);
}


$output->print_footer($nextact);
}

Zeile 1537Zeile 1535
	}
else
{

	}
else
{

		$ipp = $_POST['ipspage'];

		$ipp = (int)$_POST['ipspage'];

	}

if($_POST['ipstart'])
{

	}

if($_POST['ipstart'])
{

		$startat = $_POST['ipstart'];

		$startat = (int)$_POST['ipstart'];

		$upper = $startat+$ipp;
$lower = $startat;
}

		$upper = $startat+$ipp;
$lower = $startat;
}

Zeile 1604Zeile 1602
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer($nextact);
}


$output->print_footer($nextact);
}

Zeile 1621Zeile 1619
	}
else
{

	}
else
{

		$epp = $_POST['eventspage'];

		$epp = (int)$_POST['eventspage'];

	}

if($_POST['eventstart'])
{

	}

if($_POST['eventstart'])
{

		$startat = $_POST['eventstart'];

		$startat = (int)$_POST['eventstart'];

		$upper = $startat+$epp;
$lower = $startat;
}

		$upper = $startat+$epp;
$lower = $startat;
}

Zeile 1721Zeile 1719
		$db->write_query("ALTER TABLE ".TABLE_PREFIX."events ADD ignoretimezone int(1) NOT NULL default '0' AFTER timezone");
$db->write_query("ALTER TABLE ".TABLE_PREFIX."events ADD usingtime int(1) NOT NULL default '0' AFTER ignoretimezone");
$db->write_query("ALTER TABLE ".TABLE_PREFIX."events ADD repeats text NOT NULL AFTER usingtime");

		$db->write_query("ALTER TABLE ".TABLE_PREFIX."events ADD ignoretimezone int(1) NOT NULL default '0' AFTER timezone");
$db->write_query("ALTER TABLE ".TABLE_PREFIX."events ADD usingtime int(1) NOT NULL default '0' AFTER ignoretimezone");
$db->write_query("ALTER TABLE ".TABLE_PREFIX."events ADD repeats text NOT NULL AFTER usingtime");

	}

	}


if($db->field_exists('date', "events"))
{


if($db->field_exists('date', "events"))
{

Zeile 1746Zeile 1744
	else
{
$date = false;

	else
{
$date = false;

	}

	}


$query = $db->simple_select("events", "COUNT(eid) AS remaining", "donecon!=1");
$remaining = $db->fetch_field($query, "remaining");


$query = $db->simple_select("events", "COUNT(eid) AS remaining", "donecon!=1");
$remaining = $db->fetch_field($query, "remaining");

Zeile 1755Zeile 1753
		$nextact = "12_dbchanges8";
$startat = $startat+$epp;
$contents .= "<p><input type=\"hidden\" name=\"eventspage\" value=\"$epp\" /><input type=\"hidden\" name=\"eventstart\" value=\"$startat\" />Done. Click Next to move on to the next set of events.</p>";

		$nextact = "12_dbchanges8";
$startat = $startat+$epp;
$contents .= "<p><input type=\"hidden\" name=\"eventspage\" value=\"$epp\" /><input type=\"hidden\" name=\"eventstart\" value=\"$startat\" />Done. Click Next to move on to the next set of events.</p>";

	}

	}

	else
{
$db->write_query("ALTER TABLE ".TABLE_PREFIX."events DROP donecon");

	else
{
$db->write_query("ALTER TABLE ".TABLE_PREFIX."events DROP donecon");

Zeile 1769Zeile 1767
	$output->print_contents($contents);

global $footer_extra;

	$output->print_contents($contents);

global $footer_extra;

	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer($nextact);
}


$output->print_footer($nextact);
}





function upgrade12_redothemes()
{
global $db, $output, $config, $mybb;

function upgrade12_redothemes()
{
global $db, $output, $config, $mybb;

Zeile 1791Zeile 1789
	}
$cachewritable = @fopen(MYBB_ROOT.'cache/test.write', 'w');
if(!$cachewritable)

	}
$cachewritable = @fopen(MYBB_ROOT.'cache/test.write', 'w');
if(!$cachewritable)

	{
$not_writable = true;
@fclose($cachewritable);
}

	{
$not_writable = true;
@fclose($cachewritable);
}

	else
{
@fclose($cachewritable);
@my_chmod(MYBB_ROOT.'cache', '0777');
@my_chmod(MYBB_ROOT.'cache/test.write', '0777');
@unlink(MYBB_ROOT.'cache/test.write');

	else
{
@fclose($cachewritable);
@my_chmod(MYBB_ROOT.'cache', '0777');
@my_chmod(MYBB_ROOT.'cache/test.write', '0777');
@unlink(MYBB_ROOT.'cache/test.write');

	}

if($not_writable)

	}

if($not_writable)

	{
echo "<p><span style=\"color: red; font-weight: bold;\">Unable to write to the cache/ directory.</span><br />Before the upgrade process can continue you need to make sure this directory exists and is writable (chmod 777)</p>";
$output->print_footer("12_redothemes");

	{
echo "<p><span style=\"color: red; font-weight: bold;\">Unable to write to the cache/ directory.</span><br />Before the upgrade process can continue you need to make sure this directory exists and is writable (chmod 777)</p>";
$output->print_footer("12_redothemes");

Zeile 1812Zeile 1810

$not_writable = false;
if(!@is_dir(MYBB_ROOT.'cache/themes/'))


$not_writable = false;
if(!@is_dir(MYBB_ROOT.'cache/themes/'))

	{

	{

		@mkdir(MYBB_ROOT.'cache/themes/', 077);

// Add in empty index.html!

		@mkdir(MYBB_ROOT.'cache/themes/', 077);

// Add in empty index.html!

Zeile 1839Zeile 1837
		echo "<p><span style=\"color: red; font-weight: bold;\">Unable to write to the cache/themes/ directory.</span><br />Before the upgrade process can continue you need to make sure this directory exists and is writable (chmod 777)</p>";
$output->print_footer("12_redothemes");
exit;

		echo "<p><span style=\"color: red; font-weight: bold;\">Unable to write to the cache/themes/ directory.</span><br />Before the upgrade process can continue you need to make sure this directory exists and is writable (chmod 777)</p>";
$output->print_footer("12_redothemes");
exit;

	}

	}


if($db->field_exists('themebits', "themes") && !$db->field_exists('properties', "themes"))
{


if($db->field_exists('themebits', "themes") && !$db->field_exists('properties', "themes"))
{

Zeile 1857Zeile 1855
	}

if($db->field_exists('stylesheets', "themes"))

	}

if($db->field_exists('stylesheets', "themes"))

	{

	{

		$db->write_query("ALTER TABLE ".TABLE_PREFIX."themes DROP stylesheets");

		$db->write_query("ALTER TABLE ".TABLE_PREFIX."themes DROP stylesheets");

	}

	}

	$db->write_query("ALTER TABLE ".TABLE_PREFIX."themes ADD stylesheets text NOT NULL AFTER properties");

	$db->write_query("ALTER TABLE ".TABLE_PREFIX."themes ADD stylesheets text NOT NULL AFTER properties");





	if($db->table_exists("themestylesheets"))
{
$db->drop_table("themestylesheets");
}

	if($db->table_exists("themestylesheets"))
{
$db->drop_table("themestylesheets");
}

 

$collation = $db->build_create_table_collation();


$db->write_query("CREATE TABLE ".TABLE_PREFIX."themestylesheets(
sid int unsigned NOT NULL auto_increment,


$db->write_query("CREATE TABLE ".TABLE_PREFIX."themestylesheets(
sid int unsigned NOT NULL auto_increment,

Zeile 1991Zeile 1991
	echo "<p>Click next to continue with the upgrade process.</p>";

global $footer_extra;

	echo "<p>Click next to continue with the upgrade process.</p>";

global $footer_extra;

	//$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";

	//$footer_extra = "<script type=\"text/javascript\">$(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";


$output->print_footer("12_done");
}


$output->print_footer("12_done");
}