All line endings are now Unix-style.

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

6 files changed, 136 insertions, 136 deletions

diff --git a/views/default/admin/main.php b/views/default/admin/main.php
index 98c9495e1..7922de906 100644
--- a/views/default/admin/main.php
+++ b/views/default/admin/main.php
@@ -1,19 +1,19 @@
-<?php

-

-	/**

-	 * Elgg administration main screen

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg administration main screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-

-	// Description of what's going on 

-		echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "</p>";

-		

-	

-		

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	// Description of what's going on 
+		echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "</p>";
+		
+	
+		
 ?>
\ No newline at end of file
diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php
index 375f27a01..8a7850ed6 100644
--- a/views/default/admin/plugins_opt/plugin.php
+++ b/views/default/admin/plugins_opt/plugin.php
@@ -54,42 +54,42 @@
 		<?php } ?>
 	</div>
 
-	<h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="pluginsettings_link">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>

-	

-	<?php if (elgg_view("settings/{$plugin}/edit")) { ?>

-	<div class="pluginsettings">

-			<div id="<?php echo $plugin; ?>_settings">

-				<?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_settings($plugin))) ?>

-			</div>

-	</div>

-	<?php } ?>

-	

-	<?php

-

-		if ($manifest) {

-	

-	?>

-		<div class="plugin_description"><?php echo elgg_view('output/longtext',array('value' => $manifest['description'])); ?></div>

-	<?php

-

-		}

-	

-	?>

+	<h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="pluginsettings_link">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
 	
-	<p><a class="manifest_details"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p>

+	<?php if (elgg_view("settings/{$plugin}/edit")) { ?>
+	<div class="pluginsettings">
+			<div id="<?php echo $plugin; ?>_settings">
+				<?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_settings($plugin))) ?>
+			</div>
+	</div>
+	<?php } ?>
+	
+	<?php
+
+		if ($manifest) {
+	
+	?>
+		<div class="plugin_description"><?php echo elgg_view('output/longtext',array('value' => $manifest['description'])); ?></div>
+	<?php
+
+		}
+	
+	?>
+	
+	<p><a class="manifest_details"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p>
 
 	<div class="manifest_file">
 	
-	<?php if ($manifest) { ?>

-		<?php if ((!$version_check_valid) || (!isset($manifest['elgg_version']))) { ?>

-		<div id="version_check">

-			<?php 

-				if (!isset($manifest['elgg_version']))

-					echo elgg_echo('admin:plugins:warning:elggversionunknown');

-				else

-					echo elgg_echo('admin:plugins:warning:elggtoolow');

-			?>

-		</div>

+	<?php if ($manifest) { ?>
+		<?php if ((!$version_check_valid) || (!isset($manifest['elgg_version']))) { ?>
+		<div id="version_check">
+			<?php 
+				if (!isset($manifest['elgg_version']))
+					echo elgg_echo('admin:plugins:warning:elggversionunknown');
+				else
+					echo elgg_echo('admin:plugins:warning:elggtoolow');
+			?>
+		</div>
 		<?php } ?>
 		<div><?php echo elgg_echo('admin:plugins:label:version') . ": ". $manifest['version'] ?></div>
 		<div><?php echo elgg_echo('admin:plugins:label:author') . ": ". $manifest['author'] ?></div>
diff --git a/views/default/admin/statistics.php b/views/default/admin/statistics.php
index bf4818b64..4e0f7c3b1 100644
--- a/views/default/admin/statistics.php
+++ b/views/default/admin/statistics.php
@@ -1,15 +1,15 @@
-<?php

-	/**

-	 * Elgg statistics screen

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
+	/**
+	 * Elgg statistics screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @author Curverider Ltd

+	 * @author Curverider Ltd
 
-	 * @link http://elgg.org/

-	 */

-

-	global $CONFIG;

-	         

+	 * @link http://elgg.org/
+	 */
+
+	global $CONFIG;
+	         
 ?>
\ No newline at end of file
diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php
index d187655c3..b48b86319 100644
--- a/views/default/admin/statistics_opt/numentities.php
+++ b/views/default/admin/statistics_opt/numentities.php
@@ -1,55 +1,55 @@
-<?php

-	/**

-	 * Elgg statistics screen

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
+	/**
+	 * Elgg statistics screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @author Curverider Ltd

+	 * @author Curverider Ltd
 
-	 * @link http://elgg.org/

-	 */

-

-	

-	// Get entity statistics

+	 * @link http://elgg.org/
+	 */
+
+	
+	// Get entity statistics
 	$entity_stats = get_entity_statistics();
-	$even_odd = "";

-?>

-<div class="admin_statistics">

-    <h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>

-    <table>

-        <?php

-            foreach ($entity_stats as $k => $entry)

-            {

-            	arsort($entry);

-                foreach ($entry as $a => $b)

-                {

-                    

-                    //This function controls the alternating class

-                	$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';

-

-                    if ($a == "__base__") {

-                    	$a = elgg_echo("item:{$k}");

-                    	if (empty($a)) 

-                        	$a = $k;

-                    }

-                    else {

-                    		if (empty($a))

-                    			$a = elgg_echo("item:{$k}");

-                    		else

-                				$a = elgg_echo("item:{$k}:{$a}");

-                    		if (empty($a)) {

-								$a = "$k $a";

-                    		}

-                    	  }

-                    echo <<< END

-                        <tr class="{$even_odd}">

-                            <td class="column_one">{$a}:</td>

-                            <td>{$b}</td>

-                        </tr>

-END;

-                }

-            }

-        ?>

-    </table>

+	$even_odd = "";
+?>
+<div class="admin_statistics">
+    <h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
+    <table>
+        <?php
+            foreach ($entity_stats as $k => $entry)
+            {
+            	arsort($entry);
+                foreach ($entry as $a => $b)
+                {
+                    
+                    //This function controls the alternating class
+                	$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+
+                    if ($a == "__base__") {
+                    	$a = elgg_echo("item:{$k}");
+                    	if (empty($a)) 
+                        	$a = $k;
+                    }
+                    else {
+                    		if (empty($a))
+                    			$a = elgg_echo("item:{$k}");
+                    		else
+                				$a = elgg_echo("item:{$k}:{$a}");
+                    		if (empty($a)) {
+								$a = "$k $a";
+                    		}
+                    	  }
+                    echo <<< END
+                        <tr class="{$even_odd}">
+                            <td class="column_one">{$a}:</td>
+                            <td>{$b}</td>
+                        </tr>
+END;
+                }
+            }
+        ?>
+    </table>
 </div>
\ No newline at end of file
diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php
index 403168ef0..7b82ae085 100644
--- a/views/default/admin/statistics_opt/online.php
+++ b/views/default/admin/statistics_opt/online.php
@@ -1,22 +1,22 @@
-<?php

-	/**

-	 * Elgg statistics screen

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
+	/**
+	 * Elgg statistics screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @author Curverider Ltd

+	 * @author Curverider Ltd
 
-	 * @link http://elgg.org/

-	 */

-

-	// users online

-	get_context('search');

-	$users_online = get_online_users();

-	get_context('admin');

-?>

-

-<div class="admin_users_online">

-    <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>

-    <?php echo $users_online; ?>

-</div>

+	 * @link http://elgg.org/
+	 */
+
+	// users online
+	get_context('search');
+	$users_online = get_online_users();
+	get_context('admin');
+?>
+
+<div class="admin_users_online">
+    <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
+    <?php echo $users_online; ?>
+</div>
diff --git a/views/default/admin/user_opt/search.php b/views/default/admin/user_opt/search.php
index 10c9b4088..b7518bcd5 100644
--- a/views/default/admin/user_opt/search.php
+++ b/views/default/admin/user_opt/search.php
@@ -11,11 +11,11 @@
 <div id="search-box">
 	<form action="<?php echo $vars['url']; ?>search/" method="get">
 	<b><?php echo elgg_echo('admin:user:label:search'); ?></b>
-	<?php

-

-		echo elgg_view('input/text',array('internalname' => 'tag'));

-	

-	?>

+	<?php
+
+		echo elgg_view('input/text',array('internalname' => 'tag'));
+	
+	?>
 	<input type="hidden" name="object" value="user" />
 	<input type="submit" name="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>" 
 		value="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>" />