diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2010-09-05 14:21:07 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2010-09-05 14:21:07 +0200 |
| commit | 1a236a8884c55a7c2cc1eea71bbf63fd2268a994 (patch) | |
| tree | 2ac1ae194951ab49125a5da37543b4956f7b9e80 /inc | |
| parent | c7e707c381208b352c7056d72eacd17647c9abbf (diff) | |
| download | nextcloud-server-1a236a8884c55a7c2cc1eea71bbf63fd2268a994.tar.gz nextcloud-server-1a236a8884c55a7c2cc1eea71bbf63fd2268a994.zip | |
fix some errors when trying to save the settings
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/lib_config.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/inc/lib_config.php b/inc/lib_config.php index a6b8fba7020..6c4c4c98382 100644 --- a/inc/lib_config.php +++ b/inc/lib_config.php @@ -183,11 +183,11 @@ class OC_CONFIG{ if((!isset($_POST['adminlogin']) or empty($_POST['adminlogin'])) and $FIRSTRUN) $error.='admin login not set<br />'; if((!isset($_POST['adminpassword']) or empty($_POST['adminpassword'])) and $FIRSTRUN) $error.='admin password not set<br />'; if((!isset($_POST['adminpassword2']) or empty($_POST['adminpassword2'])) and $FIRSTRUN) $error.='retype admin password not set<br />'; - if(!isset($_POST['datadirectory']) or empty($_POST['datadirectory'])) $error.='data directory not set<br />'; + if((!isset($_POST['datadirectory']) or empty($_POST['datadirectory'])) and $FIRSTRUN) $error.='data directory not set<br />'; if(!isset($_POST['dateformat']) or empty($_POST['dateformat'])) $error.='dateformat not set<br />'; - if(!isset($_POST['dbname']) or empty($_POST['dbname'])) $error.='databasename not set<br />'; + if((!isset($_POST['dbname']) or empty($_POST['dbname'])) and $FIRSTRUN) $error.='databasename not set<br />'; if($FIRSTRUN and $_POST['adminpassword']<>$_POST['adminpassword2'] ) $error.='admin passwords are not the same<br />'; - $dbtype=$_POST['dbtype']; + $dbtype=(isset($_POST['dbtype']))?$_POST['dbtype']:$CONFIG_DBTYPE; if($dbtype=='mysql'){ if(!isset($_POST['dbhost']) or empty($_POST['dbhost'])) $error.='database host not set<br />'; if(!isset($_POST['dbuser']) or empty($_POST['dbuser'])) $error.='database user not set<br />'; @@ -204,12 +204,13 @@ class OC_CONFIG{ if(!isset($_POST['dbpassword']) or empty($_POST['dbpassword'])){ $_POST['dbpassword']=$CONFIG_DBPASSWORD; } - } - if(!is_dir($_POST['datadirectory'])){ - try{ - mkdir($_POST['datadirectory']); - }catch(Exception $e){ - $error.='error while trying to create data directory<br/>'; + }else{ + if(!is_dir($_POST['datadirectory'])){ + try{ + mkdir($_POST['datadirectory']); + }catch(Exception $e){ + $error.='error while trying to create data directory<br/>'; + } } } if(empty($error)) { |