Vergleich install/index.php - 1.6.10 - 1.6.11

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 8Zeile 8
 *
* $Id$
*/

 *
* $Id$
*/


if(function_exists("unicode_decode"))
{
// Unicode extension introduced in 6.0
error_reporting(E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_STRICT);
}
elseif(defined("E_DEPRECATED"))
{
// E_DEPRECATED introduced in 5.3
error_reporting(E_ALL ^ E_DEPRECATED ^ E_NOTICE);
}
else
{
error_reporting(E_ALL & ~E_NOTICE);
}

 

@set_time_limit(0);



@set_time_limit(0);


Zeile 36Zeile 21
{
date_default_timezone_set('GMT');
}

{
date_default_timezone_set('GMT');
}

 

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


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/class_error.php';
$error_handler = new errorHandler();

 

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

Zeile 1277Zeile 1262
		if(!$mybb->input['config'][$dbfile]['tableprefix'])
{
$mybb->input['config'][$dbfile]['tableprefix'] = "mybb_";

		if(!$mybb->input['config'][$dbfile]['tableprefix'])
{
$mybb->input['config'][$dbfile]['tableprefix'] = "mybb_";

		}

		}

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

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

		}


		}


		$class = '';
if(!$first && !$mybb->input['dbengine'])

		$class = '';
if(!$first && !$mybb->input['dbengine'])

		{

		{

			$mybb->input['dbengine'] = $dbfile;
$first = true;
}

			$mybb->input['dbengine'] = $dbfile;
$first = true;
}

Zeile 1298Zeile 1283
			<tbody id=\"{$dbfile}_settings\" class=\"db_settings db_type{$class}\">
<tr>
<th colspan=\"2\" class=\"first last\">{$dbtype['title']} {$lang->database_settings}</th>

			<tbody id=\"{$dbfile}_settings\" class=\"db_settings db_type{$class}\">
<tr>
<th colspan=\"2\" class=\"first last\">{$dbtype['title']} {$lang->database_settings}</th>

				</tr>";


				</tr>";


		// SQLite gets some special settings
if($dbfile == 'sqlite')
{

		// SQLite gets some special settings
if($dbfile == 'sqlite')
{

Zeile 1344Zeile 1329

// Encoding selection only if supported
if(is_array($encodings))


// Encoding selection only if supported
if(is_array($encodings))

		{

		{

			$select_options = "";
foreach($encodings as $encoding => $title)
{

			$select_options = "";
foreach($encodings as $encoding => $title)
{

Zeile 1366Zeile 1351
		}
}
$dbconfig = implode("", $db_info);

		}
}
$dbconfig = implode("", $db_info);





	echo $lang->sprintf($lang->db_step_config_table, $dbengines, $dbconfig);
$output->print_footer('create_tables');
}

	echo $lang->sprintf($lang->db_step_config_table, $dbengines, $dbconfig);
$output->print_footer('create_tables');
}

Zeile 1433Zeile 1418
	if((!preg_match("#^[A-Za-z][A-Za-z0-9_]*$#", $config['tableprefix'])) && $config['tableprefix'] != '')
{
$errors[] = $lang->db_step_error_invalid_tableprefix;

	if((!preg_match("#^[A-Za-z][A-Za-z0-9_]*$#", $config['tableprefix'])) && $config['tableprefix'] != '')
{
$errors[] = $lang->db_step_error_invalid_tableprefix;

	}

	}


// Needs to be smaller then 64 characters total (MySQL Limit).
// This allows 24 characters for the actual table name, which should be sufficient.


// Needs to be smaller then 64 characters total (MySQL Limit).
// This allows 24 characters for the actual table name, which should be sufficient.

Zeile 1456Zeile 1441
	{
$db_encoding = "// \$config['database']['encoding'] = '{$config['encoding']}';";
}

	{
$db_encoding = "// \$config['database']['encoding'] = '{$config['encoding']}';";
}

 

$config['dbpass'] = addslashes($config['dbpass']);


// Write the configuration file
$configdata = "<?php


// Write the configuration file
$configdata = "<?php

Zeile 2222Zeile 2209
	{
echo $lang->done_step_dirdelete;
}

	{
echo $lang->done_step_dirdelete;
}

	echo $lang->done_subscribe_mailing;

	echo $lang->done_whats_next;

	$output->print_footer('');
}


	$output->print_footer('');
}