Fixed Issue: Undefined variable $dbame in Installer optconfig view.

Dev: Streamlined duplicate code in loadOptView and stepOptionalConfiguration. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10990 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Sep 14, 2011 · 1d87189 · 1d87189
1 parent db13a68
commit 1d87189
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/application/controllers/installer.php b/application/controllers/installer.php
@@ -113,7 +113,6 @@ function check_PHPFunction($function, &$image)
             return $result;
         }
 
-
         /**
          * check if file or directory exists and is writeable, returns via parameters by reference
          *
@@ -455,7 +454,7 @@ private function stepDatabaseConfiguration()
                 {
 
                     $aStatusdata = array(
-                    'optconfig_message' => $clang->gT('The database you specified is up to date.'),
+                    'optconfig_message' => sprintf('<b>%s</b>', $clang->gT('The database you specified is up to date.')),
                     'step3'  => TRUE
                     );
                     $this->session->set_userdata($aStatusdata);
@@ -548,22 +547,19 @@ private function stepDatabaseConfiguration()
      */
     private function stepOptionalConfiguration()
     {
-        $clang = $this->limesurvey_lang;
         $this->_writeDatabaseFile();
         $this->_writeAutoloadfile();
 
+        $clang = $this->limesurvey_lang;
+
         // confirmation message to be displayed
-        $aData['confirmation']= $clang->gT("Database %s has been successfully populated.");
-        $aData['dbname']= $this->session->userdata('dbname');
-        $aData['title']="Optional settings";
-        $aData['descp']="Optional settings to give you a head start";
+        $aData['confirmation']=$this->session->userdata('optconfig_message');
+        $aData['title']=$clang->gT("Optional settings");
+        $aData['descp']=$clang->gT("Optional settings to give you a head start");
         $aData['classesForStep']=array('off','off','off','off','off','on');
         $aData['progressValue']=80;
 
-        $aStatusdata = array(
-            'optional'  => 'TRUE'
-        );
-        $this->session->set_userdata($aStatusdata);
+        $this->session->set_userdata('optional', TRUE);
 
         $this->load->helper('surveytranslator'); // FIXME for what?
         $this->load->view('installer/optconfig_view', $aData);
@@ -606,6 +602,8 @@ function install($step=0)
                 {
                     redirect(site_url('installer/install/1'));
                 }
+                $message = sprintf($clang->gT("Database %s has been successfully populated."), sprintf('<b>%s<b>', $this->session->userdata('dbname')));
+                $this->session->set_userdata('optconfig_message', $message);
                 $this->stepOptionalConfiguration();
                 break;
         }
@@ -787,11 +785,7 @@ function optional()
         else
         {
             // if passwords don't match, redirect to proper link.
-            $aStatusdata = array(
-                            //'step2'  => 'TRUE',
-                            'optconfig_message' => $clang->gT("Passwords don't match.")
-                            );
-            $this->session->set_userdata($aStatusdata);
+            $this->session->set_userdata('optconfig_message', sprintf('<b>%s</b>', $clang->gT("Passwords don't match.")));
             redirect(site_url('installer/loadOptView'));
 
         }
@@ -808,20 +802,22 @@ function loadOptView()
             redirect(site_url('installer/install/license'));
         }
 
-        self::_writeDatabaseFile();
-        self::_writeAutoloadfile();
+        $this->_writeDatabaseFile();
+        $this->_writeAutoloadfile();
 
         $clang = $this->limesurvey_lang;
-        $this->load->helper('surveytranslator');
 
-        $aData['confirmation']="<b>".$this->session->userdata('optconfig_message')."</b><br/>";
+        // confirmation message to be displayed
+        $aData['confirmation']=$this->session->userdata('optconfig_message');
         $aData['title']=$clang->gT("Optional settings");
         $aData['descp']=$clang->gT("Optional settings to give you a head start");
         $aData['classesForStep']=array('off','off','off','off','off','on');
         $aData['progressValue']=80;
 
         $this->session->set_userdata('optional', TRUE);
-        $this->load->view('installer/optconfig_view',$aData);
+
+        $this->load->helper('surveytranslator'); // FIXME for what?
+        $this->load->view('installer/optconfig_view', $aData);
 
     }
 

diff --git a/application/views/installer/optconfig_view.php b/application/views/installer/optconfig_view.php
@@ -22,7 +22,7 @@
 <div style="-moz-border-radius:15px; border-radius:15px;" >
 <p><?php echo $descp; ?></p>
 <hr />
-<?php printf($confirmation,'<b>'.$dbname.'</b>'); ?><br />
+<?php $confirmation; ?><br />
 <?php echo $clang->gT("You can leave these settings blank and change them later"); ?>
 <br />