All line endings are now Unix-style.

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

1 files changed, 133 insertions, 133 deletions

diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 0317c821c..9aa5d2174 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -1,17 +1,17 @@
-<?php

-

-	/**

-	 * Elgg configuration library

-	 * Contains functions for managing system configuration

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg configuration library
+	 * Contains functions for managing system configuration
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
 
-	 * @link http://elgg.org/

-	 */

-

 	
 	/**
 	 * Unset a config option.
@@ -31,58 +31,58 @@
 				
 			return delete_data("delete from {$CONFIG->dbprefix}config where name='$name' and site_guid=$site_guid");
 		}
-

-	/**

-	 * Sets a configuration value

-	 *

-	 * @param string $name The name of the configuration value

-	 * @param string $value Its value

-	 * @param int $site_guid Optionally, the GUID of the site (current site is assumed by default)

-	 * @return false|int 1 or false depending on success or failure 

-	 */

-		function set_config($name, $value, $site_guid = 0) {

-			

+
+	/**
+	 * Sets a configuration value
+	 *
+	 * @param string $name The name of the configuration value
+	 * @param string $value Its value
+	 * @param int $site_guid Optionally, the GUID of the site (current site is assumed by default)
+	 * @return false|int 1 or false depending on success or failure 
+	 */
+		function set_config($name, $value, $site_guid = 0) {
+			
 			global $CONFIG;
 			
 			// Unset existing
 			unset_config($name,$site_guid);
-			

-			$name = mysql_real_escape_string($name);

-			$value = mysql_real_escape_string($value);

-			$site_guid = (int) $site_guid;

-			if ($site_guid == 0)

-				$site_guid = (int) $CONFIG->site_id;

-			$CONFIG->$name = $value;

+			
+			$name = mysql_real_escape_string($name);
+			$value = mysql_real_escape_string($value);
+			$site_guid = (int) $site_guid;
+			if ($site_guid == 0)
+				$site_guid = (int) $CONFIG->site_id;
+			$CONFIG->$name = $value;
 			$value = sanitise_string(serialize($value));
-			

-			return insert_data("insert into {$CONFIG->dbprefix}config set name = '{$name}', value = '{$value}', site_guid = {$site_guid}");

-			

-		}

-

-	/**

-	 * Gets a configuration value

-	 *

-	 * @param string $name The name of the config value

-	 * @param int $site_guid Optionally, the GUID of the site (current site is assumed by default)

-	 * @return mixed|false Depending on success

-	 */

-		function get_config($name, $site_guid = 0) {

-			

-			global $CONFIG;

-			if (isset($CONFIG->$name))

-				return $CONFIG->$name;

-			$name = mysql_real_escape_string($name);

-			$site_guid = (int) $site_guid;

-			if ($site_guid == 0)

-				$site_guid = (int) $CONFIG->site_id;

-			if ($result = get_data_row("SELECT value from {$CONFIG->dbprefix}config where name = '{$name}' and site_guid = {$site_guid}")) {

-				$result = $result->value;

-				$result = unserialize($result->value);

-				$CONFIG->$name = $result;

-				return $result;

-			}

-			return false;

-			

+			
+			return insert_data("insert into {$CONFIG->dbprefix}config set name = '{$name}', value = '{$value}', site_guid = {$site_guid}");
+			
+		}
+
+	/**
+	 * Gets a configuration value
+	 *
+	 * @param string $name The name of the config value
+	 * @param int $site_guid Optionally, the GUID of the site (current site is assumed by default)
+	 * @return mixed|false Depending on success
+	 */
+		function get_config($name, $site_guid = 0) {
+			
+			global $CONFIG;
+			if (isset($CONFIG->$name))
+				return $CONFIG->$name;
+			$name = mysql_real_escape_string($name);
+			$site_guid = (int) $site_guid;
+			if ($site_guid == 0)
+				$site_guid = (int) $CONFIG->site_id;
+			if ($result = get_data_row("SELECT value from {$CONFIG->dbprefix}config where name = '{$name}' and site_guid = {$site_guid}")) {
+				$result = $result->value;
+				$result = unserialize($result->value);
+				$CONFIG->$name = $result;
+				return $result;
+			}
+			return false;
+			
 		}
 		
 		/**
@@ -110,28 +110,28 @@
 				return true;
 			}
 			return false;
-		}

-

-	/**

-	 * If certain configuration elements don't exist, autodetect sensible defaults 

-	 * 

-	 * @uses $CONFIG The main configuration global

-	 *

-	 */

-		function set_default_config() {

-			

-			global $CONFIG;

-			if (empty($CONFIG->path))

-				$CONFIG->path = str_replace("\\","/",dirname(dirname(dirname(__FILE__)))) . "/";

-				

-			if (empty($CONFIG->viewpath))

-				$CONFIG->viewpath = $CONFIG->path . "views/";	

-

-			if (empty($CONFIG->pluginspath))

-				$CONFIG->pluginspath = $CONFIG->path . "mod/";

-				

-			if (empty($CONFIG->wwwroot)) {

-				/*

+		}
+
+	/**
+	 * If certain configuration elements don't exist, autodetect sensible defaults 
+	 * 
+	 * @uses $CONFIG The main configuration global
+	 *
+	 */
+		function set_default_config() {
+			
+			global $CONFIG;
+			if (empty($CONFIG->path))
+				$CONFIG->path = str_replace("\\","/",dirname(dirname(dirname(__FILE__)))) . "/";
+				
+			if (empty($CONFIG->viewpath))
+				$CONFIG->viewpath = $CONFIG->path . "views/";	
+
+			if (empty($CONFIG->pluginspath))
+				$CONFIG->pluginspath = $CONFIG->path . "mod/";
+				
+			if (empty($CONFIG->wwwroot)) {
+				/*
 				$CONFIG->wwwroot = "http://" . $_SERVER['SERVER_NAME'];
 				
 				$request = $_SERVER['REQUEST_URI'];
@@ -142,72 +142,72 @@
 				}
 				
 				$CONFIG->wwwroot .= $request;
-				*/

-				$pathpart = str_replace("//","/",str_replace($_SERVER['DOCUMENT_ROOT'],"",$CONFIG->path));

-				if (substr($pathpart,0,1) != "/") $pathpart = "/" . $pathpart; 

+				*/
+				$pathpart = str_replace("//","/",str_replace($_SERVER['DOCUMENT_ROOT'],"",$CONFIG->path));
+				if (substr($pathpart,0,1) != "/") $pathpart = "/" . $pathpart; 
 				$CONFIG->wwwroot = "http://" . $_SERVER['HTTP_HOST'] . $pathpart;
-		

-			}

-		

-			if (empty($CONFIG->url))

-				$CONFIG->url = $CONFIG->wwwroot;

-			

-			if (empty($CONFIG->sitename))

-				$CONFIG->sitename = "New Elgg site";

+		
+			}
+		
+			if (empty($CONFIG->url))
+				$CONFIG->url = $CONFIG->wwwroot;
+			
+			if (empty($CONFIG->sitename))
+				$CONFIG->sitename = "New Elgg site";
 				
 			if (empty($CONFIG->language))
 				$CONFIG->language = "en";
-

-		}

-		

-	/**

-	 * Function that provides some config initialisation on system init

-	 *

-	 */

-		

-		function configuration_init() {

-			

-			global $CONFIG;

-			

+
+		}
+		
+	/**
+	 * Function that provides some config initialisation on system init
+	 *
+	 */
+		
+		function configuration_init() {
+			
+			global $CONFIG;
+			
 			if (is_installed() || is_db_installed()) {
-				

-				$path = datalist_get('path');

-				if (!empty($path))

-					$CONFIG->path = $path;

-				$dataroot = datalist_get('dataroot');

-				if (!empty($dataroot))

-					$CONFIG->dataroot = $dataroot;

-				$simplecache_enabled = datalist_get('simplecache_enabled');

-				if ($simplecache_enabled !== false) {

-					$CONFIG->simplecache_enabled = $simplecache_enabled;

-				} else {

-					$CONFIG->simplecache_enabled = 1;

+				
+				$path = datalist_get('path');
+				if (!empty($path))
+					$CONFIG->path = $path;
+				$dataroot = datalist_get('dataroot');
+				if (!empty($dataroot))
+					$CONFIG->dataroot = $dataroot;
+				$simplecache_enabled = datalist_get('simplecache_enabled');
+				if ($simplecache_enabled !== false) {
+					$CONFIG->simplecache_enabled = $simplecache_enabled;
+				} else {
+					$CONFIG->simplecache_enabled = 1;
 				}
 				$viewpath_cache_enabled = datalist_get('viewpath_cache_enabled');
 				if ($viewpath_cache_enabled !== false) {
 					$CONFIG->viewpath_cache_enabled = $viewpath_cache_enabled;
 				} else {
 					$CONFIG->viewpath_cache_enabled = 1;
-				}

-				if (isset($CONFIG->site) && ($CONFIG->site instanceof ElggSite)) {

-					$CONFIG->wwwroot = $CONFIG->site->url;

+				}
+				if (isset($CONFIG->site) && ($CONFIG->site instanceof ElggSite)) {
+					$CONFIG->wwwroot = $CONFIG->site->url;
 					$CONFIG->sitename = $CONFIG->site->name;
 					$CONFIG->sitedescription = $CONFIG->site->description;
-					$CONFIG->siteemail = $CONFIG->site->email;

-				}

-				$CONFIG->url = $CONFIG->wwwroot;

+					$CONFIG->siteemail = $CONFIG->site->email;
+				}
+				$CONFIG->url = $CONFIG->wwwroot;
 				
 				// Load default settings from database
 				get_all_config();
-				

-				return true;

-			}

-		}

-		

-	/**

-	 * Register config_init

-	 */

-

-		register_elgg_event_handler('boot','system','configuration_init',10);

-		

+				
+				return true;
+			}
+		}
+		
+	/**
+	 * Register config_init
+	 */
+
+		register_elgg_event_handler('boot','system','configuration_init',10);
+		
 ?>
\ No newline at end of file