All line endings are now Unix-style.

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

4 files changed, 101 insertions, 101 deletions

diff --git a/views/default/river/item/list.php b/views/default/river/item/list.php
index f529aac3f..7bbac0044 100644
--- a/views/default/river/item/list.php
+++ b/views/default/river/item/list.php
@@ -1,51 +1,51 @@
-

-<div class="river_item_list">

-<?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);

-			$i++;

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

-			

-		}

-		

-	}

-	

-	if ($vars['pagination'] !== false) {

-	

-		$baseurl = $_SERVER['REQUEST_URI'];

-		$baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl); 

-		

-		$nav = '';

-		

-		if (sizeof($vars['items']) > $vars['limit']) {

-			$newoffset = $vars['offset'] + $vars['limit'];

-			$urladdition = 'offset='.$newoffset;

-			if (substr_count($baseurl,'?')) $nexturl=$baseurl . '&' . $urladdition; else $nexturl=$baseurl . '?' . $urladdition;

-			

-			$nav .= '<a class="back" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';

-		}

-			

-		if ($vars['offset'] > 0) {

-			$newoffset = $vars['offset'] - $vars['limit'];

-			if ($newoffset < 0) $newoffset = 0;

-			$urladdition = 'offset='.$newoffset;

-			if (substr_count($baseurl,'?')) $prevurl=$baseurl . '&' . $urladdition; else $prevurl=$baseurl . '?' . $urladdition;

-			

-			$nav .= '<a class="forward" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';

-		}

-	 

-		

-		if (!empty($nav)) {

-			echo '<div class="river_pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>';

-		}

-	

-	}

-

-?>

+
+<div class="river_item_list">
+<?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);
+			$i++;
+			if ($i >= $vars['limit']) break;
+			
+		}
+		
+	}
+	
+	if ($vars['pagination'] !== false) {
+	
+		$baseurl = $_SERVER['REQUEST_URI'];
+		$baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl); 
+		
+		$nav = '';
+		
+		if (sizeof($vars['items']) > $vars['limit']) {
+			$newoffset = $vars['offset'] + $vars['limit'];
+			$urladdition = 'offset='.$newoffset;
+			if (substr_count($baseurl,'?')) $nexturl=$baseurl . '&' . $urladdition; else $nexturl=$baseurl . '?' . $urladdition;
+			
+			$nav .= '<a class="back" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+		}
+			
+		if ($vars['offset'] > 0) {
+			$newoffset = $vars['offset'] - $vars['limit'];
+			if ($newoffset < 0) $newoffset = 0;
+			$urladdition = 'offset='.$newoffset;
+			if (substr_count($baseurl,'?')) $prevurl=$baseurl . '&' . $urladdition; else $prevurl=$baseurl . '?' . $urladdition;
+			
+			$nav .= '<a class="forward" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+		}
+	 
+		
+		if (!empty($nav)) {
+			echo '<div class="river_pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>';
+		}
+	
+	}
+
+?>
 </div>
\ No newline at end of file
diff --git a/views/default/river/item/noaccess.php b/views/default/river/item/noaccess.php
index 47c177ea4..96958170b 100644
--- a/views/default/river/item/noaccess.php
+++ b/views/default/river/item/noaccess.php
@@ -1,5 +1,5 @@
-<?php

-

-	echo elgg_echo('river:noaccess');

-

+<?php
+
+	echo elgg_echo('river:noaccess');
+
 ?>
\ No newline at end of file
diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php
index 457e25abe..2b146c3c5 100644
--- a/views/default/river/item/wrapper.php
+++ b/views/default/river/item/wrapper.php
@@ -1,40 +1,40 @@
-<?php

-

-	/**

-	 * Elgg river item wrapper.

-	 * Wraps all river items.

-	 * 

-	 * @package Elgg

+<?php
 
-	 * @author Curverider

+	/**
+	 * Elgg river item wrapper.
+	 * Wraps all river items.
+	 * 
+	 * @package Elgg
 
-	 * @link http://elgg.com/

-	 */

-

-

-?>

-

-	<div class="river_item">

-		<div class="river_<?php echo $vars['item']->type; ?>">

-			<div class="river_<?php echo $vars['item']->subtype; ?>">

-				<div class="river_<?php echo $vars['item']->action_type; ?>">				

-					<div class="river_<?php echo $vars['item']->type; ?>_<?php if($vars['item']->subtype) echo $vars['item']->subtype . "_"; ?><?php echo $vars['item']->action_type; ?>">

-					<p>

-						<?php

-		

-								echo $vars['body'];

-				

-						?>

-						<span class="river_item_time">

-							(<?php

-				

-								echo friendly_time($vars['item']->posted);

-							

-							?>)

-						</span>

-					</p>

-					</div>

-				</div>				

-			</div>

-		</div>

+	 * @author Curverider
+
+	 * @link http://elgg.com/
+	 */
+
+
+?>
+
+	<div class="river_item">
+		<div class="river_<?php echo $vars['item']->type; ?>">
+			<div class="river_<?php echo $vars['item']->subtype; ?>">
+				<div class="river_<?php echo $vars['item']->action_type; ?>">				
+					<div class="river_<?php echo $vars['item']->type; ?>_<?php if($vars['item']->subtype) echo $vars['item']->subtype . "_"; ?><?php echo $vars['item']->action_type; ?>">
+					<p>
+						<?php
+		
+								echo $vars['body'];
+				
+						?>
+						<span class="river_item_time">
+							(<?php
+				
+								echo friendly_time($vars['item']->posted);
+							
+							?>)
+						</span>
+					</p>
+					</div>
+				</div>				
+			</div>
+		</div>
 	</div>
\ No newline at end of file
diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php
index 23dd508fd..cba00ff5a 100644
--- a/views/default/river/wrapper.php
+++ b/views/default/river/wrapper.php
@@ -1,15 +1,15 @@
-<?php

-

-	/**

-	 * Elgg river item wrapper.

-	 * Wraps all river items.

-	 * 

-	 * @package Elgg

+<?php
 
-	 * @author Curverider

+	/**
+	 * Elgg river item wrapper.
+	 * Wraps all river items.
+	 * 
+	 * @package Elgg
 
-	 * @link http://elgg.com/

-	 */

+	 * @author Curverider
+
+	 * @link http://elgg.com/
+	 */
 
 	$statement = $vars['statement'];
 	$time = $vars['time'];