aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/install.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-08-31 19:05:21 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-08-31 19:05:21 +0000
commitc5cc2821311012a8a4385a304a043c4b41f2afbb (patch)
tree3703351e4b5d56905eb52547d6129ffa14cb2a32 /engine/lib/install.php
parent775a5f08c501acc565c69659022bc31052677485 (diff)
downloadelgg-c5cc2821311012a8a4385a304a043c4b41f2afbb.tar.gz
elgg-c5cc2821311012a8a4385a304a043c4b41f2afbb.tar.bz2
All line endings are now Unix-style.
git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/install.php')
-rw-r--r--engine/lib/install.php100
1 files changed, 50 insertions, 50 deletions
diff --git a/engine/lib/install.php b/engine/lib/install.php
index 6faa70ef5..03abede14 100644
--- a/engine/lib/install.php
+++ b/engine/lib/install.php
@@ -1,16 +1,16 @@
-<?php
-
- /**
- * Elgg installation
- * Various functions to assist with installing and upgrading the system
- *
- * @package Elgg
- * @subpackage Core
+<?php
- * @author Curverider Ltd
+ /**
+ * Elgg installation
+ * Various functions to assist with installing and upgrading the system
+ *
+ * @package Elgg
+ * @subpackage Core
- * @link http://elgg.org/
- */
+ * @author Curverider Ltd
+
+ * @link http://elgg.org/
+ */
/**
* Check that the installed version of PHP meets the minimum requirements (currently 5.2 or greater).
@@ -18,13 +18,13 @@
* @return bool
*/
function php_check_version()
- {
+ {
/*
if ( // TODO: Remove this when Redhat pulls its finger out
(version_compare(phpversion(), '5.1.6', '>=')) &&
(version_compare(phpversion(), '5.2.0', '<'))
)
- register_error(elgg_echo('configurationwarning:phpversion'));
+ register_error(elgg_echo('configurationwarning:phpversion'));
*/
if (version_compare(phpversion(), '5.1.2', '>='))
@@ -53,12 +53,12 @@
return true;
}
-
- /**
- * Returns whether or not the database has been installed
- *
- * @return true|false Whether the database has been installed
- */
+
+ /**
+ * Returns whether or not the database has been installed
+ *
+ * @return true|false Whether the database has been installed
+ */
function is_db_installed() {
global $CONFIG;
@@ -66,29 +66,29 @@
if (isset($CONFIG->db_installed)) {
return $CONFIG->db_installed;
}
-
- if ($dblink = get_db_link('read')) {
- mysql_query("select name from {$CONFIG->dbprefix}datalists limit 1",$dblink);
- if (mysql_errno($dblink) > 0) return false;
+
+ if ($dblink = get_db_link('read')) {
+ mysql_query("select name from {$CONFIG->dbprefix}datalists limit 1",$dblink);
+ if (mysql_errno($dblink) > 0) return false;
} else return false;
$CONFIG->db_installed = true; // Set flag if db is installed (if false then we want to check every time)
-
- return true;
-
- }
-
- /**
- * Returns whether or not other settings have been set
- *
- * @return true|false Whether or not the rest of the installation has been followed through with
- */
- function is_installed() {
-
- global $CONFIG;
- return datalist_get('installed');
-
- }
+
+ return true;
+
+ }
+
+ /**
+ * Returns whether or not other settings have been set
+ *
+ * @return true|false Whether or not the rest of the installation has been followed through with
+ */
+ function is_installed() {
+
+ global $CONFIG;
+ return datalist_get('installed');
+
+ }
/**
* Copy and create a new settings.php from settings.example.php, substituting the variables in
@@ -112,15 +112,15 @@
return $file;
}
-
- /**
- * Initialisation for installation functions
- *
- */
- function install_init() {
- register_action("systemsettings/install",true);
- }
-
- register_elgg_event_handler("boot","system","install_init");
-
+
+ /**
+ * Initialisation for installation functions
+ *
+ */
+ function install_init() {
+ register_action("systemsettings/install",true);
+ }
+
+ register_elgg_event_handler("boot","system","install_init");
+
?> \ No newline at end of file