From: Jakob Sack <kde@jakobsack.de>
Date: Sat, 16 Apr 2011 09:11:16 +0000 (+0200)
Subject: replaced $CONFIG_DB* with OC_CONFIG::getValue( "db*" )
X-Git-Tag: v3.0~267^2~558^2~151
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fc33094429a942c97fb098b6ecc2c6708f507603;p=nextcloud-server.git

replaced $CONFIG_DB* with OC_CONFIG::getValue( "db*" )
---

diff --git a/lib/base.php b/lib/base.php
index c84d61b3214..270bf09e9ac 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -51,6 +51,9 @@ set_include_path($SERVERROOT.'/lib'.PATH_SEPARATOR.$SERVERROOT.'/config'.PATH_SE
 if( !isset( $RUNTIME_NOSETUPFS )){
 	$RUNTIME_NOSETUPFS = false;
 }
+if( !isset( $RUNTIME_NOAPPS )){
+	$RUNTIME_NOAPPS = false;
+}
 
 // define default config values
 $CONFIG_INSTALLED=false;
@@ -113,8 +116,11 @@ OC_UTIL::addScript( "jquery-ui-1.8.10.custom.min" );
 OC_UTIL::addScript( "js" );
 OC_UTIL::addStyle( "jquery-ui-1.8.10.custom" );
 OC_UTIL::addStyle( "styles" );
+
 // Load Apps
-OC_APP::loadApps();
+if( !$RUNTIME_NOAPPS ){
+	OC_APP::loadApps();
+}
 
 // check if the server is correctly configured for ownCloud
 OC_UTIL::checkserver();
@@ -232,13 +238,13 @@ class OC_UTIL {
 		global $CONFIG_DATADIRECTORY_ROOT;
 		global $CONFIG_BACKUPDIRECTORY;
 		global $CONFIG_ENABLEBACKUP;
-		global $CONFIG_INSTALLED;
+		$CONFIG_INSTALLED = OC_CONFIG::getValue( "installed", false );
 		$error='';
 		if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){
 			$error.='No database drivers (sqlite or mysql) installed.<br/>';
 		}
-		global $CONFIG_DBTYPE;
-		global $CONFIG_DBNAME;
+		$CONFIG_DBTYPE = OC_CONFIG::getValue( "dbtype", "sqlite" );
+		$CONFIG_DBNAME = OC_CONFIG::getValue( "dbname", "owncloud" );
 		if(!stristr(PHP_OS, 'WIN')){
 			if($CONFIG_DBTYPE=='sqlite'){
 				$file=$SERVERROOT.'/'.$CONFIG_DBNAME;
diff --git a/lib/database.php b/lib/database.php
index 6d65665df43..dc4bf75649b 100644
--- a/lib/database.php
+++ b/lib/database.php
@@ -38,11 +38,11 @@ class OC_DB {
 	 */
 	static public function connect(){
 		// The global data we need
-		global $CONFIG_DBNAME;
-		global $CONFIG_DBHOST;
-		global $CONFIG_DBUSER;
-		global $CONFIG_DBPASSWORD;
-		global $CONFIG_DBTYPE;
+		$CONFIG_DBNAME = OC_CONFIG::getValue( "dbname", "owncloud" );;
+		$CONFIG_DBHOST = OC_CONFIG::getValue( "dbhost", "" );;
+		$CONFIG_DBUSER = OC_CONFIG::getValue( "dbuser", "" );;
+		$CONFIG_DBPASSWORD = OC_CONFIG::getValue( "dbpassword", "" );;
+		$CONFIG_DBTYPE = OC_CONFIG::getValue( "dbtype", "sqlite" );;
 		global $DOCUMENTROOT;
 		global $SERVERROOT;
 
@@ -232,8 +232,8 @@ class OC_DB {
 	 * TODO: write more documentation
 	 */
 	public static function createDbFromStructure( $file ){
-		global $CONFIG_DBNAME;
-		global $CONFIG_DBTABLEPREFIX;
+		$CONFIG_DBNAME  = OC_CONFIG::getValue( "dbname", "owncloud" );
+		$CONFIG_DBTABLEPREFIX = OC_CONFIG::getValue( "dbtableprefix", "oc_" );
 
 		self::connectScheme();
 
@@ -295,8 +295,8 @@ class OC_DB {
 	 */
 	private static function processQuery( $query ){
 		// We need Database type and table prefix
-		global $CONFIG_DBTYPE;
-		global $CONFIG_DBTABLEPREFIX;
+		$CONFIG_DBTYPE = OC_CONFIG::getValue( "dbtype", "sqlite" );
+		$CONFIG_DBTABLEPREFIX = OC_CONFIG::getValue( "dbtableprefix", "oc_" );
 
 		// differences in escaping of table names (` for mysql)
 		// Problem: what if there is a ` in the value we want to insert?
diff --git a/lib/plugin.php b/lib/plugin.php
index 0cec329ea35..0d4e9744dc3 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -90,7 +90,7 @@ class OC_PLUGIN{
 	 * Load all plugins that aren't blacklisted
 	 */
 	public static function loadPlugins() {
-		global $CONFIG_INSTALLED;
+		$CONFIG_INSTALLED = OC_CONFIG::getValue( "installed", false );
 		if($CONFIG_INSTALLED){
 			global $SERVERROOT;
 			$plugins = self::listPlugins();