From 8e518978b3f570930a8f5c3bfcbceb4b2ef61f78 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 23 Mar 2011 01:55:47 +0000 Subject: Refs #3165 new admin users all get admin widgets git-svn-id: http://code.elgg.org/elgg/trunk@8823 36083f99-b078-4883-b0ff-0f9b5a30f544 --- install/ElggInstaller.php | 51 ++++------------------------------------------- 1 file changed, 4 insertions(+), 47 deletions(-) (limited to 'install/ElggInstaller.php') diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php index a62ba2bc4..6e946f0d0 100644 --- a/install/ElggInstaller.php +++ b/install/ElggInstaller.php @@ -28,16 +28,6 @@ class ElggInstaller { protected $autoLogin = TRUE; - /** - * @var array An array of widgets to add to the admin dashboard. - * - * In the form column => array of handlers in order, top to bottom - */ - protected $adminWidgets = array( - 1 => array('online_users', 'new_users', 'content_stats'), - 2 => array('admin_welcome'), - ); - /** * Constructor bootstraps the Elgg engine */ @@ -178,8 +168,6 @@ class ElggInstaller { if (!$this->createAdminAccount($params)) { throw new InstallationException(elgg_echo('install:admin:cannot_create')); } - - $this->addAdminWidgets(); } /** @@ -496,7 +484,6 @@ class ElggInstaller { * @return void */ protected function complete() { - $this->addAdminWidgets(); $params = array(); if ($this->autoLogin) { @@ -746,7 +733,8 @@ class ElggInstaller { 'private_settings.php', 'relationships.php', 'river.php', 'sites.php', 'statistics.php', 'tags.php', 'user_settings.php', 'users.php', 'version.php', 'web_services.php', - 'widgets.php', 'xml.php', 'xml-rpc.php' + 'widgets.php', 'xml.php', 'xml-rpc.php', 'deprecated-1.7.php', + 'deprecated-1.8.php', ); foreach ($lib_files as $file) { @@ -1364,39 +1352,6 @@ class ElggInstaller { } } - /** - * Adds default admin widgets to the admin dashboard. - * - * @return bool - */ - protected function addAdminWidgets() { - elgg_set_ignore_access(true); - // should only be one. - $users = elgg_get_entities(array( - 'type' => 'user', - 'limit' => 1, - )); - - if ($users) { - if ($users[0]->isAdmin()) { - $admin = $users[0]; - } - } else { - return false; - } - - foreach ($this->adminWidgets as $column => $handlers) { - foreach ($handlers as $position => $handler) { - $guid = elgg_create_widget($admin->getGUID(), $handler, 'admin'); - if ($guid) { - $widget = get_entity($guid); - $widget->move($column, $position); - } - } - } - elgg_set_ignore_access(false); - } - /** * Admin account support methods */ @@ -1477,6 +1432,8 @@ class ElggInstaller { elgg_set_ignore_access(TRUE); if ($user->makeAdmin() == FALSE) { register_error(elgg_echo('install:error:adminaccess')); + } else { + datalist_set('admin_registered', 1); } elgg_set_ignore_access(FALSE); -- cgit v1.2.3