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, 155 insertions, 155 deletions

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 2241730ad..90825bc2f 100644
--- a/actions/admin/plugins/disable.php
+++ b/actions/admin/plugins/disable.php
@@ -29,9 +29,9 @@
 		else
 			register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
 	}		
-	

+	
 	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();

+	elgg_filepath_cache_reset();
 		
 	forward($_SERVER['HTTP_REFERER']);
 	exit;
diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php
index 5d0be4ad6..672915bce 100644
--- a/actions/admin/plugins/disableall.php
+++ b/actions/admin/plugins/disableall.php
@@ -26,9 +26,9 @@
 		else
 			register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
 	}		
-	

+	
 	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();

+	elgg_filepath_cache_reset();
 		
 	forward($_SERVER['HTTP_REFERER']);
 	exit;
diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php
index 26d7abaf4..890e6648e 100644
--- a/actions/admin/plugins/enable.php
+++ b/actions/admin/plugins/enable.php
@@ -29,7 +29,7 @@
 		else
 			register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));		
 	}
-		

+		
 	elgg_view_regenerate_simplecache();
 	elgg_filepath_cache_reset();
 	
diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php
index 50409df95..36ba1f66d 100644
--- a/actions/admin/plugins/reorder.php
+++ b/actions/admin/plugins/reorder.php
@@ -1,54 +1,54 @@
-<?php

-	/**

+<?php
+	/**
 	 * Reorder plugin action.
-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @author Curverider Ltd

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

-	 */

-

-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");

-	

-	// block non-admin users

-	admin_gatekeeper();

-	

-	// Validate the action

-	action_gatekeeper();

-	

-	// Get the plugin 

-	$mod = get_input('plugin');

-	$mod = str_replace('.','',$mod);

-	$mod = str_replace('/','',$mod);

-	

-	// Get the new order

-	$order = (int) get_input('order');

-	

-	// Get the current plugin list

-	$plugins = get_plugin_list();

-

-	// Inject the plugin order back into the list

-	if ($key = array_search($mod, $plugins)) {

-		

-		unset($plugins[$key]);

-		while (isset($plugins[$order])) {

-			$order++;

-		}

-		

-		$plugins[$order] = $mod;

-	}

-	

-	// Disable

-	if (regenerate_plugin_list($plugins))

-		system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin));

-	else

-		register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin));		

-		

+	 * @link http://elgg.org/
+	 */
+
+	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+	
+	// block non-admin users
+	admin_gatekeeper();
+	
+	// Validate the action
+	action_gatekeeper();
+	
+	// Get the plugin 
+	$mod = get_input('plugin');
+	$mod = str_replace('.','',$mod);
+	$mod = str_replace('/','',$mod);
+	
+	// Get the new order
+	$order = (int) get_input('order');
+	
+	// Get the current plugin list
+	$plugins = get_plugin_list();
+
+	// Inject the plugin order back into the list
+	if ($key = array_search($mod, $plugins)) {
+		
+		unset($plugins[$key]);
+		while (isset($plugins[$order])) {
+			$order++;
+		}
+		
+		$plugins[$order] = $mod;
+	}
+	
+	// Disable
+	if (regenerate_plugin_list($plugins))
+		system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin));
+	else
+		register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin));		
+		
 	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();

-		

-	forward($_SERVER['HTTP_REFERER']);

-

+	elgg_filepath_cache_reset();
+		
+	forward($_SERVER['HTTP_REFERER']);
+
 ?>
\ No newline at end of file
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index d56e1d296..31a6b401e 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -1,103 +1,103 @@
-<?php

-

-	/**

-	 * Elgg update site action

-	 * 

-	 * This is an update version of the sitesettings/install action which is used by the admin panel to modify basic settings.

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg update site action
+	 * 
+	 * This is an update version of the sitesettings/install action which is used by the admin panel to modify basic settings.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-

-	global $CONFIG;

-	

-	// block non-admin users

-	admin_gatekeeper();

-	action_gatekeeper();

-	

-	if (get_input('settings') == 'go') {

-		

-		if (datalist_get('default_site')) {

-			

-			$site = get_entity(datalist_get('default_site'));

-			if (!($site instanceof ElggSite)) 

-				throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));

-			

-			$site->description = get_input('sitedescription');

-			$site->name = get_input('sitename');

-			$site->email = get_input('siteemail');

-			$site->url = get_input('wwwroot');

-			

-			datalist_set('path',sanitise_filepath(get_input('path')));

-			datalist_set('dataroot',sanitise_filepath(get_input('dataroot')));

-			if (get_input('simplecache_enabled')) {

-				elgg_view_enable_simplecache();

-			} else {

-				elgg_view_disable_simplecache();

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	global $CONFIG;
+	
+	// block non-admin users
+	admin_gatekeeper();
+	action_gatekeeper();
+	
+	if (get_input('settings') == 'go') {
+		
+		if (datalist_get('default_site')) {
+			
+			$site = get_entity(datalist_get('default_site'));
+			if (!($site instanceof ElggSite)) 
+				throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
+			
+			$site->description = get_input('sitedescription');
+			$site->name = get_input('sitename');
+			$site->email = get_input('siteemail');
+			$site->url = get_input('wwwroot');
+			
+			datalist_set('path',sanitise_filepath(get_input('path')));
+			datalist_set('dataroot',sanitise_filepath(get_input('dataroot')));
+			if (get_input('simplecache_enabled')) {
+				elgg_view_enable_simplecache();
+			} else {
+				elgg_view_disable_simplecache();
 			}
 			if (get_input('viewpath_cache_enabled')) {
 				elgg_enable_filepath_cache();
 			} else {
 				elgg_disable_filepath_cache();
-			}

-			

-			set_config('language', get_input('language'), $site->getGUID());

-			

-			set_config('default_access', get_input('default_access'), $site->getGUID());

-			

-			if (get_input('allow_user_default_access')) {

-				set_config('allow_user_default_access', 1, $site->getGUID());

-			} else {

-				set_config('allow_user_default_access', 0, $site->getGUID());

-			}

-			

-			set_config('view', get_input('view'), $site->getGUID());

-			

-			$debug = get_input('debug');

-			if ($debug)

-				set_config('debug', 1, $site->getGUID());

-			else

-				unset_config('debug', $site->getGUID());

-				

-			$https_login = get_input('https_login'); 

-			if ($https_login)

-				set_config('https_login', 1, $site->getGUID());

-			else

-				unset_config('https_login', $site->getGUID());

-				

-			$usage = get_input('usage');

-			if ($usage)

-				unset_config('ping_home', $site->getGUID());

-			else

-				set_config('ping_home', 'disabled', $site->getGUID());

-				

-			$api = get_input('api');

-			if ($api)

-				unset_config('disable_api', $site->getGUID());

-			else

-				set_config('disable_api', 'disabled', $site->getGUID());

-			

-			// Now ping home

-			//if ((!isset($usage)) || ($usage!='disabled'))

-			//{

-			//	ping_home($site);

-			//}

-				

-			if ($site->save())

-				system_message(elgg_echo("admin:configuration:success"));

-			else

-				register_error(elgg_echo("admin:configuration:fail"));

-			

-			//header("Location: {$CONFIG->wwwroot}admin/site/");

-			forward($_SERVER['HTTP_REFERER']);

-			exit;

-			

-		}

-		

-	}

-

+			}
+			
+			set_config('language', get_input('language'), $site->getGUID());
+			
+			set_config('default_access', get_input('default_access'), $site->getGUID());
+			
+			if (get_input('allow_user_default_access')) {
+				set_config('allow_user_default_access', 1, $site->getGUID());
+			} else {
+				set_config('allow_user_default_access', 0, $site->getGUID());
+			}
+			
+			set_config('view', get_input('view'), $site->getGUID());
+			
+			$debug = get_input('debug');
+			if ($debug)
+				set_config('debug', 1, $site->getGUID());
+			else
+				unset_config('debug', $site->getGUID());
+				
+			$https_login = get_input('https_login'); 
+			if ($https_login)
+				set_config('https_login', 1, $site->getGUID());
+			else
+				unset_config('https_login', $site->getGUID());
+				
+			$usage = get_input('usage');
+			if ($usage)
+				unset_config('ping_home', $site->getGUID());
+			else
+				set_config('ping_home', 'disabled', $site->getGUID());
+				
+			$api = get_input('api');
+			if ($api)
+				unset_config('disable_api', $site->getGUID());
+			else
+				set_config('disable_api', 'disabled', $site->getGUID());
+			
+			// Now ping home
+			//if ((!isset($usage)) || ($usage!='disabled'))
+			//{
+			//	ping_home($site);
+			//}
+				
+			if ($site->save())
+				system_message(elgg_echo("admin:configuration:success"));
+			else
+				register_error(elgg_echo("admin:configuration:fail"));
+			
+			//header("Location: {$CONFIG->wwwroot}admin/site/");
+			forward($_SERVER['HTTP_REFERER']);
+			exit;
+			
+		}
+		
+	}
+
 ?>
\ No newline at end of file
diff --git a/actions/admin/user/ban.php b/actions/admin/user/ban.php
index 831513a29..1033ec00a 100644
--- a/actions/admin/user/ban.php
+++ b/actions/admin/user/ban.php
@@ -21,15 +21,15 @@
 	if ( ($obj instanceof ElggUser) && ($obj->canEdit()))
 	{
 		// Now actually disable it
-		if ($obj->ban('banned')) {

-			system_message(elgg_echo('admin:user:ban:yes'));

+		if ($obj->ban('banned')) {
+			system_message(elgg_echo('admin:user:ban:yes'));
 		}
 		else
 			register_error(elgg_echo('admin:user:ban:no'));
-	} else {

-		$canedit = $obj->canEdit();

-		$isinstance = ($obj instanceof ElggUser);

-		register_error(elgg_echo('admin:user:ban:no'));

+	} else {
+		$canedit = $obj->canEdit();
+		$isinstance = ($obj instanceof ElggUser);
+		register_error(elgg_echo('admin:user:ban:no'));
 	}
 		
 	forward('pg/admin/user/');