All line endings are now Unix-style.

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

2 files changed, 49 insertions, 49 deletions

diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 11edfc25f..52e8b8ee1 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -1,37 +1,37 @@
-<?php

-

-     /**

-	 * Elgg login form

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+     /**
+	 * Elgg login form
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-	 

-	global $CONFIG;

-	

-	$form_body = "<p class=\"loginbox\"><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>";

-	$form_body .= "<br />";

-	$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";

-	$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div></p>";

-	$form_body .= "<p class=\"loginbox\">";

-	$form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> | " : "";

-	$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";  

-	

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+	 
+	global $CONFIG;
+	
+	$form_body = "<p class=\"loginbox\"><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>";
+	$form_body .= "<br />";
+	$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";
+	$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div></p>";
+	$form_body .= "<p class=\"loginbox\">";
+	$form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> | " : "";
+	$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";  
+	
 	//<input name=\"username\" type=\"text\" class="general-textarea" /></label>
 	
 	$login_url = $vars['url'];
 	if ((isset($CONFIG->https_login)) && ($CONFIG->https_login))
-		$login_url = str_replace("http", "https", $vars['url']);

-?>

-	

-	<div id="login-box">

-	<h2><?php echo elgg_echo('login'); ?></h2>

+		$login_url = str_replace("http", "https", $vars['url']);
+?>
+	
+	<div id="login-box">
+	<h2><?php echo elgg_echo('login'); ?></h2>
 		<?php 
 			echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
-		?>

-		

+		?>
+		
 	</div>
\ No newline at end of file
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index 16307fd0d..8ceeaab8f 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -1,22 +1,22 @@
-<?php

-

-     /**

-	 * Elgg register form

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+     /**
+	 * Elgg register form
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
 	 
 	$username = get_input('u');
 	$email = get_input('e');
 	$name = get_input('n');
-

-	$admin_option = false;

-	if (($_SESSION['user']->admin) && ($vars['show_admin'])) 

+
+	$admin_option = false;
+	if (($_SESSION['user']->admin) && ($vars['show_admin'])) 
 		$admin_option = true;
 		
 	$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "general-textarea", 'value' => $name)) . "</label><br />";
@@ -31,15 +31,15 @@
 	
 	if ($admin_option)
 		$form_body .= elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option'))));
-	

-	$form_body .= elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' => $vars['friend_guid']));

+	
+	$form_body .= elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' => $vars['friend_guid']));
 	$form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'value' => $vars['invitecode']));
 	$form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register'));
-	$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";

-?>

-

-	

-	<div id="register-box">

+	$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
+?>
+
+	
+	<div id="register-box">
 	<h2><?php echo elgg_echo('register'); ?></h2>
-	<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>

+	<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>
 	</div>
\ No newline at end of file