All line endings are now Unix-style.

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

3 files changed, 129 insertions, 129 deletions

diff --git a/views/default/page_elements/contentwrapper.php b/views/default/page_elements/contentwrapper.php
index ff54a0b6e..2cb001b05 100644
--- a/views/default/page_elements/contentwrapper.php
+++ b/views/default/page_elements/contentwrapper.php
@@ -1,11 +1,11 @@
-<div class="contentWrapper<?php

-

-	if (isset($vars['subclass'])) echo ' ' . $vars['subclass'];

-

-?>">

-<?php

-

-	echo $vars['body'];

-

-?>

+<div class="contentWrapper<?php
+
+	if (isset($vars['subclass'])) echo ' ' . $vars['subclass'];
+
+?>">
+<?php
+
+	echo $vars['body'];
+
+?>
 </div>
\ No newline at end of file
diff --git a/views/default/page_elements/header_contents.php b/views/default/page_elements/header_contents.php
index 904378ef4..2786a720e 100644
--- a/views/default/page_elements/header_contents.php
+++ b/views/default/page_elements/header_contents.php
@@ -1,25 +1,25 @@
-<?php

-

-	/**

-	 * Elgg header contents

-	 * This file holds the header output that a user will see

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg header contents
+	 * This file holds the header output that a user will see
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 **/

-	 

-?>

-

-<div id="page_container">

-<div id="page_wrapper">

-

-<div id="layout_header">

-<div id="wrapper_header">

-	<!-- display the page title -->

-	<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>

-</div><!-- /#wrapper_header -->

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 **/
+	 
+?>
+
+<div id="page_container">
+<div id="page_wrapper">
+
+<div id="layout_header">
+<div id="wrapper_header">
+	<!-- display the page title -->
+	<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
+</div><!-- /#wrapper_header -->
 </div><!-- /#layout_header -->
\ No newline at end of file
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 8296f2e5e..535d1b064 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -1,100 +1,100 @@
-<?php

-

-	/**

-	 * Elgg owner block

-	 * Displays page ownership information

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg owner block
+	 * Displays page ownership information
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 */
+
+		$contents = "";
+
+	// Is there a page owner?
+		$owner = page_owner_entity();
+		// if (!$owner && isloggedin()) $owner = $_SESSION['user'];
+		if ($owner instanceof ElggEntity) {
+			$icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+			if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
+				//$info = $owner->name;
+				$info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
+			}
+			$display = "<div id=\"owner_block_icon\">" . $icon . "</div>";
+			$display .= "<div id=\"owner_block_content\">" . $info . "</div><div class=\"clearfloat ownerblockline\"></div>";
+			
+			if ($owner->briefdescription) {
+			    $desc = $owner->briefdescription;
+			    $display .= "<div id=\"owner_block_desc\">" . $desc . "</div>";
+		    }
+		    
+		    $contents .= $display;
+		}
+		
+	// Are there feeds to display?
+		global $autofeed;
+		
+		if (isset($autofeed) && $autofeed == true) {
+			$url = $url2 = full_url();
+			if (substr_count($url,'?')) {
+				$url .= "&view=rss";
+			} else {
+				$url .= "?view=rss";
+			}
+			//if (substr_count($url2,'?')) {
+			//	$url2 .= "&view=odd";
+			//} else {
+			//	$url2 .= "?view=opendd";
+			//}
+			$label = elgg_echo('feed:rss');
+			//$label2 = elgg_echo('feed:odd');
+			$contents .= <<<END
+
+	<div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div>
+			
+END;
+		}
+		
+		//the follow are for logged in users only
+		if(isloggedin()){
+		
+    		//is the bookmark plugin installed?
+    		if(is_plugin_enabled('bookmarks')){
+    
+    		  	$label3 = elgg_echo('bookmarks:this');
+    			$contents .= "<div id=\"owner_block_bookmark_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/bookmarks/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label3}</a></div>";
+    
+    		}
+    
+    		//report this button
+    		if (is_plugin_enabled('reportedcontent'))
+    		{
+	    		$label4 = elgg_echo('reportedcontent:report');
+	    		$contents .= "<div id=\"owner_block_report_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label4}</a></div>";
+    		}
+
+	    }
+
+		
+		$contents .= elgg_view('owner_block/extend');
+		
+	// Have we been asked to inject any content? If so, display it
+		if (isset($vars['content']))
+			$contents .= $vars['content'];
+		
+	// Initialise the submenu
+		$submenu = get_submenu(); // elgg_view('canvas_header/submenu');
+		if (!empty($submenu))
+			$contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options
+			
+		if (!empty($contents)) {
+			echo "<div id=\"owner_block\">";
+			echo $contents;
+			echo "</div><div id=\"owner_block_bottom\"></div>";
+		}
 
-	 * @link http://elgg.org/

-	 * 

-	 */

-

-		$contents = "";

-

-	// Is there a page owner?

-		$owner = page_owner_entity();

-		// if (!$owner && isloggedin()) $owner = $_SESSION['user'];

-		if ($owner instanceof ElggEntity) {

-			$icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));

-			if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {

-				//$info = $owner->name;

-				$info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';

-			}

-			$display = "<div id=\"owner_block_icon\">" . $icon . "</div>";

-			$display .= "<div id=\"owner_block_content\">" . $info . "</div><div class=\"clearfloat ownerblockline\"></div>";

-			

-			if ($owner->briefdescription) {

-			    $desc = $owner->briefdescription;

-			    $display .= "<div id=\"owner_block_desc\">" . $desc . "</div>";

-		    }

-		    

-		    $contents .= $display;

-		}

-		

-	// Are there feeds to display?

-		global $autofeed;

-		

-		if (isset($autofeed) && $autofeed == true) {

-			$url = $url2 = full_url();

-			if (substr_count($url,'?')) {

-				$url .= "&view=rss";

-			} else {

-				$url .= "?view=rss";

-			}

-			//if (substr_count($url2,'?')) {

-			//	$url2 .= "&view=odd";

-			//} else {

-			//	$url2 .= "?view=opendd";

-			//}

-			$label = elgg_echo('feed:rss');

-			//$label2 = elgg_echo('feed:odd');

-			$contents .= <<<END

-

-	<div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div>

-			

-END;

-		}

-		

-		//the follow are for logged in users only

-		if(isloggedin()){

-		

-    		//is the bookmark plugin installed?

-    		if(is_plugin_enabled('bookmarks')){

-    

-    		  	$label3 = elgg_echo('bookmarks:this');

-    			$contents .= "<div id=\"owner_block_bookmark_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/bookmarks/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label3}</a></div>";

-    

-    		}

-    

-    		//report this button

-    		if (is_plugin_enabled('reportedcontent'))

-    		{

-	    		$label4 = elgg_echo('reportedcontent:report');

-	    		$contents .= "<div id=\"owner_block_report_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label4}</a></div>";

-    		}

-

-	    }

-

-		

-		$contents .= elgg_view('owner_block/extend');

-		

-	// Have we been asked to inject any content? If so, display it

-		if (isset($vars['content']))

-			$contents .= $vars['content'];

-		

-	// Initialise the submenu

-		$submenu = get_submenu(); // elgg_view('canvas_header/submenu');

-		if (!empty($submenu))

-			$contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options

-			

-		if (!empty($contents)) {

-			echo "<div id=\"owner_block\">";

-			echo $contents;

-			echo "</div><div id=\"owner_block_bottom\"></div>";

-		}

-

 ?>
\ No newline at end of file