maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Reverting the multiserver-stuff, we'll do this inside the branch

Browse Source
This commit is contained in:
Florian Aders (EleRas)
2010-10-23 10:20:23 +00:00
parent 99696ff6cb
commit ad31b07a04
32 changed files with 169 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
install/install.php
View File

@@ -255,17 +255,6 @@ function requirement_checks()
status_message('green', 'OK');
}
// check for ssh2 (multiserver-mode)
status_message('begin', $lng['install']['phpssh2']);
if(!extension_loaded('ssh2'))
{
status_message('orange', $lng['install']['ssh2neededformultiserver']);
}
else
{
status_message('green', 'OK');
}
if($_die)
{
?>
@@ -764,10 +753,8 @@ if(isset($_POST['installstep'])
$userdata.= "\$sql_root[0]['caption']='Default';\n";
$userdata.= "\$sql_root[0]['host']='" . addcslashes($mysql_host, "'\\") . "';\n";
$userdata.= "\$sql_root[0]['user']='" . addcslashes($mysql_root_user, "'\\") . "';\n";
$userdata.= "\$sql_root[0]['password']='" . addcslashes($mysql_root_pass, "'\\") . "';\n\n";
$userdata.= "// Define our system id (multiserver support, default is '0')\n";
$userdata.= "\$server_id = 0;\n";
$userdata.= "?>\n";
$userdata.= "\$sql_root[0]['password']='" . addcslashes($mysql_root_pass, "'\\") . "';\n";
$userdata.= "?>";
//we test now if we can store the userdata.inc.php in ../lib