All line endings are now Unix-style.

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

12 files changed, 282 insertions, 282 deletions

diff --git a/views/default/output/calendar.php b/views/default/output/calendar.php
index 353dd9b21..336129aed 100644
--- a/views/default/output/calendar.php
+++ b/views/default/output/calendar.php
@@ -1,19 +1,19 @@
 <?php
-

-	/**

-	 * Elgg calendar output

-	 * Displays a calendar output field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg calendar output
+	 * Displays a calendar output field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['value'] The current value, if any

-	 * 

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['value'] The current value, if any
+	 * 
+	 */
 
     if (is_int($vars['value'])) {
         echo date("F j, Y", $vars['value']);
diff --git a/views/default/output/checkboxes.php b/views/default/output/checkboxes.php
index 462d6969e..a93455e28 100644
--- a/views/default/output/checkboxes.php
+++ b/views/default/output/checkboxes.php
@@ -1,19 +1,19 @@
-<?php

-

-	/**

-	 * Elgg text output

-	 * Displays some text that was input using a standard text field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg text output
+	 * Displays some text that was input using a standard text field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['text'] The text to display

-	 * 

-	 */

-

-    echo elgg_view('output/tags',$vars);

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['text'] The text to display
+	 * 
+	 */
+
+    echo elgg_view('output/tags',$vars);
 ?>
\ No newline at end of file
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index c5440ab88..bb7e866f2 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -1,24 +1,24 @@
-<?php

-

-	/**

-	 * Elgg confirmation link

-	 * A link that displays a confirmation dialog before it executes

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg confirmation link
+	 * A link that displays a confirmation dialog before it executes
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['text'] The text of the link

-	 * @uses $vars['href'] The address

-	 * @uses $vars['confirm'] The dialog text

-	 * 

-	 */

-

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

-	if (!$confirm)

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['text'] The text of the link
+	 * @uses $vars['href'] The address
+	 * @uses $vars['confirm'] The dialog text
+	 * 
+	 */
+
+	$confirm = $vars['confirm'];
+	if (!$confirm)
 		$confirm = elgg_echo('question:areyousure');
 		
 	$link = $vars['href'];
@@ -31,12 +31,12 @@
     	$sep = "?";
 		if (strpos($link, '?')>0) $sep = "&";
 		$link = "$link{$sep}__elgg_token=$token&__elgg_ts=$ts";
-	}

-	

-	if ($vars['class']) {

-		$class = 'class="' . $vars['class'] . '"';

-	} else {

-		$class = '';

-	}

-?>

+	}
+	
+	if ($vars['class']) {
+		$class = 'class="' . $vars['class'] . '"';
+	} else {
+		$class = '';
+	}
+?>
 <a href="<?php echo $link; ?>" <?php echo $class; ?> onclick="return confirm('<?php echo addslashes($confirm); ?>');"><?php echo htmlentities($vars['text'], ENT_QUOTES, 'UTF-8'); ?></a>
\ No newline at end of file
diff --git a/views/default/output/date.php b/views/default/output/date.php
index 6973a6c92..d4fba97a0 100644
--- a/views/default/output/date.php
+++ b/views/default/output/date.php
@@ -1,21 +1,21 @@
-<?php

-

-	/**

-	 * Date

-	 * Displays a properly formatted date

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Date
+	 * Displays a properly formatted date
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['value'] A UNIX epoch timestamp

-	 * 

-	 */

-

-    if ($vars['value'] > 86400) {

-        echo date("F j, Y",$vars['value']);

-    }

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['value'] A UNIX epoch timestamp
+	 * 
+	 */
+
+    if ($vars['value'] > 86400) {
+        echo date("F j, Y",$vars['value']);
+    }
 ?>
\ No newline at end of file
diff --git a/views/default/output/email.php b/views/default/output/email.php
index 6c8e66901..2d454213f 100644
--- a/views/default/output/email.php
+++ b/views/default/output/email.php
@@ -1,21 +1,21 @@
-<?php

-

-	/**

-	 * Elgg email output

-	 * Displays an email address that was entered using an email input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg email output
+	 * Displays an email address that was entered using an email input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['value'] The email address to display

-	 * 

-	 */

-

-    if (!empty($vars['value'])) {

-    	echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlentities($vars['value'], ENT_QUOTES, 'UTF-8') ."</a>";

-    }

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['value'] The email address to display
+	 * 
+	 */
+
+    if (!empty($vars['value'])) {
+    	echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlentities($vars['value'], ENT_QUOTES, 'UTF-8') ."</a>";
+    }
 ?>
\ No newline at end of file
diff --git a/views/default/output/longtext.php b/views/default/output/longtext.php
index 101e72198..3d130359a 100644
--- a/views/default/output/longtext.php
+++ b/views/default/output/longtext.php
@@ -1,21 +1,21 @@
-<?php

-

-	/**

-	 * Elgg display long text

-	 * Displays a large amount of text, with new lines converted to line breaks

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg display long text
+	 * Displays a large amount of text, with new lines converted to line breaks
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['text'] The text to display

-	 * 

-	 */

-

-	global $CONFIG;

-

-    echo autop(parse_urls(filter_tags($vars['value'])));

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['text'] The text to display
+	 * 
+	 */
+
+	global $CONFIG;
+
+    echo autop(parse_urls(filter_tags($vars['value'])));
 ?>
\ No newline at end of file
diff --git a/views/default/output/pulldown.php b/views/default/output/pulldown.php
index ebda77471..60b365b11 100644
--- a/views/default/output/pulldown.php
+++ b/views/default/output/pulldown.php
@@ -1,19 +1,19 @@
-<?php

-

-	/**

-	 * Elgg pulldown display

-	 * Displays a value that was entered into the system via a pulldown

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg pulldown display
+	 * Displays a value that was entered into the system via a pulldown
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['text'] The text to display

-	 * 

-	 */

-

-    echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); //$vars['value'];

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['text'] The text to display
+	 * 
+	 */
+
+    echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); //$vars['value'];
 ?>
\ No newline at end of file
diff --git a/views/default/output/radio.php b/views/default/output/radio.php
index 1d93dc8a0..78723b555 100644
--- a/views/default/output/radio.php
+++ b/views/default/output/radio.php
@@ -1,19 +1,19 @@
-<?php

-

-	/**

-	 * Elgg text output

-	 * Displays some text that was input using a standard text field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg text output
+	 * Displays some text that was input using a standard text field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['text'] The text to display

-	 * 

-	 */

-

-    echo elgg_view('output/text',$vars);

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['text'] The text to display
+	 * 
+	 */
+
+    echo elgg_view('output/text',$vars);
 ?>
\ No newline at end of file
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 10da20034..27d49b089 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -1,52 +1,52 @@
-<?php

-

-	/**

-	 * Elgg tagcloud

-	 * Displays a tagcloud

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg tagcloud
+	 * Displays a tagcloud
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['tagcloud'] An array of stdClass objects with two elements: 'tag' (the text of the tag) and 'total' (the number of elements with this tag) 

-	 * 

-	 */

-    

-	if (!empty($vars['subtype'])) {

-		$subtype = "&subtype=" . urlencode($vars['subtype']);

-	} else {

-		$subtype = "";

-	}

-	if (!empty($vars['object'])) {

-		$object = "&object=" . urlencode($vars['object']);

-	} else {

-		$object = "";

-	}

-	

-	if (empty($vars['tagcloud']) && !empty($vars['value']))

-		$vars['tagcloud'] = $vars['value'];

-

-    if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {

-        

-        $counter = 0;

-        $cloud = "";

-        $max = 0;

-        foreach($vars['tagcloud'] as $tag) {

-        	if ($tag->total > $max) {

-        		$max = $tag->total;

-        	}

-        }

-        foreach($vars['tagcloud'] as $tag) {

-            if (!empty($cloud)) $cloud .= ", ";

-            $size = round((log($tag->total) / log($max)) * 100) + 30;

-            if ($size < 60) $size = 60;

-            $cloud .= "<a href=\"" . $vars['url'] . "search/?tag=". urlencode($tag->tag) . $object . $subtype . "\" style=\"font-size: {$size}%\" title=\"".addslashes($tag->tag)." ({$tag->total})\" style=\"text-decoration:none;\">" . htmlentities($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";

-        }

-        echo $cloud;

-

-    }

-     

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['tagcloud'] An array of stdClass objects with two elements: 'tag' (the text of the tag) and 'total' (the number of elements with this tag) 
+	 * 
+	 */
+    
+	if (!empty($vars['subtype'])) {
+		$subtype = "&subtype=" . urlencode($vars['subtype']);
+	} else {
+		$subtype = "";
+	}
+	if (!empty($vars['object'])) {
+		$object = "&object=" . urlencode($vars['object']);
+	} else {
+		$object = "";
+	}
+	
+	if (empty($vars['tagcloud']) && !empty($vars['value']))
+		$vars['tagcloud'] = $vars['value'];
+
+    if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
+        
+        $counter = 0;
+        $cloud = "";
+        $max = 0;
+        foreach($vars['tagcloud'] as $tag) {
+        	if ($tag->total > $max) {
+        		$max = $tag->total;
+        	}
+        }
+        foreach($vars['tagcloud'] as $tag) {
+            if (!empty($cloud)) $cloud .= ", ";
+            $size = round((log($tag->total) / log($max)) * 100) + 30;
+            if ($size < 60) $size = 60;
+            $cloud .= "<a href=\"" . $vars['url'] . "search/?tag=". urlencode($tag->tag) . $object . $subtype . "\" style=\"font-size: {$size}%\" title=\"".addslashes($tag->tag)." ({$tag->total})\" style=\"text-decoration:none;\">" . htmlentities($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";
+        }
+        echo $cloud;
+
+    }
+     
 ?>
\ No newline at end of file
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 87b23cb63..901fa806b 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -1,55 +1,55 @@
-<?php

-

-	/**

-	 * Elgg tags

-	 * Displays a list of tags, separated by commas

-	 * 

-	 * Tags can be a single string (for one tag) or an array of strings

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg tags
+	 * Displays a list of tags, separated by commas
+	 * 
+	 * Tags can be a single string (for one tag) or an array of strings
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['tags'] The tags to display

-	 * @uses $vars['tagtype'] The tagtype, optionally

-	 */

-

-	if (!empty($vars['subtype'])) {

-		$subtype = "&subtype=" . urlencode($vars['subtype']);

-	} else {

-		$subtype = "";

-	}

-	if (!empty($vars['object'])) {

-		$object = "&object=" . urlencode($vars['object']);

-	} else {

-		$object = "";

-	}

-

-	if (empty($vars['tags']) && !empty($vars['value']))

-		$vars['tags'] = $vars['value'];

-    if (!empty($vars['tags'])) {

-        

-        $tagstr = "";

-        if (!is_array($vars['tags']))

-        	$vars['tags'] = array($vars['tags']);

-

-        foreach($vars['tags'] as $tag) {

-            if (!empty($tagstr)) {

-                $tagstr .= ", ";

-            }

-           if (!empty($vars['type'])) {

-               $type = "&type={$vars['type']}";

-           } else {

-               $type = "";

-           }

-           if (is_string($tag)) { 

-               $tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}tag/".urlencode($tag) . "{$type}{$subtype}{$object}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";

-           }

-        }

-         echo $tagstr;

-        

-    }

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['tags'] The tags to display
+	 * @uses $vars['tagtype'] The tagtype, optionally
+	 */
+
+	if (!empty($vars['subtype'])) {
+		$subtype = "&subtype=" . urlencode($vars['subtype']);
+	} else {
+		$subtype = "";
+	}
+	if (!empty($vars['object'])) {
+		$object = "&object=" . urlencode($vars['object']);
+	} else {
+		$object = "";
+	}
+
+	if (empty($vars['tags']) && !empty($vars['value']))
+		$vars['tags'] = $vars['value'];
+    if (!empty($vars['tags'])) {
+        
+        $tagstr = "";
+        if (!is_array($vars['tags']))
+        	$vars['tags'] = array($vars['tags']);
+
+        foreach($vars['tags'] as $tag) {
+            if (!empty($tagstr)) {
+                $tagstr .= ", ";
+            }
+           if (!empty($vars['type'])) {
+               $type = "&type={$vars['type']}";
+           } else {
+               $type = "";
+           }
+           if (is_string($tag)) { 
+               $tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}tag/".urlencode($tag) . "{$type}{$subtype}{$object}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";
+           }
+        }
+         echo $tagstr;
+        
+    }
 ?>
\ No newline at end of file
diff --git a/views/default/output/text.php b/views/default/output/text.php
index ca667f98a..080b81d68 100644
--- a/views/default/output/text.php
+++ b/views/default/output/text.php
@@ -1,19 +1,19 @@
-<?php

-

-	/**

-	 * Elgg text output

-	 * Displays some text that was input using a standard text field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg text output
+	 * Displays some text that was input using a standard text field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['text'] The text to display

-	 * 

-	 */

-

-    echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); // $vars['value'];

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['text'] The text to display
+	 * 
+	 */
+
+    echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); // $vars['value'];
 ?>
\ No newline at end of file
diff --git a/views/default/output/url.php b/views/default/output/url.php
index 87f551ed1..7f72f0dce 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -1,24 +1,24 @@
-<?php

-

-	/**

-	 * Elgg URL display

-	 * Displays a URL as a link

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg URL display
+	 * Displays a URL as a link
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['value'] The URL to display

-	 * 

-	 */

-

-    $val = trim($vars['value']);

-    if (!empty($val)) {

-	    if ((substr_count($val, "http://") == 0) && (substr_count($val, "https://") == 0)) {

-	        $val = "http://" . $val;

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['value'] The URL to display
+	 * 
+	 */
+
+    $val = trim($vars['value']);
+    if (!empty($val)) {
+	    if ((substr_count($val, "http://") == 0) && (substr_count($val, "https://") == 0)) {
+	        $val = "http://" . $val;
 	    }
 	    
 	    if ($vars['is_action'])
@@ -30,8 +30,8 @@
 			if (strpos($val, '?')>0) $sep = "&";
 			$val = "$val{$sep}__elgg_token=$token&__elgg_ts=$ts";
 		}
-	    

-	    echo "<a href=\"{$val}\" target=\"_blank\">". htmlentities($val, ENT_QUOTES, 'UTF-8'). "</a>";

-    }

-

+	    
+	    echo "<a href=\"{$val}\" target=\"_blank\">". htmlentities($val, ENT_QUOTES, 'UTF-8'). "</a>";
+    }
+
 ?>
\ No newline at end of file