aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-10-18 18:34:38 -0700
committerfriendica <info@friendica.com>2012-10-18 18:34:38 -0700
commitf685b676567e990a1105100230a2cf1ba6d55ee9 (patch)
tree90bc2f36d3425a4834468782111c33a9c09dfe5b /mod
parent2cd999490406f3a1db3995a894768cf08f2cc0fd (diff)
downloadvolse-hubzilla-f685b676567e990a1105100230a2cf1ba6d55ee9.tar.gz
volse-hubzilla-f685b676567e990a1105100230a2cf1ba6d55ee9.tar.bz2
volse-hubzilla-f685b676567e990a1105100230a2cf1ba6d55ee9.zip
new install settings
Diffstat (limited to 'mod')
-rwxr-xr-xmod/install.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/mod/install.php b/mod/install.php
index a6ca48b61..87a1c041a 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -69,6 +69,9 @@ function install_post(&$a) {
$phpath = notags(trim($_POST['phpath']));
$timezone = notags(trim($_POST['timezone']));
$adminmail = notags(trim($_POST['adminmail']));
+ $siteurl = notags(trim($_POST['siteurl']));
+
+
// connect to db
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
@@ -80,7 +83,8 @@ function install_post(&$a) {
'$dbpass' => $dbpass,
'$dbdata' => $dbdata,
'$timezone' => $timezone,
- '$urlpath' => $urlpath,
+ '$siteurl' => $siteurl,
+ '$site_id' => hash('whirlpool', random_string()),
'$phpath' => $phpath,
'$adminmail' => $adminmail
));
@@ -235,7 +239,7 @@ function install_content(&$a) {
'$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''),
'$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')),
-
+ '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')),
'$lbl_10' => t('Please select a default timezone for your website'),
@@ -275,6 +279,8 @@ function install_content(&$a) {
'$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')),
+ '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')),
+
'$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),