aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-09-29 12:03:13 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-09-29 12:03:13 +0000
commiteaddae88046f037405757679a1c24461ec0d8dbe (patch)
tree20b5ec9871554c29b3c56edf6ed1bbeb02d324e9 /actions
parente9515d1ee18074928ae1e013dd0ff8666ecbd475 (diff)
downloadelgg-eaddae88046f037405757679a1c24461ec0d8dbe.tar.gz
elgg-eaddae88046f037405757679a1c24461ec0d8dbe.tar.bz2
Closes #383 & #384
git-svn-id: https://code.elgg.org/elgg/trunk@2144 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions')
-rw-r--r--actions/admin/site/update_basic.php9
-rw-r--r--actions/systemsettings/install.php12
2 files changed, 18 insertions, 3 deletions
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 78944e49c..5710e63b9 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -28,7 +28,8 @@
throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
$site->description = get_input('sitedescription');
- $site->name = get_input('sitename');
+ $site->name = get_input('sitename');
+ $site->email = get_input('siteemail');
$site->url = get_input('wwwroot');
datalist_set('path',sanitise_filepath(get_input('path')));
@@ -49,6 +50,12 @@
unset_config('ping_home', $site->getGUID());
else
set_config('ping_home', 'disabled', $site->getGUID());
+
+ $api = get_input('api');
+ if ($api)
+ unset_config('disable_api', $site->getGUID());
+ else
+ set_config('disable_api', 'disabled', $site->getGUID());
// Now ping home
//if ((!isset($usage)) || ($usage!='disabled'))
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 59d784df6..a7a15b29d 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -41,7 +41,8 @@
$site = new ElggSite();
$site->name = get_input('sitename');
$site->url = get_input('wwwroot');
- $site->description = get_input('sitedescription');
+ $site->description = get_input('sitedescription');
+ $site->email = get_input('siteemail');
$site->access_id = 2; // The site is public
$guid = $site->save();
@@ -70,7 +71,14 @@
if ($usage)
unset_config('ping_home', $site->getGUID());
else
- set_config('ping_home', 'disabled', $site->getGUID());
+ set_config('ping_home', 'disabled', $site->getGUID());
+
+ $api = get_input('api');
+ if ($api)
+ unset_config('disable_api', $site->getGUID());
+ else
+ set_config('disable_api', 'disabled', $site->getGUID());
+
// activate some plugins by default
enable_plugin('profile', $site->getGUID());