diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index 7f0ec8d2a..c62b73637 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -831,6 +831,7 @@ $parameters = array( password = self.extraArgs['password'] prefix = self.extraArgs['prefix'] home = self.extraArgs['home'] + siteName = self.extraArgs['siteName'] tempStatusPath = self.extraArgs['tempStatusPath'] self.tempStatusPath = tempStatusPath @@ -976,6 +977,9 @@ $parameters = array( command = "sed -i 's|$debug = 1|$debug = 0|g' %sconfiguration.php" % (finalPath) ProcessUtilities.executioner(command) + command = "sed -i 's|$sitename = '%s'|$sitename = '%s'|g' %sconfiguration.php" % (dbUser, siteName, finalPath) + ProcessUtilities.executioner(command) + ## from filemanager.filemanager import FileManager diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index f23ccbeca..db243d050 100644 --- a/static/websiteFunctions/websiteFunctions.js +++ b/static/websiteFunctions/websiteFunctions.js @@ -1739,6 +1739,7 @@ app.controller('websitePages', function ($scope, $http, $timeout, $window) { var data = { domain: domain, + siteName: $scope.siteName, home: home, path: path, password: password, diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index f23ccbeca..db243d050 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -1739,6 +1739,7 @@ app.controller('websitePages', function ($scope, $http, $timeout, $window) { var data = { domain: domain, + siteName: $scope.siteName, home: home, path: path, password: password, diff --git a/websiteFunctions/templates/websiteFunctions/installJoomla.html b/websiteFunctions/templates/websiteFunctions/installJoomla.html index 7c552fecf..011daaca8 100755 --- a/websiteFunctions/templates/websiteFunctions/installJoomla.html +++ b/websiteFunctions/templates/websiteFunctions/installJoomla.html @@ -24,6 +24,13 @@