All line endings are now Unix-style.

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

7 files changed, 158 insertions, 158 deletions

diff --git a/views/rss/annotation/default.php b/views/rss/annotation/default.php
index 982654246..1433ba9b0 100644
--- a/views/rss/annotation/default.php
+++ b/views/rss/annotation/default.php
@@ -1,30 +1,30 @@
-<?php

-

-	/**

-	 * Elgg generic comment

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
+
+	/**
+	 * Elgg generic comment
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
 
-	 * @author Curverider Ltd

+	 * @link http://elgg.org/
+	 * 
+	 */
+
+
+	$vars['entity'] = get_entity($vars['annotation']->entity_guid);
+	$title = substr($vars['annotation']->value,0,32);
+		if (strlen($vars['annotation']->value) > 32)
+			$title .= " ...";
+	
+?>
 
-	 * @link http://elgg.org/

-	 * 

-	 */

-

-

-	$vars['entity'] = get_entity($vars['annotation']->entity_guid);

-	$title = substr($vars['annotation']->value,0,32);

-		if (strlen($vars['annotation']->value) > 32)

-			$title .= " ...";

-	

-?>

-

-	<item>

-	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?>#<?php echo $vars['annotation']->id; ?></guid>

-	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>

-	  <link><?php echo $vars['entity']->getURL(); ?>#<?php echo $vars['annotation']->id; ?></link>

-	  <title><![CDATA[<?php echo $title; ?>]]></title>

+	<item>
+	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?>#<?php echo $vars['annotation']->id; ?></guid>
+	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
+	  <link><?php echo $vars['entity']->getURL(); ?>#<?php echo $vars['annotation']->id; ?></link>
+	  <title><![CDATA[<?php echo $title; ?>]]></title>
 	  <description><![CDATA[<?php echo (autop($vars['annotation']->value)); ?>]]></description>
 	  <?php
 			$owner = get_entity($vars['entity']->owner);
@@ -46,5 +46,5 @@
 				<?php
 			}
 	  ?>
-	  <?php echo elgg_view('extensions/item'); ?>

-	</item>

+	  <?php echo elgg_view('extensions/item'); ?>
+	</item>
diff --git a/views/rss/canvas/default.php b/views/rss/canvas/default.php
index 34ff1984d..a5c30fe52 100644
--- a/views/rss/canvas/default.php
+++ b/views/rss/canvas/default.php
@@ -1,21 +1,21 @@
-<?php

-

-	/**

-	 * Elgg default layout

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg default layout
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	for ($i = 1; $i < 8; $i++) {
+		
+		if (isset($vars["area{$i}"]))
+			echo $vars["area{$i}"];
+		
+	}
 
-	 * @link http://elgg.org/

-	 */

-

-	for ($i = 1; $i < 8; $i++) {

-		

-		if (isset($vars["area{$i}"]))

-			echo $vars["area{$i}"];

-		

-	}

-

 ?>
\ No newline at end of file
diff --git a/views/rss/group/default.php b/views/rss/group/default.php
index 93dfe83e2..6ab14ecce 100644
--- a/views/rss/group/default.php
+++ b/views/rss/group/default.php
@@ -1,23 +1,23 @@
-<?php

-

-	/**

-	 * Elgg default group view

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
+
+	/**
+	 * Elgg default group view
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
 
-	 * @author Curverider Ltd

+	 * @link http://elgg.org/
+	 */
+
+?>
 
-	 * @link http://elgg.org/

-	 */

-

-?>

-

-	<item>

-	  <guid isPermaLink='true'><?php echo htmlspecialchars($vars['entity']->getURL()); ?></guid>

-	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>

-	  <link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>

-	  <title><![CDATA[<?php echo (($vars['entity']->name)); ?>]]></title>

+	<item>
+	  <guid isPermaLink='true'><?php echo htmlspecialchars($vars['entity']->getURL()); ?></guid>
+	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
+	  <link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
+	  <title><![CDATA[<?php echo (($vars['entity']->name)); ?>]]></title>
 	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
 	  <?php
 			$owner = $vars['entity']->getOwnerEntity();
@@ -39,5 +39,5 @@
 				<?php
 			}
 	  ?>
-	  <?php echo elgg_view('extensions/item'); ?>

-	</item>

+	  <?php echo elgg_view('extensions/item'); ?>
+	</item>
diff --git a/views/rss/object/default.php b/views/rss/object/default.php
index 69d16d4f6..060e471c4 100644
--- a/views/rss/object/default.php
+++ b/views/rss/object/default.php
@@ -1,31 +1,31 @@
-<?php

-

-	/**

-	 * Elgg default object view

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
+
+	/**
+	 * Elgg default object view
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
 
-	 * @author Curverider Ltd

+	 * @link http://elgg.org/
+	 */
+
+	$title = $vars['entity']->title;
+	if (empty($title)) {
+		$subtitle = strip_tags($vars['entity']->description);
+		$title = substr($subtitle,0,32);
+		if (strlen($subtitle) > 32)
+			$title .= " ...";
+	}
+
+?>
 
-	 * @link http://elgg.org/

-	 */

-

-	$title = $vars['entity']->title;

-	if (empty($title)) {

-		$subtitle = strip_tags($vars['entity']->description);

-		$title = substr($subtitle,0,32);

-		if (strlen($subtitle) > 32)

-			$title .= " ...";

-	}

-

-?>

-

-	<item>

-	  <guid isPermaLink='true'><?php echo htmlspecialchars($vars['entity']->getURL()); ?></guid>

-	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>

-	  <link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>

-	  <title><![CDATA[<?php echo $title; ?>]]></title>

+	<item>
+	  <guid isPermaLink='true'><?php echo htmlspecialchars($vars['entity']->getURL()); ?></guid>
+	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
+	  <link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
+	  <title><![CDATA[<?php echo $title; ?>]]></title>
 	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
 	  <?php
 			$owner = $vars['entity']->getOwnerEntity();
@@ -47,5 +47,5 @@
 				<?php
 			}
 	  ?>
-	  <?php echo elgg_view('extensions/item'); ?>

-	</item>

+	  <?php echo elgg_view('extensions/item'); ?>
+	</item>
diff --git a/views/rss/page_elements/contentwrapper.php b/views/rss/page_elements/contentwrapper.php
index 640dd8104..15397d552 100644
--- a/views/rss/page_elements/contentwrapper.php
+++ b/views/rss/page_elements/contentwrapper.php
@@ -1,5 +1,5 @@
-<?php

-

-	echo $vars['body'];

-

+<?php
+
+	echo $vars['body'];
+
 ?>
\ No newline at end of file
diff --git a/views/rss/river/item/list.php b/views/rss/river/item/list.php
index 214f8c800..c74a99f97 100644
--- a/views/rss/river/item/list.php
+++ b/views/rss/river/item/list.php
@@ -1,42 +1,42 @@
-<?php

-

-	if (isset($vars['items']) && is_array($vars['items'])) {

-		

-		$i = 0;

-		if (!empty($vars['items']))

-		foreach($vars['items'] as $item) {

-			

-			// echo elgg_view_river_item($item);

-			if (elgg_view_exists($item->view,'default')) {

-				$body = elgg_view($item->view,array(

-									'item' => $item

-								 ),false,false,'default');

-				$time = date("r",$item->posted);

-				if ($entity = get_entity($item->object_guid)) {

-					$url = htmlspecialchars($entity->getURL());

-				} else {

-					$url = $vars['url'];

-				}

-				$title = strip_tags($body);

-				

-?>

-	<item>

-	  <guid isPermaLink='true'><?php echo $url; ?></guid>

-	  <pubDate><?php echo $time; ?></pubDate>

-	  <link><?php echo $url; ?></link>

-	  <title><![CDATA[<?php echo $title; ?>]]></title>

-	  <description><![CDATA[<?php echo (autop($body)); ?>]]></description>

-	</item>

-<?php

-				

-			}

-			

-			$i++;

-			if ($i >= $vars['limit']) break;

-			

-		}

-		

-	}

-	

-

+<?php
+
+	if (isset($vars['items']) && is_array($vars['items'])) {
+		
+		$i = 0;
+		if (!empty($vars['items']))
+		foreach($vars['items'] as $item) {
+			
+			// echo elgg_view_river_item($item);
+			if (elgg_view_exists($item->view,'default')) {
+				$body = elgg_view($item->view,array(
+									'item' => $item
+								 ),false,false,'default');
+				$time = date("r",$item->posted);
+				if ($entity = get_entity($item->object_guid)) {
+					$url = htmlspecialchars($entity->getURL());
+				} else {
+					$url = $vars['url'];
+				}
+				$title = strip_tags($body);
+				
+?>
+	<item>
+	  <guid isPermaLink='true'><?php echo $url; ?></guid>
+	  <pubDate><?php echo $time; ?></pubDate>
+	  <link><?php echo $url; ?></link>
+	  <title><![CDATA[<?php echo $title; ?>]]></title>
+	  <description><![CDATA[<?php echo (autop($body)); ?>]]></description>
+	</item>
+<?php
+				
+			}
+			
+			$i++;
+			if ($i >= $vars['limit']) break;
+			
+		}
+		
+	}
+	
+
 ?>
\ No newline at end of file
diff --git a/views/rss/user/default.php b/views/rss/user/default.php
index 98683d0cb..b3418538a 100644
--- a/views/rss/user/default.php
+++ b/views/rss/user/default.php
@@ -1,23 +1,23 @@
-<?php

-

-	/**

-	 * Elgg default user view

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg default user view
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-

-?>

-

-	<item>

-	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>

-	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>

-	  <link><?php echo $vars['entity']->getURL(); ?></link>

-	  <title><![CDATA[<?php echo (($vars['entity']->name)); ?>]]></title>

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+	<item>
+	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>
+	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
+	  <link><?php echo $vars['entity']->getURL(); ?></link>
+	  <title><![CDATA[<?php echo (($vars['entity']->name)); ?>]]></title>
 	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
 	  <?php
 			if (
@@ -30,5 +30,5 @@
 				<?php
 			}
 	  ?>
-	  <?php echo elgg_view('extensions/item'); ?>

-	</item>

+	  <?php echo elgg_view('extensions/item'); ?>
+	</item>