From 76d3b27335145459e1b9da4e07cf37ad8bd050c1 Mon Sep 17 00:00:00 2001
From: nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 25 May 2010 22:18:22 +0000
Subject: Updating administration plugins with admin submenu views.

git-svn-id: http://code.elgg.org/elgg/trunk@6220 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/defaultprofile.php                     | 55 ----------------------
 mod/profile/start.php                              | 25 +---------
 .../default/admin/appearance/defaultprofile.php    | 51 ++++++++++++++++++++
 3 files changed, 52 insertions(+), 79 deletions(-)
 delete mode 100644 mod/profile/defaultprofile.php
 create mode 100644 mod/profile/views/default/admin/appearance/defaultprofile.php

(limited to 'mod/profile')

diff --git a/mod/profile/defaultprofile.php b/mod/profile/defaultprofile.php
deleted file mode 100644
index 6d9a25832..000000000
--- a/mod/profile/defaultprofile.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Elgg profile - Admin area: edit default profile fields
- *
- * @package ElggProfile
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- */
-
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-admin_gatekeeper();
-set_context('admin');
-
-$title = elgg_view_title(elgg_echo('profile:edit:default'));
-$form = elgg_view('profile/editdefaultprofile');
-
-set_context('search');
-
-// List form elements
-$n = 0;
-$loaded_defaults = array();
-$items = array();
-if ($fieldlist = get_plugin_setting('user_defined_fields', 'profile')) {
-	$fieldlistarray = explode(',', $fieldlist);
-	foreach($fieldlistarray as $listitem) {
-		if ($translation = get_plugin_setting("admin_defined_profile_{$listitem}", 'profile')) {
-			$item = new stdClass;
-			$item->translation = $translation;
-			$item->shortname = $listitem;
-			$item->name = "admin_defined_profile_{$listitem}";
-			$item->type = get_plugin_setting("admin_defined_profile_type_{$listitem}", 'profile');
-			$items[] = $item;
-		}
-	}
-}
-
-$listing = elgg_view('profile/editdefaultprofileitems',array('items' => $items, 'fieldlist' => $fieldlist));
-
-$resetlisting = elgg_view('input/form',
-						array (
-							'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'), 'class' => 'action_button disabled')),
-							'action' => $CONFIG->wwwroot . 'action/profile/editdefault/reset'
-						)
-					);
-					
-$resetlisting = "<div class='default_profile_reset'>{$resetlisting}</div>";
-
-set_context('admin');
-
-$body = elgg_view_layout("administration", $title . $form . $listing . $resetlisting);
-
-page_draw(elgg_echo('profile:edit:default'), $body);
\ No newline at end of file
diff --git a/mod/profile/start.php b/mod/profile/start.php
index 6263f4a54..90caa8f64 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -40,7 +40,6 @@ function profile_init() {
 
 	// Register a page handler, so we can have nice URLs
 	register_page_handler('profile', 'profile_page_handler');
-	register_page_handler('defaultprofile', 'profileedit_page_handler');
 	register_page_handler('icon', 'profile_icon_handler');
 	register_page_handler('iconjs', 'profile_iconjs_handler');
 
@@ -52,11 +51,7 @@ function profile_init() {
 	// Now override icons
 	register_plugin_hook('entity:icon:url', 'user', 'profile_usericon_hook');
 	
-	elgg_add_submenu_item(array(
-		'text' => elgg_echo('profile:edit:default'),
-		'href' => "{$CONFIG->wwwroot}pg/defaultprofile/edit",
-		'parent_id' => 'appearance',
-	), 'admin', 'default');
+	elgg_add_admin_submenu_item('defaultprofile', elgg_echo('profile:edit:default'), 'appearance');
 }
 
 /**
@@ -169,24 +164,6 @@ function profile_page_handler($page) {
 	return;
 }
 
-/**
- * Profile edit page handler
- *
- * @param array $page Array of page elements, forwarded by the page handling mechanism
- */
-function profileedit_page_handler($page) {
-	global $CONFIG;
-
-	// The username should be the file we're getting
-	if (isset($page[0])) {
-		switch ($page[0]) {
-			default:
-				include($CONFIG->pluginspath . "profile/defaultprofile.php");
-				break;
-		}
-	}
-}
-
 /**
  * Pagesetup function
  *
diff --git a/mod/profile/views/default/admin/appearance/defaultprofile.php b/mod/profile/views/default/admin/appearance/defaultprofile.php
new file mode 100644
index 000000000..7c498780b
--- /dev/null
+++ b/mod/profile/views/default/admin/appearance/defaultprofile.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Elgg profile - Admin area: edit default profile fields
+ *
+ * @package ElggProfile
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+$title = elgg_view_title(elgg_echo('profile:edit:default'));
+$form = elgg_view('profile/editdefaultprofile');
+
+// List form elements
+$n = 0;
+$loaded_defaults = array();
+$items = array();
+if ($fieldlist = get_plugin_setting('user_defined_fields', 'profile')) {
+	$fieldlistarray = explode(',', $fieldlist);
+	foreach($fieldlistarray as $listitem) {
+		if ($translation = get_plugin_setting("admin_defined_profile_{$listitem}", 'profile')) {
+			$item = new stdClass;
+			$item->translation = $translation;
+			$item->shortname = $listitem;
+			$item->name = "admin_defined_profile_{$listitem}";
+			$item->type = get_plugin_setting("admin_defined_profile_type_{$listitem}", 'profile');
+			$items[] = $item;
+		}
+	}
+}
+
+$listing = elgg_view('profile/editdefaultprofileitems',array('items' => $items, 'fieldlist' => $fieldlist));
+
+$resetlisting = elgg_view('input/form',
+						array (
+							'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'), 'class' => 'action_button disabled')),
+							'action' => $CONFIG->wwwroot . 'action/profile/editdefault/reset'
+						)
+					);
+					
+$body = <<<__HTML
+$title
+$form
+$listing
+<div class="default_profile_reset">
+	$resetlisting
+</div>
+__HTML;
+
+echo $body;
-- 
cgit v1.2.3