[Fusionforge-commits] r9614 - in trunk: gforge/common/include gforge/common/include/system gforge/cronjobs gforge/plugins/mediawiki/www gforge/plugins/webcalendar/www/includes gforge/plugins/wiki/www gforge/www/include tests/code/deprecations

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Apr 27 21:48:06 CEST 2010


Author: lolando
Date: 2010-04-27 21:48:06 +0200 (Tue, 27 Apr 2010)
New Revision: 9614

Modified:
   trunk/gforge/common/include/Jabber.class.php
   trunk/gforge/common/include/config-vars.php
   trunk/gforge/common/include/database-pgsql.php
   trunk/gforge/common/include/system/LDAP.class.php
   trunk/gforge/cronjobs/backup_site.php
   trunk/gforge/plugins/mediawiki/www/LocalSettings.php
   trunk/gforge/plugins/webcalendar/www/includes/config.php
   trunk/gforge/plugins/wiki/www/gforge.php
   trunk/gforge/plugins/wiki/www/wikiconfig.php
   trunk/gforge/www/include/database-oci8.php
   trunk/tests/code/deprecations/DeprecationsTest.php
Log:
Config API: hopefully the last variables in section 'core'

Modified: trunk/gforge/common/include/Jabber.class.php
===================================================================
--- trunk/gforge/common/include/Jabber.class.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/common/include/Jabber.class.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -150,7 +150,7 @@
 		$this->port					= forge_get_config('jabber_port');
 
 		$this->username				= forge_get_config('jabber_user');
-		$this->password				= $GLOBALS['sys_jabber_pass'];
+		$this->password				= forge_get_config('jabber_password');
 		$this->resource				= 'home';
 		
 		$this->enable_logging		= FALSE;

Modified: trunk/gforge/common/include/config-vars.php
===================================================================
--- trunk/gforge/common/include/config-vars.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/common/include/config-vars.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -69,12 +69,14 @@
 forge_define_config_item ('jabber_host', 'core', $GLOBALS['sys_jabber_server']) ;
 forge_define_config_item ('jabber_port', 'core', $GLOBALS['sys_jabber_port']) ;
 forge_define_config_item ('jabber_user', 'core', $GLOBALS['sys_jabber_user']) ;
+forge_define_config_item ('jabber_password', 'core', $GLOBALS['sys_jabber_pass']) ;
 forge_define_config_item ('ldap_host', 'core', $GLOBALS['sys_ldap_host']) ;
 forge_define_config_item ('ldap_port', 'core', $GLOBALS['sys_ldap_port']) ;
 forge_define_config_item ('ldap_version', 'core', $GLOBALS['sys_ldap_version']) ;
 forge_define_config_item ('ldap_base_dn', 'core', $GLOBALS['sys_ldap_base_dn']) ;
 forge_define_config_item ('ldap_bind_dn', 'core', $GLOBALS['sys_ldap_bind_dn']) ;
 forge_define_config_item ('ldap_admin_dn', 'core', $GLOBALS['sys_ldap_admin_dn']) ;
+forge_define_config_item ('ldap_password', 'core', $GLOBALS['sys_ldap_passwd']) ;
 forge_define_config_item ('news_group', 'core', $GLOBALS['sys_news_group']) ;
 forge_define_config_item ('stats_group', 'core', $GLOBALS['sys_stats_group']) ;
 forge_define_config_item ('peer_rating_group', 'core', $GLOBALS['sys_peer_rating_group']) ;
@@ -94,6 +96,11 @@
 forge_define_config_item ('session_key', 'core', $GLOBALS['sys_session_key']) ;
 forge_define_config_item ('show_source', 'core', $GLOBALS['sys_show_source']) ;
 forge_define_config_item ('default_trove_cat', 'core', $GLOBALS['default_trove_cat']) ;
+forge_define_config_item ('database_host', 'core', $GLOBALS['sys_dbhost']) ;
+forge_define_config_item ('database_port', 'core', $GLOBALS['sys_dbport']) ;
+forge_define_config_item ('database_name', 'core', $GLOBALS['sys_dbname']) ;
+forge_define_config_item ('database_user', 'core', $GLOBALS['sys_dbuser']) ;
+forge_define_config_item ('database_password', 'core', $GLOBALS['sys_dbpasswd']) ;
 // forge_define_config_item ('', 'core', $GLOBALS['sys_']) ;
 
 /* Long-term:

Modified: trunk/gforge/common/include/database-pgsql.php
===================================================================
--- trunk/gforge/common/include/database-pgsql.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/common/include/database-pgsql.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -68,14 +68,13 @@
  *  in other functions in this library.
  */
 function db_connect() {
-	global $sys_dbhost,$sys_dbuser,$sys_dbpasswd,$gfconn,
-		$sys_dbname,$sys_db_use_replication,$sys_dbport,$sys_dbreaddb,$sys_dbreadhost;
+	global $gfconn,$sys_db_use_replication,$sys_dbreaddb,$sys_dbreadhost;
 
 	//
 	//	Connect to primary database
 	//
 	if (function_exists("pg_pconnect")) {
-		$gfconn = pg_pconnect(pg_connectstring($sys_dbname, $sys_dbuser, $sys_dbpasswd, $sys_dbhost, $sys_dbport));
+		$gfconn = pg_pconnect(pg_connectstring(forge_get_config('database_name'), forge_get_config('database_user'), forge_get_config('database_password'), forge_get_config('database_host'), forge_get_config('database_port')));
 	} else {
 		print("function pg_pconnect doesn't exist: no postgresql interface");
 		exit;
@@ -85,7 +84,7 @@
 	//	If any replication is configured, connect
 	//
 	if ($sys_db_use_replication) {
-		$gfconn2 = pg_pconnect(pg_connectstring($sys_dbreaddb, $sys_dbuser, $sys_dbpasswd, $sys_dbreadhost, $sys_dbreadport));
+		$gfconn2 = pg_pconnect(pg_connectstring($sys_dbreaddb, forge_get_config('database_user'), forge_get_config('database_password'), $sys_dbreadhost, $sys_dbreadport));
 	} else {
 		$gfconn2 = $gfconn;
 	}

Modified: trunk/gforge/common/include/system/LDAP.class.php
===================================================================
--- trunk/gforge/common/include/system/LDAP.class.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/common/include/system/LDAP.class.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -70,7 +70,7 @@
 	 */
 	function gfLdapConnect() {
 
-		global $sys_ldap_passwd,$ldap_conn;
+		global $ldap_conn;
 
 		if (!$ldap_conn) {
 			$this->clearError();
@@ -82,7 +82,7 @@
 			if (forge_get_config('ldap_version')) {
 				ldap_set_option($ldap_conn, LDAP_OPT_PROTOCOL_VERSION, forge_get_config('ldap_version'));
 			}
-			ldap_bind($ldap_conn,forge_get_config('ldap_bind_dn'),$sys_ldap_passwd);
+			ldap_bind($ldap_conn,forge_get_config('ldap_bind_dn'),forge_get_config('ldap_password'));
 		}
 		return true;
 	}

Modified: trunk/gforge/cronjobs/backup_site.php
===================================================================
--- trunk/gforge/cronjobs/backup_site.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/cronjobs/backup_site.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -25,9 +25,9 @@
 require $gfcommon.'include/cron_utils.php';
 
 
-$database=$sys_dbname; //Database name from local.inc
-$username=$sys_dbuser; //Username used to log on to data base
-$password=$sys_dbpasswd; //Db Password 
+$database=forge_get_config('database_name'); //Database name from local.inc
+$username=forge_get_config('database_user'); //Username used to log on to data base
+$password=forge_get_config('database_password'); //Db Password 
 
 $datetime=date('Y-m-d'); //we will use this to concatenate it with the tar filename
 

Modified: trunk/gforge/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -66,8 +66,6 @@
 
 require_once( "$IP/includes/DefaultSettings.php" );
 
-if (!isset($sys_dbport)) { $sys_dbport = 5432; }
-
 if ( $wgCommandLineMode ) {
         if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
                 die( "This script must be run from the command line\n" );
@@ -81,13 +79,13 @@
 $wgPasswordSender = forge_get_config('admin_email');
 
 $wgDBtype           = "postgres";
-$wgDBserver         = $sys_dbhost ;
-$wgDBname           = $sys_dbname;
-$wgDBuser           = $sys_dbuser ;
-$wgDBpassword       = $sys_dbpasswd ;
-$wgDBadminuser           = $sys_dbuser ;
-$wgDBadminpassword       = $sys_dbpasswd ;
-$wgDBport           = $sys_dbport ;
+$wgDBserver         = forge_get_config('database_host') ;
+$wgDBname           = forge_get_config('database_name');
+$wgDBuser           = forge_get_config('database_user') ;
+$wgDBpassword       = forge_get_config('database_password') ;
+$wgDBadminuser           = forge_get_config('database_user') ;
+$wgDBadminpassword       = forge_get_config('database_password') ;
+$wgDBport           = forge_get_config('database_port') ;
 $wgDBmwschema       = str_replace ('-', '_', "plugin_mediawiki_$fusionforgeproject") ;
 $wgDBts2schema      = str_replace ('-', '_', "plugin_mediawiki_$fusionforgeproject") ;
 $wgMainCacheType = CACHE_NONE;
@@ -103,11 +101,11 @@
 $wgLanguageCode = "en";
 $wgDefaultSkin = 'fusionforge';
 
-$GLOBALS['sys_dbhost'] = $sys_dbhost ;
-$GLOBALS['sys_dbport'] = $sys_dbport ;
-$GLOBALS['sys_dbname'] = $sys_dbname ;
-$GLOBALS['sys_dbuser'] = $sys_dbuser ;
-$GLOBALS['sys_dbpasswd'] = $sys_dbpasswd ;
+$GLOBALS['sys_dbhost'] = forge_get_config('database_host') ;
+$GLOBALS['sys_dbport'] = forge_get_config('database_port') ;
+$GLOBALS['sys_dbname'] = forge_get_config('database_name') ;
+$GLOBALS['sys_dbuser'] = forge_get_config('database_user') ;
+$GLOBALS['sys_dbpasswd'] = forge_get_config('database_password') ;
 $GLOBALS['sys_plugins_path'] = forge_get_config('plugins_path') ;
 $GLOBALS['sys_urlprefix'] = forge_get_config('url_prefix') ;
 $GLOBALS['sys_use_ssl'] = forge_get_config('use_ssl') ;

Modified: trunk/gforge/plugins/webcalendar/www/includes/config.php
===================================================================
--- trunk/gforge/plugins/webcalendar/www/includes/config.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/plugins/webcalendar/www/includes/config.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -77,14 +77,14 @@
   exit;
 }
 
-global $sys_dbhost,$sys_dbuser,$sys_dbpasswd,$sys_dbname;
 
+
 $db_type = 'postgresql';
 $settings['db_type'] = 'postgresql';
-$settings['db_host'] = $sys_dbhost;
-$settings['db_database'] = $sys_dbname;
-$settings['db_login'] = $sys_dbuser;
-$settings['db_password'] = $sys_dbpasswd;
+$settings['db_host'] = forge_get_config('database_host');
+$settings['db_database'] = forge_get_config('database_name');
+$settings['db_login'] = forge_get_config('database_user');
+$settings['db_password'] = forge_get_config('database_password');
 $settings['db_persistent'] = 'true';
 $settings['readonly'] = 'false';
 $settings['user_inc'] = 'user.php';

Modified: trunk/gforge/plugins/wiki/www/gforge.php
===================================================================
--- trunk/gforge/plugins/wiki/www/gforge.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/plugins/wiki/www/gforge.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -29,8 +29,8 @@
 	// Override the default configuration for VARIABLES after index.php:
 	// E.g. Use another DB:
 	$DBParams['dbtype'] = 'SQL';
-	$DBParams['dsn']    = 'pgsql://' . $sys_dbuser . ':' . 
-                              $sys_dbpasswd . '@' . $sys_dbhost .'/' . $sys_dbname
+	$DBParams['dsn']    = 'pgsql://' . forge_get_config('database_user') . ':' . 
+                              forge_get_config('database_password') . '@' . forge_get_config('database_host') .'/' . forge_get_config('database_name')
 . '_wiki';
 	$DBParams['prefix'] = $project->getUnixName() ."_";
 

Modified: trunk/gforge/plugins/wiki/www/wikiconfig.php
===================================================================
--- trunk/gforge/plugins/wiki/www/wikiconfig.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/plugins/wiki/www/wikiconfig.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -201,8 +201,8 @@
 // Override the default configuration for VARIABLES after index.php:
 // E.g. Use another DB:
 $DBParams['dbtype'] = 'SQL';
-$DBParams['dsn']    = 'pgsql://' . $sys_dbuser . ':' . 
-    $sys_dbpasswd . '@' . $sys_dbhost .'/' . $sys_dbname;
+$DBParams['dsn']    = 'pgsql://' . forge_get_config('database_user') . ':' . 
+    forge_get_config('database_password') . '@' . forge_get_config('database_host') .'/' . forge_get_config('database_name');
 
 $DBParams['prefix'] = "plugin_wiki_";
 

Modified: trunk/gforge/www/include/database-oci8.php
===================================================================
--- trunk/gforge/www/include/database-oci8.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/gforge/www/include/database-oci8.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -29,8 +29,8 @@
  *  in other functions in this library
  */
 function db_connect() {
-	global $sys_dbhost,$sys_dbuser,$sys_dbpasswd,$gfconn,$sys_dbname;
-	$gfconn = @ocilogon($sys_dbuser,$sys_dbpasswd,$sys_dbname);
+	global $gfconn;
+	$gfconn = @ocilogon(forge_get_config('database_user'),forge_get_config('database_password'),forge_get_config('database_name'));
 	#return $gfconn;
 }
 

Modified: trunk/tests/code/deprecations/DeprecationsTest.php
===================================================================
--- trunk/tests/code/deprecations/DeprecationsTest.php	2010-04-27 19:38:55 UTC (rev 9613)
+++ trunk/tests/code/deprecations/DeprecationsTest.php	2010-04-27 19:48:06 UTC (rev 9614)
@@ -86,12 +86,14 @@
 			       'sys_jabber_user',
 			       'sys_jabber_server',
 			       'sys_jabber_port',
+			       'sys_jabber_pass',
 			       'sys_ldap_host',
 			       'sys_ldap_port',
 			       'sys_ldap_version',
 			       'sys_ldap_base_dn',
 			       'sys_ldap_bind_dn',
 			       'sys_ldap_admin_dn',
+			       'sys_ldap_passwd',
 			       'sys_news_group',
 			       'sys_stats_group',
 			       'sys_peer_rating_group',
@@ -111,6 +113,11 @@
 			       'sys_session_key',
 			       'sys_show_source',
 			       'default_trove_cat',
+			       'sys_dbhost',
+			       'sys_dbport',
+			       'sys_dbname',
+			       'sys_dbuser',
+			       'sys_dbpasswd',
 			) ;
 
 		$pattern = implode ('|', $vars) ;




More information about the Fusionforge-commits mailing list