diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-23 10:29:43 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-23 10:29:43 +0000 |
| commit | abf321f2fb25d1750c96a67807bcda84a63ba497 (patch) | |
| tree | b5adddfd4456b707a35b8c35acb3782ecfe5bce0 /actions | |
| parent | ba23d8e106d4652e229d1839ec2dd13cf4daaad9 (diff) | |
| download | elgg-abf321f2fb25d1750c96a67807bcda84a63ba497.tar.gz elgg-abf321f2fb25d1750c96a67807bcda84a63ba497.tar.bz2 | |
Added site default access permissions. Refs #744
git-svn-id: https://code.elgg.org/elgg/trunk@2885 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/admin/site/update_basic.php | 106 | ||||
| -rw-r--r-- | actions/systemsettings/install.php | 1 |
2 files changed, 55 insertions, 52 deletions
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php index 002276603..f5582fb2e 100644 --- a/actions/admin/site/update_basic.php +++ b/actions/admin/site/update_basic.php @@ -12,69 +12,71 @@ * @copyright Curverider Ltd 2008-2009
* @link http://elgg.org/
*/
- - global $CONFIG; - - // block non-admin users - admin_gatekeeper(); - action_gatekeeper(); +
+ global $CONFIG;
+
+ // block non-admin users
+ admin_gatekeeper();
+ action_gatekeeper();
if (get_input('settings') == 'go') {
if (datalist_get('default_site')) {
- - $site = get_entity(datalist_get('default_site')); - if (!($site instanceof ElggSite)) - throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite')); - +
+ $site = get_entity(datalist_get('default_site'));
+ if (!($site instanceof ElggSite))
+ 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')));
- datalist_set('dataroot',sanitise_filepath(get_input('dataroot'))); - - set_config('language', get_input('language'), $site->getGUID()); - - set_config('view', get_input('view'), $site->getGUID()); - - $debug = get_input('debug'); - if ($debug) - set_config('debug', 1, $site->getGUID()); - else - unset_config('debug', $site->getGUID()); - - $https_login = get_input('https_login'); - if ($https_login) - set_config('https_login', 1, $site->getGUID()); - else - unset_config('https_login', $site->getGUID()); - - $usage = get_input('usage'); - if ($usage) - 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')) - //{ - // ping_home($site); - //} - - if ($site->save()) - system_message(elgg_echo("admin:configuration:success")); - else + datalist_set('dataroot',sanitise_filepath(get_input('dataroot')));
+
+ set_config('language', get_input('language'), $site->getGUID());
+
+ set_config('default_access', get_input('default_access'), $site->getGUID());
+
+ set_config('view', get_input('view'), $site->getGUID());
+
+ $debug = get_input('debug');
+ if ($debug)
+ set_config('debug', 1, $site->getGUID());
+ else
+ unset_config('debug', $site->getGUID());
+
+ $https_login = get_input('https_login');
+ if ($https_login)
+ set_config('https_login', 1, $site->getGUID());
+ else
+ unset_config('https_login', $site->getGUID());
+
+ $usage = get_input('usage');
+ if ($usage)
+ 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'))
+ //{
+ // ping_home($site);
+ //}
+
+ if ($site->save())
+ system_message(elgg_echo("admin:configuration:success"));
+ else
register_error(elgg_echo("admin:configuration:fail"));
- //header("Location: {$CONFIG->wwwroot}admin/site/"); + //header("Location: {$CONFIG->wwwroot}admin/site/");
forward($_SERVER['HTTP_REFERER']);
exit;
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php index 8b8f78517..9fbbd3802 100644 --- a/actions/systemsettings/install.php +++ b/actions/systemsettings/install.php @@ -58,6 +58,7 @@ set_config('view', get_input('view'), $site->getGUID());
set_config('language', get_input('language'), $site->getGUID());
+ set_config('default_access', get_input('default_access'), $site->getGUID());
$debug = get_input('debug');
if ($debug)
|