Fixed issue: Console installation from config file not working

LimeSurvey · Feb 7, 2018 · 0d50c82 · Shnoulle · Jul 24, 2019 · 0d50c82
1 parent 622bebd
commit 0d50c82
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/application/commands/InstallFromConfigCommand.php b/application/commands/InstallFromConfigCommand.php
@@ -42,7 +42,7 @@ public function run($aArguments)
     {
 
         if (isset($aArguments) && isset($aArguments[0])) {
-            $readFromConfig = realpath(dirname(APPPATH).DIRECTORY_SEPARATOR.$aArguments[0]);
+            $readFromConfig = realpath($aArguments[0]);
             $this->configuration = include($readFromConfig);
             $this->dbConnectionArray = $this->configuration['components']['db'];
 
@@ -57,9 +57,10 @@ public function run($aArguments)
             try {
                 $this->output('Connecting to database...');
                 $this->connection = App()->getDb();
-                $this->connection->connectionString = $dbConnectArray['connectionString'];
-                $this->connection->username = $dbConnectArray['username'];
-                $this->connection->password = $dbConnectArray['password'];                $this->connection->active = true;
+                $this->connection->connectionString = $this->dbConnectionArray['connectionString'];
+                $this->connection->username = $this->dbConnectionArray['username'];
+                $this->connection->password = $this->dbConnectionArray['password'];               
+                $this->connection->active = true;
                 $this->output('Using connection string '.$this->connection->connectionString);
             } catch (CDbException $e) {
                 $this->output('Could not connect to database: '.$e->getMessage());
@@ -96,12 +97,12 @@ public function run($aArguments)
             $this->connection->createCommand()->insert(
                 $this->connection->tablePrefix.'users',
                 array(
-                    'users_name'=>$this->configuration['defaultuser'],
-                    'password'=>password_hash($this->configuration['defaultpass'], PASSWORD_DEFAULT),
+                    'users_name'=>$this->configuration['config']['defaultuser'],
+                    'password'=>$this->configuration['config']['defaultpass'],
                     'full_name'=>"",
                     'parent_id'=>0,
                     'lang'=>'auto',
-                    'email'=>$this->configuration['defaultemail']
+                    'email'=>$this->configuration['config']['siteadminemail']
                 )
             );
             $this->connection->createCommand()->insert(
@@ -123,7 +124,7 @@ public function run($aArguments)
             return 0;
         } else {
             // TODO: a valid error process
-            echo "You have to set admin/password/full name and email address on the command line like this: php console.php install adminname mypassword fullname emailaddress [verbose]\n";
+            echo "You have to set the path to the config file as only parameter\n";
             return 1;
         }
     }