| Zeile 6 | Zeile 6 |
|---|
* Website: http://www.mybboard.net
* License: http://www.mybboard.net/about/license
*
|
* Website: http://www.mybboard.net
* License: http://www.mybboard.net/about/license
*
|
* $Id: upgrade.php 4120 2008-08-16 02:40:05Z Tikitiki $
| * $Id: upgrade.php 4416 2009-08-07 02:11:52Z RyanGordon $
|
*/
error_reporting(E_ALL & ~E_NOTICE);
| */
error_reporting(E_ALL & ~E_NOTICE);
|
| Zeile 14 | Zeile 14 |
|---|
define("INSTALL_ROOT", dirname(__FILE__)."/");
define("TIME_NOW", time());
define('IN_MYBB', 1);
|
define("INSTALL_ROOT", dirname(__FILE__)."/");
define("TIME_NOW", time());
define('IN_MYBB', 1);
|
| | define("IN_UPGRADE", 1);
if(function_exists('date_default_timezone_set'))
{
date_default_timezone_set('GMT');
}
|
require_once MYBB_ROOT."inc/class_core.php";
$mybb = new MyBB;
|
require_once MYBB_ROOT."inc/class_core.php";
$mybb = new MyBB;
|
| Zeile 69 | Zeile 75 |
|---|
define('TABLE_PREFIX', $config['database']['table_prefix']);
$db->connect($config['database']);
$db->set_table_prefix(TABLE_PREFIX);
|
define('TABLE_PREFIX', $config['database']['table_prefix']);
$db->connect($config['database']);
$db->set_table_prefix(TABLE_PREFIX);
|
| | $db->type = $config['database']['type'];
|
// Load Settings
if(file_exists(MYBB_ROOT."inc/settings.php"))
|
// Load Settings
if(file_exists(MYBB_ROOT."inc/settings.php"))
|
| Zeile 173 | Zeile 180 |
|---|
$user = $db->fetch_array($query);
if(!$user['uid'])
{
|
$user = $db->fetch_array($query);
if(!$user['uid'])
{
|
$output->print_error("The password you entered is incorrect. If you have forgotten your password, click <a href=\"../member.php?action=lostpw\">here</a>. Otherwise, go back and try again.");
| $output->print_error("The username you have entered appears to be invalid.");
|
}
else
{
$user = validate_password_from_uid($user['uid'], $mybb->input['password'], $user);
|
}
else
{
$user = validate_password_from_uid($user['uid'], $mybb->input['password'], $user);
|
| | if(!$user['uid'])
{
$output->print_error("The password you entered is incorrect. If you have forgotten your password, click <a href=\"../member.php?action=lostpw\">here</a>. Otherwise, go back and try again.");
}
|
}
$db->delete_query("sessions", "ip='".$db->escape_string($session->ipaddress)."' AND sid != '".$session->sid."'");
|
}
$db->delete_query("sessions", "ip='".$db->escape_string($session->ipaddress)."' AND sid != '".$session->sid."'");
|
| |
|
$newsession = array(
|
$newsession = array(
|
"uid" => $user['uid'],
"loginattempts" => 1,
| "uid" => $user['uid']
|
);
|
);
|
| |
|
$db->update_query("sessions", $newsession, "sid='".$session->sid."'");
// Temporarily set the cookie remember option for the login cookies
| $db->update_query("sessions", $newsession, "sid='".$session->sid."'");
// Temporarily set the cookie remember option for the login cookies
|
| Zeile 194 | Zeile 206 |
|---|
my_setcookie("sid", $session->sid, -1, true);
header("Location: ./upgrade.php");
|
my_setcookie("sid", $session->sid, -1, true);
header("Location: ./upgrade.php");
|
}
| }
|
$output->steps = array($lang->upgrade);
|
$output->steps = array($lang->upgrade);
|
| Zeile 285 | Zeile 297 |
|---|
unset($upgradescripts);
unset($upgradescript);
|
unset($upgradescripts);
unset($upgradescript);
|
$output->print_contents($lang->sprintf($lang->upgrade_welcome, $mybb->version)."<p><select name=\"from\">$vers</select>");
| $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")
{
|
$output->print_footer("doupgrade");
}
elseif($mybb->input['action'] == "doupgrade")
{
|
| | add_upgrade_store("allow_anonymous_info", intval($mybb->input['allow_anonymous_info']));
|
require_once INSTALL_ROOT."resources/upgrade".intval($mybb->input['from']).".php";
if($db->table_exists("datacache") && $upgrade_detail['requires_deactivated_plugins'] == 1 && $mybb->input['donewarning'] != "true")
{
| require_once INSTALL_ROOT."resources/upgrade".intval($mybb->input['from']).".php";
if($db->table_exists("datacache") && $upgrade_detail['requires_deactivated_plugins'] == 1 && $mybb->input['donewarning'] != "true")
{
|
| Zeile 373 | Zeile 386 |
|---|
status varchar(10) NOT NULL default '',
dateline int(10) NOT NULL default '0',
PRIMARY KEY (tid)
|
status varchar(10) NOT NULL default '',
dateline int(10) NOT NULL default '0',
PRIMARY KEY (tid)
|
) TYPE=MyISAM;{$charset}");
| ) TYPE=MyISAM{$charset};");
|
}
if($system_upgrade_detail['revert_all_themes'] > 0)
| }
if($system_upgrade_detail['revert_all_themes'] > 0)
|
| Zeile 400 | Zeile 413 |
|---|
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)
|
) TYPE=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";
}
| ) TYPE=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 415 | Zeile 428 |
|---|
{
$output->print_error("Please make sure your admin directory is uploaded correctly.");
}
|
{
$output->print_error("Please make sure your admin directory is uploaded correctly.");
}
|
import_theme_xml($contents, array("templateset" => -2, "no_templates" => 1));
| import_theme_xml($contents, array("templateset" => -2, "no_templates" => 1, "version_compat" => 1));
|
$tid = build_new_theme("Default", null, 1);
$db->update_query("themes", array("def" => 1), "tid='{$tid}'");
| $tid = build_new_theme("Default", null, 1);
$db->update_query("themes", array("def" => 1), "tid='{$tid}'");
|
| Zeile 440 | Zeile 453 |
|---|
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.$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
| require_once MYBB_ROOT."admin/inc/functions_themes.php";
}
else
|
| Zeile 449 | Zeile 462 |
|---|
}
// Import master theme
|
}
// Import master theme
|
import_theme_xml($contents, array("tid" => 1, "no_templates" => 1));
| import_theme_xml($contents, array("tid" => 1, "no_templates" => 1, "version_compat" => 1));
|
}
$sid = -2;
| }
$sid = -2;
|
| Zeile 462 | Zeile 475 |
|---|
$theme = $tree['theme'];
if(is_array($theme['templates']))
|
$theme = $tree['theme'];
if(is_array($theme['templates']))
|
{
| {
|
$templates = $theme['templates']['template'];
foreach($templates as $template)
{
| $templates = $theme['templates']['template'];
foreach($templates as $template)
{
|
| Zeile 559 | Zeile 572 |
|---|
function upgradedone()
{
global $db, $output, $mybb, $lang, $config;
|
function upgradedone()
{
global $db, $output, $mybb, $lang, $config;
|
| |
ob_start();
|
$output->print_header("Upgrade Complete");
|
$output->print_header("Upgrade Complete");
|
| |
$allow_anonymous_info = get_upgrade_store("allow_anonymous_info");
if($allow_anonymous_info == 1)
{
require_once MYBB_ROOT."inc/functions_serverstats.php";
$build_server_stats = build_server_stats(0, '', $mybb->version_code, $mybb->config['database']['encoding']);
if($build_server_stats['info_sent_success'] == false)
{
echo $build_server_stats['info_image'];
}
}
ob_end_flush();
|
if(is_writable("./"))
{
$lock = @fopen("./lock", "w");
| if(is_writable("./"))
{
$lock = @fopen("./lock", "w");
|
| Zeile 694 | Zeile 723 |
|---|
title varchar(220) NOT NULL default '',
description text NOT NULL,
disporder smallint unsigned NOT NULL default '0',
|
title varchar(220) NOT NULL default '',
description text NOT NULL,
disporder smallint unsigned NOT NULL default '0',
|
isdefault int(1) NOT NULL default '',
| isdefault int(1) NOT NULL default '0',
|
PRIMARY KEY (gid)
) TYPE=MyISAM;");
$db->drop_table("settings");
$db->write_query("CREATE TABLE ".TABLE_PREFIX."settings (
|
PRIMARY KEY (gid)
) TYPE=MyISAM;");
$db->drop_table("settings");
$db->write_query("CREATE TABLE ".TABLE_PREFIX."settings (
|
sid smallint(6) NOT NULL auto_increment,
| sid smallint unsigned NOT NULL auto_increment,
|
name varchar(120) NOT NULL default '',
title varchar(120) NOT NULL default '',
description text NOT NULL,
optionscode text NOT NULL,
value text NOT NULL,
|
name varchar(120) NOT NULL default '',
title varchar(120) NOT NULL default '',
description text NOT NULL,
optionscode text NOT NULL,
value text NOT NULL,
|
disporder smallint(6) NOT NULL default '0',
gid smallint(6) NOT NULL default '0',
PRIMARY KEY (sid)
| disporder smallint unsigned NOT NULL default '0',
gid smallint unsigned NOT NULL default '0',
isdefault int(1) NOT NULL default '0',
PRIMARY KEY (sid)
|
) TYPE=MyISAM;");
}
else
{
|
) TYPE=MyISAM;");
}
else
{
|
$query = $db->simple_select("settings", "name,sid", "isdefault='1' OR isdefault='yes'");
| if($db->type == "mysql" || $db->type == "mysqli")
{
$wheresettings = "isdefault='1' OR isdefault='yes'";
}
else
{
$wheresettings = "isdefault='1'";
}
$query = $db->simple_select("settings", "name,sid", $wheresettings);
|
while($setting = $db->fetch_array($query))
{
$settings[$setting['name']] = $setting['sid'];
|
while($setting = $db->fetch_array($query))
{
$settings[$setting['name']] = $setting['sid'];
|
}
| }
|
|
|
$query = $db->simple_select("settinggroups", "name,title,gid", "isdefault='1' OR isdefault='yes'");
| $query = $db->simple_select("settinggroups", "name,title,gid", $wheresettings);
|
while($group = $db->fetch_array($query))
{
$settinggroups[$group['name']] = $group['gid'];
| while($group = $db->fetch_array($query))
{
$settinggroups[$group['name']] = $group['gid'];
|
| Zeile 732 | Zeile 771 |
|---|
$tree = $parser->get_tree();
$settinggroupnames = array();
$settingnames = array();
|
$tree = $parser->get_tree();
$settinggroupnames = array();
$settingnames = array();
|
|
|
foreach($tree['settings'][0]['settinggroup'] as $settinggroup)
{
$settinggroupnames[] = $settinggroup['attributes']['name'];
| foreach($tree['settings'][0]['settinggroup'] as $settinggroup)
{
$settinggroupnames[] = $settinggroup['attributes']['name'];
|
| Zeile 792 | Zeile 831 |
|---|
require MYBB_ROOT."inc/settings.php";
foreach($settings as $key => $val)
{
|
require MYBB_ROOT."inc/settings.php";
foreach($settings as $key => $val)
{
|
$db->update_query("settings", array('value' => $db->escape_string($val)), "name='$key'");
| $db->update_query("settings", array('value' => $db->escape_string($val)), "name='".$db->escape_string($key)."'");
|
}
}
unset($settings);
| }
}
unset($settings);
|