diff --git a/build/linux/start b/build/linux/start index 4e28740ce2..65278fcc5b 100644 --- a/build/linux/start +++ b/build/linux/start @@ -30,9 +30,8 @@ mv etc/httpd.conf.80 etc/httpd.conf sed -e 's/3308/3306/g' etc/my.cnf > etc/my.cnf.3306 mv etc/my.cnf.3306 etc/my.cnf -sed -e 's/3308/3306/g' zentao/config/my.php |grep -v mysqldump > zentao/config/my.php.3306 +sed -e 's/3308/3306/g' zentao/config/my.php > zentao/config/my.php.3306 mv zentao/config/my.php.3306 zentao/config/my.php -echo '$config->mysqldump = "/opt/lampp/bin/mysqldump";' >> zentao/config/my.php # change directory permissions. chmod a+rx lampp diff --git a/build/linux/start88 b/build/linux/start88 index 71e3ecb0bb..750d641376 100755 --- a/build/linux/start88 +++ b/build/linux/start88 @@ -30,9 +30,8 @@ mv etc/httpd.conf.88 etc/httpd.conf sed -e 's/3306/3308/g' etc/my.cnf > etc/my.cnf.3308 mv etc/my.cnf.3308 etc/my.cnf -sed -e 's/3306/3308/g' zentao/config/my.php |grep -v mysqldump > zentao/config/my.php.3308 +sed -e 's/3306/3308/g' zentao/config/my.php > zentao/config/my.php.3308 mv zentao/config/my.php.3308 zentao/config/my.php -echo '$config->mysqldump = "/opt/lampp/bin/mysqldump";' >> zentao/config/my.php # change directory permissions. chmod a+rx lampp diff --git a/module/install/control.php b/module/install/control.php index 40735c3cf4..51d5fae9be 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -93,11 +93,12 @@ class install extends control if($return->result == 'ok') { $this->view = (object)$_POST; - $this->view->app = $this->app; - $this->view->lang = $this->lang; - $this->view->config = $this->config; - $this->view->domain = $this->server->HTTP_HOST; - $this->view->title = $this->lang->install->saveConfig; + $this->view->app = $this->app; + $this->view->lang = $this->lang; + $this->view->config = $this->config; + $this->view->domain = $this->server->HTTP_HOST; + $this->view->title = $this->lang->install->saveConfig; + $this->view->mysqldump = $this->install->getMySQLDump(); $this->display(); } else diff --git a/module/install/model.php b/module/install/model.php index 4a5e486db4..395e75b057 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -448,4 +448,19 @@ class installModel extends model return true; } + /** + * get the mysqldump binary. + * + * @access public + * @return string + */ + public function getMySQLDump() + { + $mysqlDump = ''; + if(strpos(__FILE__, '/opt/lampp') !== false) + { + $mysqlDump = '/opt/lampp/bin/mysqldump'; + } + if(file_exists($mysqlDump)) return $mysqlDump; + } } diff --git a/module/install/view/step3.html.php b/module/install/view/step3.html.php index ea2424e2c1..372892d62f 100644 --- a/module/install/view/step3.html.php +++ b/module/install/view/step3.html.php @@ -27,7 +27,7 @@ if(!isset($error)) \$config->webRoot = getWebRoot(); \$config->default->domain = '$domain'; \$config->default->lang = '$defaultLang'; -\$config->mysqldump = ''; +\$config->mysqldump = '$mysqldump'; EOT; } ?>