first-run wizzard wip
This commit is contained in:
parent
87ebd6700d
commit
3263b80ea9
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
|
@ -29,6 +29,13 @@ require_once( 'template.php' );
|
||||||
$errors=OC_UTIL::checkServer();
|
$errors=OC_UTIL::checkServer();
|
||||||
if(count($errors)>0){
|
if(count($errors)>0){
|
||||||
OC_TEMPLATE::printGuestPage( "", "error", array( "errors" => $errors ));
|
OC_TEMPLATE::printGuestPage( "", "error", array( "errors" => $errors ));
|
||||||
|
}elseif(isset($_POST['install']) and $_POST['install']=='true'){
|
||||||
|
require_once 'installer.php';
|
||||||
|
}elseif (!OC_CONFIG::getValue('installed',false)) {
|
||||||
|
$hasSQLite=is_callable('sqlite_open');
|
||||||
|
$hasMySQL=is_callable('mysql_connect');
|
||||||
|
$datadir=OC_CONFIG::getValue('datadir',$SERVERROOT.'/data');
|
||||||
|
OC_TEMPLATE::printGuestPage( "", "installation",array('hasSQLite'=>$hasSQLite,'hasMySQL'=>$hasMySQL,'datadir'=>$datadir));
|
||||||
}elseif( OC_USER::isLoggedIn()){
|
}elseif( OC_USER::isLoggedIn()){
|
||||||
if( isset($_GET["logout"]) and ($_GET["logout"]) ){
|
if( isset($_GET["logout"]) and ($_GET["logout"]) ){
|
||||||
OC_USER::logout();
|
OC_USER::logout();
|
||||||
|
|
18
js/js.js
18
js/js.js
|
@ -9,4 +9,22 @@ $(document).ready(function() {
|
||||||
$('#user_menu').slideToggle(250);
|
$('#user_menu').slideToggle(250);
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//hide the advanced config
|
||||||
|
$('#advanced_options').hide();
|
||||||
|
$('#use_mysql').hide();
|
||||||
|
|
||||||
|
// Sets advanced_options link behaviour :
|
||||||
|
$('#advanced_options_link').click(function() {
|
||||||
|
$('#advanced').toggleClass('userLinkOn');
|
||||||
|
$('#advanced_options').slideToggle(250);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#mysql').click(function() {
|
||||||
|
$('#use_mysql').slideDown(250);
|
||||||
|
});
|
||||||
|
$('#sqlite').click(function() {
|
||||||
|
$('#use_mysql').slideUp(250);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -0,0 +1,123 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
if(isset($_POST['install']) and $_POST['install']=='true'){
|
||||||
|
$errors=OC_INSTALLER::install($_POST);
|
||||||
|
if(count($errors)>0){
|
||||||
|
OC_TEMPLATE::printGuestPage( "", "error", array( "errors" => $errors ));
|
||||||
|
}else{
|
||||||
|
header( "Location: $WEBROOT");
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class OC_INSTALLER{
|
||||||
|
public static function install($options){
|
||||||
|
$error=array();
|
||||||
|
$dbtype=$options['dbtype'];
|
||||||
|
if(empty($options['login'])){
|
||||||
|
$error[]=array('error'=>'username not set');
|
||||||
|
};
|
||||||
|
if(empty($options['pass'])){
|
||||||
|
$error[]=array('error'=>'password not set');
|
||||||
|
};
|
||||||
|
if(empty($options['directory'])){
|
||||||
|
$error[]=array('error'=>'data directory not set');
|
||||||
|
};
|
||||||
|
if($dbtype=='mysql'){//mysql needs more config options
|
||||||
|
if(empty($options['dbuser'])){
|
||||||
|
$error[]=array('error'=>'database user directory not set');
|
||||||
|
};
|
||||||
|
if(empty($options['dbpass'])){
|
||||||
|
$error[]=array('error'=>'database password directory not set');
|
||||||
|
};
|
||||||
|
if(empty($options['dbname'])){
|
||||||
|
$error[]=array('error'=>'database name directory not set');
|
||||||
|
};
|
||||||
|
if(empty($options['dbhost'])){
|
||||||
|
$error[]=array('error'=>'database host directory not set');
|
||||||
|
};
|
||||||
|
if(!isset($options['dbtableprefix'])){
|
||||||
|
$error[]=array('error'=>'database table prefix directory not set');
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if(count($error)==0){ //no errors, good
|
||||||
|
$username=$options['login'];
|
||||||
|
$password=$options['pass'];
|
||||||
|
$datadir=$options['directory'];
|
||||||
|
|
||||||
|
//write the config file
|
||||||
|
OC_CONFIG::setValue('datadirectory',$datadir);
|
||||||
|
OC_CONFIG::setValue('dbtype',$dbtype);
|
||||||
|
if($dbtype=='mysql'){
|
||||||
|
$dbuser=$options['dbuser'];
|
||||||
|
$dbpass=$options['dbpass'];
|
||||||
|
$dbname=$options['dbname'];
|
||||||
|
$dbhost=$options['dbhost'];
|
||||||
|
$dbtableprefix=$options['dbtableprefix'];
|
||||||
|
OC_CONFIG::setValue('dbname',$dbname);
|
||||||
|
OC_CONFIG::setValue('dbhost',$dbhost);
|
||||||
|
OC_CONFIG::setValue('dbtableprefix',$dbtableprefix);
|
||||||
|
|
||||||
|
//check if the database user has admin right
|
||||||
|
$connection=mysql_connect($dbhost, $dbuser, $dbpass);
|
||||||
|
if(!$connection) {
|
||||||
|
$error[]=array('error'=>'mysql username and/or password not valid','you need to enter either an existing account, or the administrative account if you wish to create a new user for ownCloud');
|
||||||
|
}else{
|
||||||
|
$query="SELECT user FROM mysql.user WHERE user='$dbuser'";//this should be enough to check for admin rights in mysql
|
||||||
|
if(mysql_query($query,$connection)){
|
||||||
|
//use the admin login data for the new database user
|
||||||
|
self::createDBUser($username,$password);
|
||||||
|
OC_CONFIG::setValue('dbuser',$username);
|
||||||
|
OC_CONFIG::setValue('dbpass',$password);
|
||||||
|
}else{
|
||||||
|
OC_CONFIG::setValue('dbuser',$dbuser);
|
||||||
|
OC_CONFIG::setValue('dbpass',$dbpass);
|
||||||
|
|
||||||
|
//create the database
|
||||||
|
self::createDatabase($dbname,$dbuser);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mysql_close($connection);
|
||||||
|
}
|
||||||
|
OC_USER::createUser($username,$password);
|
||||||
|
OC_GROUP::createGroup('admin');
|
||||||
|
OC_GROUP::addToGroup($username,'admin');
|
||||||
|
OC_CONFIG::setValue('installed',true);
|
||||||
|
}
|
||||||
|
return $error;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function createDatabase($name,$adminUser,$adminPwd){//TODO refactoring this
|
||||||
|
$CONFIG_DBHOST=$options['host'];
|
||||||
|
$CONFIG_DBNAME=$options['name'];
|
||||||
|
$CONFIG_DBUSER=$options['user'];
|
||||||
|
$CONFIG_DBPWD=$options['pass'];
|
||||||
|
$CONFIG_DBTYPE=$options['type'];
|
||||||
|
//we cant user OC_BD functions here because we need to connect as the administrative user.
|
||||||
|
$query="CREATE DATABASE IF NOT EXISTS `$name`";
|
||||||
|
$result = mysql_query($query,$connection);
|
||||||
|
if (!$result) {
|
||||||
|
$entry='DB Error: "'.mysql_error($connection).'"<br />';
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
echo($entry);
|
||||||
|
}
|
||||||
|
$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
|
||||||
|
$result = mysql_query($query,$connection);
|
||||||
|
if (!$result) {
|
||||||
|
$entry='DB Error: "'.mysql_error($connection).'"<br />';
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
echo($entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function createDBUser($name,$password){
|
||||||
|
//we need to create 2 accounts, one for global use and one for local user. if we don't speccify the local one,
|
||||||
|
// the anonymous user would take precedence when there is one.
|
||||||
|
$query="CREATE USER 'name'@'localhost' IDENTIFIED BY '$password'";
|
||||||
|
$result = mysql_query($query,$connection);
|
||||||
|
$query="CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
|
||||||
|
$result = mysql_query($query,$connection);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
|
@ -9,7 +9,7 @@
|
||||||
<?php foreach($_["errors"] as $error):?>
|
<?php foreach($_["errors"] as $error):?>
|
||||||
<li class='error'>
|
<li class='error'>
|
||||||
<?php echo $error['error'] ?><br/>
|
<?php echo $error['error'] ?><br/>
|
||||||
<p class='hint'><?php echo $error['hint'] ?></p>
|
<p class='hint'><?php if(isset($error['hint']))echo $error['hint'] ?></p>
|
||||||
</li>
|
</li>
|
||||||
<?php endforeach ?>
|
<?php endforeach ?>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Template for installation page
|
||||||
|
*/
|
||||||
|
?>
|
||||||
|
<div id="login">
|
||||||
|
<img src="<?php echo image_path("", "owncloud-logo-medium-white.png"); ?>" alt="ownCloud" />
|
||||||
|
<form action="" method="post">
|
||||||
|
<input type='hidden' name='install' value='true'/>
|
||||||
|
<fieldset>
|
||||||
|
<p><input type="text" name="login" value="username" /></p>
|
||||||
|
<p><input type="password" name="pass" value="password" /></p>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset>
|
||||||
|
<?php if(!$_['hasSQLite']): ?>
|
||||||
|
<legend><abbr title="to use SQLite instead, install it on your server">MySQL</abbr> Database</legend>
|
||||||
|
<p><input type="text" name="dbuser" value="admin / username" /></p>
|
||||||
|
<p><input type="password" name="dbpass" value="password" /></p>
|
||||||
|
<p><input type="text" name="dbname" value="database name" /></p>
|
||||||
|
<?php endif;?>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset id="advanced">
|
||||||
|
<legend><a id="advanced_options_link" href="">Advanced ▾</a></legend>
|
||||||
|
<div id="advanced_options">
|
||||||
|
<p><label class="left">Data directory</label></p><p><input type="text" name="directory" value="<?php echo($_['datadir']);?>" /></p>
|
||||||
|
<?php if($_['hasMySQL'] and $_['hasSQLite']): ?>
|
||||||
|
<p><label class="left">Database</label></p>
|
||||||
|
<p><input type="radio" name="dbtype" value='sqlite' id="sqlite" checked="checked" /><label for="sqlite">SQLite</label>
|
||||||
|
<input type="radio" name="dbtype" value='mysql' id="mysql"><label for="mysql">MySQL</label></p>
|
||||||
|
<div id="use_mysql">
|
||||||
|
<p><input type="text" name="dbuser" value="admin / username" /></p>
|
||||||
|
<p><input type="password" name="dbpass" value="password" /></p>
|
||||||
|
<p><input type="text" name="dbname" value="database name" /></p>
|
||||||
|
<?php endif;?>
|
||||||
|
<?php if($_['hasMySQL'] and !$_['hasSQLite']): ?>
|
||||||
|
<input type='hidden' name='dbtype' value='mysql'/>
|
||||||
|
<?php endif;?>
|
||||||
|
<?php if(!$_['hasMySQL'] and $_['hasSQLite']): ?>
|
||||||
|
<input type='hidden' name='dbtype' value='sqlite'/>
|
||||||
|
<?php endif;?>
|
||||||
|
<?php if($_['hasMySQL']): ?>
|
||||||
|
<p><label class="left">Host</label></p><p><input type="text" name="dbhost" value="localhost" /></p>
|
||||||
|
<p><label class="left">Table prefix</label></p><p><input type="text" name="dbtableprefix" value="oc_" /></p>
|
||||||
|
</div>
|
||||||
|
<?php endif;?>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset>
|
||||||
|
<p class="submit"><input type="submit" value="Create" /></p>
|
||||||
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
</div>
|
Loading…
Reference in New Issue