Converted most forms to use elgg_view_form (therefore also moved the views to forms/*). Some views are left that _only_ do elgg_view_form, so I wonder if those should even be kept around.

git-svn-id: http://code.elgg.org/elgg/trunk@8127 36083f99-b078-4883-b0ff-0f9b5a30f544

5 files changed, 112 insertions, 116 deletions

diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index a3d7b3cad..eb5c3db95 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -23,12 +23,7 @@ $people = array();
 
 $groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 9999));
 
-$form_body = elgg_view('notifications/subscriptions/groupsform',array('groups' => $groupmemberships));
-$body = elgg_view('input/form',array(
-		'body' => $form_body,
-		'method' => 'post',
-		'action' => 'action/notificationsettings/groupsave'
-));
+$body = elgg_view_form('notificationsettings/groupsave', array(), array('groups' => $groupmemberships));
 
 $params = array(
 	'content' => $body,
diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
new file mode 100644
index 000000000..632e34a54
--- /dev/null
+++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Elgg notifications groups subscription form
+ *
+ * @package ElggNotifications
+ */
+
+global $NOTIFICATION_HANDLERS;
+foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+	$subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 99999));
+	$tmparray = array();
+	if ($subsbig[$method]) {
+		foreach($subsbig[$method] as $tmpent) {
+			$tmparray[] = $tmpent->guid;
+		}
+	}
+	$subsbig[$method] = $tmparray;
+}
+
+?>
+
+<div class="elgg-module elgg-module-info">
+	<div class="elgg-body">
+	<?php
+		echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
+	?>
+	
+	<p>
+		<?php
+
+			echo elgg_echo('notifications:subscriptions:groups:description');
+		
+		?>
+	</p>
+<?php
+
+if (isset($vars['groups']) && !empty($vars['groups'])) {
+
+?>
+	<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
+		<tr>
+			<td>&nbsp;</td>
+<?php
+
+	$i = 0; 
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+		if ($i > 0) {
+			echo "<td class='spacercolumn'>&nbsp;</td>";
+		}
+?>
+			<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
+<?php
+		$i++;
+	}
+?>
+			<td>&nbsp;</td>
+		</tr>
+<?php
+	foreach($vars['groups'] as $group) {
+		
+		$fields = '';
+		$i = 0;
+		
+		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+			if (in_array($group->guid,$subsbig[$method])) {
+				$checked[$method] = 'checked="checked"';
+			} else {
+				$checked[$method] = '';
+			}
+			if ($i > 0) {
+				$fields .= "<td class=\"spacercolumn\">&nbsp;</td>";
+			}
+			$fields .= <<< END
+				<td class="{$method}togglefield">
+				<a border="0" id="{$method}{$group->guid}" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}{$group->guid}');">
+				<input type="checkbox" name="{$method}subscriptions[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}{$group->guid}');" value="{$group->guid}" {$checked[$method]} /></a></td>
+END;
+			$i++;
+		}
+	
+?>
+		<tr>
+			<td class="namefield">
+				<p>
+					<?php echo $group->name; ?>
+				</p>
+			</td>
+<?php
+		echo $fields;
+?>
+			<td>&nbsp;</td>
+		</tr>
+<?php
+	}
+?>
+	</table>
+<?php
+}
+?>
+	<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
+	</div>
+</div>
diff --git a/mod/notifications/views/default/forms/notificationsettings/save.php b/mod/notifications/views/default/forms/notificationsettings/save.php
new file mode 100644
index 000000000..ec0c9c701
--- /dev/null
+++ b/mod/notifications/views/default/forms/notificationsettings/save.php
@@ -0,0 +1,5 @@
+<?php
+
+echo elgg_view('notifications/subscriptions/personal');
+echo elgg_view('notifications/subscriptions/collections');
+echo elgg_view('notifications/subscriptions/forminternals');
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 654cb01c1..008e98554 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -8,12 +8,4 @@ echo elgg_view('subscriptions/form/additions',$vars);
 	
 // Display a description
 
-echo elgg_view('input/form',array(
-		'body' => 	elgg_view('notifications/subscriptions/personal') .
-					elgg_view('notifications/subscriptions/collections') .
-					elgg_view('notifications/subscriptions/forminternals'),
-		'method' => 'post',
-		'action' => 'action/notificationsettings/save',
-	));
-
-?>
+echo elgg_view_form('notificationsettings/save');
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
index 632e34a54..f1dbdcff8 100644
--- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -1,102 +1,4 @@
-<?php
-/**
- * Elgg notifications groups subscription form
- *
- * @package ElggNotifications
- */
+<?php 
 
-global $NOTIFICATION_HANDLERS;
-foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-	$subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 99999));
-	$tmparray = array();
-	if ($subsbig[$method]) {
-		foreach($subsbig[$method] as $tmpent) {
-			$tmparray[] = $tmpent->guid;
-		}
-	}
-	$subsbig[$method] = $tmparray;
-}
-
-?>
-
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-body">
-	<?php
-		echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
-	?>
-	
-	<p>
-		<?php
-
-			echo elgg_echo('notifications:subscriptions:groups:description');
-		
-		?>
-	</p>
-<?php
-
-if (isset($vars['groups']) && !empty($vars['groups'])) {
-
-?>
-	<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
-		<tr>
-			<td>&nbsp;</td>
-<?php
-
-	$i = 0; 
-	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-		if ($i > 0) {
-			echo "<td class='spacercolumn'>&nbsp;</td>";
-		}
-?>
-			<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
-<?php
-		$i++;
-	}
-?>
-			<td>&nbsp;</td>
-		</tr>
-<?php
-	foreach($vars['groups'] as $group) {
-		
-		$fields = '';
-		$i = 0;
-		
-		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-			if (in_array($group->guid,$subsbig[$method])) {
-				$checked[$method] = 'checked="checked"';
-			} else {
-				$checked[$method] = '';
-			}
-			if ($i > 0) {
-				$fields .= "<td class=\"spacercolumn\">&nbsp;</td>";
-			}
-			$fields .= <<< END
-				<td class="{$method}togglefield">
-				<a border="0" id="{$method}{$group->guid}" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}{$group->guid}');">
-				<input type="checkbox" name="{$method}subscriptions[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}{$group->guid}');" value="{$group->guid}" {$checked[$method]} /></a></td>
-END;
-			$i++;
-		}
-	
-?>
-		<tr>
-			<td class="namefield">
-				<p>
-					<?php echo $group->name; ?>
-				</p>
-			</td>
-<?php
-		echo $fields;
-?>
-			<td>&nbsp;</td>
-		</tr>
-<?php
-	}
-?>
-	</table>
-<?php
-}
-?>
-	<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
-	</div>
-</div>
+elgg_deprecated_notice("notifications/subscriptions/groupsform was moved to forms/notificationsettings/groupsave", 1.8);
+echo elgg_view('forms/notificationsettings/groupsave');
\ No newline at end of file