From a6000f3051e034bec2030379139b3a53c9e7329b Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 26 Aug 2011 13:37:04 -0700 Subject: [PATCH 1/2] Update install form to include installation profile dropdown --- install.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/install.php b/install.php index 5cb46e27d2..fdcbce84c9 100644 --- a/install.php +++ b/install.php @@ -248,6 +248,20 @@ class WebInstaller extends Installer +
+ Installation profile + +
From af97bc896e64ccbfc161ebde7bca808ae5089564 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 26 Aug 2011 21:10:24 -0700 Subject: [PATCH 2/2] Make site profiles work --- install.php | 22 ++-- lib/installer.php | 45 ++++++-- lib/siteprofile.php | 264 ++++++++++++++++++++++++++++++++++++++++++++ lib/statusnet.php | 11 ++ 4 files changed, 323 insertions(+), 19 deletions(-) create mode 100644 lib/siteprofile.php diff --git a/install.php b/install.php index fdcbce84c9..054be3d8d7 100644 --- a/install.php +++ b/install.php @@ -249,11 +249,11 @@ class WebInstaller extends Installer
- Installation profile + Site profile
  • - - @@ -298,7 +298,7 @@ STR; /** * Read and validate input data. * May output side effects. - * + * * @return boolean success */ function prepare() @@ -318,6 +318,8 @@ STR; $this->adminEmail = $post->string('admin_email'); $this->adminUpdates = $post->string('admin_updates'); + $this->siteProfile = $post->string('site_profile'); + $this->server = $_SERVER['HTTP_HOST']; $this->path = substr(dirname($_SERVER['PHP_SELF']), 1); @@ -329,12 +331,16 @@ STR; if (!$this->validateAdmin()) { $fail = true; } - + if ($this->adminPass != $adminPass2) { $this->updateStatus("Administrator passwords do not match. Did you mistype?", true); $fail = true; } - + + if (!$this->validateSiteProfile()) { + $fail = true; + } + return !$fail; } @@ -373,11 +379,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"