merged in notifications plugin cleanup from 1.7 branch: [5962], [5978] - [5980], [6000]

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

5 files changed, 234 insertions, 211 deletions

diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index 87906bf76..d89dddb7b 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -5,10 +5,10 @@
 		for ( var i in members ) {
 			var checked = $('#' + method + 'collections' + id).children("INPUT[type='checkbox']").attr('checked');
 			if ($("#"+method+members[i]).children("INPUT[type='checkbox']").attr('checked') != checked) {  
-    			$("#"+method+members[i]).children("INPUT[type='checkbox']").attr('checked', checked);
-    			functioncall = 'adjust' + method + '_alt("'+method+members[i]+'");';
-    			eval(functioncall);
-    		}
+				$("#"+method+members[i]).children("INPUT[type='checkbox']").attr('checked', checked);
+				functioncall = 'adjust' + method + '_alt("'+method+members[i]+'");';
+				eval(functioncall);
+			}
 		} 
 	}
 	
@@ -21,121 +21,130 @@
 	<?php echo elgg_echo('notifications:subscriptions:collections:description'); ?>
 </p>
 <table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
-  <tr>
-    <td>&nbsp;</td>
+	<tr>
+		<td>&nbsp;</td>
 <?php
 	$i = 0; 
 	global $NOTIFICATION_HANDLERS;
 	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-		if ($i > 0)
+		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>
+		<td>&nbsp;</td>
+	</tr>
 <?php
-		$members = array();
-		if ($friends = get_user_friends($vars['user']->guid,'',9999,0)) {
-			foreach($friends as $friend)
-				$members[] = $friend->guid;
+	$members = array();
+	if ($friends = get_user_friends($vars['user']->guid, '', 9999, 0)) {
+		foreach($friends as $friend) {
+			$members[] = $friend->guid;
 		}
-		$memberno = sizeof($members);
-		$members = implode(',',$members);
+	}
+	$memberno = sizeof($members);
+	$members = implode(',',$members);
 
 ?>
-  <tr>
-    <td class="namefield">
-    	<p>
-    		<?php echo elgg_echo('friends:all'); ?> (<?php echo $memberno; ?>)
-    	</p>
-    </td>
+	<tr>
+		<td class="namefield">
+			<p>
+				<?php echo elgg_echo('friends:all'); ?> (<?php echo $memberno; ?>)
+			</p>
+		</td>
 <?php
 
-		$fields = '';
-		$i = 0;
-		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-			$metaname = 'collections_notifications_preferences_' . $method;
-			if ($collections_preferences = $vars['user']->$metaname) {
-				if (!empty($collections_preferences) && !is_array($collections_preferences))
-					$collections_preferences = array($collections_preferences);
-				if (is_array($collections_preferences))
+	$fields = '';
+	$i = 0;
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+		$metaname = 'collections_notifications_preferences_' . $method;
+		if ($collections_preferences = $vars['user']->$metaname) {
+			if (!empty($collections_preferences) && !is_array($collections_preferences)) {
+				$collections_preferences = array($collections_preferences);
+			}
+			if (is_array($collections_preferences)) {
 				if (in_array(-1,$collections_preferences)) {
 					$collectionschecked[$method] = 'checked="checked"';
 				} else {
 					$collectionschecked[$method] = '';
 				}
 			}
-			if ($i > 0) $fields .= "<td class='spacercolumn'>&nbsp;</td>";
-			$fields .= <<< END
-			    <td class="{$method}togglefield">
-			    <a border="0" id="{$method}collections-1" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}collections-1'); setCollection([{$members}],'{$method}',-1);">
-			    <input type="checkbox" name="{$method}collections[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}collections-1');" value="-1" {$collectionschecked[$method]} /></a></td>
-END;
-			$i++;
 		}
-		echo $fields;
+		if ($i > 0) {
+			$fields .= "<td class='spacercolumn'>&nbsp;</td>";
+		}
+		$fields .= <<< END
+			<td class="{$method}togglefield">
+			<a border="0" id="{$method}collections-1" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}collections-1'); setCollection([{$members}],'{$method}',-1);">
+			<input type="checkbox" name="{$method}collections[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}collections-1');" value="-1" {$collectionschecked[$method]} /></a></td>
+END;
+		$i++;
+	}
+	echo $fields;
 
 ?>
-	<td>&nbsp;</td>
-  </tr>
+		<td>&nbsp;</td>
+	</tr>
 <?php
 /*
 	@todo
 	collections removed from notifications - they are no longer used and will be replaced with shared access collections
 	
 	if ($collections = get_user_access_collections($vars['user']->guid)) {
-	foreach($collections as $collection) {
-		$members = get_members_of_access_collection($collection->id, true);
-		$memberno = sizeof($members);
-		$members = implode(',',$members);
+		foreach($collections as $collection) {
+			$members = get_members_of_access_collection($collection->id, true);
+			$memberno = sizeof($members);
+			$members = implode(',', $members);
 
 ?>
-  <tr>
-    <td class="namefield">
-    	<p>
-    		<?php echo $collection->name; ?> (<?php echo $memberno; ?>)
-    	</p>
-    	
-    </td>
-    
+	<tr>
+		<td class="namefield">
+			<p>
+				<?php echo $collection->name; ?> (<?php echo $memberno; ?>)
+			</p>
+		</td>
+
 <?php
 
-		$fields = '';
-		$i = 0;
-		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-			$metaname = 'collections_notifications_preferences_' . $method;
-			if ($collections_preferences = $vars['user']->$metaname) {
-				if (!empty($collections_preferences) && !is_array($collections_preferences))
-					$collections_preferences = array($collections_preferences);
-				if (is_array($collections_preferences))
-				if (in_array($collection->id,$collections_preferences)) {
-					$collectionschecked[$method] = 'checked="checked"';
-				} else {
-					$collectionschecked[$method] = '';
+			$fields = '';
+			$i = 0;
+			foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+				$metaname = 'collections_notifications_preferences_' . $method;
+				if ($collections_preferences = $vars['user']->$metaname) {
+					if (!empty($collections_preferences) && !is_array($collections_preferences)) {
+						$collections_preferences = array($collections_preferences);
+					}
+					if (is_array($collections_preferences)) {
+						if (in_array($collection->id,$collections_preferences)) {
+							$collectionschecked[$method] = 'checked="checked"';
+						} else {
+							$collectionschecked[$method] = '';
+						}
+					}
 				}
-			}
-			if ($i > 0) $fields .= "<td class='spacercolumn'>&nbsp;</td>";
-			$fields .= <<< END
-			    <td class="{$method}togglefield">
-			    <a border="0" id="{$method}collections{$collection->id}" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}collections{$collection->id}'); setCollection([{$members}],'{$method}',{$collection->id});">
-			    <input type="checkbox" name="{$method}collections[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}collections{$collection->id}');" value="{$collection->id}" {$collectionschecked[$method]} /></a></td>
+				if ($i > 0) {
+					$fields .= "<td class='spacercolumn'>&nbsp;</td>";
+				}
+				$fields .= <<< END
+					<td class="{$method}togglefield">
+					<a border="0" id="{$method}collections{$collection->id}" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}collections{$collection->id}'); setCollection([{$members}],'{$method}',{$collection->id});">
+					<input type="checkbox" name="{$method}collections[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}collections{$collection->id}');" value="{$collection->id}" {$collectionschecked[$method]} /></a></td>
 END;
-			$i++;
-		}
-		echo $fields;
+				$i++;
+			}
+			echo $fields;
 
 ?>
-  
-    <td>&nbsp;</td>
-  </tr>
+
+		<td>&nbsp;</td>
+	</tr>
 <?php
 
+		}
 	}
-}
 
 */
 ?>
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 8ad0110bf..d4f243e20 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -1,33 +1,34 @@
 <?php
 
-	/**
-	 * Elgg SMS Client
-	 * 
-	 * @package ElggSMS
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
+/**
+ * Elgg SMS Client
+ * 
+ * @package ElggSMS
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 
 
-	// Echo title
-		echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings'));
-		
-		echo elgg_view('subscriptions/form/additions',$vars);
-		
-	// Display a description
+// Echo title
+	echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings'));
+	
+	echo elgg_view('subscriptions/form/additions',$vars);
+	
+// Display a description
 ?>
 <div class="user_settings notifications">
 <?php
 
-	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' => $vars['url'] . 'action/notificationsettings/save',
-		));
+
+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' => $vars['url'] . 'action/notificationsettings/save',
+	));
 
 ?>
 </div>
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
index fa002b9da..edb9c587c 100644
--- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -1,95 +1,106 @@
 <?php
+/**
+ * Elgg notifications groups subscription form
+ *
+ * @package ElggNotifications
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 
-	global $NOTIFICATION_HANDLERS;
-	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-		$subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => $vars['user']->guid, 'types' => 'group', 'limit' => 99999));
-		$tmparray = array();
-		if ($subsbig[$method]) {
-			foreach($subsbig[$method] as $tmpent) {
-				$tmparray[] = $tmpent->guid;
-			}
+global $NOTIFICATION_HANDLERS;
+foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+	$subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => $vars['user']->guid, 'types' => 'group', 'limit' => 99999));
+	$tmparray = array();
+	if ($subsbig[$method]) {
+		foreach($subsbig[$method] as $tmpent) {
+			$tmparray[] = $tmpent->guid;
 		}
-		$subsbig[$method] = $tmparray;
 	}
+	$subsbig[$method] = $tmparray;
+}
+
+echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups'));
+?>
 
-echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups')); ?>
 <div class="user_settings margin_top">
+
+	<?php
+		echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
+	?>
+	
+	<p>
 		<?php
-			echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
-		?>
-		
-		<p>
-			<?php
 
-				echo elgg_echo('notifications:subscriptions:groups:description');
-			
-			?>
-		</p>
+			echo elgg_echo('notifications:subscriptions:groups:description');
+		
+		?>
+	</p>
 <?php
 
-		if (isset($vars['groups']) && !empty($vars['groups'])) {
-			
+if (isset($vars['groups']) && !empty($vars['groups'])) {
+
 ?>
-<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
-  <tr>
-    <td>&nbsp;</td>
+	<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
+		<tr>
+			<td>&nbsp;</td>
 <?php
-	global $NOTIFICATION_HANDLERS;
+
 	$i = 0; 
 	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-		if ($i > 0)
+		if ($i > 0) {
 			echo "<td class='spacercolumn'>&nbsp;</td>";
+		}
 ?>
-	<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></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>
+			<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++;
-				}
-				
+			$i++;
+		}
+	
 ?>
-	<tr>
-		<td class="namefield">
-	    	<p>
-	    		<?php echo $group->name; ?>
-	    	</p>
-	    </td>
+		<tr>
+			<td class="namefield">
+				<p>
+					<?php echo $group->name; ?>
+				</p>
+			</td>
 <?php
-				echo $fields;
+		echo $fields;
 ?>
-		<td>&nbsp;</td>
-	</tr>
+			<td>&nbsp;</td>
+		</tr>
 <?php
-	
-				
-			}
+	}
 ?>
-</table>
+	</table>
 <?php
-		}
-
+}
 ?>
-
-		<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
-</div>
\ No newline at end of file
+	<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
+</div>
diff --git a/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php b/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php
index da1598dae..d94edf9ef 100644
--- a/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php
+++ b/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php
@@ -1,6 +1,6 @@
 <?php
 
-	global $NOTIFICATION_HANDLERS;
+global $NOTIFICATION_HANDLERS;
 
 ?> 
 
@@ -8,14 +8,14 @@
 
 $(document).ready(function () {
 <?php 
-	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 ?>
 	$('input[type=checkbox]:checked').parent("a.<?php echo $method; ?>toggleOff").each(function(){
 		$(this).removeClass('<?php echo $method; ?>toggleOff').addClass('<?php echo $method; ?>toggleOn');
 	});
 	
 <?php
-	}
+}
 ?>
 
 });
@@ -23,7 +23,7 @@ $(document).ready(function () {
 	clickflag = 0;
 
 <?php 
-	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 ?>
 function adjust<?php echo $method; ?>(linkId) {
 	var obj = $(this).prev("a");
@@ -48,7 +48,7 @@ function adjust<?php echo $method; ?>_alt(linkId) {
 	return false;
 }
 <?php
-	}
+}
 ?>
 
 </script>
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/personal.php b/mod/notifications/views/default/notifications/subscriptions/personal.php
index d8ce0e97e..e70207aa3 100644
--- a/mod/notifications/views/default/notifications/subscriptions/personal.php
+++ b/mod/notifications/views/default/notifications/subscriptions/personal.php
@@ -1,6 +1,6 @@
 <?php
 
-	global $NOTIFICATION_HANDLERS;
+global $NOTIFICATION_HANDLERS;
 
 ?>
 <div class="notification_personal">
@@ -10,54 +10,56 @@
 	</h3>
 </div>
 <table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
-  <tr>
-    <td>&nbsp;</td>
+	<tr>
+		<td>&nbsp;</td>
 <?php
-	$i = 0; 
-	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-		if ($i > 0)
-			echo "<td class='spacercolumn'>&nbsp;</td>";
+$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>
+		<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
 <?php
-		$i++;
-	}
+	$i++;
+}
 ?>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="namefield">
-    	<p>
-    		<?php echo elgg_echo('notifications:subscriptions:personal:description') ?>
-    	</p>
-    	
-    </td>
-    
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td class="namefield">
+			<p>
+				<?php echo elgg_echo('notifications:subscriptions:personal:description') ?>
+			</p>
+		</td>
+
 <?php
 
-		$fields = '';
-		$i = 0;
-		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
-			if ($notification_settings = get_user_notification_settings($vars['user']->guid)) {
-				if ($notification_settings->$method) {
-					$personalchecked[$method] = 'checked="checked"';
-				} else {
-					$personalchecked[$method] = '';
-				}
-			}
-			if ($i > 0) $fields .= "<td class='spacercolumn'>&nbsp;</td>";
-			$fields .= <<< END
-			    <td class="{$method}togglefield">
-			    <a  border="0" id="{$method}personal" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}personal');">
-			    <input type="checkbox" name="{$method}personal" id="{$method}checkbox" onclick="adjust{$method}('{$method}personal');" value="1" {$personalchecked[$method]} /></a></td>
-END;
-			$i++;
+$fields = '';
+$i = 0;
+foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+	if ($notification_settings = get_user_notification_settings($vars['user']->guid)) {
+		if ($notification_settings->$method) {
+			$personalchecked[$method] = 'checked="checked"';
+		} else {
+			$personalchecked[$method] = '';
 		}
-		echo $fields;
+	}
+	if ($i > 0) {
+		$fields .= "<td class='spacercolumn'>&nbsp;</td>";
+	}
+	$fields .= <<< END
+		<td class="{$method}togglefield">
+		<a  border="0" id="{$method}personal" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}personal');">
+		<input type="checkbox" name="{$method}personal" id="{$method}checkbox" onclick="adjust{$method}('{$method}personal');" value="1" {$personalchecked[$method]} /></a></td>
+END;
+	$i++;
+}
+echo $fields;
 
 ?>
-  
-    <td>&nbsp;</td>
-  </tr>
+
+		<td>&nbsp;</td>
+	</tr>
 </table>
 </div>
\ No newline at end of file