From 3263b80ea94a2d3c8a7d68d8190a93db198e2203 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 17 Apr 2011 00:45:05 +0200 Subject: [PATCH] first-run wizzard wip --- img/task-attention.png | Bin 0 -> 1696 bytes index.php | 7 +++ js/js.js | 18 ++++++ lib/installer.php | 123 +++++++++++++++++++++++++++++++++++++ templates/error.php | 2 +- templates/installation.php | 52 ++++++++++++++++ 6 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 img/task-attention.png create mode 100644 lib/installer.php create mode 100644 templates/installation.php diff --git a/img/task-attention.png b/img/task-attention.png new file mode 100644 index 0000000000000000000000000000000000000000..35a112e9d53429da221cfd0b7110a6eae0594b85 GIT binary patch literal 1696 zcmV;R24DG!P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igW5 z3kndqPxu4?00tmQL_t(o!_}5uY#m1#hM#X|&)IX1&#_Np$8l^@f*X>^0otaDX{i!w zm6GsNi4v(0QPGwPiXx~&XnKK!TBP1^!v%NzU2s7}5ki#;5kjH-)Cp-RrKE(UF$q>m z{%psN&+hU0+1>fL*mZpDI;oQqBvu;D?Ci|E@4nyr%?$iMKB|lK?Z3XY+-nB^9>A~B zm$!S=xQQ$ovT|B(*FcYhZ1`U&aFBdFyzCqCnSGV;(7k~kkRR${r|Wvwa;^#Z`BeUl zb7ypR>M4r17iHC>g~kPalt^~!am)=RAol^o(h*&huT$Kdb)uY@woT&nJwSMo-2`Se zfIfYr6!kw?k1|l{nYrJ9>A3wMSy#xGn#Pr$jZCL$*d3w zry=r@<|Q)ypVx3ocTsZsuaqh8h=BSCq4N=2jqlE^`HB*af%dpAT30=^v_`o~R&=v$(4t)F`lD#C6s!RfQ!H&|lyX z*-zS<9W*O;f}P~_g@Cx>qm6)L{|dnPnBr!M<9sJo`Lh01a!XNRX$tf?tD=hTcDg@- zXalT|s86FB(5U)2HUL|J@ZY%I_iM8fKSbmV0O-%&Apt#wA!J8bciv~Z?gcvywt|=O zsrgkJ)hb>#NW7o{rm#w4r?aR&kLy7S^1yWxxSY#V=BDN)`?$OEK9zVHmqMt&{pnmrnPeT#VBV?nC`fy~I_j${EAof8*AO<2# zN0X*+Pz~uQ*C1{t-!w#Q9pjA)`Cii)JNJb5L3ssqdPxNIcOXMRWY*Qs$6xX`Y*#T> za0_7TK$u9Bap));!bYC7jLxb0ZBXOv1!Wl8PyWBvVA%S5iBDVQ+q&{0a2p zRXw2l)A>brWALVZIKQT(l1uRLA}|vmXFyIu{12kwDAZ4aJr8ar8JADT=RghQHsooH zv6Y&+M^7PFRX{!tdYD3eB>Jj)?=EIKN9WTt>8}Z((7#dXC?{=l3u6hQVDh85J!`1` zb98T8!Tmi%WAiZIa?g9+{m|rr=!MeI`fR5BhTxasK-B+ZI?&Sg+K)O3#IC7(H>{ndN0%chTsC3v}9Xq59opuhYTZ!3@l6gvMuA> zL@{wdawFt63^4uo_zC(<&!QgCXAnGhaONcU7w>QtNf&7?vx}GD`EOy~HC->XuoYh-C zTpoHc0lJd;W=k84zn%!VV!*;o3S?Ud&$i>azTo&>I`hYa=ei#=cgfB1Xrf)4^u=NE z)@55Q+5j=>gjND+>Rk?616K5=W}aH0&|(DA_u_4#1jC)Z*vSFiLrP$VxUiNgvb>^=mCDU3*F+?l1FmMcN+Tc608&M^Gv#odLN0;^=ezJb5gNWFzQ7r%c`s;>o*kjij+woCSY5 z+pjIa&SjE1kMtaNI!B=yPf~MU;bnVXc3n0h$Svuv^-YBBzy$D{WW&LxIbLX4d{)*; q;I+h*Z`tHqef0k1oRBBy>+~PFvdCaVEHL5#00000){ 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()){ if( isset($_GET["logout"]) and ($_GET["logout"]) ){ OC_USER::logout(); diff --git a/js/js.js b/js/js.js index 244433184f..86f5885ce6 100644 --- a/js/js.js +++ b/js/js.js @@ -9,4 +9,22 @@ $(document).ready(function() { $('#user_menu').slideToggle(250); 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); + }); }); diff --git a/lib/installer.php b/lib/installer.php new file mode 100644 index 0000000000..a87e7541fc --- /dev/null +++ b/lib/installer.php @@ -0,0 +1,123 @@ +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).'"
'; + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + $query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'"; + $result = mysql_query($query,$connection); + if (!$result) { + $entry='DB Error: "'.mysql_error($connection).'"
'; + $entry.='Offending command was: '.$query.'
'; + 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); + } +} + +?> \ No newline at end of file diff --git a/templates/error.php b/templates/error.php index 5b71c1ef75..ae3f029708 100644 --- a/templates/error.php +++ b/templates/error.php @@ -9,7 +9,7 @@

  • -

    +

    • diff --git a/templates/installation.php b/templates/installation.php new file mode 100644 index 0000000000..6e555e843f --- /dev/null +++ b/templates/installation.php @@ -0,0 +1,52 @@ + +
    + " alt="ownCloud" /> +
    + +
    +

    +

    +
    +
    + + MySQL Database +

    +

    +

    + +
    +
    + Advanced ▾ +
    +

    + +

    +

    +

    +
    +

    +

    +

    + + + + + + + + +

    +

    +
    + +
    +
    +
    +

    +
    +
    +
    \ No newline at end of file